mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 07:38:05 +01:00
Easy fixes/tweaks. (#22348)
* Fixes a misleading message * Fixed more bugs, did kor's shit * Fixes holodeck monkey message * does the needful
This commit is contained in:
@@ -154,7 +154,7 @@
|
||||
|
||||
else if(istype(W, /obj/item/weapon/weldingtool))
|
||||
if(weld(W, user))
|
||||
visible_message("<span class='warning'>[user] unwelds [src], leaving it as just a frame screwed to the wall.</span>", "<span class='warning'>You unweld [src], leaving it as just a frame screwed to the wall</span>")
|
||||
visible_message("<span class='warning'>[user] unwelds [src], leaving it as just a frame bolted to the wall.</span>", "<span class='warning'>You unweld [src], leaving it as just a frame bolted to the wall</span>")
|
||||
deconstruct(TRUE)
|
||||
return
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
/obj/structure/mecha_wreckage
|
||||
name = "exosuit wreckage"
|
||||
desc = "Remains of some unfortunate mecha. Completely unrepairable."
|
||||
desc = "Remains of some unfortunate mecha. Completely unrepairable, but perhaps something can be salvaged."
|
||||
icon = 'icons/mecha/mecha.dmi'
|
||||
density = 1
|
||||
anchored = 0
|
||||
@@ -139,6 +139,7 @@
|
||||
name = "\improper Reticence wreckage"
|
||||
icon_state = "reticence-broken"
|
||||
color = "#87878715"
|
||||
desc = "..."
|
||||
|
||||
/obj/structure/mecha_wreckage/ripley
|
||||
name = "\improper Ripley wreckage"
|
||||
@@ -185,6 +186,7 @@
|
||||
/obj/structure/mecha_wreckage/honker
|
||||
name = "\improper H.O.N.K wreckage"
|
||||
icon_state = "honker-broken"
|
||||
desc = "All is right in the universe."
|
||||
|
||||
/obj/structure/mecha_wreckage/honker/New()
|
||||
..()
|
||||
@@ -245,4 +247,4 @@
|
||||
if(parts.len && prob(40))
|
||||
var/part = pick(parts)
|
||||
welder_salvage += part
|
||||
parts -= part
|
||||
parts -= part
|
||||
|
||||
@@ -42,6 +42,10 @@
|
||||
|
||||
H.update_hair()
|
||||
|
||||
/obj/structure/mirror/examine_status()
|
||||
if(broken)
|
||||
return // no message spam
|
||||
..()
|
||||
|
||||
/obj/structure/mirror/obj_break(damage_flag)
|
||||
if(!broken && !(flags & NODECONSTRUCT))
|
||||
|
||||
@@ -17,4 +17,4 @@
|
||||
butcher_results = list()
|
||||
response_help = "pets"
|
||||
response_disarm = "pushes aside"
|
||||
response_harm = "bites"
|
||||
response_harm = "kicks"
|
||||
|
||||
Reference in New Issue
Block a user