shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8501 from Trilbyspaceclone/boxen

Browse Source 
Colored boxes, more box icons, and more craftable box types!
This commit is contained in:
kevinz000
2019-06-08 01:10:11 -07:00
committed by GitHub
parent 642bfc1d91 9badda96d8
commit 80aa303b4e
3 changed files with 74 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/sheet_types.dm
+17 -2
View File
@@ -282,9 +282,14 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
*/
GLOBAL_LIST_INIT(cardboard_recipes, list ( \
new/datum/stack_recipe("box", /obj/item/storage/box), \
new/datum/stack_recipe("sec box", /obj/item/storage/box/seclooking), \
new/datum/stack_recipe("light tubes", /obj/item/storage/box/lights/tubes), \
new/datum/stack_recipe("light bulbs", /obj/item/storage/box/lights/bulbs), \
new/datum/stack_recipe("mouse traps", /obj/item/storage/box/mousetraps), \
new/datum/stack_recipe("pizza box", /obj/item/pizzabox), \
new/datum/stack_recipe("power cell", /obj/item/storage/box/cells), \
new/datum/stack_recipe("02", /obj/item/storage/box/otwo), \
null, \
new/datum/stack_recipe("lethal ammo box", /obj/item/storage/box/lethalshot), \
new/datum/stack_recipe("rubber shot ammo box", /obj/item/storage/box/rubbershot), \
new/datum/stack_recipe("bean bag ammo box", /obj/item/storage/box/beanbag), \
@@ -292,13 +297,23 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
new/datum/stack_recipe("stun slug ammo box", /obj/item/storage/box/stunslug), \
new/datum/stack_recipe("tech shell ammo box", /obj/item/storage/box/techsslug), \
new/datum/stack_recipe("incendiary ammo box", /obj/item/storage/box/fireshot), \
new/datum/stack_recipe("firing pins", /obj/item/storage/box/firingpins), \
new/datum/stack_recipe("loose ammo", /obj/item/storage/box/ammoshells), \
null, \
new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3), \
new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg), \
new/datum/stack_recipe("pizza box", /obj/item/pizzabox), \
new/datum/stack_recipe("folder", /obj/item/folder), \
new/datum/stack_recipe("large box", /obj/structure/closet/cardboard, 4), \
new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5), \
))
null, \
new/datum/stack_recipe("colored brown", /obj/item/storage/box/brown), \
new/datum/stack_recipe("colored green", /obj/item/storage/box/green), \
new/datum/stack_recipe("colored red", /obj/item/storage/box/blue), \
new/datum/stack_recipe("colored blue", /obj/item/storage/box/red), \
new/datum/stack_recipe("colored yellow", /obj/item/storage/box/yellow), \
new/datum/stack_recipe("colored pink", /obj/item/storage/box/pink), \
new/datum/stack_recipe("colored purple", /obj/item/storage/box/purple), \
))
/obj/item/stack/sheet/cardboard //BubbleWrap //it's cardboard you fuck
name = "cardboard"
code/game/objects/items/storage/boxes.dm
+57 -6
View File
@@ -15,9 +15,10 @@
* Handcuff, mousetrap, and pillbottle boxes,
* Snap-pops and matchboxes,
* Replacement light boxes,
* Shotgun Ammo boxes,
* Ammo types,
* Action Figure Boxes,
* Various paper bags.
* Various paper bags,
* Colored boxes
*
* For syndicate call-ins see uplink_kits.dm
*/
@@ -75,7 +76,6 @@
return 0
return ..()
//Disk boxes
/obj/item/storage/box/disks
name = "diskette box"
@@ -142,6 +142,29 @@
..() // we want the regular stuff too
new /obj/item/radio/off(src)
/obj/item/storage/box/seclooking
icon_state = "secbox"
illustration = null
/obj/item/storage/box/cells
name = "box of powercells"
desc = "Contains powercells."
illustration = "power_cell"
/obj/item/storage/box/ammoshells
name = "box of loose ammo"
desc = "Contains loose ammo."
illustration = "loose_ammo"
/obj/item/storage/box/otwo
name = "box of o2 supplies"
desc = "Contains o2 supplies."
illustration = "02"
/obj/item/storage/box/otwo/PopulateContents()
for(var/i in 1 to 7)
new /obj/item/tank/internals/emergency_oxygen/engi(src)
/obj/item/storage/box/gloves
name = "box of latex gloves"
desc = "Contains sterile latex gloves."
@@ -463,7 +486,7 @@
/obj/item/storage/box/firingpins
name = "box of standard firing pins"
desc = "A box full of standard firing pins, to allow newly-developed firearms to operate."
illustration = "id"
illustration = "firing_pins"
/obj/item/storage/box/firingpins/PopulateContents()
for(var/i in 1 to 5)
@@ -472,7 +495,7 @@
/obj/item/storage/box/lasertagpins
name = "box of laser tag firing pins"
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"
illustration = "firing_pins"
/obj/item/storage/box/lasertagpins/PopulateContents()
for(var/i in 1 to 3)
@@ -1003,7 +1026,6 @@
for(var/i in 1 to 7)
new /obj/item/reagent_containers/pill/patch/silver_sulf(src)
/obj/item/storage/box/fountainpens
name = "box of fountain pens"
@@ -1062,3 +1084,32 @@
new /obj/item/stock_parts/matter_bin/bluespace(src)
new /obj/item/stock_parts/matter_bin/bluespace(src)
new /obj/item/stock_parts/matter_bin/bluespace(src)
//Colored boxes.
/obj/item/storage/box/green
icon_state = "box_green"
illustration = null
/obj/item/storage/box/blue
icon_state = "box_blue"
illustration = null
/obj/item/storage/box/purple
icon_state = "box_purple"
illustration = null
/obj/item/storage/box/red
icon_state = "box_red"
illustration = null
/obj/item/storage/box/yellow
icon_state = "box_yellow"
illustration = null
/obj/item/storage/box/brown
icon_state = "box_brown"
illustration = null
/obj/item/storage/box/pink
icon_state = "box_pink"
illustration = null