Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes the Bioterror Grenade into a Large Grenade Casing #3451

Merged
merged 3 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions code/game/objects/items/grenades/chem_grenade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -617,12 +617,18 @@
beakers += beaker_one
beakers += beaker_two

/obj/item/grenade/chem_grenade/bioterrorfoam
// MONKESTATION EDIT START
// MONKESTATION EDIT ORIGINAL /obj/item/grenade/chem_grenade/bioterrorfoam
/obj/item/grenade/chem_grenade/large/bioterrorfoam
// MONKESTATION EDIT END
name = "Bio terror foam grenade"
desc = "Tiger Cooperative chemical foam grenade. Causes temporary irration, blindness, confusion, mutism, and mutations to carbon based life forms. Contains additional spore toxin."
stage = GRENADE_READY

/obj/item/grenade/chem_grenade/bioterrorfoam/Initialize(mapload)
// MONKESTATION EDIT START
// MONKESTATION EDIT ORIGINAL /obj/item/grenade/chem_grenade/bioterrorfoam/Initialize(mapload)
/obj/item/grenade/chem_grenade/large/bioterrorfoam/Initialize(mapload)
// MONKESTATION EDIT END
. = ..()
var/obj/item/reagent_containers/cup/beaker/bluespace/beaker_one = new(src)
var/obj/item/reagent_containers/cup/beaker/bluespace/beaker_two = new(src)
Expand Down
5 changes: 4 additions & 1 deletion code/game/objects/items/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,10 @@
new /obj/item/gun/ballistic/automatic/c20r/toy(src)
new /obj/item/storage/box/syringes(src)
new /obj/item/ammo_box/foambox/riot(src)
new /obj/item/grenade/chem_grenade/bioterrorfoam(src)
// MONKESTATION EDIT START
// MONKESTATION EDIT ORIGINAL new /obj/item/grenade/chem_grenade/bioterrorfoam(src)
new /obj/item/grenade/chem_grenade/large/bioterrorfoam(src)
// MONKESTATION EDIT END
if(prob(5))
new /obj/item/food/pizza/pineapple(src)

Expand Down
5 changes: 4 additions & 1 deletion code/game/objects/items/storage/uplink_kits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,10 @@
new /obj/item/megaphone(src) // 0 tc
new /obj/item/grenade/clusterbuster/random(src) // 10 tc?
new /obj/item/grenade/clusterbuster/random(src) // 10 tc?
new /obj/item/grenade/chem_grenade/bioterrorfoam(src) // 5 tc
// MONKESTATION EDIT START
// MONKESTATION EDIT ORIGINAL new /obj/item/grenade/chem_grenade/bioterrorfoam(src)
new /obj/item/grenade/chem_grenade/large/bioterrorfoam(src) // 5 tc
// MONKESTATION EDIT END
new /obj/item/assembly/signaler(src) // 0 tc
new /obj/item/assembly/signaler(src) // 0 tc
new /obj/item/assembly/signaler(src) // 0 tc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
cost = 3

/datum/armament_entry/assault_operatives/explosives/bioterror
item_type = /obj/item/grenade/chem_grenade/bioterrorfoam
item_type = /obj/item/grenade/chem_grenade/large/bioterrorfoam
cost = 1

/datum/armament_entry/assault_operatives/explosives/minibomb
Expand Down
Loading