diff --git a/GainStation13/icons/obj/clothing/haydee_modular.dmi b/GainStation13/icons/obj/clothing/haydee_modular.dmi index d859bec1..f8149f49 100644 Binary files a/GainStation13/icons/obj/clothing/haydee_modular.dmi and b/GainStation13/icons/obj/clothing/haydee_modular.dmi differ diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 98946f97..f8e87b9c 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -6068,7 +6068,7 @@ "cnL" = (/turf/open/floor/engine,/area/science/explab) "cnM" = (/obj/structure/table,/obj/item/flashlight/lamp,/turf/open/floor/plating,/area/maintenance/starboard/aft) "cnN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plating{icon_state = "platingdmg3"},/area/maintenance/starboard/aft) -"cnO" = (/obj/machinery/door/airlock/maintenance/abandoned{name = "Incinerator Access"; req_access_txt = "12"; welded = 1},/area/maintenance/port/aft) +"cnO" = (/obj/machinery/door/airlock/maintenance/abandoned{name = "Incinerator Access"; req_access_txt = "12"; welded = 1},/turf/open/floor/plating,/area/maintenance/port/aft) "cnP" = (/obj/machinery/light/small{dir = 8},/turf/open/floor/wood,/area/maintenance/bar) "cnQ" = (/obj/effect/landmark/xeno_spawn,/turf/open/floor/wood,/area/maintenance/bar) "cnR" = (/obj/structure/chair/wood/normal{dir = 4},/obj/effect/landmark/blobstart,/turf/open/floor/wood,/area/maintenance/bar) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index f726b8ef..7766fbb0 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -40415,7 +40415,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/autolathe, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/dark, /area/quartermaster/office) @@ -84935,6 +84934,15 @@ icon_state = "wood-broken7" }, /area/security/vacantoffice) +"pqr" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "research_shutters"; + name = "Research Privacy Shutter" + }, +/obj/machinery/autolathe, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/science/lab) "pvQ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -85461,6 +85469,11 @@ }, /turf/open/floor/wood, /area/ruin/space/has_grav/powered/dinner_for_two) +"tcG" = ( +/obj/machinery/autolathe, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/quartermaster/office) "tdM" = ( /obj/machinery/door/poddoor{ id = "chapelgun"; @@ -123267,7 +123280,7 @@ bdJ bdJ aZr aYd -aYK +pqr aZL bch aYd @@ -123281,7 +123294,7 @@ bhX bhs biM bmt -bhX +tcG bsz blf bkm diff --git a/_maps/map_files/gs13/Fast_Food.dmm b/_maps/map_files/gs13/Fast_Food.dmm index 542ddda5..72ef8b26 100644 --- a/_maps/map_files/gs13/Fast_Food.dmm +++ b/_maps/map_files/gs13/Fast_Food.dmm @@ -135,7 +135,6 @@ "fZ" = (/obj/item/clothing/head/helmet/skull,/obj/item/stack/sheet/bone{pixel_x = 16},/turf/open/floor/plating/asteroid/airless,/area/space/nearstation) "gq" = (/obj/structure/chair/sofa/right{dir = 8},/turf/open/floor/carpet/gato,/area/ruin/space/has_grav/fastfood_employee) "gA" = (/obj/machinery/telecomms/relay/preset/mining,/turf/open/floor/bluespace,/area/ruin/space/has_grav/fastfood_employee) -"gF" = (/obj/docking_port/stationary{dir = 2; dwidth = 11; height = 22; id = "whiteship_home"; name = "GATO Fast Food Restaurant"; width = 35},/turf/open/space/basic,/area/space) "gI" = (/obj/effect/turf_decal/stripes/line{dir = 4},/obj/effect/turf_decal/stripes/white/line{dir = 4},/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 8; icon_state = "steel_decals9"},/turf/open/floor/circuit,/area/ruin/space/has_grav/fastfood_employee) "gP" = (/obj/machinery/disposal/bin{pixel_x = -8},/obj/machinery/airalarm/syndicate{pixel_y = 32},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "gQ" = (/obj/structure/trash_pile,/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plating/airless,/area/space/nearstation) @@ -543,7 +542,7 @@ (1,1,1) = {" DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhaMDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDh -DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhgFDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDh +DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDh DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDh DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDh DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDh diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 34107c32..58565dc1 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -19,7 +19,6 @@ to_chat(L, "As you attempt to pass through \the [src], your ample curves get wedged in the narrow opening. You find yourself stuck in the [src] frame, struggling to free yourself from the tight squeeze.") sleep(100) L.doorstuck = 0 - L.Knockdown(1) return ..() else if(L.fatness > 3000) @@ -29,7 +28,6 @@ to_chat(L, "As you attempt to pass through \the [src], your ample curves get wedged in the narrow opening. You find yourself stuck in the [src] frame, struggling to free yourself from the tight squeeze.") sleep(55) L.doorstuck = 0 - L.Knockdown(1) return ..() if(rand(1, 5) == 5) to_chat(L, "With great effort, you manage to squeeze your massive form through \the [src]. It's a tight fit, but you successfully navigate the narrow opening, barely avoiding getting stuck.") diff --git a/code/modules/cargo/packs/costumes_toys.dm b/code/modules/cargo/packs/costumes_toys.dm index c6118aa3..b9cfc25c 100644 --- a/code/modules/cargo/packs/costumes_toys.dm +++ b/code/modules/cargo/packs/costumes_toys.dm @@ -397,8 +397,8 @@ /datum/supply_pack/costumes_toys/haydee //GS13 name = "H4Y-D33 Suit Crate" - desc = "A crate with a strange, futiristic white suit." - cost = 6000 + desc = "A crate with a strange, futuristic white suit." + cost = 7000 contraband = TRUE contains = list(/obj/item/clothing/suit/space/hardsuit/engine/haydee, /obj/item/gun/ballistic/automatic/pistol/haydee)