shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Fixes mirror var desync (#5883)

Browse Source 
* Fixes mirror var desync (#36251)

* Fixes mirror var desync
This commit is contained in:
CitadelStationBot
2018-03-10 07:17:52 -06:00
committed by Poojawa
parent 2aa4fef8e1
commit a999863e5c
4 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm
+3 -2
View File
@@ -24,7 +24,7 @@
/area/ruin/unpowered)
"f" = (
/obj/structure/mirror{
desc = "Oh no, seven years of bad luck!";
desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";
icon_state = "mirror_broke";
pixel_x = 28;
broken = 1
@@ -56,6 +56,7 @@
/area/ruin/unpowered)
"k" = (
/obj/structure/mirror{
desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";
icon_state = "mirror_broke";
pixel_y = 28;
broken = 1
@@ -65,7 +66,7 @@
/area/ruin/unpowered)
"l" = (
/obj/structure/mirror{
desc = "Oh no, seven years of bad luck!";
desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";
icon_state = "mirror_broke";
pixel_x = 28;
broken = 1
_maps/RandomZLevels/moonoutpost19.dmm
+1 -3
View File
@@ -4078,10 +4078,8 @@
pixel_x = 11
},
/obj/structure/mirror{
desc = "Oh no, seven years of bad luck!";
icon_state = "mirror_broke";
pixel_x = 28;
broken = 1
pixel_x = 28
},
/turf/open/floor/plasteel/freezer{
heat_capacity = 1e+006
_maps/map_files/BoxStation/BoxStation.dmm
+3 -5
View File
@@ -8216,8 +8216,7 @@
"auX" = (
/obj/structure/mirror{
icon_state = "mirror_broke";
pixel_y = 28;
broken = 1
pixel_y = 28
},
/obj/machinery/iv_drip,
/turf/open/floor/plating,
@@ -8225,8 +8224,7 @@
"auY" = (
/obj/structure/mirror{
icon_state = "mirror_broke";
pixel_y = 28;
broken = 1
pixel_y = 28
},
/obj/item/shard{
icon_state = "medium"
@@ -33249,7 +33247,7 @@
department = "Medbay";
departmentType = 1;
name = "Medbay RC";
pixel_w = 30
pixel_x = 30
},
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
code/game/objects/structures/mirror.dm
+10 -4
View File
@@ -9,6 +9,10 @@
max_integrity = 200
integrity_failure = 100
/obj/structure/mirror/Initialize(mapload)
. = ..()
if(icon_state == "mirror_broke" && !broken)
obj_break(null, mapload)
/obj/structure/mirror/attack_hand(mob/user)
if(broken || !Adjacent(user))
@@ -46,12 +50,14 @@
return // no message spam
..()
/obj/structure/mirror/obj_break(damage_flag)
/obj/structure/mirror/obj_break(damage_flag, mapload)
if(!broken && !(flags_1 & NODECONSTRUCT_1))
icon_state = "mirror_broke"
playsound(src, "shatter", 70, 1)
desc = "Oh no, seven years of bad luck!"
broken = 1
if(!mapload)
playsound(src, "shatter", 70, 1)
if(desc == initial(desc))
desc = "Oh no, seven years of bad luck!"
broken = TRUE
/obj/structure/mirror/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1))