diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index 058633c3..f14b62a6 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -497,7 +497,7 @@ "jC" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power) "jD" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power) "jE" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power) -"jF" = (/obj/structure/extinguisher_cabinet{pixel_x = 30},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power) +"jF" = (/obj/structure/extinguisher_cabinet{pixel_x = 30},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/machinery/power/port_gen/pacman/super,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power) "jG" = (/turf/closed/wall,/area/ruin/space/has_grav/hotel/security) "jH" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/security) "jI" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/security) @@ -524,7 +524,7 @@ "kd" = (/obj/machinery/power/terminal,/obj/structure/cable/yellow{icon_state = "0-4"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power) "ke" = (/obj/machinery/power/terminal,/obj/structure/cable/yellow{icon_state = "4-8"},/obj/structure/cable/yellow{icon_state = "0-4"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power) "kf" = (/obj/structure/cable/yellow{icon_state = "2-8"},/obj/machinery/atmospherics/components/binary/valve/on{name = "Air Release Valve"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power) -"kg" = (/obj/machinery/light{dir = 4},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power) +"kg" = (/obj/machinery/light{dir = 4},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/structure/closet/crate,/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power) "kh" = (/obj/machinery/light{dir = 8},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/security) "ki" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/security) "kj" = (/obj/structure/chair,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/security) diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 7abe0011..6f6d19e4 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -7,29 +7,33 @@ // return 1 +//GS13 stuckage code obj/machinery/door/airlock/Crossed(mob/living/carbon/L) if(L.fatness > 5000) if(rand(1, 3) == 1) L.doorstuck = 1 - L.visible_message ("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.") + L.visible_message("[L] gets stuck in the doorway!") + 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 > 1890) if(rand(1, 5) == 1) - L.visible_message ("As you pass through \the [src], you feel a slight brushing against your hips. The [src] frame accommodates your form, but it's a close fit..") + L.visible_message("[L]'s hips brush against the doorway...") + to_chat(L, "As you pass through \the [src], you feel a slight brushing against your hips. The [src] frame accommodates your form, but it's a close fit..") return else if(L.fatness > 3000) if(rand(1, 5) == 1) L.doorstuck = 1 - L.visible_message ("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.") + L.visible_message("[L] gets stuck in the doorway!") + 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) - L.visible_message ("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.") + 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.") return /obj/machinery/door/airlock/abandoned diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index bfff409a..5bf92775 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -259,6 +259,8 @@ var/static/regex/dab_words = regex("dab|mood") //CITADEL CHANGE var/static/regex/snap_words = regex("snap") //CITADEL CHANGE var/static/regex/bwoink_words = regex("what the fuck are you doing|bwoink|hey you got a moment?") //CITADEL CHANGE + var/static/regex/gain_words = regex("gain|fatten|widen|get fatter|get fat") //GS13 + var/static/regex/inflate_words = regex("blimp|balloon|inflate|bloat") //GS13 var/i = 0 //STUN @@ -610,6 +612,20 @@ addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, get_turf(user), 'sound/effects/adminhelp.ogg', 300, 1), 25) //END CITADEL CHANGES + +//GS13 STUFF + //INFLATE + else if((findtext(message, inflate_words))) + cooldown = COOLDOWN_MEME + for(var/mob/living/carbon/gainer in listeners) + gainer.fullness += 200 //this probably needs a pref lock... + + //GAIN + else if((findtext(message, gain_words))) + cooldown = COOLDOWN_MEME + for(var/mob/living/carbon/gainer in listeners) + gainer.adjust_fatness(500, FATTENING_TYPE_MAGIC) + else cooldown = COOLDOWN_NONE