Skip to content

Commit

Permalink
merge upstream (#796)
Browse files Browse the repository at this point in the history
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то
может пойти не так. -->
<!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. -->

## Что этот PR делает
Мерж с оффами

## Changelog

:cl: ParadiseSS13 (Оффы, подробнее на гитхабе)
add: Мороженое с ТГ
add: Лор расы в настройках персонажа
add: 5 новых оттенков кожи (Latte, Caramel, Bronzed, Almond, Sienna)
tweak: Все эмоуты, которые издают звуки теперь высвечиваются в рунчате
tweak: "Dehydrated carp" теперь стоит 4 ТК
tweak: Передозировка дифенгидрамина вызывает довольно неприятные
побочные эффекты, включая сильные галлюцинации
tweak: Изменены 2 оттенка (Coffee и Pale)
tweak: Реорганизация цвета кожи от светлого к темному
tweak: У ведра появилась крышка
tweak: Бафф хедслага генокрада
tweak: Нерф армблейда генокрада
tweak: Новые звуки для генокрада
tweak: Основание кристалла СМ перерисовано в 3/4
tweak: Талисман бессмертия теперь можно поместить в карман
tweak: e20 больше не выпадает в surplus crate
tweak: Бафф акробатических ботинок клоуна
tweak: Изменены спрайты одежды у Хопа
tweak: Улучшено несколько дрянных заклинаний волшебника, уменьшено время
паралича у Mindswap
tweak: Если вы схватите кого-либо, это будет показано при осмотре
imageadd: Шмотки ГП были перерисованы
imageadd: Респрайт мимского рюкзака
fix: Самонаводящийся тулбокс теперь наносит урон
fix: Исправлено отсутствие пробивания брони у даблсворда
fix: Дионы теперь могут сбрасывать мертвых нимф, которых они поглотили
fix: Горелка больше не расходует топливо если используется не по
назначению
fix: И прочие различные фиксы от оффов (смотрите на Гитхабе)
/:cl:

<!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы
можете написать свой ник справа от первого :cl:, если хотите. Иначе
будет использован ваш ник на ГитХабе. -->
<!-- Вы можете использовать несколько записей с одинаковым префиксом
(Они используются только для иконки в игре) и удалить ненужные. Помните,
что чейнджлог должен быть понятен обычным игроком. -->
<!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы
можете исключить всю секцию. -->
  • Loading branch information
Legendaxe authored Dec 7, 2023
2 parents 75b6310 + cdf5f30 commit 6c603b3
Show file tree
Hide file tree
Showing 242 changed files with 1,489 additions and 843 deletions.
16 changes: 16 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,22 @@ eg: `/datum/thing`, not `datum/thing`
In DM, this is optional, but omitting it makes finding definitions harder. To be specific, you can declare the path `/arbitrary`, but it
will still be, in actuality, `/datum/arbitrary`. Write your code to reflect this.

### Do not use list operators in strings

The use of list operators to augment strings is not allowed. This is roughly 10 times slower than using a list with a Join() Function.

```dm
//Bad
var/text = "text"
text += "More text"
to_chat(world, text)
//Good
var/list/text = list("text")
text += "More text"
to_chat(world, text.Join(""))
```

### Do not use text/string based type paths

It is rarely allowed to put type paths in a text format, as there are no compile errors if the type path no longer exists. Here is an example:
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,6 @@ jobs:
sudo apt update || true
sudo apt install libssl1.1:i386
ldd librust_g.so
- name: Start Redis
uses: supercharge/[email protected]
with:
redis-version: 6
- name: Compile & Run Unit Tests
run: |
tools/ci/install_byond.sh '${{ matrix.byondtype }}'
Expand Down
6 changes: 2 additions & 4 deletions _maps/map_files/MetaStation/MetaStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -55190,13 +55190,12 @@
d2 = 8;
icon_state = "4-8"
},
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/machinery/door/airlock/engineering/glass{
heat_proof = 1;
name = "Supermatter Chamber"
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/turf/simulated/floor/engine,
/area/station/engineering/engine/supermatter)
"gvN" = (
Expand Down Expand Up @@ -74829,13 +74828,12 @@
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_south)
"peF" = (
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/machinery/door/airlock/engineering/glass{
heat_proof = 1;
name = "Supermatter Chamber"
},
/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/turf/simulated/floor/engine,
/area/station/engineering/engine/supermatter)
"pfh" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5151,7 +5151,7 @@
/obj/effect/decal/cleanable/cobweb2,
/obj/effect/turf_decal/delivery/hollow,
/obj/structure/rack,
/obj/item/assembly/signaler/anomaly/random,
/obj/item/paper/researchnotes,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -8441,13 +8441,13 @@
/area/ruin/space/unpowered)
"Fm" = (
/obj/structure/safe,
/obj/item/paper/researchnotes,
/obj/item/clothing/glasses/hud/security/sunglasses/fluff/eyepro,
/obj/machinery/light/small{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery/hollow,
/obj/item/assembly/signaler/anomaly/random,
/obj/item/storage/lockbox/experimental_weapon,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down
2 changes: 2 additions & 0 deletions _maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1075,6 +1075,7 @@
/area/ruin/space/derelict/crew_quarters)
"cK" = (
/obj/structure/table,
/obj/item/soap/deluxe/laundry,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "blue"
Expand Down Expand Up @@ -1191,6 +1192,7 @@
"cZ" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
/obj/item/soap/deluxe/laundry,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "blue"
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/generic/Lavaland.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -7527,7 +7527,7 @@
dir = 4
},
/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station,
/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station,
/turf/simulated/floor/plasteel{
icon_state = "darkgreencorners"
},
Expand Down Expand Up @@ -8026,11 +8026,11 @@
name = "Shuttle Dock"
},
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station,
/obj/effect/mapping_helpers/airlock/unres{
dir = 8
},
/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkredfull"
Expand Down
16 changes: 8 additions & 8 deletions _maps/map_files220/delta/delta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -71443,14 +71443,14 @@
/area/station/maintenance/old_kitchen)
"lkZ" = (
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/item/reagent_containers/food/snacks/icecream/icecreamcone,
/obj/item/reagent_containers/food/snacks/icecream/icecreamcone,
/obj/item/reagent_containers/food/snacks/icecream/icecreamcone,
/obj/item/reagent_containers/food/snacks/icecream/icecreamcone,
/obj/item/reagent_containers/food/snacks/icecream,
/obj/item/reagent_containers/food/snacks/icecream,
/obj/item/reagent_containers/food/snacks/icecreamsandwich,
/obj/item/reagent_containers/food/snacks/icecreamsandwich,
/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcone,
/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcone,
/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcone,
/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcone,
/obj/item/reagent_containers/food/snacks/frozen/icecream,
/obj/item/reagent_containers/food/snacks/frozen/icecream,
/obj/item/reagent_containers/food/snacks/frozen/icecreamsandwich,
/obj/item/reagent_containers/food/snacks/frozen/icecreamsandwich,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "redyellowfull"
Expand Down
6 changes: 2 additions & 4 deletions code/__DEFINES/emotes_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@
#define EMOTE_VISIBLE (1<<0)
/// Emote is audible (in character).
#define EMOTE_AUDIBLE (1<<1)
/// Emote makes a sound. These emotes will specifically not be runechatted.
#define EMOTE_SOUND (1<<2)
/// Regardless of its existing flags, an emote with this flag will not be sent to runechat.
#define EMOTE_FORCE_NO_RUNECHAT (1<<3)
#define EMOTE_FORCE_NO_RUNECHAT (1<<2)
/// This emote uses the mouth, and so should be blocked if the user is muzzled or can't breathe (for humans).
#define EMOTE_MOUTH (1<<4)
#define EMOTE_MOUTH (1<<3)

// User audio cooldown system.
// This is a value stored on the user and represents their current ability to perform audio emotes.
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/is_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#define isliving(A) (istype(A, /mob/living))

#define isbrain(A) (istype(A, /mob/living/carbon/brain))
#define isbrain(A) (istype(A, /mob/living/brain))

// Carbon mobs
#define iscarbon(A) (istype(A, /mob/living/carbon))
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/mob_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@

// For the tcomms monitor
#define ispathhuman(A) (ispath(A, /mob/living/carbon/human))
#define ispathbrain(A) (ispath(A, /mob/living/carbon/brain))
#define ispathbrain(A) (ispath(A, /mob/living/brain))
#define ispathslime(A) (ispath(A, /mob/living/simple_animal/slime))
#define ispathbot(A) (ispath(A, /mob/living/simple_animal/bot))
#define ispathsilicon(A) (ispath(A, /mob/living/silicon))
Expand Down
6 changes: 6 additions & 0 deletions code/__DEFINES/status_effects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,12 @@
/// This status effect allows a mob to be revived with a defibrillator.
#define STATUS_EFFECT_REVIVABLE /datum/status_effect/limited_bonus/revivable

/// Status effects for different actions
#define STATUS_EFFECT_REMOVE_CUFFS /datum/status_effect/action_status_effect/remove_handcuffs
#define STATUS_EFFECT_BREAK_CUFFS /datum/status_effect/action_status_effect/break_handcuffs
#define STATUS_EFFECT_REMOVE_MUZZLE /datum/status_effect/action_status_effect/remove_muzzle
#define STATUS_EFFECT_UNBUCKLE /datum/status_effect/action_status_effect/unbuckle

//////////////////////////
// Mind batter variants //
//////////////////////////
Expand Down
42 changes: 0 additions & 42 deletions code/__HELPERS/experimental.dm

This file was deleted.

4 changes: 0 additions & 4 deletions code/__HELPERS/global_lists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,6 @@
for(var/limb_type in typesof(/datum/robolimb))
var/datum/robolimb/R = new limb_type()
GLOB.all_robolimbs[R.company] = R
if(!R.unavailable_at_chargen)
if(R != "head" && R != "chest" && R != "groin") //Part of the method that ensures only IPCs can access head, chest and groin prosthetics.
if(R.has_subtypes) //Ensures solos get added to the list as well be incorporating has_subtypes == 1 and has_subtypes == 2.
GLOB.chargen_robolimbs[R.company] = R //List only main brands and solo parts.
if(R.selectable)
GLOB.selectable_robolimbs[R.company] = R

Expand Down
2 changes: 1 addition & 1 deletion code/__HELPERS/mob_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@
return FALSE

#define DOAFTERONCE_MAGIC "Magic~~"
GLOBAL_LIST_INIT(do_after_once_tracker, list())
GLOBAL_LIST_EMPTY(do_after_once_tracker)
/proc/do_after_once(mob/user, delay, needhand = 1, atom/target = null, progress = 1, allow_moving, must_be_held, attempt_cancel_message = "Attempt cancelled.", special_identifier)
if(!user || !target)
return
Expand Down
2 changes: 1 addition & 1 deletion code/__HELPERS/unsorted.dm
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
moblist.Add(M)
for(var/mob/living/carbon/human/M in sortmob)
moblist.Add(M)
for(var/mob/living/carbon/brain/M in sortmob)
for(var/mob/living/brain/M in sortmob)
moblist.Add(M)
for(var/mob/living/carbon/alien/M in sortmob)
moblist.Add(M)
Expand Down
3 changes: 0 additions & 3 deletions code/_globalvars/configuration.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,3 @@ GLOBAL_VAR_INIT(dsay_enabled, TRUE)

/// Amount of time (in minutes) that must pass between a player dying as a mouse and repawning as a mouse
GLOBAL_VAR_INIT(mouse_respawn_time, 5)

/// Enable debugging of things such as job starts and other things
GLOBAL_VAR_INIT(debug2, TRUE)
1 change: 0 additions & 1 deletion code/_globalvars/game_modes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ GLOBAL_VAR_INIT(secret_force_mode, "secret") // if this is anything but "secret"
GLOBAL_DATUM(start_state, /datum/station_state) // Used in round-end report. Dont ask why it inits as null

GLOBAL_VAR(custom_event_msg)
GLOBAL_VAR(custom_event_admin_msg)
3 changes: 0 additions & 3 deletions code/_globalvars/genetics.dm
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,3 @@ GLOBAL_VAR_INIT(polymorphblock, 0)
///////////////////////////////
GLOBAL_VAR_INIT(loudblock, 0)
GLOBAL_VAR_INIT(dizzyblock, 0)

GLOBAL_LIST_EMPTY(reg_dna)
GLOBAL_LIST_EMPTY(global_mutations)
49 changes: 20 additions & 29 deletions code/_globalvars/lists/flavor_misc.dm
Original file line number Diff line number Diff line change
@@ -1,35 +1,31 @@
//Preferences stuff
//Head accessory styles
GLOBAL_LIST_INIT(head_accessory_styles_list, list()) //stores /datum/sprite_accessory/head_accessory indexed by name
GLOBAL_LIST_EMPTY(head_accessory_styles_list) //stores /datum/sprite_accessory/head_accessory indexed by name
//Marking styles
GLOBAL_LIST_INIT(marking_styles_list, list()) //stores /datum/sprite_accessory/body_markings indexed by name
GLOBAL_LIST_EMPTY(marking_styles_list) //stores /datum/sprite_accessory/body_markings indexed by name
//Hairstyles
GLOBAL_LIST_INIT(hair_styles_public_list, list()) //stores /datum/sprite_accessory/hair indexed by name
GLOBAL_LIST_INIT(hair_styles_male_list, list())
GLOBAL_LIST_INIT(hair_styles_female_list, list())
GLOBAL_LIST_INIT(hair_styles_full_list, list()) //fluff hair styles
GLOBAL_LIST_INIT(facial_hair_styles_list, list()) //stores /datum/sprite_accessory/facial_hair indexed by name
GLOBAL_LIST_INIT(facial_hair_styles_male_list, list())
GLOBAL_LIST_INIT(facial_hair_styles_female_list, list())
GLOBAL_LIST_EMPTY(hair_styles_public_list) //stores /datum/sprite_accessory/hair indexed by name
GLOBAL_LIST_EMPTY(hair_styles_male_list)
GLOBAL_LIST_EMPTY(hair_styles_female_list)
GLOBAL_LIST_EMPTY(hair_styles_full_list) //fluff hair styles
GLOBAL_LIST_EMPTY(facial_hair_styles_list) //stores /datum/sprite_accessory/facial_hair indexed by name
GLOBAL_LIST_EMPTY(facial_hair_styles_male_list)
GLOBAL_LIST_EMPTY(facial_hair_styles_female_list)
GLOBAL_LIST_EMPTY(hair_gradients_list) //stores /datum/sprite_accessory/hair_gradient indexed by name
//Underwear
GLOBAL_LIST_INIT(underwear_list, list()) //stores /datum/sprite_accessory/underwear indexed by name
GLOBAL_LIST_INIT(underwear_m, list()) //stores only underwear name
GLOBAL_LIST_INIT(underwear_f, list()) //stores only underwear name
GLOBAL_LIST_EMPTY(underwear_list) //stores /datum/sprite_accessory/underwear indexed by name
GLOBAL_LIST_EMPTY(underwear_m) //stores only underwear name
GLOBAL_LIST_EMPTY(underwear_f) //stores only underwear name
//Undershirts
GLOBAL_LIST_INIT(undershirt_list, list()) //stores /datum/sprite_accessory/undershirt indexed by name
GLOBAL_LIST_INIT(undershirt_m, list()) //stores only undershirt name
GLOBAL_LIST_INIT(undershirt_f, list()) //stores only undershirt name
GLOBAL_LIST_EMPTY(undershirt_list) //stores /datum/sprite_accessory/undershirt indexed by name
GLOBAL_LIST_EMPTY(undershirt_m) //stores only undershirt name
GLOBAL_LIST_EMPTY(undershirt_f) //stores only undershirt name
//Socks
GLOBAL_LIST_INIT(socks_list, list()) //stores /datum/sprite_accessory/socks indexed by name
GLOBAL_LIST_INIT(socks_m, list()) //stores only socks name
GLOBAL_LIST_INIT(socks_f, list()) //stores only socks name
GLOBAL_LIST_EMPTY(socks_list) //stores /datum/sprite_accessory/socks indexed by name
GLOBAL_LIST_EMPTY(socks_m) //stores only socks name
GLOBAL_LIST_EMPTY(socks_f) //stores only socks name
//Alt Heads
GLOBAL_LIST_INIT(alt_heads_list, list()) //stores /datum/sprite_accessory/alt_heads indexed by name

GLOBAL_LIST_INIT(scarySounds, list('sound/weapons/thudswoosh.ogg','sound/weapons/taser.ogg','sound/weapons/armbomb.ogg','sound/voice/hiss1.ogg','sound/voice/hiss2.ogg', \
'sound/voice/hiss3.ogg','sound/voice/hiss4.ogg','sound/voice/hiss5.ogg','sound/voice/hiss6.ogg','sound/effects/glassbr1.ogg','sound/effects/glassbr2.ogg','sound/effects/glassbr3.ogg', \
'sound/items/welder.ogg','sound/items/welder2.ogg','sound/machines/airlock_open.ogg','sound/effects/clownstep1.ogg','sound/effects/clownstep2.ogg'))
GLOBAL_LIST_EMPTY(alt_heads_list) //stores /datum/sprite_accessory/alt_heads indexed by name

// Reference list for disposal sort junctions. Set the sort_type_txt variable on disposal sort junctions to
// the index of the sort department that you want. For example, adding "2" to sort_type_txt will reroute all packages
Expand All @@ -56,12 +52,7 @@ GLOBAL_LIST_INIT(phonetic_alphabet, list("Alpha", "Bravo", "Charlie",
"Romeo", "Sierra", "Tango", "Uniform", "Victor", "Whiskey", "X-ray",
"Yankee", "Zulu"))

GLOBAL_LIST_INIT(numbers_as_words, list("One", "Two", "Three", "Four",
"Five", "Six", "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve",
"Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen",
"Eighteen", "Nineteen"))

//Backpacks
//Backpacks
#define GBACKPACK "Grey Backpack"
#define GSATCHEL "Grey Satchel"
#define GDUFFLEBAG "Grey Dufflebag"
Expand Down
6 changes: 1 addition & 5 deletions code/_globalvars/lists/misc_lists.dm
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
GLOBAL_LIST_INIT(alphabet, list("a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z"))
GLOBAL_LIST_INIT(alphabet_uppercase, list("A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"))
GLOBAL_LIST_INIT(zero_character_only, list("0"))
GLOBAL_LIST_INIT(hex_characters, list("0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f"))
GLOBAL_LIST_INIT(binary, list("0","1"))
GLOBAL_LIST_INIT(html_colors, list("Alice Blue","Antique White","Aqua","Aquamarine","Azure","Beige","Bisque","Black","Blanched Almond","Blue","Blue Violet",
"Brown","Burly Wood","Cadet Blue","Chartreuse","Chocolate","Coral","Cornflower Blue","Cornsilk","Crimson","Cyan",
"Dark Blue","Dark Cyan","Dark Golden Rod","Dark Gray","Dark Green","Dark Khaki","Dark Magenta","Dark Olive Green",
Expand All @@ -19,7 +16,6 @@ GLOBAL_LIST_INIT(html_colors, list("Alice Blue","Antique White","Aqua","Aquamari
"Salmon","Sandy Brown","Sea Green","Sea Shell","Sienna","Silver","Sky Blue","Slate Blue","Slate Gray","Snow","Spring Green",
"Steel Blue","Tan","Teal","Thistle","Tomato","Turquoise","Violet","Wheat","White","White Smoke","Yellow","Yellow Green"))

GLOBAL_LIST_INIT(day_names, list("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"))
GLOBAL_LIST_INIT(month_names, list("January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"))
// keep si_suffixes balanced and with a pivot in the middle!
GLOBAL_LIST_INIT(si_suffixes, list("y", "z", "a", "f", "p", "n", "u", "m", "", "k", "M", "G", "T", "P", "E", "Z", "Y"))
Expand All @@ -38,7 +34,7 @@ GLOBAL_LIST_INIT(restricted_camera_networks, list(
"SyndicateCaves"
)) //Those networks can only be accessed by preexisting terminals. AIs and new terminals can't use them.

GLOBAL_LIST_INIT(ruin_landmarks, list())
GLOBAL_LIST_EMPTY(ruin_landmarks)

GLOBAL_LIST_INIT(round_end_sounds, list(
'sound/AI/newroundsexy.ogg' = 2.3 SECONDS,
Expand Down
1 change: 0 additions & 1 deletion code/_globalvars/lists/mob_lists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ GLOBAL_LIST_EMPTY(silicon_mob_list) //List of all silicon mobs, including clie
GLOBAL_LIST_EMPTY(mob_living_list) //all instances of /mob/living and subtypes
GLOBAL_LIST_EMPTY(carbon_list) //all instances of /mob/living/carbon and subtypes, notably does not contain simple animals
GLOBAL_LIST_EMPTY(human_list) //all instances of /mob/living/carbon/human and subtypes
GLOBAL_LIST_EMPTY(spirits) //List of all the spirits, including Masks
GLOBAL_LIST_EMPTY(alive_mob_list) //List of all alive mobs, including clientless. Excludes /mob/new_player
GLOBAL_LIST_EMPTY(dead_mob_list) //List of all dead mobs, including clientless. Excludes /mob/new_player
GLOBAL_LIST_EMPTY(non_respawnable_keys) //List of ckeys that are excluded from respawning for remainder of round.
Expand Down
Loading

0 comments on commit 6c603b3

Please sign in to comment.