del_all(christmas) #15163
del_all(christmas) #15163
Conversation
… will end six weeks early this year.
| @@ -2322,7 +2322,6 @@ | |||
| "aSH" = (/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating/airless{icon_state = "warnplatecorner"; dir = 1},/area/engine/engineering) | |||
| "aSI" = (/turf/simulated/wall,/area/engine/engineering) | |||
| "aSJ" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 4},/area/engine/engineering) | |||
| "aSK" = (/obj/machinery/suit_storage_unit/engine,/turf/simulated/floor/plasteel{dir = 8; icon_state = "yellow"},/area/engine/engineering) | |||
There was a problem hiding this comment.
SSUs are for christmas?
There was a problem hiding this comment.
I don't understand how this could have happened, I literally updated to master, prepared map merge, went in and manually deleted the christmas stuff via the dang drop down menu, then map merged.
It's possible that this specific tile loadout is already defined to a different letter combination than "aSK" and this was just cleaning up the doubled bit.
There was a problem hiding this comment.
Upon looking into it, that is exactly what happened, the designation "aSK" and "biY" represented the same exact tile loadout, so one was removed at some point automatically either by DM or map merge.
There was a problem hiding this comment.
Found an SSU for engineering at aUF and bhV and another at biY.
|
Merge Priority |
|
Leave santa suit for wizards please it's great. |
|
someone could put the bits in the wizard vending machine |
|
the last time i tried killing christmas it gave me a lot of troubles, good luck |
|
You'll be fighting map conflicts until christmas comes again, might as well leave the trees in at this point. |
|
It'd be great if you left the santa suit but if it's too much work with conflicts leave it out. |
|
we can do that later, after we're sure I'm not endlessly conflicted like the last 2/3 pulls that tried to end Christmas |
|
It would probably make more sense to place a landmark on each map that checks the date on New() so we don't have to do this every year |
|
i think the world's trying to tell us something about removing the christmas trees if this is the 4th pr for it |
|
Please before it conflicts |
The groundhog didn't see his shadow today, so it looks like Christmas will end six weeks early this year.
Removes all extant Christmas trees and festivus poles from the maps, as well at the wizard santa suit.