cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-14 17:36:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Antag Dirty Bombs & Bodyhorror Parasites (#16317)

Browse Source 
* dirty bombs & bodyhorror

* clean up + extra flavour

CE_ANTIEMETIC taken into account in the delayed_vomit() proc. doesn't need to subtract from CE_EMETIC anymore.

* desc. fix, TC tweak, syringe gun kit

* dirty bomb tweaks

radiation remains for as long as advertised (~8mins in an open space)
it also actually leaves behind the green goo now.
This commit is contained in:
smellie
2023-05-16 01:34:10 +01:00
committed by GitHub
parent 0a3be0f04c
commit f237ea8309
24 changed files with 434 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/contraband.dm
+22
View File
@@ -65,3 +65,25 @@
reagents.add_reagent(/singleton/reagent/venenum,volume)
desc = "Contains venenum."
update_icon()
/obj/item/reagent_containers/glass/beaker/vial/nerveworm_eggs
flags = 0
/obj/item/reagent_containers/glass/beaker/vial/nerveworm_eggs/Initialize()
. = ..()
if(is_open_container())
flags ^= OPENCONTAINER
reagents.add_reagent(/singleton/reagent/toxin/nerveworm_eggs, 2)
desc = "<b>BIOHAZARDOUS! - Nerve Fluke eggs.</b> Purchased from <i>SciSupply Eridani</i>, recently incorporated into <i>Zeng-Hu Pharmaceuticals' Keiretsu</i>!"
update_icon()
/obj/item/reagent_containers/glass/beaker/vial/heartworm_eggs
flags = 0
/obj/item/reagent_containers/glass/beaker/vial/heartworm_eggs/Initialize()
. = ..()
if(is_open_container())
flags ^= OPENCONTAINER
reagents.add_reagent(/singleton/reagent/toxin/heartworm_eggs, 2)
desc = "<b>BIOHAZARDOUS! - Heart Fluke eggs.</b> Purchased from <i>SciSupply Eridani</i>, recently incorporated into <i>Zeng-Hu Pharmaceuticals' Keiretsu</i>!"
update_icon()
code/game/objects/items/weapons/explosives.dm
+18
View File
@@ -138,3 +138,21 @@
R.cell.use(1000)
can_deploy = TRUE
maptext = "<span style=\"font-family: 'Small Fonts'; -dm-text-outline: 1 black; font-size: 7px;\">Ready</span>"
/obj/item/plastique/dirty
name = "dirty bomb"
desc = "A small explosive laced with radium. The explosion is small, but the radioactive material will remain for a fair while."
timer = 300
/obj/item/plastique/dirty/attack_self(mob/user as mob)
var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num
if(user.get_active_hand() == src)
newtime = Clamp(newtime, 300, 60000)
timer = newtime
to_chat(user, SPAN_NOTICE("Timer set for [timer] seconds."))
/obj/item/plastique/dirty/explode(turf/location)
if(location)
SSradiation.radiate(src, 250)
new /obj/effect/decal/cleanable/greenglow(get_turf(src))
..()
code/game/objects/items/weapons/storage/pill_bottle.dm
+17 -2
View File
@@ -142,7 +142,7 @@
starts_with = list(/obj/item/reagent_containers/pill/parvosil = 3)
/obj/item/storage/pill_bottle/assorted
name = "pill bottle (assorted)"
name = "bottle of assorted pills"
desc = "Commonly found on paramedics, these assorted pill bottles contain all the basics."
starts_with = list(
/obj/item/reagent_containers/pill/inaprovaline = 6,
@@ -155,6 +155,21 @@
)
/obj/item/storage/pill_bottle/antidexafen
name = "pill bottle (cold medicine)"
name = "bottle of 15u Antidexafen pills"
desc = "All-in-one cold medicine. 15u dose per pill. Safe for babies like you!"
starts_with = list(/obj/item/reagent_containers/pill/antidexafen = 21)
/obj/item/storage/pill_bottle/antiparasitic
name = "bottle of 5u Helmizole pills"
desc = "Contains pills used to treat parasitic infections caused by worms."
starts_with = list(/obj/item/reagent_containers/pill/antiparasitic = 8)
/obj/item/storage/pill_bottle/asinodryl
name = "bottle of 10u Asinodryl pills"
desc = "Contains pills used to treat nausea and vomiting."
starts_with = list(/obj/item/reagent_containers/pill/asinodryl = 8)
/obj/item/storage/pill_bottle/steramycin
name = "bottle of 5u Steramycin pills"
desc = "Contains prophylactic antibiotic pills."
starts_with = list(/obj/item/reagent_containers/pill/steramycin = 3)
code/game/objects/items/weapons/storage/uplink_kits.dm
+20
View File
@@ -197,3 +197,23 @@
starts_with = list(
/obj/item/reagent_containers/hypospray/autoinjector/berserk = 2
)
/obj/item/storage/box/syndie_kit/nerveworms
name = "nerve fluke kit"
desc = "Contains the eggs of a Nerve Fluke (non-lethal, incapacitating)."
starts_with = list(/obj/item/reagent_containers/glass/beaker/vial/nerveworm_eggs = 1, /obj/item/reagent_containers/syringe = 1, /obj/item/reagent_containers/pill/antiparasitic = 1, /obj/item/reagent_containers/pill/asinodryl = 1)
/obj/item/storage/box/syndie_kit/heartworms
name = "heart fluke kit"
desc = "Contains the eggs of a Heart Fluke (lethal)."
starts_with = list(/obj/item/reagent_containers/glass/beaker/vial/heartworm_eggs = 1, /obj/item/reagent_containers/syringe = 1, /obj/item/reagent_containers/pill/antiparasitic = 1, /obj/item/reagent_containers/pill/asinodryl = 1)
/obj/item/storage/box/syndie_kit/radsuit
name = "radiation suit kit"
desc = "Contains a radiation suit and geiger counter to protect you from radiation."
starts_with = list(/obj/item/clothing/head/radiation = 1, /obj/item/clothing/suit/radiation = 1, /obj/item/clothing/glasses/safety/goggles = 1, /obj/item/device/geiger = 1, /obj/item/reagent_containers/pill/hyronalin = 1)
/obj/item/storage/box/syndie_kit/syringe_gun
name = "syringe gun kit"
desc = "Contains a syringe gun and the parts require to assemble a few darts."
starts_with = list(/obj/item/gun/launcher/syringe = 1, /obj/item/syringe_cartridge = 3, /obj/item/reagent_containers/syringe = 3)
code/game/objects/random/random.dm
+17 -5
View File
@@ -152,12 +152,24 @@
/obj/item/stack/medical/splint = 1,
/obj/item/bodybag = 2,
/obj/item/bodybag/cryobag = 1,
/obj/item/storage/pill_bottle/kelotane = 2,
/obj/item/storage/pill_bottle/bicaridine = 2,
/obj/item/storage/pill_bottle/antitox = 2,
/obj/item/auto_cpr = 1,
/obj/item/storage/pill_bottle/kelotane = 3,
/obj/item/storage/pill_bottle/bicaridine = 3,
/obj/item/storage/pill_bottle/antitox = 3,
/obj/item/storage/pill_bottle/mortaphenyl = 2,
/obj/item/reagent_containers/syringe/dylovene = 2,
/obj/item/reagent_containers/syringe/inaprovaline = 2,
/obj/item/storage/pill_bottle/antiparasitic = 1,
/obj/item/storage/pill_bottle/asinodryl = 1,
/obj/item/storage/pill_bottle/steramycin =1,
/obj/item/reagent_containers/syringe/dylovene = 3,
/obj/item/reagent_containers/syringe/inaprovaline = 3,
/obj/item/reagent_containers/syringe/antiparasitic = 1,
/obj/item/reagent_containers/syringe/antibiotic = 2,
/obj/item/reagent_containers/syringe/fluvectionem = 2,
/obj/item/reagent_containers/hypospray/autoinjector/coagzolug = 2,
/obj/item/reagent_containers/hypospray/autoinjector/hyronalin = 2,
/obj/item/reagent_containers/hypospray/autoinjector/sideeffectbgone = 1,
/obj/item/reagent_containers/inhaler/pneumalin = 1,
/obj/item/reagent_containers/inhaler/peridaxon = 1,
/obj/item/stack/nanopaste = 1
)