diff --git a/GainStation13/code/mechanics/fatness.dm b/GainStation13/code/mechanics/fatness.dm index b2c370571f..4315a6570a 100644 --- a/GainStation13/code/mechanics/fatness.dm +++ b/GainStation13/code/mechanics/fatness.dm @@ -275,3 +275,11 @@ GLOBAL_LIST_INIT(uncapped_resize_areas, list(/area/command/bridge, /area/mainten var/fat_to_add = ((amount * CONFIG_GET(number/damage_multiplier)) * FAT_DAMAGE_TO_FATNESS) adjust_fatness(fat_to_add, FATTENING_TYPE_WEAPON) return fat_to_add + +/mob/living/carbon/proc/applyPermaFatnessDamage(amount) + if(!client?.prefs?.weight_gain_permanent) // If we cant apply permafat, apply regular fat + return applyFatnessDamage(amount) + + var/fat_to_add = ((amount * CONFIG_GET(number/damage_multiplier)) * PERMA_FAT_DAMAGE_TO_FATNESS) + adjust_perma(fat_to_add, FATTENING_TYPE_WEAPON) + return fat_to_add diff --git a/GainStation13/code/modules/food_and_drinks/bigbottle.dm b/GainStation13/code/modules/food_and_drinks/bigbottle.dm index a04875e20e..6ab4ce01f7 100644 --- a/GainStation13/code/modules/food_and_drinks/bigbottle.dm +++ b/GainStation13/code/modules/food_and_drinks/bigbottle.dm @@ -46,7 +46,6 @@ cut_overlays() var/mutable_appearance/reagent_overlay = mutable_appearance(icon, "reagent") if(reagents.reagent_list.len) - var/datum/reagent/R = reagents.get_master_reagent() /*if(!renamedByPlayer) name = "bottle of " + R.name desc = R.glass_desc*/ diff --git a/GainStation13/code/structures/chair.dm b/GainStation13/code/structures/chair.dm index b139dffbbb..c9dfb731cd 100644 --- a/GainStation13/code/structures/chair.dm +++ b/GainStation13/code/structures/chair.dm @@ -63,6 +63,7 @@ icon_state = "beanbag" color = "#ffffff" anchored = FALSE + buildstacktype = /obj/item/stack/sheet/cloth buildstackamount = 5 item_chair = null diff --git a/GainStation13/icons/obj/atmos.dmi b/GainStation13/icons/obj/atmos.dmi index 4952aa3146..56c59d4f24 100644 Binary files a/GainStation13/icons/obj/atmos.dmi and b/GainStation13/icons/obj/atmos.dmi differ diff --git a/GainStation13/icons/obj/device.dmi b/GainStation13/icons/obj/device.dmi index b4a7291677..6b6d86e248 100644 Binary files a/GainStation13/icons/obj/device.dmi and b/GainStation13/icons/obj/device.dmi differ diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index c5231c015a..ce834d885a 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -528,7 +528,7 @@ "km" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/ruin/space/has_grav/hotel/security) "kn" = (/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/security) "ko" = (/obj/structure/window{dir = 1; icon_state = "window"},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) -"kp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/window{dir = 1; icon_state = "window"},/obj/structure/chair/comfy/blue{dir = 8},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) +"kp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/window{dir = 1; icon_state = "window"},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "kq" = (/obj/machinery/suit_storage_unit/standard_unit,/obj/structure/cable{icon_state = "1-4"},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power) "kr" = (/obj/machinery/power/smes/engineering,/obj/structure/cable{icon_state = "4-8"},/obj/structure/cable{icon_state = "0-8"},/obj/structure/sign/warning/electricshock{pixel_y = -32},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power) "ks" = (/obj/machinery/power/smes/engineering,/obj/structure/cable{icon_state = "0-8"},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power) @@ -683,7 +683,6 @@ "no" = (/obj/machinery/door/airlock{dir = 4; name = "Men's Changing"},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_panel"; name = "steel pannel"},/obj/structure/curtain,/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/pool) "np" = (/obj/structure/table,/obj/item/reagent_containers/rag/towel{pixel_x = 4; pixel_y = 4},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/pool) "nq" = (/obj/structure/table,/obj/item/card/id/away/hotel/securty,/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/security) -"nr" = (/obj/structure/window,/obj/structure/chair/comfy/blue{dir = 4},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "ns" = (/obj/machinery/door/airlock{dir = 4; name = "Women's Changing"},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_panel"; name = "steel pannel"},/obj/structure/curtain,/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/pool) "nt" = (/obj/machinery/door/airlock{dir = 4; name = "Custodial Closet"; req_access_txt = "200,201"},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/hotel/custodial) "nu" = (/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/dock) @@ -715,7 +714,7 @@ "pD" = (/obj/effect/turf_decal/tile/purple,/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "pV" = (/obj/structure/mirror{pixel_y = 32},/obj/structure/sink{pixel_y = 24},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 4},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/guestroom/room_6) "qs" = (/obj/machinery/vending/autodrobe/all_access,/turf/open/floor/wood,/area/ruin/space/has_grav/hotel/dock) -"qC" = (/obj/machinery/vending/clothing{credits = 50},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) +"qC" = (/obj/machinery/vending/clothing,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "qW" = (/obj/structure/flora/ausbushes/grassybush,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/pool) "rd" = (/turf/open/floor/plasteel/white/side{dir = 5},/area/ruin/space/has_grav/hotel/pool) "rs" = (/obj/machinery/light{dir = 1; pixel_y = 16},/obj/structure/flora/ausbushes/fullgrass,/obj/structure/flora/ausbushes/ppflowers,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/pool) @@ -767,13 +766,11 @@ "EG" = (/obj/structure/window{dir = 1; icon_state = "window"},/obj/machinery/vending/mealdor,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "EY" = (/obj/structure/toilet{dir = 4},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/guestroom/room_6) "Fh" = (/obj/machinery/pool/controller,/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/floor/plasteel/yellowsiding,/area/ruin/space/has_grav/hotel/pool) -"FH" = (/obj/structure/window,/obj/structure/chair/comfy/blue{dir = 8},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "Gg" = (/obj/machinery/deepfryer,/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/bar) "Gj" = (/obj/effect/overlay/palmtree_l,/obj/structure/flora/ausbushes/fullgrass,/obj/structure/flora/ausbushes/ywflowers,/obj/machinery/light,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/pool) "Gk" = (/obj/structure/window{dir = 1; icon_state = "window"},/obj/structure/reagent_dispensers/water_cooler,/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "Gz" = (/obj/machinery/door/window/eastleft{dir = 1},/obj/effect/turf_decal/loading_area{dir = 5; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/guestroom/room_6) "GA" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/pool) -"GG" = (/obj/structure/window{dir = 1; icon_state = "window"},/obj/structure/chair/comfy/blue{dir = 4},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool) "HU" = (/obj/structure/flora/ausbushes/fullgrass,/obj/structure/flora/ausbushes/ppflowers,/obj/machinery/light,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/pool) "IF" = (/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "IN" = (/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/pool) @@ -880,7 +877,7 @@ aaaaaaaaabaaajiriHiIiJiJiKiLircQfifihIfifihUfifififififififiamamamamamamameTmWeT aaaaaaaaabaaajiriRiIiSiSiKiTirhPcJiUiVcJcJiWcJcJcJcJcJhQcJcJcJcJiYiZcJcJnLjamZjanajcjdeGjeeWgKNrgyeWzwjfgKNrgyjheGgfaaaaababaaaaaaaaaa aaaaaaaaabaaajirjijjjkjliKjmjnjojojpjqjojojrjGjojojpnbhfjtjtjtjtjtjtjtjtjtjtncjvndjxjtjtjtjtjtjtjyjtjtfreGeGeGeGeGgfaaabaaaaaaaaaaaaaa aaaaaaaaabaaajirjAjBiKjCjDjEjFjGjHjIjJjKjLjGjMjNjOjPckcQjQnvwsVXUcAhjTrsnvnfDrqCngDrjZneAhUcVXBfkanvjQgWgAgAhwjQaaaaaaabaaaaaaaaaaaaaa -aaaaaaaaabacajkbkckdkekfiKiKkgjGkhkikjkkklkmknknknjPbLcQjQEGyfWHGkkokokokokUkUkUnkkUkokokokoGGwekpyBjQkFluluXPjQaaaaaaabaaaaaaaaaaaaaa +aaaaaaaaabacajkbkckdkekfiKiKkgjGkhkikjkkklkmknknknjPbLcQjQEGyfWHGkkokokokokUkUkUnkkUkokokokokowekpyBjQkFluluXPjQaaaaaaabaaaaaaaaaaaaaa aaaaaaaaabaaajirkqkrksktkukvkwjGkxkykzkAklkBknknkCjPawcQjQMykUkUlPnhnhnhnhnhnhnhninhnhnhnhnhrdkUkGnnMFlululuINjQaaaaaaabaaaaaaaaaaaaaa aaaaaaaaabaaajirkHkHkHkIkHkHkJjGkKkkkLkMkNkmkOkPknjPawcQjQMynzlPYxnynynynyAonyFhkRpikSkSkSkSONVlnAsxjQjQjQjQjQjQacacacabaaaaaaaaaaaaaa aaaaaaaaabaaajirkVkWkXkYkZkHlajGlbkklcldkljGlelflgjPawcQjQbMjbfbZSLKljNnNnAMNnNnNnAMNnNnNnliKiVNjbnnjQlmlnlnlojQaaaaaaabaaaaaaaaaaaaaa @@ -894,7 +891,7 @@ abaclVlWlWlWlWlXlYlYlYlYlZacacjGjGjGjGjGjGjGjGjGjGjPcQmajQMynzlhZSUtIFIFIFIFIFnO abaaaaaaaaaaaaajaaaaaaaaaaaaaaaamdmemfmgmhmimjmkmlmmcQckjQbMjbfbZSzQtetetenmtetetenmteteteltKiVNjRnnnslHlHlHlHjQaaaaabaaaaaaaaaaaaaaaa abaaaaaaaaaaaaajaaaaaaaaaaaaaaaamdmlmlmlmlmompmpmpmqhfcvjtmrnzwBEknjnjnjnjIQnjnjnjIQnjnjnjnjsonxkUnnjQmsOcOcmtjQaaaaabaaaaaaaaaaaaaaaa abaclVlWlWlWlWlXlYlYlYlYlZacacacmdmlmlmlmumvmvmvmwntmymznMmBkTkUwBjSjSjSjSjSjSjSjSjSjSjSjSjSnxkUkULEjQlmlululojQacacabaaaaaaaaaaaaaaaa -abaaaaaaaaaaaaajaaaaaaaaaaaaaaaamdmlmEmFmGmHmImlmJmdawedjQSOkQnrVhFHkQkUkUkUkQkQkQkUkUkUkQnrVhFHkQUqjQlmlululojQaaaaabaaaaaaaaaaaaaaaa +abaaaaaaaaaaaaajaaaaaaaaaaaaaaaamdmlmEmFmGmHmImlmJmdawedjQSOkQkQVhkQkQkUkUkUkQkQkQkUkUkUkQkQVhkQkQUqjQlmlululojQaaaaabaaaaaaaaaaaaaaaa abaaaaaaaaaaaaajaaaaaaaaaaaaaaaamdmdmdmdmdmdmdmdmdmdawfgjQnvxXvrHUxAnvPEfLoJnvGjnvoJmLDwnvnwhXqWBfnvjQlmlululojQaaaaabaaaaaaaaaaaaaaaa abaclVlWlWlWlWlXlYlYlYlYlZacacacacacaaaaaaaaacaaaaamamamjQjQjQmNmNmNmNjQjQmNmNmNmNmNjQjQmNmNmNmNjQjQjQjQjQjQjQjQaaaaabaaaaaaaaaaaaaaaa abaaaaaaaaaaaaajaaaaaaaaaaaaaaaaaaacaaaaaaaaacaaaaaaaaaaaaaaacaaaaaaaaaaacaaaaaaaaaaacaaaaaaaaaaacaaaaaaaaaaaaacaaaaabaaaaaaaaaaaaaaaa diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 8efd2b2683..6a467ccfa8 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -62,14 +62,14 @@ /turf/open/floor/plating) "aas" = ( /obj/docking_port/stationary/random{ - id = "pod_lavaland1"; + shuttle_id = "pod_lavaland1"; name = "lavaland" }, /turf/open/space, /area/space/nearstation) "aat" = ( /obj/docking_port/stationary/random{ - id = "pod_lavaland2"; + shuttle_id = "pod_lavaland2"; name = "lavaland" }, /turf/open/space, @@ -392,7 +392,7 @@ dir = 2; dwidth = 4; height = 17; - id = "arrivals_stationary"; + shuttle_id = "arrivals_stationary"; name = "delta arrivals"; roundstart_template = /datum/map_template/shuttle/arrival/delta; width = 9 @@ -1454,7 +1454,7 @@ dir = 8; dwidth = 12; height = 17; - id = "syndicate_ne"; + shuttle_id = "syndicate_ne"; name = "northeast of station"; width = 23 }, @@ -1465,7 +1465,7 @@ dir = 8; dwidth = 11; height = 15; - id = "whiteship_home"; + shuttle_id = "whiteship_home"; name = "SS13: Auxiliary Dock, Station-Fore"; width = 32 }, @@ -1777,7 +1777,7 @@ dir = 1; dwidth = 2; height = 13; - id = "ferry_home"; + shuttle_id = "ferry_home"; name = "port bay 2"; width = 5 }, @@ -12461,7 +12461,7 @@ dir = 4; dwidth = 4; height = 7; - id = "supply_home"; + shuttle_id = "supply_home"; name = "Cargo Bay"; width = 12 }, @@ -26243,7 +26243,7 @@ "bbz" = ( /obj/docking_port/stationary/random{ dir = 4; - id = "pod_lavaland4"; + shuttle_id = "pod_lavaland4"; name = "lavaland" }, /turf/open/space, @@ -29021,7 +29021,7 @@ dir = 4; dwidth = 3; height = 5; - id = "mining_home"; + shuttle_id = "mining_home"; name = "mining shuttle bay"; roundstart_template = /datum/map_template/shuttle/mining/delta; width = 7 @@ -39820,7 +39820,7 @@ dir = 8; dwidth = 2; height = 5; - id = "laborcamp_home"; + shuttle_id = "laborcamp_home"; name = "fore bay 1"; roundstart_template = /datum/map_template/shuttle/labour/delta; width = 9 @@ -113910,7 +113910,7 @@ dir = 4; dwidth = 11; height = 18; - id = "emergency_home"; + shuttle_id = "emergency_home"; name = "DeltaStation emergency evac bay"; width = 30 }, @@ -118015,7 +118015,7 @@ dir = 4; dwidth = 4; height = 9; - id = "aux_base_zone"; + shuttle_id = "aux_base_zone"; name = "aux base zone"; roundstart_template = /datum/map_template/shuttle/aux_base/default; width = 9 diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 067d02df5e..2be59b4655 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -48118,13 +48118,14 @@ /turf/open/floor/plating, /area/maintenance/starboard) "dMm" = ( -/obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/machinery/door/airlock/external{ + name = "Supply Dock Airlock"; + req_access_txt = "31"; + dir = 4 + }, /turf/open/floor/plating, /area/cargo/storage) "dNK" = ( @@ -52715,6 +52716,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/door/airlock/security/glass{ + id_tag = "innerbrig"; + name = "Brig"; + req_access_txt = "63" + }, /turf/open/floor/plasteel, /area/security/office) "gzG" = ( @@ -55330,14 +55336,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/security/glass{ - bound_width = 64; - doorOpen = 'sound/machines/bigairlockopen.ogg'; - icon = 'icons/obj/doors/airlocks/station/securitydouble.dmi'; id_tag = "innerbrig"; - name = "Security Office"; - note_overlay_file = 'icons/obj/doors/airlocks/station/overlaysdouble.dmi'; - overlays_file = 'icons/obj/doors/airlocks/station/overlaysdouble.dmi'; - req_one_access_txt = "1;4" + name = "Brig"; + req_access_txt = "63" }, /turf/open/floor/plasteel, /area/security/office) @@ -58988,12 +58989,13 @@ /turf/open/floor/plasteel/dark, /area/commons/cryopod) "kff" = ( -/obj/machinery/door/airlock/external{ - name = "Mining Dock Airlock" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/machinery/door/airlock/external{ + name = "Mining Dock Airlock"; + dir = 8 + }, /turf/open/floor/plating, /area/cargo/miningoffice) "kfu" = ( @@ -62043,11 +62045,12 @@ /turf/open/floor/plating, /area/construction/storage_wing) "lQC" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, /obj/machinery/door/airlock/mining/glass{ name = "Mining Dock"; - req_access_txt = "48" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + req_access_txt = "48"; dir = 8 }, /turf/open/floor/plasteel, @@ -66379,11 +66382,12 @@ /turf/open/floor/plating, /area/cargo/storage) "otk" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, /obj/machinery/door/airlock/external{ name = "Supply Dock Airlock"; - req_access_txt = "31" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + req_access_txt = "31"; dir = 4 }, /turf/open/floor/plating, diff --git a/_maps/old_backups/gs_maps/BoxStation/BoxStation.dmm b/backup_files/old_map_backups/gs_maps/BoxStation/BoxStation.dmm similarity index 100% rename from _maps/old_backups/gs_maps/BoxStation/BoxStation.dmm rename to backup_files/old_map_backups/gs_maps/BoxStation/BoxStation.dmm diff --git a/_maps/old_backups/gs_maps/Deltastation/DeltaStation2.dmm b/backup_files/old_map_backups/gs_maps/Deltastation/DeltaStation2.dmm similarity index 100% rename from _maps/old_backups/gs_maps/Deltastation/DeltaStation2.dmm rename to backup_files/old_map_backups/gs_maps/Deltastation/DeltaStation2.dmm diff --git a/_maps/old_backups/gs_maps/KiloStation/KiloStation.dmm b/backup_files/old_map_backups/gs_maps/KiloStation/KiloStation.dmm similarity index 100% rename from _maps/old_backups/gs_maps/KiloStation/KiloStation.dmm rename to backup_files/old_map_backups/gs_maps/KiloStation/KiloStation.dmm diff --git a/_maps/old_backups/gs_maps/LayeniaStation/LayeniaStation.dmm b/backup_files/old_map_backups/gs_maps/LayeniaStation/LayeniaStation.dmm similarity index 100% rename from _maps/old_backups/gs_maps/LayeniaStation/LayeniaStation.dmm rename to backup_files/old_map_backups/gs_maps/LayeniaStation/LayeniaStation.dmm diff --git a/_maps/old_backups/gs_maps/MetaStation/MetaStation.dmm b/backup_files/old_map_backups/gs_maps/MetaStation/MetaStation.dmm similarity index 100% rename from _maps/old_backups/gs_maps/MetaStation/MetaStation.dmm rename to backup_files/old_map_backups/gs_maps/MetaStation/MetaStation.dmm diff --git a/_maps/old_backups/gs_maps/Mining/Lavaland.dmm b/backup_files/old_map_backups/gs_maps/Mining/Lavaland.dmm similarity index 100% rename from _maps/old_backups/gs_maps/Mining/Lavaland.dmm rename to backup_files/old_map_backups/gs_maps/Mining/Lavaland.dmm diff --git a/_maps/old_backups/gs_maps/Mining/Lavaland_Demone.dmm b/backup_files/old_map_backups/gs_maps/Mining/Lavaland_Demone.dmm similarity index 100% rename from _maps/old_backups/gs_maps/Mining/Lavaland_Demone.dmm rename to backup_files/old_map_backups/gs_maps/Mining/Lavaland_Demone.dmm diff --git a/_maps/old_backups/gs_maps/Mining/Lavaland_Lower.dmm b/backup_files/old_map_backups/gs_maps/Mining/Lavaland_Lower.dmm similarity index 100% rename from _maps/old_backups/gs_maps/Mining/Lavaland_Lower.dmm rename to backup_files/old_map_backups/gs_maps/Mining/Lavaland_Lower.dmm diff --git a/_maps/old_backups/gs_maps/OmegaStation/OmegaStation.dmm b/backup_files/old_map_backups/gs_maps/OmegaStation/OmegaStation.dmm similarity index 100% rename from _maps/old_backups/gs_maps/OmegaStation/OmegaStation.dmm rename to backup_files/old_map_backups/gs_maps/OmegaStation/OmegaStation.dmm diff --git a/_maps/old_backups/gs_maps/OmegaStation/job_changes.dm b/backup_files/old_map_backups/gs_maps/OmegaStation/job_changes.dm similarity index 100% rename from _maps/old_backups/gs_maps/OmegaStation/job_changes.dm rename to backup_files/old_map_backups/gs_maps/OmegaStation/job_changes.dm diff --git a/_maps/old_backups/gs_maps/PubbyStation/PubbyStation.dmm b/backup_files/old_map_backups/gs_maps/PubbyStation/PubbyStation.dmm similarity index 100% rename from _maps/old_backups/gs_maps/PubbyStation/PubbyStation.dmm rename to backup_files/old_map_backups/gs_maps/PubbyStation/PubbyStation.dmm diff --git a/_maps/old_backups/gs_maps/PubbyStation/job_changes.dm b/backup_files/old_map_backups/gs_maps/PubbyStation/job_changes.dm similarity index 100% rename from _maps/old_backups/gs_maps/PubbyStation/job_changes.dm rename to backup_files/old_map_backups/gs_maps/PubbyStation/job_changes.dm diff --git a/_maps/old_backups/gs_maps/RandomRuins/StationRuins/Lavaland/MiningStation/Mining_Station_Public_01.dmm b/backup_files/old_map_backups/gs_maps/RandomRuins/StationRuins/Lavaland/MiningStation/Mining_Station_Public_01.dmm similarity index 100% rename from _maps/old_backups/gs_maps/RandomRuins/StationRuins/Lavaland/MiningStation/Mining_Station_Public_01.dmm rename to backup_files/old_map_backups/gs_maps/RandomRuins/StationRuins/Lavaland/MiningStation/Mining_Station_Public_01.dmm diff --git a/_maps/old_backups/gs_maps/SyndieBoxStation/SyndieBoxStation.dmm b/backup_files/old_map_backups/gs_maps/SyndieBoxStation/SyndieBoxStation.dmm similarity index 100% rename from _maps/old_backups/gs_maps/SyndieBoxStation/SyndieBoxStation.dmm rename to backup_files/old_map_backups/gs_maps/SyndieBoxStation/SyndieBoxStation.dmm diff --git a/_maps/old_backups/gs_maps/debug/multiz.dmm b/backup_files/old_map_backups/gs_maps/debug/multiz.dmm similarity index 100% rename from _maps/old_backups/gs_maps/debug/multiz.dmm rename to backup_files/old_map_backups/gs_maps/debug/multiz.dmm diff --git a/_maps/old_backups/gs_maps/debug/runtimestation.dmm b/backup_files/old_map_backups/gs_maps/debug/runtimestation.dmm similarity index 100% rename from _maps/old_backups/gs_maps/debug/runtimestation.dmm rename to backup_files/old_map_backups/gs_maps/debug/runtimestation.dmm diff --git a/_maps/old_backups/gs_maps/generic/CentCom.dmm b/backup_files/old_map_backups/gs_maps/generic/CentCom.dmm similarity index 100% rename from _maps/old_backups/gs_maps/generic/CentCom.dmm rename to backup_files/old_map_backups/gs_maps/generic/CentCom.dmm diff --git a/_maps/old_backups/gs_maps/generic/City_of_Cogs.dmm b/backup_files/old_map_backups/gs_maps/generic/City_of_Cogs.dmm similarity index 100% rename from _maps/old_backups/gs_maps/generic/City_of_Cogs.dmm rename to backup_files/old_map_backups/gs_maps/generic/City_of_Cogs.dmm diff --git a/_maps/old_backups/gs_maps/generic/SpaceDock.dmm b/backup_files/old_map_backups/gs_maps/generic/SpaceDock.dmm similarity index 100% rename from _maps/old_backups/gs_maps/generic/SpaceDock.dmm rename to backup_files/old_map_backups/gs_maps/generic/SpaceDock.dmm diff --git a/_maps/old_backups/gs_maps/gs13/Fast_Food.dmm b/backup_files/old_map_backups/gs_maps/gs13/Fast_Food.dmm similarity index 100% rename from _maps/old_backups/gs_maps/gs13/Fast_Food.dmm rename to backup_files/old_map_backups/gs_maps/gs13/Fast_Food.dmm diff --git a/_maps/old_backups/gs_maps/gs13/GS13_beach.dmm b/backup_files/old_map_backups/gs_maps/gs13/GS13_beach.dmm similarity index 100% rename from _maps/old_backups/gs_maps/gs13/GS13_beach.dmm rename to backup_files/old_map_backups/gs_maps/gs13/GS13_beach.dmm diff --git a/_maps/old_backups/gs_maps/hyper/Diner.dmm b/backup_files/old_map_backups/gs_maps/hyper/Diner.dmm similarity index 100% rename from _maps/old_backups/gs_maps/hyper/Diner.dmm rename to backup_files/old_map_backups/gs_maps/hyper/Diner.dmm diff --git a/_maps/old_backups/map_files/BoxStation/BoxStation.dmm b/backup_files/old_map_backups/map_files/BoxStation/BoxStation.dmm similarity index 100% rename from _maps/old_backups/map_files/BoxStation/BoxStation.dmm rename to backup_files/old_map_backups/map_files/BoxStation/BoxStation.dmm diff --git a/_maps/old_backups/map_files/CogStation/CogStation.dmm b/backup_files/old_map_backups/map_files/CogStation/CogStation.dmm similarity index 100% rename from _maps/old_backups/map_files/CogStation/CogStation.dmm rename to backup_files/old_map_backups/map_files/CogStation/CogStation.dmm diff --git a/_maps/old_backups/map_files/CogStation/job_changes.dm b/backup_files/old_map_backups/map_files/CogStation/job_changes.dm similarity index 100% rename from _maps/old_backups/map_files/CogStation/job_changes.dm rename to backup_files/old_map_backups/map_files/CogStation/job_changes.dm diff --git a/_maps/old_backups/map_files/Deltastation/DeltaStation2.dmm b/backup_files/old_map_backups/map_files/Deltastation/DeltaStation2.dmm similarity index 100% rename from _maps/old_backups/map_files/Deltastation/DeltaStation2.dmm rename to backup_files/old_map_backups/map_files/Deltastation/DeltaStation2.dmm diff --git a/_maps/old_backups/map_files/FestiveBall/FestiveStation.dmm b/backup_files/old_map_backups/map_files/FestiveBall/FestiveStation.dmm similarity index 100% rename from _maps/old_backups/map_files/FestiveBall/FestiveStation.dmm rename to backup_files/old_map_backups/map_files/FestiveBall/FestiveStation.dmm diff --git a/_maps/old_backups/map_files/FestiveBall/doorButtonOrganizer.dm b/backup_files/old_map_backups/map_files/FestiveBall/doorButtonOrganizer.dm similarity index 100% rename from _maps/old_backups/map_files/FestiveBall/doorButtonOrganizer.dm rename to backup_files/old_map_backups/map_files/FestiveBall/doorButtonOrganizer.dm diff --git a/_maps/old_backups/map_files/KiloStation/KiloStation.dmm b/backup_files/old_map_backups/map_files/KiloStation/KiloStation.dmm similarity index 100% rename from _maps/old_backups/map_files/KiloStation/KiloStation.dmm rename to backup_files/old_map_backups/map_files/KiloStation/KiloStation.dmm diff --git a/_maps/old_backups/map_files/LambdaStation/dorms.dmm b/backup_files/old_map_backups/map_files/LambdaStation/dorms.dmm similarity index 100% rename from _maps/old_backups/map_files/LambdaStation/dorms.dmm rename to backup_files/old_map_backups/map_files/LambdaStation/dorms.dmm diff --git a/_maps/old_backups/map_files/LambdaStation/lambda.dmm b/backup_files/old_map_backups/map_files/LambdaStation/lambda.dmm similarity index 100% rename from _maps/old_backups/map_files/LambdaStation/lambda.dmm rename to backup_files/old_map_backups/map_files/LambdaStation/lambda.dmm diff --git a/_maps/old_backups/map_files/Mafia/mafia_ayylmao.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_ayylmao.dmm similarity index 100% rename from _maps/old_backups/map_files/Mafia/mafia_ayylmao.dmm rename to backup_files/old_map_backups/map_files/Mafia/mafia_ayylmao.dmm diff --git a/_maps/old_backups/map_files/Mafia/mafia_ball.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_ball.dmm similarity index 100% rename from _maps/old_backups/map_files/Mafia/mafia_ball.dmm rename to backup_files/old_map_backups/map_files/Mafia/mafia_ball.dmm diff --git a/_maps/old_backups/map_files/Mafia/mafia_gothic.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_gothic.dmm similarity index 100% rename from _maps/old_backups/map_files/Mafia/mafia_gothic.dmm rename to backup_files/old_map_backups/map_files/Mafia/mafia_gothic.dmm diff --git a/_maps/old_backups/map_files/Mafia/mafia_lavaland.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_lavaland.dmm similarity index 100% rename from _maps/old_backups/map_files/Mafia/mafia_lavaland.dmm rename to backup_files/old_map_backups/map_files/Mafia/mafia_lavaland.dmm diff --git a/_maps/old_backups/map_files/Mafia/mafia_reebe.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_reebe.dmm similarity index 100% rename from _maps/old_backups/map_files/Mafia/mafia_reebe.dmm rename to backup_files/old_map_backups/map_files/Mafia/mafia_reebe.dmm diff --git a/_maps/old_backups/map_files/Mafia/mafia_snow.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_snow.dmm similarity index 100% rename from _maps/old_backups/map_files/Mafia/mafia_snow.dmm rename to backup_files/old_map_backups/map_files/Mafia/mafia_snow.dmm diff --git a/_maps/old_backups/map_files/Mafia/mafia_spiderclan.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_spiderclan.dmm similarity index 100% rename from _maps/old_backups/map_files/Mafia/mafia_spiderclan.dmm rename to backup_files/old_map_backups/map_files/Mafia/mafia_spiderclan.dmm diff --git a/_maps/old_backups/map_files/Mafia/mafia_syndie.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_syndie.dmm similarity index 100% rename from _maps/old_backups/map_files/Mafia/mafia_syndie.dmm rename to backup_files/old_map_backups/map_files/Mafia/mafia_syndie.dmm diff --git a/_maps/old_backups/map_files/MetaStation/MetaStation.dmm b/backup_files/old_map_backups/map_files/MetaStation/MetaStation.dmm similarity index 100% rename from _maps/old_backups/map_files/MetaStation/MetaStation.dmm rename to backup_files/old_map_backups/map_files/MetaStation/MetaStation.dmm diff --git a/_maps/old_backups/map_files/Mining/Lavaland.dmm b/backup_files/old_map_backups/map_files/Mining/Lavaland.dmm similarity index 100% rename from _maps/old_backups/map_files/Mining/Lavaland.dmm rename to backup_files/old_map_backups/map_files/Mining/Lavaland.dmm diff --git a/_maps/old_backups/map_files/Mining/Lavaland_Demone.dmm b/backup_files/old_map_backups/map_files/Mining/Lavaland_Demone.dmm similarity index 100% rename from _maps/old_backups/map_files/Mining/Lavaland_Demone.dmm rename to backup_files/old_map_backups/map_files/Mining/Lavaland_Demone.dmm diff --git a/_maps/old_backups/map_files/Mining/Lavaland_Lower.dmm b/backup_files/old_map_backups/map_files/Mining/Lavaland_Lower.dmm similarity index 100% rename from _maps/old_backups/map_files/Mining/Lavaland_Lower.dmm rename to backup_files/old_map_backups/map_files/Mining/Lavaland_Lower.dmm diff --git a/_maps/old_backups/map_files/OmegaStation/OmegaStation.dmm b/backup_files/old_map_backups/map_files/OmegaStation/OmegaStation.dmm similarity index 100% rename from _maps/old_backups/map_files/OmegaStation/OmegaStation.dmm rename to backup_files/old_map_backups/map_files/OmegaStation/OmegaStation.dmm diff --git a/_maps/old_backups/map_files/OmegaStation/job_changes.dm b/backup_files/old_map_backups/map_files/OmegaStation/job_changes.dm similarity index 100% rename from _maps/old_backups/map_files/OmegaStation/job_changes.dm rename to backup_files/old_map_backups/map_files/OmegaStation/job_changes.dm diff --git a/_maps/old_backups/map_files/PubbyStation/PubbyStation.dmm b/backup_files/old_map_backups/map_files/PubbyStation/PubbyStation.dmm similarity index 100% rename from _maps/old_backups/map_files/PubbyStation/PubbyStation.dmm rename to backup_files/old_map_backups/map_files/PubbyStation/PubbyStation.dmm diff --git a/_maps/old_backups/map_files/PubbyStation/job_changes.dm b/backup_files/old_map_backups/map_files/PubbyStation/job_changes.dm similarity index 100% rename from _maps/old_backups/map_files/PubbyStation/job_changes.dm rename to backup_files/old_map_backups/map_files/PubbyStation/job_changes.dm diff --git a/_maps/old_backups/map_files/Snaxi/Snaxi.dmm b/backup_files/old_map_backups/map_files/Snaxi/Snaxi.dmm similarity index 100% rename from _maps/old_backups/map_files/Snaxi/Snaxi.dmm rename to backup_files/old_map_backups/map_files/Snaxi/Snaxi.dmm diff --git a/_maps/old_backups/map_files/SpookyStation/SpookyStation.dmm b/backup_files/old_map_backups/map_files/SpookyStation/SpookyStation.dmm similarity index 100% rename from _maps/old_backups/map_files/SpookyStation/SpookyStation.dmm rename to backup_files/old_map_backups/map_files/SpookyStation/SpookyStation.dmm diff --git a/_maps/old_backups/map_files/SpookyStation/halloweenPersiWork.dm b/backup_files/old_map_backups/map_files/SpookyStation/halloweenPersiWork.dm similarity index 100% rename from _maps/old_backups/map_files/SpookyStation/halloweenPersiWork.dm rename to backup_files/old_map_backups/map_files/SpookyStation/halloweenPersiWork.dm diff --git a/_maps/old_backups/map_files/SpookyStation/job_changes.dm b/backup_files/old_map_backups/map_files/SpookyStation/job_changes.dm similarity index 100% rename from _maps/old_backups/map_files/SpookyStation/job_changes.dm rename to backup_files/old_map_backups/map_files/SpookyStation/job_changes.dm diff --git a/_maps/old_backups/map_files/SyndicateStation/SyndicateBoxStation.dmm b/backup_files/old_map_backups/map_files/SyndicateStation/SyndicateBoxStation.dmm similarity index 100% rename from _maps/old_backups/map_files/SyndicateStation/SyndicateBoxStation.dmm rename to backup_files/old_map_backups/map_files/SyndicateStation/SyndicateBoxStation.dmm diff --git a/_maps/old_backups/map_files/debug/multiz.dmm b/backup_files/old_map_backups/map_files/debug/multiz.dmm similarity index 100% rename from _maps/old_backups/map_files/debug/multiz.dmm rename to backup_files/old_map_backups/map_files/debug/multiz.dmm diff --git a/_maps/old_backups/map_files/debug/runtimestation.dmm b/backup_files/old_map_backups/map_files/debug/runtimestation.dmm similarity index 100% rename from _maps/old_backups/map_files/debug/runtimestation.dmm rename to backup_files/old_map_backups/map_files/debug/runtimestation.dmm diff --git a/_maps/old_backups/map_files/generic/CentCom.dmm b/backup_files/old_map_backups/map_files/generic/CentCom.dmm similarity index 100% rename from _maps/old_backups/map_files/generic/CentCom.dmm rename to backup_files/old_map_backups/map_files/generic/CentCom.dmm diff --git a/_maps/old_backups/map_files/generic/City_of_Cogs.dmm b/backup_files/old_map_backups/map_files/generic/City_of_Cogs.dmm similarity index 100% rename from _maps/old_backups/map_files/generic/City_of_Cogs.dmm rename to backup_files/old_map_backups/map_files/generic/City_of_Cogs.dmm diff --git a/_maps/old_backups/map_files/generic/SpaceDock.dmm b/backup_files/old_map_backups/map_files/generic/SpaceDock.dmm similarity index 100% rename from _maps/old_backups/map_files/generic/SpaceDock.dmm rename to backup_files/old_map_backups/map_files/generic/SpaceDock.dmm diff --git a/_maps/old_backups/map_files/gs13/Fast_Food.dmm b/backup_files/old_map_backups/map_files/gs13/Fast_Food.dmm similarity index 100% rename from _maps/old_backups/map_files/gs13/Fast_Food.dmm rename to backup_files/old_map_backups/map_files/gs13/Fast_Food.dmm diff --git a/_maps/old_backups/map_files/hyper/Diner.dmm b/backup_files/old_map_backups/map_files/hyper/Diner.dmm similarity index 100% rename from _maps/old_backups/map_files/hyper/Diner.dmm rename to backup_files/old_map_backups/map_files/hyper/Diner.dmm diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 4629c4a954..785c83c322 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -277,5 +277,7 @@ // GS13 EDIT #define FAT "fat" +#define PERMA_FAT "perma_fat" /// What is the rate that one damage is converted to fatness? #define FAT_DAMAGE_TO_FATNESS 4 +#define PERMA_FAT_DAMAGE_TO_FATNESS 4 diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 8d96b2c88e..041f02168e 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -412,6 +412,17 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("19x19 canvas", /obj/item/canvas/nineteenXnineteen, 3), \ new/datum/stack_recipe("23x19 canvas", /obj/item/canvas/twentythreeXnineteen, 4), \ new/datum/stack_recipe("23x23 canvas", /obj/item/canvas/twentythreeXtwentythree, 5), \ + null, \ + // GS13 edit - beanbag chairs + new/datum/stack_recipe_list("beanbag chairs", list( \ + new/datum/stack_recipe("red beanbag chair", /obj/structure/chair/beanbag/red, 5, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("blue beanbag chair", /obj/structure/chair/beanbag/blue, 5, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("green beanbag chair",/obj/structure/chair/beanbag/green, 5, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("purple beanbag chair", /obj/structure/chair/beanbag/purple, 5, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("black beanbag chair", /obj/structure/chair/beanbag/black, 5, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("GATO beanbag chair", /obj/structure/chair/beanbag/gato, 5, one_per_turf = TRUE, on_floor = TRUE), \ + )), \ + // END GS13 edit )) /obj/item/stack/sheet/cloth diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 40613aa96b..8debdaa03f 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -77,7 +77,12 @@ qdel(src) /obj/structure/chair/attackby(obj/item/W, mob/user, params) - if(W.tool_behaviour == TOOL_WRENCH && !(flags_1 & NODECONSTRUCT_1)) + // GS13 EDIT - replaced wrench check with a check based on material and tool - chairs made from any material other + // than cloth will function the same as before, but chairs made from cloth will be destructible using a wirecutter + var/wrench_deconstruct = W.tool_behaviour == TOOL_WRENCH && buildstacktype != /obj/item/stack/sheet/cloth + var/wirecutter_deconstruct = W.tool_behaviour == TOOL_WIRECUTTER && buildstacktype == /obj/item/stack/sheet/cloth + if((wrench_deconstruct || wirecutter_deconstruct) && !(flags_1 & NODECONSTRUCT_1)) + // GS13 END EDIT W.play_tool_sound(src) deconstruct() else if(istype(W, /obj/item/assembly/shock_kit)) diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index ee5f4e83f3..b6af06a5f6 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -18,13 +18,13 @@ var/list/saferChems = list( /datum/reagent/water, /datum/reagent/carbon, - /datum/reagent/consumable/flour, + // /datum/reagent/consumable/flour, //GS13 remove: there's already few too many messy reagents there /datum/reagent/space_cleaner, /datum/reagent/consumable/nutriment, /datum/reagent/consumable/condensedcapsaicin, /datum/reagent/drug/mushroomhallucinogen, /datum/reagent/lube, - /datum/reagent/glitter/pink, + // /datum/reagent/glitter/pink, //GS13 tweak: there's already few too many messy reagents there /datum/reagent/glitter/pink_subtle, //GS13 Add: Add our subtle variants of glitter. /datum/reagent/cryptobiolin, //datum/reagent/toxin/plantbgone, //GS13 Remove: Annoying Reagent @@ -42,7 +42,7 @@ /datum/reagent/pax, /datum/reagent/consumable/laughter, /datum/reagent/concentrated_barbers_aid, - /datum/reagent/baldium, + // /datum/reagent/baldium, //gs13 remove: just cruel /datum/reagent/colorful_reagent, /datum/reagent/peaceborg_confuse, /datum/reagent/peaceborg_tire, @@ -67,7 +67,7 @@ priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert", has_important_message = TRUE) /datum/round_event/vent_clog/setup() - end_when = rand(120, 180) + end_when = rand(60, 120) //GS13 - length nerf for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/temp_vent in GLOB.machines) var/turf/T = get_turf(temp_vent) var/area/A = T.loc @@ -102,7 +102,7 @@ R.add_reagent(pick(saferChems), reagentsAmount) var/datum/effect_system/smoke_spread/chem/smoke_machine/C = new - C.set_up(R,16,1,T) + C.set_up(R,5,1,T) //GS13 - tweaked size of clouds, from 16 to 5 C.start() playsound(T, 'sound/effects/smoke.ogg', 50, 1, -3) @@ -110,7 +110,7 @@ name = "Clogged Vents: Threatening" typepath = /datum/round_event/vent_clog/threatening weight = 4 - min_players = 18 + min_players = 30 //gs13 tweak max_occurrences = 1 earliest_start = 35 MINUTES description = "Extra dangerous chemicals come out of the scrubbers." @@ -123,7 +123,7 @@ name = "Clogged Vents: Catastrophic" typepath = /datum/round_event/vent_clog/catastrophic weight = 2 - min_players = 25 + min_players = 35 //gs13 tweak max_occurrences = 1 earliest_start = 45 MINUTES description = "EXTREMELY dangerous chemicals come out of the scrubbers." diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 5f2875df34..550d179583 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -2325,6 +2325,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) // GS13 EDIT if(FAT) H.applyFatnessDamage(damage * hit_percent) + if(PERMA_FAT) + H.applyPermaFatnessDamage(damage * hit_percent) return TRUE diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 8790113ba6..3a38a18c6e 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -602,7 +602,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) //Varies based on power and gas content removed.adjust_moles(GAS_PLASMA, clamp((device_energy * dynamic_heat_modifier) / PLASMA_RELEASE_MODIFIER, 0, 50)) //Varies based on power, gas content, and heat - removed.adjust_moles(GAS_O2, clamp((device_energy * dynamic_heat_modifier + effective_temperature - T0C) / OXYGEN_RELEASE_MODIFIER, 0, 100)) + removed.adjust_moles(GAS_O2, clamp((device_energy * dynamic_heat_modifier + effective_temperature - T20C) / OXYGEN_RELEASE_MODIFIER, 0, 100)) if(removed.return_temperature() < max_temp_increase) removed.adjust_heat(device_energy * dynamic_heat_modifier * THERMAL_RELEASE_MODIFIER) diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm index bf9d5886a0..6fd1cd2ef5 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm @@ -58,9 +58,9 @@ build_path = /obj/item/construction/rcd category = list("hacked", "Construction") -/datum/design/rpd +/datum/design/rpd_autolathe //ORIGINAL /datum/design/rpd name = "Rapid Pipe Dispenser (RPD)" - id = "rpd" + id = "rpd_autolathe" // ORIGINAL id = "rpd" build_type = AUTOLATHE | NO_PUBLIC_LATHE materials = list(/datum/material/iron = 75000, /datum/material/glass = 37500) build_path = /obj/item/pipe_dispenser diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index 6f6a1fd88e..e5efcdc6e1 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -742,6 +742,18 @@ category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING +//GS13 EDIT START +/datum/design/double_emergency_oxygen_engi + name = "Double Engineering Emergency Oxygen Tank" + desc = "An double emergency oxygen tank for engineers." + id = "double_emergency_oxygen_engi" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1500, /datum/material/silver = 200) + build_path = /obj/item/tank/internals/emergency_oxygen/double/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING +//GS13 EDIT END + ///////////////////////////////////////// /////////////////Tape//////////////////// ///////////////////////////////////////// diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm index 7392f83975..e4934a1f85 100644 --- a/code/modules/research/designs/stock_parts_designs.dm +++ b/code/modules/research/designs/stock_parts_designs.dm @@ -3,7 +3,8 @@ //////////////////////////////////////// /datum/design/RPED - name = "Rapid Part Exchange Device" + // ORIGINAL name = "Rapid Part Exchange Device" + name = "Rapid Part Exchange Device (RPED)" desc = "Special mechanical module made to store, sort, and apply standard machine parts." id = "rped" build_type = PROTOLATHE @@ -13,7 +14,8 @@ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE /datum/design/BS_RPED - name = "Bluespace RPED" + // ORIGINAL name = "Bluespace RPED" + name = "Bluespace Rapid Part Exchange Device (RPED)" desc = "Powered by bluespace technology, this RPED variant can upgrade buildings from a distance, without needing to remove the panel first." id = "bs_rped" build_type = PROTOLATHE diff --git a/code/modules/research/designs/tool_designs.dm b/code/modules/research/designs/tool_designs.dm index 5ef050efe9..7ed2969926 100644 --- a/code/modules/research/designs/tool_designs.dm +++ b/code/modules/research/designs/tool_designs.dm @@ -33,7 +33,8 @@ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING /datum/design/rpd - name = "Rapid Pipe Dispenser" + // ORIGINAL name = "Rapid Pipe Dispenser" + name = "Rapid Piping Device (RPD)" desc = "A tool that can construct and deconstruct pipes on the fly." id = "rpd" build_type = PROTOLATHE diff --git a/code/modules/research/techweb/nodes/engineering_nodes.dm b/code/modules/research/techweb/nodes/engineering_nodes.dm index 51b9480c27..15feb89149 100644 --- a/code/modules/research/techweb/nodes/engineering_nodes.dm +++ b/code/modules/research/techweb/nodes/engineering_nodes.dm @@ -17,7 +17,8 @@ description = "Pushing the boundaries of physics, one chainsaw-fist at a time." prereq_ids = list("engineering", "emp_basic") design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask" , "rcd_loaded", "rpd", - "rcd_upgrade_frames", "rcd_upgrade_simple_circuits", "rcd_ammo_large", "sheetifier") + // ORIGINAL "rcd_upgrade_frames", "rcd_upgrade_simple_circuits", "rcd_ammo_large", "sheetifier") + "rcd_upgrade_frames", "rcd_upgrade_simple_circuits", "rcd_ammo_large", "sheetifier", "double_emergency_oxygen_engi") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 4000) /datum/techweb_node/anomaly diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index 07613c2ba1..cf5c74a38d 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -1,6 +1,5 @@ //This is the file that handles donator loadout items. -//GS13 temporarily placed files here, will solve it eventually - +//GS13 temporarily placed files here, will solve it eventually :clueless: /datum/gear/donator name = "IF YOU SEE THIS, PING A CODER RIGHT NOW!" @@ -19,7 +18,7 @@ name = "GATO Badge - Correspondent" category = LOADOUT_CATEGORY_DONATOR path = /obj/item/clothing/accessory/medal/gato_badge/middleman - ckeywhitelist = list("johnjimjim", "sonoida", "yeeny", "Not Number", "Not_Number", "NotNumber", "PointNshoot", "Plapp", "CubicP1sa", "cubicp1sa", "plapp", "colorlessspy", "M16nPregnant") + ckeywhitelist = list("johnjimjim", "sonoida", "Sonoida", "SONOIDA", "yeeny", "Not Number", "Not_Number", "NotNumber", "PointNshoot", "pointnshoot", "POINTNSHOOT", "Plapp", "plapp", "PLAPP", "colorlessspy", "Colorlessspy", "COLORLESSSPY", "M16nPregnant", "m16npregnant", "M16NPREGNANT") /datum/gear/donator/halsey_overcoat name = "Halsey's Commander Overcoat" @@ -43,7 +42,7 @@ name = "Dezir Rose Plush" category = LOADOUT_CATEGORY_DONATOR path = /obj/item/toy/plush/gs13/rose - ckeywhitelist = list("eremitanovem", "sonoida", "Absolutely_Free") + ckeywhitelist = list("eremitanovem", "sonoida", "Absolutely_Free", "absolutely_free", "ABSOLUTELY_FREE") /datum/gear/donator/chloe_plush name = "Chloe Plush"