mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 11:07:12 +01:00
Linen bin/ashtrays/coin presser tweaks (#19207)
* tweaks for linen bin and ashtrays * Apply suggestions from code review Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * deleted empty line * coin presser can now be unfastened * Update code/modules/mining/mint.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * suggestion * rewind time Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
var/max_butts = 0
|
||||
var/icon_half = ""
|
||||
var/icon_full = ""
|
||||
var/material = /obj/item/stack/sheet/metal
|
||||
|
||||
/obj/item/ashtray/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -51,10 +52,6 @@
|
||||
else
|
||||
desc = initial(desc)
|
||||
|
||||
/obj/item/ashtray/deconstruct()
|
||||
empty_tray()
|
||||
qdel(src)
|
||||
|
||||
/obj/item/ashtray/proc/empty_tray()
|
||||
for(var/obj/item/I in contents)
|
||||
I.forceMove(loc)
|
||||
@@ -66,6 +63,14 @@
|
||||
empty_tray()
|
||||
return ..()
|
||||
|
||||
/obj/item/ashtray/wrench_act(mob/user, obj/item/I)
|
||||
. = TRUE
|
||||
if(!I.use_tool(src, user, volume = I.tool_volume))
|
||||
return
|
||||
empty_tray()
|
||||
new material(drop_location(), 1)
|
||||
deconstruct()
|
||||
|
||||
/obj/item/ashtray/plastic
|
||||
name = "plastic ashtray"
|
||||
desc = "Cheap plastic ashtray."
|
||||
@@ -74,7 +79,7 @@
|
||||
icon_full = "ashtray_full_bl"
|
||||
max_butts = 8
|
||||
max_integrity = 8
|
||||
materials = list(MAT_METAL=30, MAT_GLASS=30)
|
||||
material = /obj/item/stack/sheet/plastic
|
||||
throwforce = 3
|
||||
|
||||
/obj/item/ashtray/bronze
|
||||
@@ -85,7 +90,6 @@
|
||||
icon_full = "ashtray_full_br"
|
||||
max_butts = 16
|
||||
max_integrity = 16
|
||||
materials = list(MAT_METAL=80)
|
||||
throwforce = 10
|
||||
|
||||
/obj/item/ashtray/glass
|
||||
@@ -96,5 +100,5 @@
|
||||
icon_full = "ashtray_full_gl"
|
||||
max_butts = 12
|
||||
max_integrity = 12
|
||||
materials = list(MAT_GLASS=60)
|
||||
material = /obj/item/stack/sheet/glass
|
||||
throwforce = 6
|
||||
|
||||
@@ -305,6 +305,11 @@ LINEN BINS
|
||||
extinguish()
|
||||
update_icon()
|
||||
|
||||
/obj/structure/bedsheetbin/wrench_act(mob/user, obj/item/I)
|
||||
if(user.a_intent == INTENT_HARM)
|
||||
default_unfasten_wrench(user, I, time = 20)
|
||||
return TRUE
|
||||
|
||||
/obj/structure/bedsheetbin/attackby(obj/item/I, mob/user, params)
|
||||
if(istype(I, /obj/item/bedsheet))
|
||||
if(!user.drop_item())
|
||||
|
||||
Reference in New Issue
Block a user