April sync (#360)
* Maps and things no code/icons * helpers defines globalvars * Onclick world.dm orphaned_procs * subsystems Round vote and shuttle autocall done here too * datums * Game folder * Admin - chatter modules * clothing - mining * modular computers - zambies * client * mob level 1 * mob stage 2 + simple_animal * silicons n brains * mob stage 3 + Alien/Monkey * human mobs * icons updated * some sounds * emitter y u no commit * update tgstation.dme * compile fixes * travis fixes Also removes Fast digest mode, because reasons. * tweaks for travis Mentors are broke again Also fixes Sizeray guns * oxygen loss fix for vore code. * removes unused code * some code updates * bulk fixes * further fixes * outside things * whoops. * Maint bar ported * GLOBs.
This commit is contained in:
@@ -30,8 +30,8 @@
|
||||
var/foldable = /obj/item/stack/sheet/cardboard
|
||||
var/illustration = "writing"
|
||||
|
||||
/obj/item/weapon/storage/box/Initialize()
|
||||
. = ..()
|
||||
/obj/item/weapon/storage/box/Initialize(mapload)
|
||||
..()
|
||||
update_icon()
|
||||
|
||||
/obj/item/weapon/storage/box/update_icon()
|
||||
@@ -72,8 +72,7 @@
|
||||
name = "diskette box"
|
||||
illustration = "disk_kit"
|
||||
|
||||
/obj/item/weapon/storage/box/disks/Initialize()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/disks/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/weapon/disk/data(src)
|
||||
|
||||
@@ -82,24 +81,21 @@
|
||||
name = "plant data disks box"
|
||||
illustration = "disk_kit"
|
||||
|
||||
/obj/item/weapon/storage/box/disks_plantgene/Initialize()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/disks_plantgene/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/weapon/disk/plantgene(src)
|
||||
|
||||
// Ordinary survival box
|
||||
/obj/item/weapon/storage/box/survival/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/survival/PopulateContents()
|
||||
new /obj/item/clothing/mask/breath(src)
|
||||
new /obj/item/weapon/tank/internals/emergency_oxygen(src)
|
||||
new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
|
||||
|
||||
/obj/item/weapon/storage/box/survival/radio/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/survival/radio/PopulateContents()
|
||||
..() // we want the survival stuff too.
|
||||
new /obj/item/device/radio/off(src)
|
||||
|
||||
/obj/item/weapon/storage/box/survival_mining/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/survival_mining/PopulateContents()
|
||||
new /obj/item/clothing/mask/gas/explorer(src)
|
||||
new /obj/item/weapon/tank/internals/emergency_oxygen/engi(src)
|
||||
new /obj/item/weapon/crowbar/red(src)
|
||||
@@ -107,31 +103,28 @@
|
||||
|
||||
|
||||
// Engineer survival box
|
||||
/obj/item/weapon/storage/box/engineer/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/engineer/PopulateContents()
|
||||
new /obj/item/clothing/mask/breath(src)
|
||||
new /obj/item/weapon/tank/internals/emergency_oxygen/engi(src)
|
||||
new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
|
||||
|
||||
/obj/item/weapon/storage/box/engineer/radio/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/engineer/radio/PopulateContents()
|
||||
..() // we want the regular items too.
|
||||
new /obj/item/device/radio/off(src)
|
||||
|
||||
// Syndie survival box
|
||||
/obj/item/weapon/storage/box/syndie/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/syndie/PopulateContents()
|
||||
new /obj/item/clothing/mask/gas/syndicate(src)
|
||||
new /obj/item/weapon/tank/internals/emergency_oxygen/engi(src)
|
||||
|
||||
// Security survival box
|
||||
/obj/item/weapon/storage/box/security/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/security/PopulateContents()
|
||||
new /obj/item/clothing/mask/gas/sechailer(src)
|
||||
new /obj/item/weapon/tank/internals/emergency_oxygen(src)
|
||||
new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
|
||||
|
||||
/obj/item/weapon/storage/box/security/radio/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/security/radio/PopulateContents()
|
||||
..() // we want the regular stuff too
|
||||
new /obj/item/device/radio/off(src)
|
||||
|
||||
/obj/item/weapon/storage/box/gloves
|
||||
@@ -139,8 +132,7 @@
|
||||
desc = "Contains sterile latex gloves."
|
||||
illustration = "latex"
|
||||
|
||||
/obj/item/weapon/storage/box/gloves/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/gloves/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/clothing/gloves/color/latex(src)
|
||||
|
||||
@@ -149,8 +141,7 @@
|
||||
desc = "This box contains sterile medical masks."
|
||||
illustration = "sterile"
|
||||
|
||||
/obj/item/weapon/storage/box/masks/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/masks/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/clothing/mask/surgical(src)
|
||||
|
||||
@@ -159,47 +150,34 @@
|
||||
desc = "A box full of syringes."
|
||||
illustration = "syringe"
|
||||
|
||||
/obj/item/weapon/storage/box/syringes/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/syringes/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/weapon/reagent_containers/syringe( src )
|
||||
new /obj/item/weapon/reagent_containers/syringe(src)
|
||||
|
||||
/obj/item/weapon/storage/box/medipens
|
||||
name = "box of medipens"
|
||||
desc = "A box full of epinephrine MediPens."
|
||||
illustration = "syringe"
|
||||
|
||||
/obj/item/weapon/storage/box/medipens/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/medipens/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/weapon/reagent_containers/hypospray/medipen( src )
|
||||
new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
|
||||
|
||||
/obj/item/weapon/storage/box/medipens/utility
|
||||
name = "stimpack value kit"
|
||||
desc = "A box with several stimpack medipens for the economical miner."
|
||||
illustration = "syringe"
|
||||
|
||||
/obj/item/weapon/storage/box/medipens/utility/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/medipens/utility/PopulateContents()
|
||||
..() // includes regular medipens.
|
||||
for(var/i in 1 to 5)
|
||||
new /obj/item/weapon/reagent_containers/hypospray/medipen/stimpack(src)
|
||||
|
||||
/obj/item/weapon/storage/box/medipens/survival
|
||||
name = "Survival pen bundle"
|
||||
desc = "a box with several survival pens inside, welcome to immortality!!"
|
||||
illustration = "syringe"
|
||||
|
||||
/obj/item/weapon/storage/box/medipens/survival/New()
|
||||
..()
|
||||
for(var/i in 1 to 5)
|
||||
new /obj/item/weapon/reagent_containers/hypospray/medipen/survival(src)
|
||||
|
||||
/obj/item/weapon/storage/box/beakers
|
||||
name = "box of beakers"
|
||||
illustration = "beaker"
|
||||
|
||||
/obj/item/weapon/storage/box/beakers/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/beakers/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/weapon/reagent_containers/glass/beaker( src )
|
||||
|
||||
@@ -207,8 +185,7 @@
|
||||
name = "box of DNA injectors"
|
||||
desc = "This box contains injectors, it seems."
|
||||
|
||||
/obj/item/weapon/storage/box/injectors/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/injectors/PopulateContents()
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/weapon/dnainjector/h2m(src)
|
||||
for(var/i in 1 to 3)
|
||||
@@ -220,8 +197,7 @@
|
||||
icon_state = "secbox"
|
||||
illustration = "flashbang"
|
||||
|
||||
/obj/item/weapon/storage/box/flashbangs/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/flashbangs/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/weapon/grenade/flashbang(src)
|
||||
|
||||
@@ -231,8 +207,7 @@
|
||||
icon_state = "secbox"
|
||||
illustration = "flashbang"
|
||||
|
||||
/obj/item/weapon/storage/box/flashes/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/flashes/PopulateContents()
|
||||
for(var/i in 1 to 6)
|
||||
new /obj/item/device/assembly/flash/handheld(src)
|
||||
|
||||
@@ -241,9 +216,9 @@
|
||||
desc = "This box contains everything necessary to build a wall-mounted flash. <B>WARNING: Flashes can cause serious eye damage, protective eyewear is required.</B>"
|
||||
illustration = "flashbang"
|
||||
|
||||
/obj/item/weapon/storage/box/wall_flash/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/wall_flash/PopulateContents()
|
||||
var/id = rand(1000, 9999)
|
||||
// FIXME what if this conflicts with an existing one?
|
||||
|
||||
new /obj/item/wallframe/button(src)
|
||||
new /obj/item/weapon/electronics/airlock(src)
|
||||
@@ -260,8 +235,7 @@
|
||||
desc = "<B>WARNING: These devices are extremely dangerous and can cause blindness and skin irritation.</B>"
|
||||
illustration = "flashbang"
|
||||
|
||||
/obj/item/weapon/storage/box/teargas/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/teargas/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/weapon/grenade/chem_grenade/teargas(src)
|
||||
|
||||
@@ -270,8 +244,7 @@
|
||||
desc = "A box with 5 emp grenades."
|
||||
illustration = "flashbang"
|
||||
|
||||
/obj/item/weapon/storage/box/emps/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/emps/PopulateContents()
|
||||
for(var/i in 1 to 5)
|
||||
new /obj/item/weapon/grenade/empgrenade(src)
|
||||
|
||||
@@ -280,8 +253,7 @@
|
||||
desc = "Box full of scum-bag tracking utensils."
|
||||
illustration = "implant"
|
||||
|
||||
/obj/item/weapon/storage/box/trackimp/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/trackimp/PopulateContents()
|
||||
for(var/i in 1 to 4)
|
||||
new /obj/item/weapon/implantcase/tracking(src)
|
||||
new /obj/item/weapon/implanter(src)
|
||||
@@ -293,8 +265,7 @@
|
||||
desc = "For finding those who have died on the accursed lavaworld."
|
||||
illustration = "implant"
|
||||
|
||||
/obj/item/weapon/storage/box/minertracker/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/minertracker/PopulateContents()
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/weapon/implantcase/tracking(src)
|
||||
new /obj/item/weapon/implanter(src)
|
||||
@@ -306,8 +277,7 @@
|
||||
desc = "Box of stuff used to implant chemicals."
|
||||
illustration = "implant"
|
||||
|
||||
/obj/item/weapon/storage/box/chemimp/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/chemimp/PopulateContents()
|
||||
for(var/i in 1 to 5)
|
||||
new /obj/item/weapon/implantcase/chem(src)
|
||||
new /obj/item/weapon/implanter(src)
|
||||
@@ -318,8 +288,7 @@
|
||||
desc = "Box of exile implants. It has a picture of a clown being booted through the Gateway."
|
||||
illustration = "implant"
|
||||
|
||||
/obj/item/weapon/storage/box/exileimp/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/exileimp/PopulateContents()
|
||||
for(var/i in 1 to 5)
|
||||
new /obj/item/weapon/implantcase/exile(src)
|
||||
new /obj/item/weapon/implanter(src)
|
||||
@@ -329,13 +298,17 @@
|
||||
desc = "The label indicates that it contains body bags."
|
||||
illustration = "bodybags"
|
||||
|
||||
/obj/item/weapon/storage/box/bodybags/PopulateContents()
|
||||
..()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/bodybag(src)
|
||||
|
||||
/obj/item/weapon/storage/box/rxglasses
|
||||
name = "box of prescription glasses"
|
||||
desc = "This box contains nerd glasses."
|
||||
illustration = "glasses"
|
||||
|
||||
/obj/item/weapon/storage/box/rxglasses/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/rxglasses/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/clothing/glasses/regular(src)
|
||||
|
||||
@@ -343,8 +316,7 @@
|
||||
name = "box of drinking glasses"
|
||||
desc = "It has a picture of drinking glasses on it."
|
||||
|
||||
/obj/item/weapon/storage/box/drinkingglasses/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/drinkingglasses/PopulateContents()
|
||||
for(var/i in 1 to 6)
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
|
||||
|
||||
@@ -352,8 +324,7 @@
|
||||
name = "box of condiment bottles"
|
||||
desc = "It has a large ketchup smear on it."
|
||||
|
||||
/obj/item/weapon/storage/box/condimentbottles/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/condimentbottles/PopulateContents()
|
||||
for(var/i in 1 to 6)
|
||||
new /obj/item/weapon/reagent_containers/food/condiment(src)
|
||||
|
||||
@@ -361,8 +332,7 @@
|
||||
name = "box of paper cups"
|
||||
desc = "It has pictures of paper cups on the front."
|
||||
|
||||
/obj/item/weapon/storage/box/cups/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/cups/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
|
||||
|
||||
@@ -371,8 +341,7 @@
|
||||
desc = "<B>Instructions:</B> <I>Heat in microwave. Product will cool if not eaten within seven minutes.</I>"
|
||||
illustration = "donk_kit"
|
||||
|
||||
/obj/item/weapon/storage/box/donkpockets/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/donkpockets/PopulateContents()
|
||||
for(var/i in 1 to 6)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
|
||||
|
||||
@@ -384,9 +353,8 @@
|
||||
can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube)
|
||||
illustration = null
|
||||
|
||||
/obj/item/weapon/storage/box/monkeycubes/New()
|
||||
..()
|
||||
for(var/i = 1; i <= 5; i++)
|
||||
/obj/item/weapon/storage/box/monkeycubes/PopulateContents()
|
||||
for(var/i in 1 to 5)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/monkeycube(src)
|
||||
|
||||
/obj/item/weapon/storage/box/ids
|
||||
@@ -394,8 +362,7 @@
|
||||
desc = "Has so many empty IDs."
|
||||
illustration = "id"
|
||||
|
||||
/obj/item/weapon/storage/box/ids/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/ids/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/weapon/card/id(src)
|
||||
|
||||
@@ -405,13 +372,26 @@
|
||||
desc = "A box of spare PDA microcomputers."
|
||||
illustration = "pda"
|
||||
|
||||
/obj/item/weapon/storage/box/PDAs/PopulateContents()
|
||||
new /obj/item/device/pda(src)
|
||||
new /obj/item/device/pda(src)
|
||||
new /obj/item/device/pda(src)
|
||||
new /obj/item/device/pda(src)
|
||||
new /obj/item/weapon/cartridge/head(src)
|
||||
|
||||
var/newcart = pick( /obj/item/weapon/cartridge/engineering,
|
||||
/obj/item/weapon/cartridge/security,
|
||||
/obj/item/weapon/cartridge/medical,
|
||||
/obj/item/weapon/cartridge/signal/toxins,
|
||||
/obj/item/weapon/cartridge/quartermaster)
|
||||
new newcart(src)
|
||||
|
||||
/obj/item/weapon/storage/box/silver_ids
|
||||
name = "box of spare silver IDs"
|
||||
desc = "Shiny IDs for important people."
|
||||
illustration = "id"
|
||||
|
||||
/obj/item/weapon/storage/box/silver_ids/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/silver_ids/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/weapon/card/id/silver(src)
|
||||
|
||||
@@ -420,7 +400,7 @@
|
||||
desc = "Take away their last shred of dignity, their name."
|
||||
illustration = "id"
|
||||
|
||||
/obj/item/weapon/storage/box/prisoner/New()
|
||||
/obj/item/weapon/storage/box/prisoner/PopulateContents()
|
||||
..()
|
||||
new /obj/item/weapon/card/id/prisoner/one(src)
|
||||
new /obj/item/weapon/card/id/prisoner/two(src)
|
||||
@@ -435,8 +415,7 @@
|
||||
desc = "A box full of PDA cartridges used by Security."
|
||||
illustration = "pda"
|
||||
|
||||
/obj/item/weapon/storage/box/seccarts/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/seccarts/PopulateContents()
|
||||
new /obj/item/weapon/cartridge/detective(src)
|
||||
for(var/i in 1 to 6)
|
||||
new /obj/item/weapon/cartridge/security(src)
|
||||
@@ -446,8 +425,7 @@
|
||||
desc = "A box full of standard firing pins, to allow newly-developed firearms to operate."
|
||||
illustration = "id"
|
||||
|
||||
/obj/item/weapon/storage/box/firingpins/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/firingpins/PopulateContents()
|
||||
for(var/i in 1 to 5)
|
||||
new /obj/item/device/firing_pin(src)
|
||||
|
||||
@@ -456,8 +434,7 @@
|
||||
desc = "A box full of laser tag firing pins, to allow newly-developed firearms to require wearing brightly coloured plastic armor before being able to be used."
|
||||
illustration = "id"
|
||||
|
||||
/obj/item/weapon/storage/box/lasertagpins/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/lasertagpins/PopulateContents()
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/device/firing_pin/tag/red(src)
|
||||
new /obj/item/device/firing_pin/tag/blue(src)
|
||||
@@ -468,8 +445,7 @@
|
||||
icon_state = "secbox"
|
||||
illustration = "handcuff"
|
||||
|
||||
/obj/item/weapon/storage/box/handcuffs/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/handcuffs/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/weapon/restraints/handcuffs(src)
|
||||
|
||||
@@ -479,8 +455,7 @@
|
||||
icon_state = "secbox"
|
||||
illustration = "handcuff"
|
||||
|
||||
/obj/item/weapon/storage/box/zipties/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/zipties/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/weapon/restraints/handcuffs/cable/zipties(src)
|
||||
|
||||
@@ -490,8 +465,7 @@
|
||||
icon_state = "alienbox"
|
||||
illustration = "handcuff"
|
||||
|
||||
/obj/item/weapon/storage/box/alienhandcuffs/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/alienhandcuffs/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/weapon/restraints/handcuffs/alien(src)
|
||||
|
||||
@@ -500,8 +474,7 @@
|
||||
desc = "A sleek, sturdy box used to hold replica spacesuits."
|
||||
icon_state = "syndiebox"
|
||||
|
||||
/obj/item/weapon/storage/box/fakesyndiesuit/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/fakesyndiesuit/PopulateContents()
|
||||
new /obj/item/clothing/head/syndicatefake(src)
|
||||
new /obj/item/clothing/suit/syndicatefake(src)
|
||||
|
||||
@@ -510,20 +483,18 @@
|
||||
desc = "<span class='alert'>Keep out of reach of children.</span>"
|
||||
illustration = "mousetraps"
|
||||
|
||||
/obj/item/weapon/storage/box/mousetraps/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/mousetraps/PopulateContents()
|
||||
for(var/i in 1 to 6)
|
||||
new /obj/item/device/assembly/mousetrap( src )
|
||||
new /obj/item/device/assembly/mousetrap(src)
|
||||
|
||||
/obj/item/weapon/storage/box/pillbottles
|
||||
name = "box of pill bottles"
|
||||
desc = "It has pictures of pill bottles on its front."
|
||||
illustration = "pillbox"
|
||||
|
||||
/obj/item/weapon/storage/box/pillbottles/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/pillbottles/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/weapon/storage/pill_bottle( src )
|
||||
new /obj/item/weapon/storage/pill_bottle(src)
|
||||
|
||||
/obj/item/weapon/storage/box/snappops
|
||||
name = "snap pop box"
|
||||
@@ -533,9 +504,8 @@
|
||||
storage_slots = 8
|
||||
can_hold = list(/obj/item/toy/snappop)
|
||||
|
||||
/obj/item/weapon/storage/box/snappops/New()
|
||||
..()
|
||||
for(var/i=1; i <= storage_slots; i++)
|
||||
/obj/item/weapon/storage/box/snappops/PopulateContents()
|
||||
for(var/i in 1 to storage_slots)
|
||||
new /obj/item/toy/snappop(src)
|
||||
|
||||
/obj/item/weapon/storage/box/matches
|
||||
@@ -549,9 +519,8 @@
|
||||
slot_flags = SLOT_BELT
|
||||
can_hold = list(/obj/item/weapon/match)
|
||||
|
||||
/obj/item/weapon/storage/box/matches/New()
|
||||
..()
|
||||
for(var/i=1; i <= storage_slots; i++)
|
||||
/obj/item/weapon/storage/box/matches/PopulateContents()
|
||||
for(var/i in 1 to storage_slots)
|
||||
new /obj/item/weapon/match(src)
|
||||
|
||||
/obj/item/weapon/storage/box/matches/attackby(obj/item/weapon/match/W as obj, mob/user as mob, params)
|
||||
@@ -570,29 +539,26 @@
|
||||
max_combined_w_class = 21
|
||||
use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
|
||||
|
||||
/obj/item/weapon/storage/box/lights/bulbs/New()
|
||||
..()
|
||||
for(var/i = 0; i < 21; i++)
|
||||
/obj/item/weapon/storage/box/lights/bulbs/PopulateContents()
|
||||
for(var/i in 1 to 21)
|
||||
new /obj/item/weapon/light/bulb(src)
|
||||
|
||||
/obj/item/weapon/storage/box/lights/tubes
|
||||
name = "box of replacement tubes"
|
||||
illustration = "lighttube"
|
||||
|
||||
/obj/item/weapon/storage/box/lights/tubes/New()
|
||||
..()
|
||||
for(var/i = 0; i < 21; i++)
|
||||
/obj/item/weapon/storage/box/lights/tubes/PopulateContents()
|
||||
for(var/i in 1 to 21)
|
||||
new /obj/item/weapon/light/tube(src)
|
||||
|
||||
/obj/item/weapon/storage/box/lights/mixed
|
||||
name = "box of replacement lights"
|
||||
illustration = "lightmixed"
|
||||
|
||||
/obj/item/weapon/storage/box/lights/mixed/New()
|
||||
..()
|
||||
for(var/i = 0; i < 14; i++)
|
||||
/obj/item/weapon/storage/box/lights/mixed/PopulateContents()
|
||||
for(var/i in 1 to 14)
|
||||
new /obj/item/weapon/light/tube(src)
|
||||
for(var/i = 0; i < 7; i++)
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/weapon/light/bulb(src)
|
||||
|
||||
|
||||
@@ -600,8 +566,7 @@
|
||||
name = "box of deputy armbands"
|
||||
desc = "To be issued to those authorized to act as deputy of security."
|
||||
|
||||
/obj/item/weapon/storage/box/deputy/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/deputy/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/clothing/tie/armband/deputy(src)
|
||||
|
||||
@@ -610,8 +575,7 @@
|
||||
desc = "To be used to rapidly seal hull breaches."
|
||||
illustration = "flashbang"
|
||||
|
||||
/obj/item/weapon/storage/box/metalfoam/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/metalfoam/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/weapon/grenade/chem_grenade/metalfoam(src)
|
||||
|
||||
@@ -632,28 +596,23 @@
|
||||
playsound(loc, "rustle", 50, 1, -5)
|
||||
user.visible_message("<span class='notice'>[user] hugs \the [src].</span>","<span class='notice'>You hug \the [src].</span>")
|
||||
|
||||
/obj/item/weapon/storage/box/hug/medical/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/hug/medical/PopulateContents()
|
||||
new /obj/item/stack/medical/bruise_pack(src)
|
||||
new /obj/item/stack/medical/ointment(src)
|
||||
new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
|
||||
|
||||
/obj/item/weapon/storage/box/hug/survival/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/hug/survival/PopulateContents()
|
||||
new /obj/item/clothing/mask/breath(src)
|
||||
new /obj/item/weapon/tank/internals/emergency_oxygen(src)
|
||||
new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
|
||||
|
||||
/obj/item/ammo_casing/shotgun/rubbershot
|
||||
|
||||
/obj/item/weapon/storage/box/rubbershot
|
||||
name = "box of rubber shots"
|
||||
desc = "A box full of rubber shots, designed for riot shotguns."
|
||||
icon_state = "rubbershot_box"
|
||||
illustration = null
|
||||
|
||||
/obj/item/weapon/storage/box/rubbershot/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/rubbershot/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/ammo_casing/shotgun/rubbershot(src)
|
||||
|
||||
@@ -663,15 +622,9 @@
|
||||
icon_state = "lethalshot_box"
|
||||
illustration = null
|
||||
|
||||
/obj/item/weapon/storage/box/lethalshot/New()
|
||||
..()
|
||||
new /obj/item/ammo_casing/shotgun/buckshot(src)
|
||||
new /obj/item/ammo_casing/shotgun/buckshot(src)
|
||||
new /obj/item/ammo_casing/shotgun/buckshot(src)
|
||||
new /obj/item/ammo_casing/shotgun/buckshot(src)
|
||||
new /obj/item/ammo_casing/shotgun/buckshot(src)
|
||||
new /obj/item/ammo_casing/shotgun/buckshot(src)
|
||||
new /obj/item/ammo_casing/shotgun/buckshot(src)
|
||||
/obj/item/weapon/storage/box/lethalshot/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/ammo_casing/shotgun/buckshot(src)
|
||||
|
||||
/obj/item/weapon/storage/box/beanbag
|
||||
name = "box of beanbags"
|
||||
@@ -679,23 +632,16 @@
|
||||
icon_state = "rubbershot_box"
|
||||
illustration = null
|
||||
|
||||
/obj/item/weapon/storage/box/beanbag/New()
|
||||
..()
|
||||
new /obj/item/ammo_casing/shotgun/beanbag(src)
|
||||
new /obj/item/ammo_casing/shotgun/beanbag(src)
|
||||
new /obj/item/ammo_casing/shotgun/beanbag(src)
|
||||
new /obj/item/ammo_casing/shotgun/beanbag(src)
|
||||
new /obj/item/ammo_casing/shotgun/beanbag(src)
|
||||
new /obj/item/ammo_casing/shotgun/beanbag(src)
|
||||
|
||||
/obj/item/weapon/storage/box/beanbag/PopulateContents()
|
||||
for(var/i in 1 to 6)
|
||||
new /obj/item/ammo_casing/shotgun/beanbag(src)
|
||||
|
||||
/obj/item/weapon/storage/box/actionfigure
|
||||
name = "box of action figures"
|
||||
desc = "The latest set of collectable action figures."
|
||||
icon_state = "box"
|
||||
|
||||
/obj/item/weapon/storage/box/actionfigure/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/actionfigure/PopulateContents()
|
||||
for(var/i in 1 to 4)
|
||||
var/randomFigure = pick(subtypesof(/obj/item/toy/figure))
|
||||
new randomFigure(src)
|
||||
@@ -775,11 +721,16 @@
|
||||
illustration = "donk_kit"
|
||||
item_state = null
|
||||
|
||||
/obj/item/weapon/storage/box/ingredients/Initialize()
|
||||
..()
|
||||
if(item_state)
|
||||
name = "[name] ([item_state])"
|
||||
desc = "A box containing supplementary ingredients for the aspiring chef. This box's theme is '[item_state]'."
|
||||
|
||||
/obj/item/weapon/storage/box/ingredients/wildcard
|
||||
item_state = "wildcard"
|
||||
|
||||
/obj/item/weapon/storage/box/ingredients/wildcard/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/ingredients/wildcard/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
var/randomFood = pick(/obj/item/weapon/reagent_containers/food/snacks/grown/chili,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
|
||||
@@ -800,8 +751,7 @@
|
||||
/obj/item/weapon/storage/box/ingredients/fiesta
|
||||
item_state = "fiesta"
|
||||
|
||||
/obj/item/weapon/storage/box/ingredients/fiesta/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/ingredients/fiesta/PopulateContents()
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/tortilla(src)
|
||||
for(var/i in 1 to 2)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/grown/corn(src)
|
||||
@@ -811,8 +761,7 @@
|
||||
/obj/item/weapon/storage/box/ingredients/italian
|
||||
item_state = "italian"
|
||||
|
||||
/obj/item/weapon/storage/box/ingredients/italian/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/ingredients/italian/PopulateContents()
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/grown/tomato(src)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/faggot(src)
|
||||
@@ -821,8 +770,7 @@
|
||||
/obj/item/weapon/storage/box/ingredients/vegetarian
|
||||
item_state = "vegetarian"
|
||||
|
||||
/obj/item/weapon/storage/box/ingredients/vegetarian/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/ingredients/vegetarian/PopulateContents()
|
||||
for(var/i in 1 to 2)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/grown/carrot(src)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant(src)
|
||||
@@ -834,8 +782,7 @@
|
||||
/obj/item/weapon/storage/box/ingredients/american
|
||||
item_state = "american"
|
||||
|
||||
/obj/item/weapon/storage/box/ingredients/american/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/ingredients/american/PopulateContents()
|
||||
for(var/i in 1 to 2)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/grown/potato(src)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/grown/tomato(src)
|
||||
@@ -845,8 +792,7 @@
|
||||
/obj/item/weapon/storage/box/ingredients/fruity
|
||||
item_state = "fruity"
|
||||
|
||||
/obj/item/weapon/storage/box/ingredients/fruity/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/ingredients/fruity/PopulateContents()
|
||||
for(var/i in 1 to 2)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/grown/apple(src)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange(src)
|
||||
@@ -857,8 +803,7 @@
|
||||
/obj/item/weapon/storage/box/ingredients/sweets
|
||||
item_state = "sweets"
|
||||
|
||||
/obj/item/weapon/storage/box/ingredients/sweets/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/ingredients/sweets/PopulateContents()
|
||||
for(var/i in 1 to 2)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/grown/cherries(src)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/grown/banana(src)
|
||||
@@ -869,8 +814,7 @@
|
||||
/obj/item/weapon/storage/box/ingredients/delights
|
||||
item_state = "delights"
|
||||
|
||||
/obj/item/weapon/storage/box/ingredients/delights/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/ingredients/delights/PopulateContents()
|
||||
for(var/i in 1 to 2)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/grown/potato/sweet(src)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries(src)
|
||||
@@ -881,8 +825,7 @@
|
||||
/obj/item/weapon/storage/box/ingredients/grains
|
||||
item_state = "grains"
|
||||
|
||||
/obj/item/weapon/storage/box/ingredients/grains/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/ingredients/grains/PopulateContents()
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/grown/oat(src)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/grown/wheat(src)
|
||||
@@ -893,8 +836,7 @@
|
||||
/obj/item/weapon/storage/box/ingredients/carnivore
|
||||
item_state = "carnivore"
|
||||
|
||||
/obj/item/weapon/storage/box/ingredients/carnivore/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/ingredients/carnivore/PopulateContents()
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear(src)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/spider(src)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/spidereggs(src)
|
||||
@@ -906,40 +848,34 @@
|
||||
/obj/item/weapon/storage/box/ingredients/exotic
|
||||
item_state = "exotic"
|
||||
|
||||
/obj/item/weapon/storage/box/ingredients/exotic/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/ingredients/exotic/PopulateContents()
|
||||
for(var/i in 1 to 2)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/carpmeat(src)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans(src)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage(src)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/grown/chili(src)
|
||||
|
||||
/obj/item/weapon/storage/box/ingredients/New()
|
||||
..()
|
||||
if(item_state)
|
||||
name = "[name] ([item_state])"
|
||||
desc = "A box containing supplementary ingredients for the aspiring chef. This box's theme is '[item_state]'."
|
||||
|
||||
/obj/item/weapon/storage/box/emptysandbags
|
||||
name = "box of empty sandbags"
|
||||
|
||||
/obj/item/weapon/storage/box/emptysandbags/New()
|
||||
..()
|
||||
new /obj/item/weapon/emptysandbag(src)
|
||||
new /obj/item/weapon/emptysandbag(src)
|
||||
new /obj/item/weapon/emptysandbag(src)
|
||||
new /obj/item/weapon/emptysandbag(src)
|
||||
new /obj/item/weapon/emptysandbag(src)
|
||||
new /obj/item/weapon/emptysandbag(src)
|
||||
new /obj/item/weapon/emptysandbag(src)
|
||||
/obj/item/weapon/storage/box/emptysandbags/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/weapon/emptysandbag(src)
|
||||
|
||||
/obj/item/weapon/storage/box/rndboards
|
||||
name = "\proper the liberator's legacy"
|
||||
desc = "A box containing a gift for worthy golems."
|
||||
|
||||
/obj/item/weapon/storage/box/rndboards/New()
|
||||
..()
|
||||
/obj/item/weapon/storage/box/rndboards/PopulateContents()
|
||||
new /obj/item/weapon/circuitboard/machine/protolathe(src)
|
||||
new /obj/item/weapon/circuitboard/machine/destructive_analyzer(src)
|
||||
new /obj/item/weapon/circuitboard/machine/circuit_imprinter(src)
|
||||
new /obj/item/weapon/circuitboard/computer/rdconsole(src)
|
||||
|
||||
/obj/item/weapon/storage/box/silver_sulf
|
||||
name = "box of silver sulfadiazine patches"
|
||||
desc = "Contains patches used to treat burns."
|
||||
|
||||
/obj/item/weapon/storage/box/silver_sulf/PopulateContents()
|
||||
for(var/i in 1 to 7)
|
||||
new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src)
|
||||
|
||||
Reference in New Issue
Block a user