diff --git a/_maps/map_files/Blueshift/BlueShift_middle.dmm b/_maps/map_files/Blueshift/BlueShift_middle.dmm index 612f7bbb948..583cf642507 100644 --- a/_maps/map_files/Blueshift/BlueShift_middle.dmm +++ b/_maps/map_files/Blueshift/BlueShift_middle.dmm @@ -8046,7 +8046,6 @@ "cgh" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/window/left{ - dir = 2; name = "Service Deliveries"; req_one_access_txt = "25;26;35;28;22;37;46;38;70" }, @@ -24184,13 +24183,6 @@ pixel_x = 5; pixel_y = 13 }, -/obj/item/clothing/mask/bandana/black{ - pixel_x = -6 - }, -/obj/item/clothing/mask/bandana/skull, -/obj/item/clothing/mask/bandana/durathread{ - pixel_x = 6 - }, /turf/open/floor/iron/dark, /area/hallway/primary/port) "idY" = ( @@ -33790,9 +33782,7 @@ /area/security/detectives_office/private_investigators_office) "luk" = ( /obj/effect/turf_decal/siding/wood, -/obj/machinery/door/window/right{ - dir = 2 - }, +/obj/machinery/door/window/right, /turf/open/floor/wood{ icon_state = "wood-broken2" }, @@ -34634,7 +34624,6 @@ req_access_txt = "3" }, /obj/machinery/door/window/left{ - dir = 2; name = "Warden's Desk" }, /obj/machinery/recharger{ @@ -40168,7 +40157,6 @@ /area/commons/fitness/recreation) "nLs" = ( /obj/machinery/door/window/brigdoor/security/holding/right{ - dir = 2; name = "Holding Cell" }, /obj/effect/turf_decal/delivery/blue, @@ -57177,7 +57165,6 @@ req_access_txt = "35" }, /obj/machinery/door/window/left{ - dir = 2; name = "Kitchen Desk"; req_access_txt = "28" }, @@ -63854,7 +63841,6 @@ req_access_txt = "63" }, /obj/machinery/door/window/right{ - dir = 2; name = "Security Desk" }, /obj/effect/turf_decal/tile/red{ @@ -68556,7 +68542,6 @@ "xJQ" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/window/left{ - dir = 2; name = "Janitorial Delivery"; req_access_txt = "26" }, @@ -69919,7 +69904,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/item/radio/intercom/directional/north, /obj/machinery/door/window/brigdoor/right{ - dir = 2; name = "Cargo Deliveries"; req_access_txt = "63" }, diff --git a/_maps/map_files/Blueshift/BlueShift_upper.dmm b/_maps/map_files/Blueshift/BlueShift_upper.dmm index d76af890135..8961f34c63d 100644 --- a/_maps/map_files/Blueshift/BlueShift_upper.dmm +++ b/_maps/map_files/Blueshift/BlueShift_upper.dmm @@ -16914,7 +16914,6 @@ "foR" = ( /obj/effect/turf_decal/stripes, /obj/machinery/door/window/right{ - dir = 2; name = "Research Test Chamber"; req_access_txt = "7" }, @@ -33791,9 +33790,7 @@ "lFn" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/machinery/door/window/right{ - dir = 2 - }, +/obj/machinery/door/window/right, /obj/item/kitchen/fork{ pixel_x = -12; pixel_y = 2 @@ -45448,7 +45445,6 @@ "pYA" = ( /obj/structure/table, /obj/item/clothing/under/utility, -/obj/item/clothing/mask/bandana/blue, /obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/maintenance/aft/upper) @@ -56437,7 +56433,6 @@ "uec" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/left{ - dir = 2; name = "First-Aid Supplies"; red_alert_access = 1; req_access_txt = "5" diff --git a/code/modules/clothing/masks/bandana.dm b/code/modules/clothing/masks/bandana.dm index 95fd8fed06c..e73c62b1a99 100644 --- a/code/modules/clothing/masks/bandana.dm +++ b/code/modules/clothing/masks/bandana.dm @@ -51,8 +51,8 @@ worn_icon_state = "bandana_worn" greyscale_config = /datum/greyscale_config/bandana greyscale_config_worn = /datum/greyscale_config/bandana_worn - var/greyscale_config_up = /datum/greyscale_config/bandana_up - var/greyscale_config_worn_up = /datum/greyscale_config/bandana_worn_up + greyscale_config_up = /datum/greyscale_config/bandana_up // SKYRAT EDIT + greyscale_config_worn_up = /datum/greyscale_config/bandana_worn_up // SKYRAT EDIT greyscale_colors = "#2e2e2e" /obj/item/clothing/mask/bandana/color/attack_self(mob/user) diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index 3556319f852..7aea9bf064a 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -146,8 +146,8 @@ airlock.welded = TRUE if(24 to 30) airlock.panel_open = TRUE - if(airlock.cutAiWire) - wires.cut(WIRE_AI) + if(airlock.cutAiWire && wires) // SKYRAT EDIT + wires?.cut(WIRE_AI) // SKYRAT EDIT if(airlock.autoname) name = get_area_name(src, TRUE) update_appearance() diff --git a/modular_skyrat/master_files/code/modules/bandana/bandanafix.dm b/modular_skyrat/master_files/code/modules/bandana/bandanafix.dm new file mode 100644 index 00000000000..d5e3593bfae --- /dev/null +++ b/modular_skyrat/master_files/code/modules/bandana/bandanafix.dm @@ -0,0 +1,8 @@ +/obj/item/clothing/mask/bandana + icon_state = "bandana" + worn_icon_state = "bandana_worn" + greyscale_config = /datum/greyscale_config/bandana + greyscale_config_worn = /datum/greyscale_config/bandana_worn + var/greyscale_config_up = /datum/greyscale_config/bandana_up + var/greyscale_config_worn_up = /datum/greyscale_config/bandana_worn_up + greyscale_colors = "#2e2e2e" diff --git a/tgstation.dme b/tgstation.dme index bf715a6b8f5..91898ee1d12 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4485,6 +4485,7 @@ #include "modular_skyrat\master_files\code\modules\antagonists\ert\ert.dm" #include "modular_skyrat\master_files\code\modules\antagonists\traitor\objectives\kill_pet.dm" #include "modular_skyrat\master_files\code\modules\antagonists\wizard\equipment\spellbook.dm" +#include "modular_skyrat\master_files\code\modules\bandana\bandanafix.dm" #include "modular_skyrat\master_files\code\modules\buildmode\submodes\offercontrol.dm" #include "modular_skyrat\master_files\code\modules\client\preferences.dm" #include "modular_skyrat\master_files\code\modules\client\preferences_savefile.dm"