mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 07:38:05 +01:00
New job! Barber and salon! (#8756)
* Oh hi Mark. * hand dryer 4000 * E * fur dyer * actually makes it work * Update fur_dyer.dm * Update fur_dyer.dm * Final touches! * Update jobs.txt * le straight razor * f * Update hhmirror.dm * updoot * Update IceBoxStation_skyrat.dmm * E * No more failure penalties, it's bad. * logic errors * actual hairdye * Update barber.dm * Rebases to newer map versions Fixes multiple issues with the original map changes in this PR, which are as follows but not limited to: • Trapping Lawyers in their office on Blueshift • Incorrect curtain types • Awkward atmos • Broken disposals • Missing wallmounts • Missing firelocks * camera on meta * Update jobs.dm * more dyesprays Co-authored-by: Kat <evesovereign@hotmail.co.uk>
This commit is contained in:
@@ -29,7 +29,7 @@
|
||||
. = ..()
|
||||
if(icon_state == "mirror_broke" && !broken)
|
||||
atom_break(null, mapload)
|
||||
|
||||
/* SKYRAT EDIT REMOVAL
|
||||
/obj/structure/mirror/attack_hand(mob/user, list/modifiers)
|
||||
. = ..()
|
||||
if(.)
|
||||
@@ -63,7 +63,7 @@
|
||||
H.hairstyle = new_style
|
||||
|
||||
H.update_hair()
|
||||
|
||||
*/
|
||||
/obj/structure/mirror/examine_status(mob/user)
|
||||
if(broken)
|
||||
return list()// no message spam
|
||||
|
||||
Reference in New Issue
Block a user