diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 4944125f28fc..9fbd77703803 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,6 +194,22 @@ 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/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) // sepia to stop time because we dont really have a time slow event + /obj/item/storage/box/syndicate/contract_kit name = "Contract Kit" 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"