Removes guns and viruses from maint loot spawners (#11516)

This commit is contained in:
Kurfursten
2016-08-24 10:20:15 -05:00
committed by sood
parent cd2ea5f027
commit 3b34ed2e31
3 changed files with 36 additions and 16 deletions

View File

@@ -227,7 +227,7 @@
/obj/item/device/radio/headset/headset_earmuffs /obj/item/device/radio/headset/headset_earmuffs
name = "headset earmuffs" name = "headset earmuffs"
desc = "Protective earmuffs for sound technicians that allow one to speak on radio channels. To access service, use :d. For engineering, use :e." desc = "Protective earmuffs for sound technicians that allow one to speak on radio channels."
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
icon_state = "headset_earmuffs" icon_state = "headset_earmuffs"
item_state = "earmuffs" item_state = "earmuffs"

View File

@@ -312,17 +312,12 @@
/obj/item/device/camera, /obj/item/device/camera,
/obj/item/device/camera_film, /obj/item/device/camera_film,
/obj/item/device/encryptionkey, /obj/item/device/encryptionkey,
/obj/item/device/encryptionkey,
/obj/item/device/encryptionkey,
/obj/item/device/encryptionkey/syndicate,
/obj/item/device/encryptionkey/binary, /obj/item/device/encryptionkey/binary,
/obj/item/device/encryptionkey/syndicate/hacked,
/obj/item/device/hailer, /obj/item/device/hailer,
/obj/item/device/healthanalyzer, /obj/item/device/healthanalyzer,
/obj/item/device/mass_spectrometer, /obj/item/device/mass_spectrometer,
/obj/item/device/megaphone, /obj/item/device/megaphone,
/obj/item/device/mmi/radio_enabled, /obj/item/device/mmi/radio_enabled,
/obj/item/device/powersink,
/obj/item/device/reagent_scanner, /obj/item/device/reagent_scanner,
/obj/item/device/soundsynth, /obj/item/device/soundsynth,
/obj/item/latexballon, /obj/item/latexballon,
@@ -525,9 +520,6 @@
/obj/item/weapon/coin/silver, /obj/item/weapon/coin/silver,
/obj/item/weapon/coin/uranium, /obj/item/weapon/coin/uranium,
/obj/item/weapon/dice, /obj/item/weapon/dice,
/obj/item/weapon/gun/projectile/flamethrower/full,
/obj/item/weapon/gun/projectile/deagle/gold,
/obj/item/weapon/gun/projectile/russian,
/obj/item/weapon/handcuffs, /obj/item/weapon/handcuffs,
/obj/item/weapon/handcuffs/cable, /obj/item/weapon/handcuffs/cable,
/obj/item/weapon/hatchet, /obj/item/weapon/hatchet,
@@ -541,17 +533,10 @@
/obj/item/weapon/scalpel, /obj/item/weapon/scalpel,
/obj/item/weapon/shard, /obj/item/weapon/shard,
/obj/item/weapon/stool, /obj/item/weapon/stool,
/obj/item/device/powersink,
/obj/item/weapon/reagent_containers/blood/OMinus, /obj/item/weapon/reagent_containers/blood/OMinus,
/obj/item/weapon/reagent_containers/glass/bottle/ammonia, /obj/item/weapon/reagent_containers/glass/bottle/ammonia,
/obj/item/weapon/reagent_containers/glass/bottle/capsaicin, /obj/item/weapon/reagent_containers/glass/bottle/capsaicin,
/obj/item/weapon/reagent_containers/glass/bottle/chloralhydrate,
/obj/item/weapon/reagent_containers/glass/bottle/cold,
/obj/item/weapon/reagent_containers/glass/bottle/diethylamine, /obj/item/weapon/reagent_containers/glass/bottle/diethylamine,
/obj/item/weapon/reagent_containers/glass/bottle/epiglottis_virion,
/obj/item/weapon/reagent_containers/glass/bottle/flu_virion,
/obj/item/weapon/reagent_containers/glass/bottle/magnitis,
/obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat,
/obj/item/weapon/reagent_containers/food/drinks/beer, /obj/item/weapon/reagent_containers/food/drinks/beer,
/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe,
/obj/item/weapon/reagent_containers/food/drinks/bottle/cream, /obj/item/weapon/reagent_containers/food/drinks/bottle/cream,
@@ -586,8 +571,37 @@
/obj/item/weapon/reagent_containers/food/snacks/soylenviridians, /obj/item/weapon/reagent_containers/food/snacks/soylenviridians,
/obj/item/weapon/reagent_containers/food/snacks/syndicake, /obj/item/weapon/reagent_containers/food/snacks/syndicake,
/obj/item/weapon/reagent_containers/food/snacks/tofurkey, /obj/item/weapon/reagent_containers/food/snacks/tofurkey,
/obj/item/device/radio/headset/headset_earmuffs,
/obj/item/weapon/solder/pre_fueled,
/obj/item/weapon/storage/box/smokebombs,
/obj/item/weapon/storage/box/wind,
/obj/item/weapon/storage/box/foam,
/obj/item/weapon/reagent_containers/food/snacks/grown/peanut,
/obj/structure/popout_cake,
/obj/structure/bed/chair/vehicle/wheelchair/multi_people,
/obj/item/stack/package_wrap/syndie,
/obj/item/weapon/storage/toolbox/syndicate,
/obj/item/weapon/switchtool/swiss_army_knife
) )
/obj/map/spawner/highrisk
name = "high risk spawner"
icon_state = "maint"
chance = 20
to_spawn = list(
/obj/item/weapon/reagent_containers/glass/bottle/epiglottis_virion,
/obj/item/weapon/reagent_containers/glass/bottle/flu_virion,
/obj/item/weapon/reagent_containers/glass/bottle/magnitis,
/obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat,
/obj/item/weapon/reagent_containers/glass/bottle/chloralhydrate,
/obj/item/weapon/reagent_containers/glass/bottle/cold,
/obj/item/device/powersink,
/obj/item/device/powersink,
/obj/item/weapon/gun/projectile/flamethrower/full,
/obj/item/weapon/gun/projectile/deagle/gold,
/obj/item/weapon/gun/projectile/russian,
)
// Space /////////////////////////////////////////////////////// // Space ///////////////////////////////////////////////////////
/obj/map/spawner/space/weapons /obj/map/spawner/space/weapons

View File

@@ -0,0 +1,6 @@
author: Kurfurst
delete-after: True
changes:
- rscdel: The maint loot spawner has had several items moved to a separate high risk spawner, including guns and viruses. They will no longer appear in Defficiency maintenance.
- rscadd: The maint loot spawner now spawns several new items including (normally unobtainable) multi-person wheelchair, peanuts, headset earmuffs, box of wind grenades, and swiss army knife among other things.