cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing stuff

Browse Source
This commit is contained in:
DeityLink
2015-11-11 13:21:30 +01:00
parent 071c19886c
commit 9eefbfc462
4 changed files with 132 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/mecha/mecha_construction_paths.dm
View File

@@ -343,9 +343,9 @@
),
//8
list(Co_DESC="Advanced scanner module is secured",
Co_NEXTSTEP = list(Co_KEY=/obj/item/weapon/stock_parts/capacitor/adv,
Co_NEXTSTEP = list(Co_KEY=/obj/item/weapon/stock_parts/capacitor,
Co_AMOUNT = 1,
Co_VIS_MSG = "{USER} install{s} advanced capacitor to {HOLDER}."),
Co_VIS_MSG = "{USER} install{s} capacitor to {HOLDER}."),
Co_BACKSTEP = list(Co_KEY=/obj/item/weapon/screwdriver,
Co_VIS_MSG = "{USER} unfasten{s} the Advanced scanner module.")
),
@@ -358,9 +358,9 @@
),
//10
list(Co_DESC="Targeting module is secured",
Co_NEXTSTEP = list(Co_KEY=/obj/item/weapon/stock_parts/scanning_module/adv,
Co_NEXTSTEP = list(Co_KEY=/obj/item/weapon/stock_parts/scanning_module,
Co_AMOUNT = 1,
Co_VIS_MSG = "{USER} install{s} advanced scanner module to {HOLDER}."),
Co_VIS_MSG = "{USER} install{s} scanner module to {HOLDER}."),
Co_BACKSTEP = list(Co_KEY=/obj/item/weapon/screwdriver,
Co_VIS_MSG = "{USER} unfasten{s} the targeting module.")
),

222
code/game/objects/items/stacks/sheets/sheet_types.dm
View File

@@ -10,77 +10,77 @@
/*
* Metal
*/
var/global/list/datum/stack_recipe/metal_recipes = list ( \
new/datum/stack_recipe("floor tile", /obj/item/stack/tile/plasteel, 1, 4, 20), \
new/datum/stack_recipe("metal rod", /obj/item/stack/rods, 1, 2, 60), \
null, \
new/datum/stack_recipe("computer frame", /obj/structure/computerframe, 5, time = 25, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 50, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("machine frame", /obj/machinery/constructable_frame/machine_frame, 5, time = 25, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("mirror frame", /obj/structure/mirror_frame, 5, time = 25, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, time = 25, one_per_turf = 1, on_floor = 1), \
null, \
new/datum/stack_recipe_list("chairs and beds",list( \
new/datum/stack_recipe("dark office chair", /obj/structure/bed/chair/office/dark, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("light office chair", /obj/structure/bed/chair/office/light, 5, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("beige comfy chair", /obj/structure/bed/chair/comfy/beige, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("black comfy chair", /obj/structure/bed/chair/comfy/black, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("brown comfy chair", /obj/structure/bed/chair/comfy/brown, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("lime comfy chair", /obj/structure/bed/chair/comfy/lime, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("teal comfy chair", /obj/structure/bed/chair/comfy/teal, 2, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("stool", /obj/item/weapon/stool, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("chair", /obj/structure/bed/chair, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("bed", /obj/structure/bed, 2, one_per_turf = 1, on_floor = 1), \
)), \
new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts, 2 ), \
new/datum/stack_recipe("rack parts", /obj/item/weapon/rack_parts ), \
new/datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = 1, on_floor = 1), \
null, \
new/datum/stack_recipe_list("airlock assemblies", list( \
new/datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("command airlock assembly", /obj/structure/door_assembly/door_assembly_com, 4, time = 50, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("security airlock assembly", /obj/structure/door_assembly/door_assembly_sec, 4, time = 50, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("engineering airlock assembly", /obj/structure/door_assembly/door_assembly_eng, 4, time = 50, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("mining airlock assembly", /obj/structure/door_assembly/door_assembly_min, 4, time = 50, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("atmospherics airlock assembly", /obj/structure/door_assembly/door_assembly_atmo, 4, time = 50, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("research airlock assembly", /obj/structure/door_assembly/door_assembly_research, 4, time = 50, one_per_turf = 1, on_floor = 1), \
/* new/datum/stack_recipe("science airlock assembly", /obj/structure/door_assembly/door_assembly_science, 4, time = 50, one_per_turf = 1, on_floor = 1), \ */
new/datum/stack_recipe("medical airlock assembly", /obj/structure/door_assembly/door_assembly_med, 4, time = 50, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_mai, 4, time = 50, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("external airlock assembly", /obj/structure/door_assembly/door_assembly_ext, 4, time = 50, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("freezer airlock assembly", /obj/structure/door_assembly/door_assembly_fre, 4, time = 50, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("airtight hatch assembly", /obj/structure/door_assembly/door_assembly_hatch, 4, time = 50, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("maintenance hatch assembly", /obj/structure/door_assembly/door_assembly_mhatch, 4, time = 50, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 4, time = 50, one_per_turf = 1, on_floor = 1), \
/* new/datum/stack_recipe("multi-tile airlock assembly", /obj/structure/door_assembly/multi_tile, 4, time = 50, one_per_turf = 1, on_floor = 1), \ */
), 4), \
null, \
new/datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 10, time = 15, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("iv drip", /obj/machinery/iv_drip, 2, time = 25, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("meat spike", /obj/structure/kitchenspike, 2, time = 25, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("shower", /obj/machinery/shower/, 2, time = 25, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("grenade casing", /obj/item/weapon/grenade/chem_grenade ), \
new/datum/stack_recipe("desk bell shell", /obj/item/device/deskbell_assembly, 2 ), \
null, \
new/datum/stack_recipe_list("mounted frames", list( \
new/datum/stack_recipe("apc frame", /obj/item/mounted/frame/apc_frame, 2 ), \
new/datum/stack_recipe("air alarm frame", /obj/item/mounted/frame/alarm_frame, 2 ), \
new/datum/stack_recipe("fire alarm frame", /obj/item/mounted/frame/firealarm, 2 ), \
new/datum/stack_recipe("lightswitch frame", /obj/item/mounted/frame/light_switch, 2 ), \
new/datum/stack_recipe("intercom frame", /obj/item/mounted/frame/intercom, 2 ), \
new/datum/stack_recipe("sound system frame", /obj/item/mounted/frame/soundsystem, 2 ), \
new/datum/stack_recipe("nanomed frame", /obj/item/mounted/frame/wallmed, 3, time = 25, one_per_turf = 0, on_floor = 1), \
new/datum/stack_recipe("light fixture frame", /obj/item/mounted/frame/light_fixture, 2 ), \
new/datum/stack_recipe("small light fixture frame", /obj/item/mounted/frame/light_fixture/small, 1 ), \
new/datum/stack_recipe("embedded controller frame", /obj/item/mounted/frame/airlock_controller, 1, time = 50, one_per_turf = 0, on_floor = 1), \
new/datum/stack_recipe("access button frame", /obj/item/mounted/frame/access_button, 1, time = 50, one_per_turf = 0, on_floor = 1), \
new/datum/stack_recipe("airlock sensor frame", /obj/item/mounted/frame/airlock_sensor, 1, time = 50, one_per_turf = 0, on_floor = 1), \
new/datum/stack_recipe("mass driver button frame", /obj/item/mounted/frame/driver_button, 1, time = 50, one_per_turf = 0, on_floor = 1), \
new/datum/stack_recipe("lantern hook", /obj/item/mounted/frame/hanging_lantern_hook, 1, time = 25, one_per_turf = 0, on_floor = 0), \
)), \
null, \
new/datum/stack_recipe("iron door", /obj/machinery/door/mineral/iron, 20, one_per_turf = 1, on_floor = 1), \
)
var/global/list/datum/stack_recipe/metal_recipes = list (
new/datum/stack_recipe("floor tile", /obj/item/stack/tile/plasteel, 1, 4, 20),
new/datum/stack_recipe("metal rod", /obj/item/stack/rods, 1, 2, 60),
null,
new/datum/stack_recipe("computer frame", /obj/structure/computerframe, 5, time = 25, one_per_turf = 1 ),
new/datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 50, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("machine frame", /obj/machinery/constructable_frame/machine_frame, 5, time = 25, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("mirror frame", /obj/structure/mirror_frame, 5, time = 25, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, time = 25, one_per_turf = 1, on_floor = 1),
null,
new/datum/stack_recipe_list("chairs and beds",list(
new/datum/stack_recipe("dark office chair", /obj/structure/bed/chair/office/dark, 5, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("light office chair", /obj/structure/bed/chair/office/light, 5, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("beige comfy chair", /obj/structure/bed/chair/comfy/beige, 2, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("black comfy chair", /obj/structure/bed/chair/comfy/black, 2, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("brown comfy chair", /obj/structure/bed/chair/comfy/brown, 2, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("lime comfy chair", /obj/structure/bed/chair/comfy/lime, 2, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("teal comfy chair", /obj/structure/bed/chair/comfy/teal, 2, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("stool", /obj/item/weapon/stool ),
new/datum/stack_recipe("chair", /obj/structure/bed/chair, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("bed", /obj/structure/bed, 2, one_per_turf = 1, on_floor = 1),
)),
new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts, 2 ),
new/datum/stack_recipe("rack parts", /obj/item/weapon/rack_parts ),
new/datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = 1),
null,
new/datum/stack_recipe_list("airlock assemblies", list(
new/datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("command airlock assembly", /obj/structure/door_assembly/door_assembly_com, 4, time = 50, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("security airlock assembly", /obj/structure/door_assembly/door_assembly_sec, 4, time = 50, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("engineering airlock assembly", /obj/structure/door_assembly/door_assembly_eng, 4, time = 50, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("mining airlock assembly", /obj/structure/door_assembly/door_assembly_min, 4, time = 50, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("atmospherics airlock assembly", /obj/structure/door_assembly/door_assembly_atmo, 4, time = 50, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("research airlock assembly", /obj/structure/door_assembly/door_assembly_research, 4, time = 50, one_per_turf = 1, on_floor = 1),
/* new/datum/stack_recipe("science airlock assembly", /obj/structure/door_assembly/door_assembly_science, 4, time = 50, one_per_turf = 1, on_floor = 1), */
new/datum/stack_recipe("medical airlock assembly", /obj/structure/door_assembly/door_assembly_med, 4, time = 50, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("maintenance airlock assembly", /obj/structure/door_assembly/door_assembly_mai, 4, time = 50, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("external airlock assembly", /obj/structure/door_assembly/door_assembly_ext, 4, time = 50, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("freezer airlock assembly", /obj/structure/door_assembly/door_assembly_fre, 4, time = 50, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("airtight hatch assembly", /obj/structure/door_assembly/door_assembly_hatch, 4, time = 50, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("maintenance hatch assembly", /obj/structure/door_assembly/door_assembly_mhatch, 4, time = 50, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 4, time = 50, one_per_turf = 1, on_floor = 1),
/* new/datum/stack_recipe("multi-tile airlock assembly", /obj/structure/door_assembly/multi_tile, 4, time = 50, one_per_turf = 1, on_floor = 1), */
), 4),
null,
new/datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 10, time = 15, one_per_turf = 1 ),
new/datum/stack_recipe("iv drip", /obj/machinery/iv_drip, 2, time = 25, one_per_turf = 1 ),
new/datum/stack_recipe("meat spike", /obj/structure/kitchenspike, 2, time = 25, one_per_turf = 1, on_floor = 1 ),
new/datum/stack_recipe("shower", /obj/machinery/shower/, 2, time = 25, one_per_turf = 1, on_floor = 1 ),
new/datum/stack_recipe("grenade casing", /obj/item/weapon/grenade/chem_grenade ),
new/datum/stack_recipe("desk bell shell", /obj/item/device/deskbell_assembly, 2 ),
null,
new/datum/stack_recipe_list("mounted frames", list(
new/datum/stack_recipe("apc frame", /obj/item/mounted/frame/apc_frame, 2 ),
new/datum/stack_recipe("air alarm frame", /obj/item/mounted/frame/alarm_frame, 2 ),
new/datum/stack_recipe("fire alarm frame", /obj/item/mounted/frame/firealarm, 2 ),
new/datum/stack_recipe("lightswitch frame", /obj/item/mounted/frame/light_switch, 2 ),
new/datum/stack_recipe("intercom frame", /obj/item/mounted/frame/intercom, 2 ),
new/datum/stack_recipe("sound system frame", /obj/item/mounted/frame/soundsystem, 2 ),
new/datum/stack_recipe("nanomed frame", /obj/item/mounted/frame/wallmed, 3, time = 25, one_per_turf = 0, on_floor = 1),
new/datum/stack_recipe("light fixture frame", /obj/item/mounted/frame/light_fixture, 2 ),
new/datum/stack_recipe("small light fixture frame", /obj/item/mounted/frame/light_fixture/small, 1 ),
new/datum/stack_recipe("embedded controller frame", /obj/item/mounted/frame/airlock_controller, 1, time = 50, one_per_turf = 0, on_floor = 1),
new/datum/stack_recipe("access button frame", /obj/item/mounted/frame/access_button, 1, time = 50, one_per_turf = 0, on_floor = 1),
new/datum/stack_recipe("airlock sensor frame", /obj/item/mounted/frame/airlock_sensor, 1, time = 50, one_per_turf = 0, on_floor = 1),
new/datum/stack_recipe("mass driver button frame", /obj/item/mounted/frame/driver_button, 1, time = 50, one_per_turf = 0, on_floor = 1),
new/datum/stack_recipe("lantern hook", /obj/item/mounted/frame/hanging_lantern_hook, 1, time = 25, one_per_turf = 0, on_floor = 0),
)),
null,
new/datum/stack_recipe("iron door", /obj/machinery/door/mineral/iron, 20, one_per_turf = 1, on_floor = 1),
)
/obj/item/stack/sheet/metal
name = "metal"
@@ -137,16 +137,16 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
/*
* Plasteel
*/
var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = 1), \
new/datum/stack_recipe("Metal crate", /obj/structure/closet/crate, 10, time = 50, one_per_turf = 1), \
new/datum/stack_recipe("RUST fuel assembly port frame", /obj/item/mounted/frame/rust_fuel_assembly_port, 12, time = 50, one_per_turf = 1), \
new/datum/stack_recipe("RUST fuel compressor frame", /obj/item/mounted/frame/rust_fuel_compressor, 12, time = 50, one_per_turf = 1), \
new/datum/stack_recipe("Mass Driver frame", /obj/machinery/mass_driver_frame, 3, time = 50, one_per_turf = 1), \
new/datum/stack_recipe("Tank dispenser", /obj/structure/dispenser/empty, 2, time = 10, one_per_turf = 1), \
new/datum/stack_recipe("Fireaxe cabinet", /obj/item/mounted/frame/fireaxe_cabinet_frame, 2, time = 50), \
null, \
new/datum/stack_recipe("Vault Door assembly", /obj/structure/door_assembly/door_assembly_vault, 8, time = 50, one_per_turf = 1, on_floor = 1), \
var/global/list/datum/stack_recipe/plasteel_recipes = list (
new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = 1 ),
new/datum/stack_recipe("Metal crate", /obj/structure/closet/crate, 10, time = 50, one_per_turf = 1 ),
new/datum/stack_recipe("RUST fuel assembly port frame", /obj/item/mounted/frame/rust_fuel_assembly_port, 12, time = 50, one_per_turf = 1 ),
new/datum/stack_recipe("RUST fuel compressor frame", /obj/item/mounted/frame/rust_fuel_compressor, 12, time = 50, one_per_turf = 1 ),
new/datum/stack_recipe("Mass Driver frame", /obj/machinery/mass_driver_frame, 3, time = 50, one_per_turf = 1 ),
new/datum/stack_recipe("Tank dispenser", /obj/structure/dispenser/empty, 2, time = 10, one_per_turf = 1 ),
new/datum/stack_recipe("Fireaxe cabinet", /obj/item/mounted/frame/fireaxe_cabinet_frame, 2, time = 50 ),
null,
new/datum/stack_recipe("Vault Door assembly", /obj/structure/door_assembly/door_assembly_vault, 8, time = 50, one_per_turf = 1, on_floor = 1),
)
/obj/item/stack/sheet/plasteel
@@ -176,19 +176,19 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
/*
* Wood
*/
var/global/list/datum/stack_recipe/wood_recipes = list ( \
new/datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1), \
new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20), \
new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts/wood, 2), \
new/datum/stack_recipe("wooden chair", /obj/structure/bed/chair/wood/normal, 3, time = 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("barricade kit", /obj/item/weapon/barricade_kit, 5), \
new/datum/stack_recipe("bookcase", /obj/structure/bookcase, 5, time = 50, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("wooden door", /obj/machinery/door/mineral/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("apiary", /obj/item/apiary, 10, time = 25, one_per_turf = 0, on_floor = 0), \
new/datum/stack_recipe("bowl", /obj/item/trash/bowl, 1), \
new/datum/stack_recipe("notice board", /obj/structure/noticeboard, 2, time = 15, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("blank canvas", /obj/item/mounted/frame/painting/blank, 2, time = 15), \
var/global/list/datum/stack_recipe/wood_recipes = list (
new/datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal ),
new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1,4,20 ),
new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts/wood, 2 ),
new/datum/stack_recipe("wooden chair", /obj/structure/bed/chair/wood/normal, 3, time = 10, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("barricade kit", /obj/item/weapon/barricade_kit, 5 ),
new/datum/stack_recipe("bookcase", /obj/structure/bookcase, 5, time = 50, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("wooden door", /obj/machinery/door/mineral/wood, 10, time = 20, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("apiary", /obj/item/apiary, 10, time = 25, one_per_turf = 0, on_floor = 0),
new/datum/stack_recipe("bowl", /obj/item/trash/bowl, 1 ),
new/datum/stack_recipe("notice board", /obj/structure/noticeboard, 2, time = 15, one_per_turf = 1, on_floor = 1),
new/datum/stack_recipe("blank canvas", /obj/item/mounted/frame/painting/blank, 2, time = 15 ),
)
/obj/item/stack/sheet/wood
@@ -221,23 +221,23 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
/*
* Cardboard
*/
var/global/list/datum/stack_recipe/cardboard_recipes = list ( \
new/datum/stack_recipe("box", /obj/item/weapon/storage/box), \
new/datum/stack_recipe("large box", /obj/item/weapon/storage/box/large, 4), \
new/datum/stack_recipe("light tubes box", /obj/item/weapon/storage/box/lights/tubes), \
new/datum/stack_recipe("light bulbs box", /obj/item/weapon/storage/box/lights/bulbs), \
new/datum/stack_recipe("mouse traps box", /obj/item/weapon/storage/box/mousetraps), \
new/datum/stack_recipe("candle box", /obj/item/weapon/storage/fancy/candle_box/empty), \
new/datum/stack_recipe("crayon box", /obj/item/weapon/storage/fancy/crayons/empty), \
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/weapon/folder), \
new/datum/stack_recipe("flare box", /obj/item/weapon/storage/fancy/flares/empty), \
new/datum/stack_recipe("donut box", /obj/item/weapon/storage/fancy/donut_box/empty), \
new/datum/stack_recipe("eggbox", /obj/item/weapon/storage/fancy/egg_box/empty), \
new/datum/stack_recipe("paper bin", /obj/item/weapon/paper_bin/empty), \
)
var/global/list/datum/stack_recipe/cardboard_recipes = list (
new/datum/stack_recipe("box", /obj/item/weapon/storage/box ),
new/datum/stack_recipe("large box", /obj/item/weapon/storage/box/large, 4 ),
new/datum/stack_recipe("light tubes box", /obj/item/weapon/storage/box/lights/tubes ),
new/datum/stack_recipe("light bulbs box", /obj/item/weapon/storage/box/lights/bulbs ),
new/datum/stack_recipe("mouse traps box", /obj/item/weapon/storage/box/mousetraps ),
new/datum/stack_recipe("candle box", /obj/item/weapon/storage/fancy/candle_box/empty ),
new/datum/stack_recipe("crayon box", /obj/item/weapon/storage/fancy/crayons/empty ),
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/weapon/folder ),
new/datum/stack_recipe("flare box", /obj/item/weapon/storage/fancy/flares/empty ),
new/datum/stack_recipe("donut box", /obj/item/weapon/storage/fancy/donut_box/empty ),
new/datum/stack_recipe("eggbox", /obj/item/weapon/storage/fancy/egg_box/empty ),
new/datum/stack_recipe("paper bin", /obj/item/weapon/paper_bin/empty ),
)
/obj/item/stack/sheet/cardboard //BubbleWrap
name = "cardboard"

15
code/game/objects/items/weapons/storage/briefcase.dm
View File

@@ -80,7 +80,12 @@
var/busy_hunting = 0
var/bottom_open = 0 //is the false bottom open?
var/obj/item/stored_item //what's in the false bottom. If it's a gun, we can fire it
var/obj/item/stored_item = null //what's in the false bottom. If it's a gun, we can fire it
/obj/item/weapon/storage/briefcase/false_bottomed/Destroy()
if(stored_item)//since the stored_item isn't in the briefcase' contents we gotta remind the game to delete it here.
qdel(stored_item)
..()
/obj/item/weapon/storage/briefcase/false_bottomed/afterattack(var/atom/A, mob/user)
..()
@@ -102,7 +107,13 @@
else if(bottom_open)
user << "You push the false bottom down and close it with a click[stored_item ? ", with \the [stored_item] snugly inside." : "."]"
bottom_open = 0
else if(bottom_open && item.w_class <= 3.0)
else if(bottom_open)
if(stored_item)
user << "<span class='warning'>There's already something in the false bottom!</span>"
return
if(item.w_class > 3.0)
user << "<span class='warning'>\The [item] is too big to fit in the false bottom!</span>"
return
stored_item = item
user.drop_item(item)
max_w_class = 3.0 - stored_item.w_class

4
code/game/objects/items/weapons/storage/fancy.dm
View File

@@ -24,6 +24,8 @@
var/plural_type = "s" //Why does the english language have to be so complicated to work with ?
var/empty = 0
foldable = /obj/item/stack/sheet/cardboard
//Note : Fancy storages generally collect one specific type of objects only due to their properties
//As such, it would make sense that one click on a stack of the corresponding objects should shove everything in here
@@ -325,6 +327,8 @@
storage_slots = 6
can_hold = list("/obj/item/weapon/reagent_containers/glass/beaker/vial")
foldable = null
/obj/item/weapon/storage/fancy/vials/New()
..()