From 55c89c7491fd1f005158a84f111adcecaa1a75a6 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Tue, 3 Dec 2019 23:55:40 -0800 Subject: [PATCH 1/6] neo --- code/game/objects/items/storage/uplink_kits.dm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 4944125f28fc..af09417a874c 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -120,7 +120,7 @@ new /obj/item/card/emag(src) // 6 tc /obj/item/storage/box/syndicate/bundle_B/PopulateContents() - switch (pickweight(list( "bond" = 2, "ninja" = 1, "darklord" = 1, "white_whale_holy_grail" = 2, "mad_scientist" = 2, "bee" = 2, "mr_freeze" = 2))) + switch (pickweight(list( "bond" = 2, "neo=1", "ninja" = 1, "darklord" = 1, "white_whale_holy_grail" = 2, "mad_scientist" = 2, "bee" = 2, "mr_freeze" = 2))) if("bond") new /obj/item/gun/ballistic/automatic/pistol(src) new /obj/item/suppressor(src) @@ -194,7 +194,21 @@ new /obj/item/dnainjector/cryokinesis(src) new /obj/item/gun/energy/temperature/security(src) new /obj/item/melee/transforming/energy/sword/saber/blue(src) //see see it fits the theme bc its blue and ice is blue - + + if("neo") + new /obj/item/clothing/glasses/sunglasses(src) + new /obj/item/gun/ballistic/automatic/pistol(src) + new /obj/item/gun/ballistic/automatic/pistol(src) + new /obj/item/ammo_box/magazine/m10mm/ap(src) + new /obj/item/ammo_box/magazine/m10mm/ap(src) + new /obj/item/ammo_box/magazine/m10mm(src) + new /obj/item/ammo_box/magazine/m10mm(src) + new /obj/item/slime_extract/sepia(src) + new /obj/item/slime_extract/sepia(src) + new /obj/item/slime_extract/sepia(src) + + +/obj/item/ammo_box/magazine/m10mm /obj/item/storage/box/syndicate/contract_kit name = "Contract Kit" desc = "Supplied to Syndicate contractors." From 07c46c1fd5df7ff3ed9692dfb56930ed02ee8f38 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Wed, 4 Dec 2019 00:49:32 -0800 Subject: [PATCH 2/6] Update code/game/objects/items/storage/uplink_kits.dm Co-Authored-By: Theos --- code/game/objects/items/storage/uplink_kits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index af09417a874c..b64f2155acb4 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -195,7 +195,7 @@ new /obj/item/gun/energy/temperature/security(src) new /obj/item/melee/transforming/energy/sword/saber/blue(src) //see see it fits the theme bc its blue and ice is blue - if("neo") + if("neo") new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/gun/ballistic/automatic/pistol(src) new /obj/item/gun/ballistic/automatic/pistol(src) From 812d3ba12e12d65c3da6a135aec0bbb919d370ab Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Wed, 4 Dec 2019 08:24:49 -0800 Subject: [PATCH 3/6] Update uplink_kits.dm --- code/game/objects/items/storage/uplink_kits.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index b64f2155acb4..a3fb3fc23a81 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -203,12 +203,14 @@ new /obj/item/ammo_box/magazine/m10mm/ap(src) new /obj/item/ammo_box/magazine/m10mm(src) new /obj/item/ammo_box/magazine/m10mm(src) + + new /obj/item/reagent_containers/syringe/plasma(src) new /obj/item/slime_extract/sepia(src) new /obj/item/slime_extract/sepia(src) new /obj/item/slime_extract/sepia(src) - -/obj/item/ammo_box/magazine/m10mm + + /obj/item/storage/box/syndicate/contract_kit name = "Contract Kit" desc = "Supplied to Syndicate contractors." From a018c0ac4557292755e7e9dd27e0651301d4d60d Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Wed, 4 Dec 2019 08:28:33 -0800 Subject: [PATCH 4/6] stimulants --- .../reagents/reagent_containers/hypospray.dm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/yogstation/code/modules/reagents/reagent_containers/hypospray.dm b/yogstation/code/modules/reagents/reagent_containers/hypospray.dm index d5d961054d73..c888a231f3d1 100644 --- a/yogstation/code/modules/reagents/reagent_containers/hypospray.dm +++ b/yogstation/code/modules/reagents/reagent_containers/hypospray.dm @@ -29,4 +29,21 @@ else if(reagents.total_volume) icon_state = "[initial(icon_state)]25" else - icon_state = "[initial(icon_state)]0" \ No newline at end of file + icon_state = "[initial(icon_state)]0" + +/obj/item/reagent_containers/hypospray/medipen/stimpack/large/redpill + name = "Red Pill injector" + desc = "Contains two heavy doses of Red Pills (Stimulants)." + icon = 'yogstation/icons/obj/syringe.dmi' + icon_state = "stimpakpen" + volume = 50 + amount_per_transfer_from_this = 25 + list_reagents = list(/datum/reagent/medicine/stimulants = 50) + +/obj/item/reagent_containers/hypospray/medipen/stimpack/large/redpill/update_icon() + if(reagents.total_volume > 25) + icon_state = initial(icon_state) + else if(reagents.total_volume) + icon_state = "[initial(icon_state)]25" + else + icon_state = "[initial(icon_state)]0" From 91d2e7cd0cddb811dbe12cd8f78e3d3f1f46f2a5 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Wed, 4 Dec 2019 08:31:03 -0800 Subject: [PATCH 5/6] Update uplink_kits.dm --- code/game/objects/items/storage/uplink_kits.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index a3fb3fc23a81..bf43432cbc1b 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -203,11 +203,12 @@ new /obj/item/ammo_box/magazine/m10mm/ap(src) new /obj/item/ammo_box/magazine/m10mm(src) new /obj/item/ammo_box/magazine/m10mm(src) - + new /obj/item/ammo_box/magazine/m10mm/fire(src) new /obj/item/reagent_containers/syringe/plasma(src) + new /obj/item/reagent_containers/hypospray/medipen/stimpack/large/redpill(src) new /obj/item/slime_extract/sepia(src) new /obj/item/slime_extract/sepia(src) - new /obj/item/slime_extract/sepia(src) + new /obj/item/slime_extract/sepia(src) // sepia to stop time because we dont really have a time slow event From 9df33084d1febf8bc1dba8c248831bf638f40be9 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Wed, 4 Dec 2019 08:39:29 -0800 Subject: [PATCH 6/6] Update uplink_kits.dm --- code/game/objects/items/storage/uplink_kits.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index bf43432cbc1b..9fbd77703803 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -211,7 +211,6 @@ new /obj/item/slime_extract/sepia(src) // sepia to stop time because we dont really have a time slow event - /obj/item/storage/box/syndicate/contract_kit name = "Contract Kit" desc = "Supplied to Syndicate contractors."