cyberpresidentvanellope/GS13-Citadel
1
0
Fork 0
mirror of https://github.com/evilew/GS13-Citadel.git synced 2026-08-25 14:17:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'evilew:master' into better_belts

Browse Source
This commit is contained in:
Phantastic-Swan
2024-12-23 13:30:59 +01:00
committed by GitHub
parent b55fb91d6c d1be07f437
commit 69328a66cf
79 changed files with 103 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/sheet_types.dm
+11
View File
@@ -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
code/game/objects/structures/beds_chairs/chair.dm
+6 -1
View File
@@ -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))