Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

adds a tacti cool kit based off of neo #7233

Merged
alexkar598 merged 6 commits into from
Dec 12, 2019
Merged

adds a tacti cool kit based off of neo #7233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
55c89c7
neo
boodaliboo Dec 4, 2019
07c46c1
Update code/game/objects/items/storage/uplink_kits.dm
boodaliboo Dec 4, 2019
812d3ba
Update uplink_kits.dm
boodaliboo Dec 4, 2019
a018c0a
stimulants
boodaliboo Dec 4, 2019
91d2e7c
Update uplink_kits.dm
boodaliboo Dec 4, 2019
9df3308
Update uplink_kits.dm
boodaliboo Dec 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion code/game/objects/items/storage/uplink_kits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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"
Expand Down
19 changes: 18 additions & 1 deletion yogstation/code/modules/reagents/reagent_containers/hypospray.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,21 @@
else if(reagents.total_volume)
icon_state = "[initial(icon_state)]25"
else
icon_state = "[initial(icon_state)]0"
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"