diff --git a/GainStation13/code/structures/chair.dm b/GainStation13/code/structures/chair.dm index b139dffbbb..c9dfb731cd 100644 --- a/GainStation13/code/structures/chair.dm +++ b/GainStation13/code/structures/chair.dm @@ -63,6 +63,7 @@ icon_state = "beanbag" color = "#ffffff" anchored = FALSE + buildstacktype = /obj/item/stack/sheet/cloth buildstackamount = 5 item_chair = null diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 8d96b2c88e..041f02168e 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -412,6 +412,17 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("19x19 canvas", /obj/item/canvas/nineteenXnineteen, 3), \ new/datum/stack_recipe("23x19 canvas", /obj/item/canvas/twentythreeXnineteen, 4), \ new/datum/stack_recipe("23x23 canvas", /obj/item/canvas/twentythreeXtwentythree, 5), \ + null, \ + // GS13 edit - beanbag chairs + new/datum/stack_recipe_list("beanbag chairs", list( \ + new/datum/stack_recipe("red beanbag chair", /obj/structure/chair/beanbag/red, 5, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("blue beanbag chair", /obj/structure/chair/beanbag/blue, 5, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("green beanbag chair",/obj/structure/chair/beanbag/green, 5, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("purple beanbag chair", /obj/structure/chair/beanbag/purple, 5, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("black beanbag chair", /obj/structure/chair/beanbag/black, 5, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("GATO beanbag chair", /obj/structure/chair/beanbag/gato, 5, one_per_turf = TRUE, on_floor = TRUE), \ + )), \ + // END GS13 edit )) /obj/item/stack/sheet/cloth diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 40613aa96b..8debdaa03f 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -77,7 +77,12 @@ qdel(src) /obj/structure/chair/attackby(obj/item/W, mob/user, params) - if(W.tool_behaviour == TOOL_WRENCH && !(flags_1 & NODECONSTRUCT_1)) + // GS13 EDIT - replaced wrench check with a check based on material and tool - chairs made from any material other + // than cloth will function the same as before, but chairs made from cloth will be destructible using a wirecutter + var/wrench_deconstruct = W.tool_behaviour == TOOL_WRENCH && buildstacktype != /obj/item/stack/sheet/cloth + var/wirecutter_deconstruct = W.tool_behaviour == TOOL_WIRECUTTER && buildstacktype == /obj/item/stack/sheet/cloth + if((wrench_deconstruct || wirecutter_deconstruct) && !(flags_1 & NODECONSTRUCT_1)) + // GS13 END EDIT W.play_tool_sound(src) deconstruct() else if(istype(W, /obj/item/assembly/shock_kit)) diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm index bf9d5886a0..6fd1cd2ef5 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm @@ -58,9 +58,9 @@ build_path = /obj/item/construction/rcd category = list("hacked", "Construction") -/datum/design/rpd +/datum/design/rpd_autolathe //ORIGINAL /datum/design/rpd name = "Rapid Pipe Dispenser (RPD)" - id = "rpd" + id = "rpd_autolathe" // ORIGINAL id = "rpd" build_type = AUTOLATHE | NO_PUBLIC_LATHE materials = list(/datum/material/iron = 75000, /datum/material/glass = 37500) build_path = /obj/item/pipe_dispenser diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index 6f6a1fd88e..e5efcdc6e1 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -742,6 +742,18 @@ category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING +//GS13 EDIT START +/datum/design/double_emergency_oxygen_engi + name = "Double Engineering Emergency Oxygen Tank" + desc = "An double emergency oxygen tank for engineers." + id = "double_emergency_oxygen_engi" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1500, /datum/material/silver = 200) + build_path = /obj/item/tank/internals/emergency_oxygen/double/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING +//GS13 EDIT END + ///////////////////////////////////////// /////////////////Tape//////////////////// ///////////////////////////////////////// diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm index 7392f83975..e4934a1f85 100644 --- a/code/modules/research/designs/stock_parts_designs.dm +++ b/code/modules/research/designs/stock_parts_designs.dm @@ -3,7 +3,8 @@ //////////////////////////////////////// /datum/design/RPED - name = "Rapid Part Exchange Device" + // ORIGINAL name = "Rapid Part Exchange Device" + name = "Rapid Part Exchange Device (RPED)" desc = "Special mechanical module made to store, sort, and apply standard machine parts." id = "rped" build_type = PROTOLATHE @@ -13,7 +14,8 @@ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE /datum/design/BS_RPED - name = "Bluespace RPED" + // ORIGINAL name = "Bluespace RPED" + name = "Bluespace Rapid Part Exchange Device (RPED)" desc = "Powered by bluespace technology, this RPED variant can upgrade buildings from a distance, without needing to remove the panel first." id = "bs_rped" build_type = PROTOLATHE diff --git a/code/modules/research/designs/tool_designs.dm b/code/modules/research/designs/tool_designs.dm index 5ef050efe9..7ed2969926 100644 --- a/code/modules/research/designs/tool_designs.dm +++ b/code/modules/research/designs/tool_designs.dm @@ -33,7 +33,8 @@ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING /datum/design/rpd - name = "Rapid Pipe Dispenser" + // ORIGINAL name = "Rapid Pipe Dispenser" + name = "Rapid Piping Device (RPD)" desc = "A tool that can construct and deconstruct pipes on the fly." id = "rpd" build_type = PROTOLATHE diff --git a/code/modules/research/techweb/nodes/engineering_nodes.dm b/code/modules/research/techweb/nodes/engineering_nodes.dm index 51b9480c27..15feb89149 100644 --- a/code/modules/research/techweb/nodes/engineering_nodes.dm +++ b/code/modules/research/techweb/nodes/engineering_nodes.dm @@ -17,7 +17,8 @@ description = "Pushing the boundaries of physics, one chainsaw-fist at a time." prereq_ids = list("engineering", "emp_basic") design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask" , "rcd_loaded", "rpd", - "rcd_upgrade_frames", "rcd_upgrade_simple_circuits", "rcd_ammo_large", "sheetifier") + // ORIGINAL "rcd_upgrade_frames", "rcd_upgrade_simple_circuits", "rcd_ammo_large", "sheetifier") + "rcd_upgrade_frames", "rcd_upgrade_simple_circuits", "rcd_ammo_large", "sheetifier", "double_emergency_oxygen_engi") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 4000) /datum/techweb_node/anomaly