Merge branch 'evilew:master' into master
This commit is contained in:
Phantastic-Swan
@@ -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
|
||||
|
||||
@@ -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*/
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 7.2 KiB |
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user