Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NEW: ERT MODsuits #1685

Merged
merged 19 commits into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/modules/response_team/ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ GLOBAL_LIST_EMPTY(ert_request_messages)
A.close()
var/list/ert_species_prefs = list()
for(var/mob/M in GLOB.response_team_members)
ert_species_prefs.Add(input_async(M, "Please select a species (10 seconds):", list("Human", "Tajaran", "Skrell", "Unathi", "Diona", "Vulpkanin", "Nian", "Drask", "Kidan", "Grey", "Random")))
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(get_ert_role_prefs), GLOB.response_team_members, ert_gender_prefs, ert_species_prefs), 10 SECONDS)
ert_species_prefs.Add(input_async(M, "Please select a species (10 seconds):", list("Human"))) // SS220 EDIT - Human only ERT
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(get_ert_role_prefs), GLOB.response_team_members, ert_gender_prefs, ert_species_prefs), 0 SECONDS) // SS220 EDIT - Human only ERT

/proc/get_ert_role_prefs(list/response_team_members, list/ert_gender_prefs, list/ert_species_prefs) // Why the FUCK is this variable the EXACT SAME as the global one
var/list/ert_role_prefs = list()
Expand Down
1 change: 0 additions & 1 deletion modular_ss220/clothing/_clothing.dme
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@
#include "code/shoes.dm"
#include "code/suits.dm"
#include "code/under.dm"
#include "code/mod.dm"
317 changes: 0 additions & 317 deletions modular_ss220/clothing/code/mod.dm

This file was deleted.

Binary file modified modular_ss220/clothing/icons/mob/mod_clothing.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/mod_clothing.dmi
Binary file not shown.
4 changes: 4 additions & 0 deletions modular_ss220/mod/_mods.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/datum/modpack/mods
name = "МОДсьюты"
desc = "Неочевидная штука - там внутри МОДсьюты"
author = "Konushi, Kar4es"
7 changes: 7 additions & 0 deletions modular_ss220/mod/_mods.dme
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#include "_mods.dm"

#include "code/mod_control.dm"
#include "code/mod_modules.dm"
#include "code/mod_theme.dm"
#include "code/mod_clothes.dm"
#include "code/mod_types.dm"
Loading
Loading