cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 10:03:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed wood drop oversight

Browse Source
This commit is contained in:
SabreML
2020-08-11 05:27:27 +01:00
parent 09fc4918c4
commit 5f6f54429d
4 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/dresser.dm
+6 -4
View File
@@ -61,8 +61,7 @@
TOOL_ATTEMPT_DISMANTLE_MESSAGE
if(I.use_tool(src, user, 50, volume = I.tool_volume))
TOOL_DISMANTLE_SUCCESS_MESSAGE
new /obj/item/stack/sheet/wood(loc, 30)
qdel(src)
deconstruct(disassembled = TRUE)
/obj/structure/dresser/wrench_act(mob/user, obj/item/I)
. = TRUE
@@ -78,6 +77,9 @@
WRENCH_ANCHOR_MESSAGE
anchored = TRUE
/obj/structure/dresser/deconstruct(disassembled = TRUE)
new /obj/item/stack/sheet/wood(drop_location(), 30)
obj/structure/dresser/deconstruct(disassembled = FALSE)
var/mat_drop = 15
if(disassembled)
mat_drop = 30
new /obj/item/stack/sheet/wood(drop_location(), mat_drop)
qdel(src)
code/game/objects/structures/loom.dm
+8 -4
View File
@@ -11,8 +11,6 @@
anchored = TRUE
/obj/structure/loom/attackby(obj/item/I, mob/user)
if(default_unfasten_wrench(user, I, 5))
return
if(weave(I, user))
return
return ..()
@@ -24,8 +22,7 @@
TOOL_ATTEMPT_DISMANTLE_MESSAGE
if(I.use_tool(src, user, 50, volume = I.tool_volume))
TOOL_DISMANTLE_SUCCESS_MESSAGE
new /obj/item/stack/sheet/wood(loc, 10)
qdel(src)
deconstruct(disassembled = TRUE)
/obj/structure/loom/wrench_act(mob/user, obj/item/I)
. = TRUE
@@ -41,6 +38,13 @@
WRENCH_ANCHOR_MESSAGE
anchored = TRUE
/obj/structure/loom/deconstruct(disassembled = FALSE)
var/mat_drop = 5
if(disassembled)
mat_drop = 10
new /obj/item/stack/sheet/wood(drop_location(), mat_drop)
qdel(src)
///Handles the weaving.
/obj/structure/loom/proc/weave(obj/item/stack/sheet/cotton/W, mob/user)
if(!istype(W))
code/modules/hydroponics/beekeeping/beebox.dm
+6 -4
View File
@@ -205,8 +205,7 @@
TOOL_ATTEMPT_DISMANTLE_MESSAGE
if(I.use_tool(src, user, 50, volume = I.tool_volume))
TOOL_DISMANTLE_SUCCESS_MESSAGE
new /obj/item/stack/sheet/wood(loc, 40)
qdel(src)
deconstruct(disassembled = TRUE)
/obj/structure/beebox/wrench_act(mob/user, obj/item/I)
. = TRUE
@@ -271,8 +270,11 @@
visible_message("<span class='notice'>[user] removes the queen from the apiary.</span>")
queen_bee = null
/obj/structure/beebox/deconstruct(disassembled = TRUE)
new /obj/item/stack/sheet/wood(loc, 20)
/obj/structure/beebox/deconstruct(disassembled = FALSE)
var/mat_drop = 20
if(disassembled)
mat_drop = 40
new /obj/item/stack/sheet/wood(loc, mat_drop)
for(var/mob/living/simple_animal/hostile/poison/bees/B in bees)
if(B.loc == src)
B.forceMove(drop_location())
code/modules/hydroponics/fermenting_barrel.dm
+8 -2
View File
@@ -72,8 +72,7 @@
TOOL_ATTEMPT_DISMANTLE_MESSAGE
if(I.use_tool(src, user, 50, volume = I.tool_volume))
TOOL_DISMANTLE_SUCCESS_MESSAGE
new /obj/item/stack/sheet/wood(loc, 30)
qdel(src)
deconstruct(disassembled = TRUE)
/obj/structure/fermenting_barrel/wrench_act(mob/living/user, obj/item/I)
. = TRUE
@@ -89,6 +88,13 @@
WRENCH_ANCHOR_MESSAGE
anchored = TRUE
/obj/structure/fermenting_barrel/deconstruct(disassembled = FALSE)
var/mat_drop = 15
if(disassembled)
mat_drop = 30
new /obj/item/stack/sheet/wood(drop_location(), mat_drop)
qdel(src)
/obj/structure/fermenting_barrel/update_icon()
if(open)
icon_state = "barrel_open"