diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 4d5c1969..1bf0c7fd 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1273,9 +1273,9 @@ "ayU" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/quartermaster/miningoffice) "ayV" = (/turf/closed/wall,/area/quartermaster/miningoffice) "ayW" = (/obj/machinery/status_display/supply,/turf/closed/wall,/area/quartermaster/miningoffice) -"ayX" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/door/airlock/maintenance/abandoned{name = "Storage Room"; req_access_txt = "12"},/turf/open/floor/plating,/area/maintenance/port/fore) +"ayX" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/door/airlock/mining{name = "Cargo Bay"; req_one_access_txt = "48;50"},/turf/open/floor/plating,/area/maintenance/port/fore) "ayY" = (/turf/closed/wall,/area/quartermaster/warehouse) -"ayZ" = (/obj/machinery/door/airlock/maintenance{name = "Cargo Bay Warehouse Maintenance"; req_one_access_txt = "48;50"},/obj/structure/cable/yellow{icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/open/floor/plating,/area/maintenance/port/fore) +"ayZ" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/mining{name = "Cargo Bay"; req_one_access_txt = "48;50"},/turf/open/floor/plating,/area/maintenance/port/fore) "aza" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/plating,/area/maintenance/port/fore) "azb" = (/obj/machinery/computer/bank_machine,/obj/effect/turf_decal/bot_white,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/security/nuke_storage) "azc" = (/obj/machinery/light_switch{pixel_y = 28},/turf/open/floor/circuit/green{luminosity = 2},/area/security/nuke_storage) diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index 8df516e3..55e0ce07 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -671,7 +671,7 @@ This is here to make the tiles around the station mininuke change when it's arme if(istype(loneop) && prob(loneop.weight)) loneop.weight = max(loneop.weight - 1, 0) if(loneop.weight % 5 == 0) - message_admins("[src] is on the move (currently in [ADMIN_VERBOSEJMP(newturf)]). The weight of Lone Operative is now [loneop.weight].") + // message_admins("[src] is on the move (currently in [ADMIN_VERBOSEJMP(newturf)]). The weight of Lone Operative is now [loneop.weight].") //removed, it's turbo annoying for admins log_game("[src] being on the move has reduced the weight of the Lone Operative event to [loneop.weight].") /obj/item/disk/nuclear/examine(mob/user) diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm index 23cacc6e..7c8e8b1b 100644 --- a/code/modules/cargo/packs/misc.dm +++ b/code/modules/cargo/packs/misc.dm @@ -84,6 +84,18 @@ /obj/item/clothing/shoes/kindleKicks) crate_name = "footie crate" +/datum/supply_pack/misc/modular_greysuits + name = "Modular Greysuits Crate" + desc = "In case of sudden obesity, this stretchable jumpsuit pack can help cover up any exposed bodies!" + cost = 2000 + contains = list(/obj/item/clothing/under/color/grey/modular, + /obj/item/clothing/under/color/grey/modular, + /obj/item/clothing/under/color/grey/modular, + /obj/item/clothing/under/color/grey/modular, + /obj/item/clothing/under/color/grey/modular, + /obj/item/clothing/under/color/grey/modular) + crate_name = "modular jumpsuits crate" + /datum/supply_pack/misc/randombedsheets name = "Bedsheet Crate (R)" desc = "Snuggle up in some sweet sheets with this assorted bedsheet crate. Each set comes with eight random bedsheets for your slumbering pleasure!" diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 4f9ecd59..c5d7bd42 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -6,10 +6,11 @@ icon_deny = "clothes-deny" product_slogans = "Dress for success!;Prepare to look swagalicious!;Look at all this free swag!;Why leave style up to fate? Use the ClothesMate!" vend_reply = "Thank you for using the ClothesMate!" - // GS13: GATO Letterman Jacket + // GS13: GATO Letterman Jacket + modular gray jumpsuit products = list(/obj/item/clothing/head/that = 4, /obj/item/clothing/head/fedora = 3, - /obj/item/clothing/suit/jacket/letterman_gato = 5, + /obj/item/clothing/suit/jacket/letterman_gato = 5, //GS13 + /obj/item/clothing/under/color/grey/modular = 6, //GS13 /obj/item/clothing/glasses/monocle = 3, /obj/item/clothing/suit/jacket = 4, /obj/item/clothing/suit/jacket/flannel = 4, diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index ac65dfe8..d2f06f78 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -523,4 +523,12 @@ name = "Tunic" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/tunic - cost = 1 \ No newline at end of file + cost = 1 + + + //GS13 +/datum/gear/modular_greysuit + name = "Modular Jumpsuit (gray)" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/color/grey/modular + cost = 1