cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mad scientist kit buff (#17998)

Browse Source 
* mad sci

* fix type erroring

* Update snowdin.dm

* Update CentCom.dmm
This commit is contained in:
ynot01
2023-02-25 20:54:09 -05:00
committed by GitHub
parent baea4cef7f
commit f252e3c17a
5 changed files with 45 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
_maps/map_files/generic/CentCom.dmm
View File

@@ -20284,11 +20284,11 @@
"aPi" = ( "aPi" = (
/obj/structure/table/reinforced, /obj/structure/table/reinforced,
/obj/item/grenade/clusterbuster/cleaner, /obj/item/grenade/clusterbuster/cleaner,
/obj/item/grenade/clusterbuster/emp{ /obj/item/grenade/clusterbuster/syndie/emp{
pixel_x = 4; pixel_x = 4;
pixel_y = 4 pixel_y = 4
}, },
/obj/item/grenade/clusterbuster/facid{ /obj/item/grenade/clusterbuster/syndie/facid{
pixel_x = 8; pixel_x = 8;
pixel_y = 8 pixel_y = 8
}, },
@@ -22835,12 +22835,12 @@
/area/bluespace_locker) /area/bluespace_locker)
"aUu" = ( "aUu" = (
/obj/structure/table/reinforced, /obj/structure/table/reinforced,
/obj/item/grenade/clusterbuster/inferno, /obj/item/grenade/clusterbuster/syndie/inferno,
/obj/item/grenade/clusterbuster/spawner_spesscarp{ /obj/item/grenade/clusterbuster/syndie/spawner_spesscarp{
pixel_x = 4; pixel_x = 4;
pixel_y = 4 pixel_y = 4
}, },
/obj/item/grenade/clusterbuster/spawner_manhacks{ /obj/item/grenade/clusterbuster/syndie/spawner_manhacks{
pixel_x = 8; pixel_x = 8;
pixel_y = 8 pixel_y = 8
}, },

21
code/game/objects/items/grenades/clusterbuster.dm
View File

@@ -117,7 +117,7 @@
/obj/item/grenade/flashbang/cluster /obj/item/grenade/flashbang/cluster
icon_state = "flashbang_active" icon_state = "flashbang_active"
/obj/item/grenade/clusterbuster/emp /obj/item/grenade/clusterbuster/syndie/emp
name = "Electromagnetic Storm" name = "Electromagnetic Storm"
payload = /obj/item/grenade/empgrenade payload = /obj/item/grenade/empgrenade
@@ -129,7 +129,7 @@
name = "Instant Concrete" name = "Instant Concrete"
payload = /obj/item/grenade/chem_grenade/metalfoam payload = /obj/item/grenade/chem_grenade/metalfoam
/obj/item/grenade/clusterbuster/inferno /obj/item/grenade/clusterbuster/syndie/inferno
name = "Inferno" name = "Inferno"
payload = /obj/item/grenade/chem_grenade/incendiary payload = /obj/item/grenade/chem_grenade/incendiary
@@ -145,19 +145,19 @@
name = "Oignon Grenade" name = "Oignon Grenade"
payload = /obj/item/grenade/chem_grenade/teargas payload = /obj/item/grenade/chem_grenade/teargas
/obj/item/grenade/clusterbuster/facid /obj/item/grenade/clusterbuster/syndie/facid
name = "Aciding Rain" name = "Aciding Rain"
payload = /obj/item/grenade/chem_grenade/facid payload = /obj/item/grenade/chem_grenade/facid
/obj/item/grenade/clusterbuster/syndieminibomb /obj/item/grenade/clusterbuster/syndie/syndieminibomb
name = "SyndiWrath" name = "SyndiWrath"
payload = /obj/item/grenade/syndieminibomb payload = /obj/item/grenade/syndieminibomb
/obj/item/grenade/clusterbuster/spawner_manhacks /obj/item/grenade/clusterbuster/syndie/spawner_manhacks
name = "iViscerator" name = "iViscerator"
payload = /obj/item/grenade/spawnergrenade/manhacks payload = /obj/item/grenade/spawnergrenade/manhacks
/obj/item/grenade/clusterbuster/spawner_spesscarp /obj/item/grenade/clusterbuster/syndie/spawner_spesscarp
name = "Invasion of the Space Carps" name = "Invasion of the Space Carps"
payload = /obj/item/grenade/spawnergrenade/spesscarp payload = /obj/item/grenade/spawnergrenade/spesscarp
@@ -165,7 +165,7 @@
name = "Slipocalypse" name = "Slipocalypse"
payload = /obj/item/grenade/spawnergrenade/syndiesoap payload = /obj/item/grenade/spawnergrenade/syndiesoap
/obj/item/grenade/clusterbuster/clf3 /obj/item/grenade/clusterbuster/syndie/clf3
name = "WELCOME TO HELL" name = "WELCOME TO HELL"
payload = /obj/item/grenade/chem_grenade/clf3 payload = /obj/item/grenade/chem_grenade/clf3
@@ -179,6 +179,13 @@
new real_type(loc) new real_type(loc)
return INITIALIZE_HINT_QDEL return INITIALIZE_HINT_QDEL
// syndie subtype so syndies dont get something utterly useless
/obj/item/grenade/clusterbuster/random/syndie/Initialize()
..()
var/real_type = pick(subtypesof(/obj/item/grenade/clusterbuster/syndie))
new real_type(loc)
return INITIALIZE_HINT_QDEL
//rainbow slime effect //rainbow slime effect
/obj/item/grenade/clusterbuster/slime /obj/item/grenade/clusterbuster/slime
name = "Blorble Blorble" name = "Blorble Blorble"

45
code/game/objects/items/storage/uplink_kits.dm
View File

@@ -191,7 +191,7 @@
new /obj/item/clothing/suit/space/hardsuit/carp(src) //1 carp new /obj/item/clothing/suit/space/hardsuit/carp(src) //1 carp
new /obj/item/clothing/mask/gas/carp(src) //1 carp? new /obj/item/clothing/mask/gas/carp(src) //1 carp?
new /obj/item/twohanded/pitchfork/trident(src) new /obj/item/twohanded/pitchfork/trident(src)
new /obj/item/grenade/clusterbuster/spawner_spesscarp(src) //when you need A LOT of carps, you'll get at least (but most likely more) 30 carps with that new /obj/item/grenade/clusterbuster/syndie/spawner_spesscarp(src) //when you need A LOT of carps, you'll get at least (but most likely more) 30 carps with that
new /obj/item/grenade/spawnergrenade/spesscarp(src) //for precise and quick delivery of carps, 5 carps per grenade for a total of 20 carps new /obj/item/grenade/spawnergrenade/spesscarp(src) //for precise and quick delivery of carps, 5 carps per grenade for a total of 20 carps
new /obj/item/grenade/spawnergrenade/spesscarp(src) new /obj/item/grenade/spawnergrenade/spesscarp(src)
new /obj/item/grenade/spawnergrenade/spesscarp(src) new /obj/item/grenade/spawnergrenade/spesscarp(src)
@@ -199,23 +199,24 @@
new /obj/item/carpcaller(src) //to spawn carps in space, making the place safer for you and dangerous for everyone else, you should get at least 20 carps per use so 60 carps new /obj/item/carpcaller(src) //to spawn carps in space, making the place safer for you and dangerous for everyone else, you should get at least 20 carps per use so 60 carps
new /obj/item/toy/plush/carpplushie/dehy_carp //1 carp but guaranteed complete loyalty and cuddliness new /obj/item/toy/plush/carpplushie/dehy_carp //1 carp but guaranteed complete loyalty and cuddliness
if("mad_scientist") if("mad_scientist") // ~21 tc
new /obj/item/clothing/suit/toggle/labcoat/mad(src) // 0 tc new /obj/item/clothing/suit/toggle/labcoat/mad(src) // 0 tc
new /obj/item/clothing/shoes/jackboots(src) // 0 tc new /obj/item/clothing/shoes/jackboots(src) // 0 tc
new /obj/item/megaphone(src) // 0 tc (because how else are they to know you're mad?) new /obj/item/megaphone(src) // 0 tc (because how else are they to know you're mad?)
new /obj/item/grenade/clusterbuster/random(src) // 10 tc? new /obj/item/grenade/clusterbuster/random/syndie(src) // RNG worth like 2-10TC
new /obj/item/grenade/clusterbuster/random(src) // 10 tc? new /obj/item/grenade/clusterbuster/random/syndie(src) // RNG worth like 2-10TC
new /obj/item/grenade/chem_grenade/bioterrorfoam(src) // 5 tc new /obj/item/grenade/chem_grenade/bioterrorfoam(src) // 5 tc
new /obj/item/storage/box/syndie_kit/ez_clean // 6 tc
new /obj/item/assembly/signaler(src) // 0 tc new /obj/item/assembly/signaler(src) // 0 tc
new /obj/item/assembly/signaler(src) // 0 tc new /obj/item/assembly/signaler(src) // 0 tc
new /obj/item/assembly/signaler(src) // 0 tc new /obj/item/assembly/signaler(src) // 0 tc
new /obj/item/assembly/signaler(src) // 0 tc new /obj/item/assembly/signaler(src) // 0 tc
new /obj/item/storage/toolbox/syndicate(src) // 1 tc new /obj/item/storage/toolbox/syndicate(src) // 1 tc
new /obj/item/pen/edagger(src) new /obj/item/pen/edagger(src) // 2 tc
new /obj/item/gun/energy/wormhole_projector/upgraded(src) //mooorttyyyy new /obj/item/gun/energy/wormhole_projector/upgraded(src) // ~2 tc
new /obj/item/gun/energy/decloner/unrestricted(src) new /obj/item/gun/energy/decloner/unrestricted(src) // these shots do 9 damage. 1 tc
if("bee") if("bee") // bee sword too based so its priceless
new /obj/item/paper/fluff/bee_objectives(src) // 0 tc (motivation) new /obj/item/paper/fluff/bee_objectives(src) // 0 tc (motivation)
new /obj/item/clothing/suit/hooded/bee_costume(src) // 0 tc new /obj/item/clothing/suit/hooded/bee_costume(src) // 0 tc
new /obj/item/clothing/mask/rat/bee(src) // 0 tc new /obj/item/clothing/mask/rat/bee(src) // 0 tc
@@ -224,20 +225,20 @@
new /obj/item/reagent_containers/glass/bottle/beesease(src) // 10 tc? new /obj/item/reagent_containers/glass/bottle/beesease(src) // 10 tc?
new /obj/item/melee/beesword(src) //priceless new /obj/item/melee/beesword(src) //priceless
if("mr_freeze") if("mr_freeze") // ~17 tc
new /obj/item/clothing/glasses/cold(src) new /obj/item/clothing/glasses/cold(src) // 0 tc
new /obj/item/clothing/gloves/color/black(src) new /obj/item/clothing/gloves/color/black(src) // 0 tc
new /obj/item/clothing/mask/chameleon/syndicate(src) new /obj/item/clothing/mask/chameleon/syndicate(src) // 0 tc on its own
new /obj/item/clothing/suit/hooded/wintercoat(src) new /obj/item/clothing/suit/hooded/wintercoat(src) // 0 tc
new /obj/item/clothing/shoes/winterboots(src) new /obj/item/clothing/shoes/winterboots(src) // 0 tc
new /obj/item/grenade/gluon(src) new /obj/item/grenade/gluon(src) // all four probably like 1 tc together kind of just a slip bomb
new /obj/item/grenade/gluon(src) new /obj/item/grenade/gluon(src) //
new /obj/item/grenade/gluon(src) new /obj/item/grenade/gluon(src) //
new /obj/item/grenade/gluon(src) new /obj/item/grenade/gluon(src) //
new /obj/item/dnainjector/geladikinesis(src) new /obj/item/dnainjector/geladikinesis(src) // 0 tc
new /obj/item/dnainjector/cryokinesis(src) new /obj/item/dnainjector/cryokinesis(src) // 1 or 2 tc, kind of useful
new /obj/item/gun/energy/temperature/security(src) new /obj/item/gun/energy/temperature/security(src) // the crutch of this kit, alongside esword, ~4 tc
new /obj/item/melee/transforming/energy/sword/saber/blue(src) //see see it fits the theme bc its blue and ice is blue new /obj/item/melee/transforming/energy/sword/saber/blue(src) //see see it fits the theme bc its blue and ice is blue, 8 tc
if("neo") if("neo")
new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/clothing/glasses/sunglasses(src)

4
code/modules/awaymissions/mission_code/snowdin.dm
View File

@@ -503,7 +503,7 @@
/obj/item/storage/backpack/holding = 12, /obj/item/storage/backpack/holding = 12,
/obj/item/grenade/spawnergrenade/manhacks = 6, /obj/item/grenade/spawnergrenade/manhacks = 6,
/obj/item/grenade/spawnergrenade/spesscarp = 7, /obj/item/grenade/spawnergrenade/spesscarp = 7,
/obj/item/grenade/clusterbuster/inferno = 3, /obj/item/grenade/clusterbuster/syndie/inferno = 3,
/obj/item/stack/sheet/mineral/diamond{amount = 15} = 10, /obj/item/stack/sheet/mineral/diamond{amount = 15} = 10,
/obj/item/stack/sheet/mineral/uranium{amount = 15} = 10, /obj/item/stack/sheet/mineral/uranium{amount = 15} = 10,
/obj/item/stack/sheet/mineral/plasma{amount = 15} = 10, /obj/item/stack/sheet/mineral/plasma{amount = 15} = 10,
@@ -527,7 +527,7 @@
/obj/item/gun/magic/wand/resurrection = 10, /obj/item/gun/magic/wand/resurrection = 10,
/obj/item/uplink/old = 2, /obj/item/uplink/old = 2,
/obj/item/book/granter/spell/charge = 12, /obj/item/book/granter/spell/charge = 12,
/obj/item/grenade/clusterbuster/spawner_manhacks = 15, /obj/item/grenade/clusterbuster/syndie/spawner_manhacks = 15,
/obj/item/book/granter/spell/fireball = 10, /obj/item/book/granter/spell/fireball = 10,
/obj/item/pickaxe/drill/jackhammer = 30, /obj/item/pickaxe/drill/jackhammer = 30,
/obj/item/borg/upgrade/syndicate = 13, /obj/item/borg/upgrade/syndicate = 13,

2
code/modules/cargo/exports/lavaland.dm
View File

@@ -13,7 +13,7 @@
/obj/item/melee/ghost_sword, /obj/item/melee/ghost_sword,
/obj/item/clothing/suit/space/hardsuit/cult, /obj/item/clothing/suit/space/hardsuit/cult,
/obj/item/voodoo, /obj/item/voodoo,
/obj/item/grenade/clusterbuster/inferno, /obj/item/grenade/clusterbuster/syndie/inferno,
/obj/item/clothing/neck/necklace/memento_mori, /obj/item/clothing/neck/necklace/memento_mori,
/obj/item/organ/heart/cursed/wizard, /obj/item/organ/heart/cursed/wizard,
/obj/item/clothing/suit/hooded/cloak/drake, /obj/item/clothing/suit/hooded/cloak/drake,