"
diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm
index 4795dd29e5f7..a395552ee8d4 100644
--- a/code/__HELPERS/time.dm
+++ b/code/__HELPERS/time.dm
@@ -1,17 +1,11 @@
-//Returns the world time in english
-/proc/worldtime2text()
- return gameTimestamp("hh:mm:ss", world.time)
-
-/proc/time_stamp(format = "hh:mm:ss", show_ds)
+/proc/time_stamp(format = "YYYY-MM-DD hh:mm:ss", show_ds)
var/time_string = time2text(world.timeofday, format)
return show_ds ? "[time_string]:[world.timeofday % 10]" : time_string
-/proc/gameTimestamp(format = "hh:mm:ss", wtime=null)
- if(!wtime)
- wtime = world.time
+/proc/game_timestamp(format = "hh:mm:ss", wtime = world.time)
return time2text(wtime - GLOB.timezoneOffset, format)
-/proc/station_time(display_only = FALSE, wtime=world.time)
+/proc/station_time(display_only = FALSE, wtime = world.time)
return ((((wtime - SSticker.round_start_time) * SSticker.station_time_rate_multiplier) + SSticker.gametime_offset) % 864000) - (display_only? GLOB.timezoneOffset : 0)
/proc/station_time_timestamp(format = "hh:mm:ss", wtime)
@@ -24,15 +18,49 @@
else
. += " AM"
-/proc/station_time_debug(force_set)
- if(isnum(force_set))
- SSticker.gametime_offset = force_set
- return
- SSticker.gametime_offset = rand(0, 864000) //hours in day * minutes in hour * seconds in minute * deciseconds in second
- if(prob(50))
- SSticker.gametime_offset = FLOOR(SSticker.gametime_offset, 3600)
- else
- SSticker.gametime_offset = CEILING(SSticker.gametime_offset, 3600)
+/proc/sector_datestamp(realtime = world.realtime, shortened = FALSE)
+ //International Fixed Calendar format (https://en.wikipedia.org/wiki/International_Fixed_Calendar)
+ var/days_since = round(realtime / (24 HOURS))
+ var/year = round(days_since / 365) + 481
+ var/day_of_year = days_since % 365 + 1
+ var/month = round(day_of_year / 28)
+ var/day_of_month = day_of_year % 28 + 1
+
+ if(shortened)
+ return "[year]-[month]-[day_of_month]FSC"
+
+ var/monthname
+ switch(month)
+ if(1)
+ monthname = "January"
+ if(2)
+ monthname = "February"
+ if(3)
+ monthname = "March"
+ if(4)
+ monthname = "April"
+ if(5)
+ monthname = "May"
+ if(6)
+ monthname = "June"
+ if(7)
+ monthname = "Sol"
+ if(8)
+ monthname = "July"
+ if(9)
+ monthname = "August"
+ if(10)
+ monthname = "September"
+ if(11)
+ monthname = "October"
+ if(12)
+ monthname = "November"
+ if(13)
+ monthname = "December"
+ if(14)
+ return "Year Day, [year] FSC"
+
+ return "[monthname] [day_of_month], [year] FSC"
//returns timestamp in a sql and a not-quite-compliant ISO 8601 friendly format
/proc/SQLtime(timevar)
diff --git a/code/_compile_options.dm b/code/_compile_options.dm
index 4f96217abd2c..419abcd6be70 100644
--- a/code/_compile_options.dm
+++ b/code/_compile_options.dm
@@ -42,6 +42,7 @@
#endif // REFERENCE_DOING_IT_LIVE
//#define UNIT_TESTS //Enables unit tests via TEST_RUN_PARAMETER
+//#define ALL_TESTS //Enables all tests, including the ones that take a long time to run
#ifndef PRELOAD_RSC //set to:
#define PRELOAD_RSC 2 // 0 to allow using external resources or on-demand behaviour;
@@ -78,6 +79,14 @@
#define GC_FAILURE_HARD_LOOKUP
#endif
+#ifdef ALL_TESTS
+#define BASIC_TESTS
+#define CREATE_AND_DESTROY_TEST
+#define PLANET_GEN_TEST
+#define RUIN_PLACEMENT_TEST
+#define SHIP_PLACEMENT_TEST
+#endif
+
// A reasonable number of maximum overlays an object needs
// If you think you need more, rethink it
#define MAX_ATOM_OVERLAYS 100
diff --git a/code/_globalvars/lists/mapping.dm b/code/_globalvars/lists/mapping.dm
index 7f1e2693f893..ff4237d1e892 100644
--- a/code/_globalvars/lists/mapping.dm
+++ b/code/_globalvars/lists/mapping.dm
@@ -34,6 +34,7 @@ GLOBAL_LIST_EMPTY(blobstart) //blobs, santa, respawning devils
GLOBAL_LIST_EMPTY(secequipment) //sec equipment lockers that scale with the number of sec players
GLOBAL_LIST_EMPTY(deathsquadspawn)
GLOBAL_LIST_EMPTY(emergencyresponseteamspawn)
+GLOBAL_LIST_EMPTY(emergencyresponseteam_outpostspawn)
GLOBAL_LIST_EMPTY(ruin_landmarks)
GLOBAL_LIST_EMPTY(stationroom_landmarks) //List of all spawns for stationrooms
diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm
index 41a470aac610..6a5959574754 100644
--- a/code/controllers/configuration/entries/general.dm
+++ b/code/controllers/configuration/entries/general.dm
@@ -236,8 +236,8 @@
/datum/config_entry/string/wikiurl
config_entry_value = "https://shiptest.net/wiki/"
-/datum/config_entry/string/forumurl
- config_entry_value = "https://shiptest.net/discord"
+/datum/config_entry/string/loreurl
+ config_entry_value = "https://shiptest.net/wiki/Lore_Primer"
/datum/config_entry/string/rulesurl
config_entry_value = "https://shiptest.net/wiki/Rules"
diff --git a/code/controllers/subsystem/explosions.dm b/code/controllers/subsystem/explosions.dm
index 14f8e8b8fa19..ae0074e9fb5b 100644
--- a/code/controllers/subsystem/explosions.dm
+++ b/code/controllers/subsystem/explosions.dm
@@ -216,7 +216,7 @@ SUBSYSTEM_DEF(explosions)
var/y0 = epicenter.y
var/z0 = epicenter.virtual_z()
var/area/areatype = get_area(epicenter)
- SSblackbox.record_feedback("associative", "explosion", 1, list("dev" = devastation_range, "heavy" = heavy_impact_range, "light" = light_impact_range, "flash" = flash_range, "flame" = flame_range, "orig_dev" = orig_dev_range, "orig_heavy" = orig_heavy_range, "orig_light" = orig_light_range, "x" = x0, "y" = y0, "z" = z0, "area" = areatype.type, "time" = time_stamp("YYYY-MM-DD hh:mm:ss", 1)))
+ SSblackbox.record_feedback("associative", "explosion", 1, list("dev" = devastation_range, "heavy" = heavy_impact_range, "light" = light_impact_range, "flash" = flash_range, "flame" = flame_range, "orig_dev" = orig_dev_range, "orig_heavy" = orig_heavy_range, "orig_light" = orig_light_range, "x" = x0, "y" = y0, "z" = z0, "area" = areatype.type, "time" = time_stamp(show_ds = TRUE)))
// Play sounds; we want sounds to be different depending on distance so we will manually do it ourselves.
// Stereo users will also hear the direction of the explosion!
diff --git a/code/controllers/subsystem/overmap.dm b/code/controllers/subsystem/overmap.dm
index de03f6a5a03e..b96a4944c812 100644
--- a/code/controllers/subsystem/overmap.dm
+++ b/code/controllers/subsystem/overmap.dm
@@ -31,6 +31,9 @@ SUBSYSTEM_DEF(overmap)
///The two-dimensional list that contains every single tile in the overmap as a sublist.
var/list/list/overmap_container
+ ///Whether or not a ship is currently being spawned. Used to prevent multiple ships from being spawned at once.
+ var/ship_spawning //TODO: Make a proper queue for this
+
/datum/controller/subsystem/overmap/get_metrics()
. = ..()
var/list/cust = list()
@@ -227,13 +230,18 @@ SUBSYSTEM_DEF(overmap)
* Inteded for ship purchases, etc.
*/
/datum/controller/subsystem/overmap/proc/spawn_ship_at_start(datum/map_template/shuttle/template)
+ //Should never happen, but just in case. This'll delay the next spawn until the current one is done.
+ UNTIL(!ship_spawning)
+
var/ship_loc
if(template.space_spawn)
ship_loc = null
else
ship_loc = SSovermap.outposts[1]
- return new /datum/overmap/ship/controlled(ship_loc, template)
+ ship_spawning = TRUE
+ . = new /datum/overmap/ship/controlled(ship_loc, template) //This statement SHOULDN'T runtime (not counting runtimes actually in the constructor) so ship_spawning should always be toggled.
+ ship_spawning = FALSE
/**
* Creates an overmap object for each ruin level, making them accessible.
diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm
index ac505107d726..95e40bff159f 100644
--- a/code/controllers/subsystem/statpanel.dm
+++ b/code/controllers/subsystem/statpanel.dm
@@ -11,18 +11,17 @@ SUBSYSTEM_DEF(statpanels)
/datum/controller/subsystem/statpanels/fire(resumed = FALSE)
if (!resumed)
- var/actual_round_time = world.timeofday - SSticker.round_start_timeofday
- var/game_round_time = world.time - SSticker.round_start_time
var/list/global_data = list(
"Round ID: [GLOB.round_id ? GLOB.round_id : "NULL"]",
"Time Dilation: [round(SStime_track.time_dilation_current,1)]% AVG:([round(SStime_track.time_dilation_avg_fast,1)]%, [round(SStime_track.time_dilation_avg,1)]%, [round(SStime_track.time_dilation_avg_slow,1)]%)",
"Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]",
- "Local Time: [station_time_timestamp()]",
"\n",
- "Internal Round Timer: [SSticker.round_start_time ? time2text(game_round_time, "hh:mm:ss", 0) : "The round hasn't started yet!"]",
- "Actual Round Timer: [SSticker.round_start_timeofday ? time2text(actual_round_time, "hh:mm:ss", 0) : "The round hasn't started yet!"]",
+ "Local Sector Time: [SSticker.round_start_timeofday ? "[station_time_timestamp()] [sector_datestamp()]" : "The round hasn't started yet!"]",
"\n",
- "Playing/Connected: [get_active_player_count()]/[GLOB.clients.len]"
+ "Internal Round Timer: [SSticker.round_start_timeofday ? ROUND_TIME : "The round hasn't started yet!"]",
+ "Actual Round Timer: [SSticker.round_start_timeofday ? ROUND_REALTIMEOFDAY : "The round hasn't started yet!"]",
+ "\n",
+ "Playing/Connected: [get_active_player_count()]/[length(GLOB.clients)]"
)
if(SSshuttle.jump_mode != BS_JUMP_IDLE)
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 1a5d2367c85a..0a5c787d3bfd 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -36,10 +36,11 @@ SUBSYSTEM_DEF(ticker)
var/selected_tip // What will be the tip of the day?
var/timeLeft //pregame timer
- //var/start_at WS Edit - Countdown after init
- var/gametime_offset = 432000 //Deciseconds to add to world.time for station time.
- var/station_time_rate_multiplier = 12 //factor of station time progressal vs real time.
+ /// The "start" of the round in station time, for example, 9 HOURS = 9:00 AM
+ var/gametime_offset = 9 HOURS
+ /// Factor of station time progressal vs real time.
+ var/station_time_rate_multiplier = 1
var/totalPlayers = 0 //used for pregame stats on statpanel
var/totalPlayersReady = 0 //used for pregame stats on statpanel
@@ -58,11 +59,6 @@ SUBSYSTEM_DEF(ticker)
var/mode_result = "undefined"
var/end_state = "undefined"
- //Crew Objective stuff
- var/list/successfulCrew = list()
- var/list/crewobjlist = list()
- var/list/crewobjjobs = list()
-
/// Why an emergency shuttle was called
var/emergency_reason
@@ -136,7 +132,6 @@ SUBSYSTEM_DEF(ticker)
GLOB.syndicate_code_response_regex = codeword_match
- //start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10) WS Edit - Countdown at init
if(CONFIG_GET(flag/randomize_shift_time))
gametime_offset = rand(0, 23) HOURS
else if(CONFIG_GET(flag/shift_time_realtime))
@@ -280,7 +275,7 @@ SUBSYSTEM_DEF(ticker)
cb.InvokeAsync()
LAZYCLEARLIST(round_start_events)
- log_world("Game start took [(world.timeofday - init_start)/10]s")
+ log_world("Game start took [(REALTIMEOFDAY - init_start)/10]s")
round_start_time = world.time
round_start_timeofday = world.timeofday
SSdbcore.SetRoundStart()
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index ba64c98c56c9..b06baa1c49c2 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -120,7 +120,7 @@ SUBSYSTEM_DEF(vote)
text += "
Vote Result: Inconclusive - No Votes!"
log_vote(text)
remove_action_buttons()
- to_chat(world, "\n
[text]")
+ to_chat(world, span_purple(examine_block(text)))
return .
/datum/controller/subsystem/vote/proc/result()
@@ -218,10 +218,10 @@ SUBSYSTEM_DEF(vote)
log_vote(text)
var/vp = CONFIG_GET(number/vote_period)
- var/vote_message = "\n
[text]\nType vote or click here to place your votes.\nYou have [DisplayTimeText(vp)] to vote."
+ var/vote_message = "
[text]\nType vote or click here to place your votes.\nYou have [DisplayTimeText(vp)] to vote."
if(observer_vote_allowed)
- to_chat(world, vote_message)
- SEND_SOUND(world, sound('sound/misc/vinethud.ogg'))
+ to_chat(world, examine_block(vote_message))
+ SEND_SOUND(world, sound('sound/misc/compiler-stage2.ogg'))
time_remaining = round(vp/10)
for(var/c in GLOB.clients)
var/client/C = c
@@ -240,8 +240,8 @@ SUBSYSTEM_DEF(vote)
valid_clients -= C
for(var/c in valid_clients)
var/client/C = c
- SEND_SOUND(C, sound('sound/misc/vinethud.ogg'))
- to_chat(C.mob, vote_message)
+ SEND_SOUND(C, sound('sound/misc/compiler-stage2.ogg'))
+ to_chat(C.mob, examine_block(vote_message))
var/datum/action/vote/V = new
if(question)
V.name = "Vote: [question]"
diff --git a/code/datums/blood_type.dm b/code/datums/blood_type.dm
index 9541699db92c..3fb4e4198566 100644
--- a/code/datums/blood_type.dm
+++ b/code/datums/blood_type.dm
@@ -28,7 +28,7 @@
/datum/blood_type/ab_plus
name = "AB+"
- compatible_types = list(/datum/blood_type/b_minus, /datum/blood_type/a_minus, /datum/blood_type/ab_minus, /datum/blood_type/o_minus)
+ compatible_types = list(/datum/blood_type/b_minus, /datum/blood_type/b_plus, /datum/blood_type/a_minus, /datum/blood_type/a_plus, /datum/blood_type/ab_minus, /datum/blood_type/ab_plus, /datum/blood_type/o_minus, /datum/blood_type/o_plus)
/datum/blood_type/o_minus
name = "O-"
diff --git a/code/datums/browser.dm b/code/datums/browser.dm
index c1ce6f43e99b..6aba94212699 100644
--- a/code/datums/browser.dm
+++ b/code/datums/browser.dm
@@ -399,7 +399,7 @@
if ("color")
settings["mainsettings"][setting]["value"] = input(user, "Enter new value for [settings["mainsettings"][setting]["desc"]]", "Enter new value for [settings["mainsettings"][setting]["desc"]]", settings["mainsettings"][setting]["value"]) as color
if ("boolean")
- settings["mainsettings"][setting]["value"] = input(user, "[settings["mainsettings"][setting]["desc"]]?") in list("Yes","No")
+ settings["mainsettings"][setting]["value"] = (settings["mainsettings"][setting]["value"] == "Yes") ? "No" : "Yes"
if ("ckey")
settings["mainsettings"][setting]["value"] = input(user, "[settings["mainsettings"][setting]["desc"]]?") in list("none") + GLOB.directory
if (settings["mainsettings"][setting]["callback"])
diff --git a/code/datums/ert.dm b/code/datums/ert.dm
index 8bb5f0e6e35a..0c0eb282e484 100644
--- a/code/datums/ert.dm
+++ b/code/datums/ert.dm
@@ -1,15 +1,29 @@
/datum/ert
var/mobtype = /mob/living/carbon/human
var/team = /datum/team/ert
- var/opendoors = TRUE
+ var/opendoors = FALSE
var/leader_role = /datum/antagonist/ert/commander
- var/enforce_human = TRUE
+ var/enforce_human = FALSE
var/roles = list(/datum/antagonist/ert/security, /datum/antagonist/ert/medic, /datum/antagonist/ert/engineer) //List of possible roles to be assigned to ERT members.
var/rename_team
var/code
var/mission = "Assist your employers in achieving their goals. Protect corporate assets."
var/teamsize = 5
var/polldesc
+ /// If TRUE, gives the team members "[role] [random last name]" style names
+ var/random_names = FALSE
+ /// If TRUE, the admin who created the response team will be spawned in the briefing room in their preferred briefing outfit (assuming they're a ghost)
+ var/spawn_admin = FALSE
+ /// If TRUE, we try and pick one of the most experienced players who volunteered to fill the leader slot
+ var/leader_experience = TRUE
+ /// A custom map template to spawn the ERT at. If use_custom_shuttle is FALSE, the ERT will spawn on foot. By default, a Kunai-Class.
+ var/datum/map_template/ert_template = /datum/map_template/shuttle/subshuttles/kunai
+ /// If we should actually _use_ the ert_template custom shuttle
+ var/use_custom_shuttle = TRUE
+ /// If TRUE, the ERT will spawn at the outpost. If use_custom_shuttle is also TRUE, the shuttle will be docked at the outpost
+ var/spawn_at_outpost = TRUE
+
+// Nanotrasen
/datum/ert/New()
if (!polldesc)
@@ -46,20 +60,16 @@
code = "Green"
teamsize = 1
opendoors = FALSE
- leader_role = /datum/antagonist/official
- roles = list(/datum/antagonist/official)
+ leader_role = /datum/antagonist/ert/official
+ roles = list(/datum/antagonist/ert/official)
rename_team = "CentCom Officials"
polldesc = "a CentCom Official"
+ random_names = FALSE
+ leader_experience = FALSE
+ spawn_at_outpost = FALSE
/datum/ert/centcom_official/New()
- mission = "Conduct a routine review of [station_name()]."
-
-/datum/ert/inquisition
- roles = list(/datum/antagonist/ert/chaplain/inquisitor, /datum/antagonist/ert/security/inquisitor, /datum/antagonist/ert/medic/inquisitor)
- leader_role = /datum/antagonist/ert/commander/inquisitor
- rename_team = "Inquisition"
- mission = "Destroy any traces of paranormal activity within the deployment site."
- polldesc = "a Nanotrasen paranormal response team"
+ mission = "Conduct a routine review of [station_name()]'s vessels."
/datum/ert/janitor
roles = list(/datum/antagonist/ert/janitor, /datum/antagonist/ert/janitor/heavy)
@@ -75,6 +85,170 @@
leader_role = /datum/antagonist/ert/intern/leader
teamsize = 7
opendoors = FALSE
+ spawn_at_outpost = FALSE
rename_team = "Horde of Interns"
mission = "Assist in conflict resolution."
polldesc = "an unpaid internship opportunity with Nanotrasen"
+
+/datum/ert/intern/unarmed
+ roles = list(/datum/antagonist/ert/intern/unarmed)
+ leader_role = /datum/antagonist/ert/intern/leader/unarmed
+ rename_team = "Unarmed Horde of Interns"
+
+/datum/ert/loss_prevention
+ code = "Light Blue"
+ teamsize = 4
+ opendoors = FALSE
+ leader_role = /datum/antagonist/ert/lp/lieutenant
+ roles = list(/datum/antagonist/ert/lp, /datum/antagonist/ert/lp/medic, /datum/antagonist/ert/lp/engineer)
+ rename_team = "Loss Prevention Team"
+ polldesc = "a NanoTrasen loss prevention team"
+
+// Inteq
+
+/datum/ert/inteq
+ teamsize = 4
+ opendoors = FALSE
+ leader_role = /datum/antagonist/ert/inteq/leader
+ roles = list(/datum/antagonist/ert/inteq)
+ mission = "Carry out your contract."
+ rename_team = "Generic Inteq Team"
+ polldesc = "an Inteq emergency team"
+
+// SolGov
+
+/datum/ert/solgov
+ teamsize = 4
+ opendoors = FALSE
+ leader_role = /datum/antagonist/ert/solgov
+ roles = list(/datum/antagonist/ert/solgov)
+ mission = "Intervene in Solarian interests."
+ rename_team = "SolGov Sonnensoldner Team"
+ polldesc = "a SolGov mercenary team"
+
+/datum/ert/solgov/inspector
+ teamsize = 1
+ leader_role = /datum/antagonist/ert/official/solgov
+ roles = list(/datum/antagonist/ert/official/solgov)
+ rename_team = "SolGov Inspector"
+ polldesc = "a solarian inspector"
+ spawn_at_outpost = FALSE
+
+/datum/ert/solgov/inspector/New()
+ mission = "Conduct a routine review on [station_name()]'s vessels."
+
+// Minutemen
+
+/datum/ert/minutemen
+ teamsize = 4
+ opendoors = FALSE
+ leader_role = /datum/antagonist/ert/minutemen/leader
+ roles = list(/datum/antagonist/ert/minutemen)
+ mission = "Keep the peace in sector affairs"
+ rename_team = "Generic Minutemen Team"
+ polldesc = "a Minutemen emergency team"
+ random_names = TRUE
+
+
+/datum/ert/minutemen/bard
+ leader_role = /datum/antagonist/ert/minutemen/bard/leader
+ roles = list(/datum/antagonist/ert/minutemen/bard)
+ rename_team = "Minutemen BARD Team"
+ polldesc = "a Minutemen biohazard removal team"
+
+/datum/ert/minutemen/riot
+ teamsize = 6
+ leader_role = /datum/antagonist/ert/minutemen/riot/leader
+ roles = list(/datum/antagonist/ert/minutemen/riot)
+ rename_team = "Minutemen Riot Control Team"
+ polldesc = "a Minutemen riot control team"
+
+/datum/ert/minutemen/piratehunters
+ leader_role = /datum/antagonist/ert/minutemen/piratehunters/leader
+ roles = list(/datum/antagonist/ert/minutemen/piratehunters)
+ mission = "Eliminate pirate presence within the sector."
+ rename_team = "Minutemen Pirate Hunter Team"
+ polldesc = "a fireteam of Minutemen pirate hunters"
+
+/datum/ert/minutemen/inspector
+ teamsize = 1
+ leader_role = /datum/antagonist/ert/official/minutemen
+ roles = list(/datum/antagonist/ert/official/minutemen)
+ rename_team = "Minutemen GOLD Inspector"
+ polldesc = "a Minutemen inspector"
+
+// Syndicate
+
+/datum/ert/syndicate
+ teamsize = 4
+ opendoors = FALSE
+ leader_role = /datum/antagonist/ert/syndicate/leader
+ roles = list(/datum/antagonist/ert/syndicate)
+ mission = "Serve the interests of the Syndicate."
+ rename_team = "Generic Syndicate Team"
+ polldesc = "a Syndicate emergency team"
+ spawn_at_outpost = FALSE
+
+/datum/ert/syndicate/gorlex
+ leader_role = /datum/antagonist/ert/syndicate/gorlex/leader
+ roles = list(/datum/antagonist/ert/syndicate/gorlex, /datum/antagonist/ert/syndicate/gorlex/pointman, /datum/antagonist/ert/syndicate/gorlex/medic, /datum/antagonist/ert/syndicate/gorlex/sniper)
+ mission = "Serve the interests of the 2nd Battlegroup."
+ rename_team = "2nd Battlegroup Squad"
+ polldesc = "a loyalist Gorlex squad"
+
+/datum/ert/syndicate/cybersun
+ leader_role = /datum/antagonist/ert/syndicate/cybersun/leader
+ roles = list(/datum/antagonist/ert/syndicate/cybersun)
+ mission = "Serve the interests of CyberSun."
+ rename_team = "Cybersun Commando Team"
+ polldesc = "a Cybersun Commando team"
+
+/datum/ert/syndicate/cybersun/medic
+ leader_role = /datum/antagonist/ert/syndicate/cybersun/medic/leader
+ roles = list(/datum/antagonist/ert/syndicate/cybersun/medic)
+ mission = "Assist CyberSun clients."
+ rename_team = "Cybersun Medical Intervention Team"
+ polldesc = "a Cybersun paramedic team"
+
+// Frontiersmen
+/datum/ert/frontier
+ teamsize = 4
+ opendoors = FALSE
+ leader_role = /datum/antagonist/ert/frontier/leader
+ roles = list(/datum/antagonist/ert/frontier)
+ rename_team = "Generic Frontiersmen Team"
+ mission = "Pillage in the name of the Frontiersmen."
+ polldesc = "an armed group of pirates"
+ random_names = TRUE
+ leader_experience = FALSE
+ spawn_at_outpost = FALSE
+ ert_template = /datum/map_template/shuttle/subshuttles/sugarcube
+
+/datum/ert/frontier/assault
+ leader_role = /datum/antagonist/ert/frontier/leader
+ roles = list(/datum/antagonist/ert/frontier, /datum/antagonist/ert/frontier/medic, /datum/antagonist/ert/frontier/engineer)
+ rename_team = "Assault Frontiersmen Team"
+ polldesc = "a well armed squad of pirates"
+ ert_template = /datum/map_template/shuttle/subshuttles/frontiersmen_gut
+
+/datum/ert/independent
+ teamsize = 3
+ opendoors = FALSE
+ leader_role = /datum/antagonist/ert/independent
+ roles = list(/datum/antagonist/ert/independent)
+ rename_team = "Security Independent Team"
+ polldesc = "an independent security team"
+
+/datum/ert/independent/emt
+ teamsize = 4
+ leader_role = /datum/antagonist/ert/independent/emt
+ roles = list(/datum/antagonist/ert/independent/emt)
+ rename_team = "Medical Independent Team"
+ polldesc = "an independent medical response team"
+
+/datum/ert/independent/firefighter
+ teamsize = 5
+ leader_role = /datum/antagonist/ert/independent/firefighter/leader
+ roles = list(/datum/antagonist/ert/independent/firefighter, /datum/antagonist/ert/independent/firefighter/medic)
+ rename_team = "Independent Firefighter Team"
+ polldesc = "an independent firefighting team"
diff --git a/code/datums/ruins/icemoon.dm b/code/datums/ruins/icemoon.dm
index a38ad6a1f86b..cc11481b6690 100644
--- a/code/datums/ruins/icemoon.dm
+++ b/code/datums/ruins/icemoon.dm
@@ -77,3 +77,9 @@
id = "slimelab"
description = "An underground research facility devoted to researching the uncommon slime lifeform"
suffix = "icemoon_underground_slimelab.dmm"
+
+/datum/map_template/ruin/icemoon/crashed_holemaker
+ name = "Crashed Holemaker"
+ id = "crashed_holemaker"
+ description = "Safety records for early Nanotrasen Spaceworks vessels were, and always have been, top of their class. Absolutely no multi-billion credit projects have been painstakingly erased from history. (Citation Needed)"
+ suffix = "icemoon_crashed_holemaker.dmm"
diff --git a/code/datums/ruins/whitesands.dm b/code/datums/ruins/whitesands.dm
index 5615d5d72366..2135036e3d97 100644
--- a/code/datums/ruins/whitesands.dm
+++ b/code/datums/ruins/whitesands.dm
@@ -48,6 +48,12 @@
description = "Some sort of survivors, brandishing old nanotrasen security gear."
suffix = "whitesands_surface_chokepoint.dmm"
+/datum/map_template/ruin/whitesands/pubbyslopcrash
+ name = "Pubby Slop Crash"
+ id = "ws-pubbyslopcrash"
+ description = "A failed attempt of the Nanotrasen nutrional replacement program"
+ suffix = "whitesands_surface_pubbyslopcrash.dmm"
+
//////////OUTSIDE SETTLEMENTS/RUINS//////////
/datum/map_template/ruin/whitesands/survivors/drugstore
name = "Abandoned Store"
@@ -67,3 +73,4 @@
description = "A small encampment of nomadic survivors of the First Colony, and their descendants. By all accounts, feral and without allegance to anyone but themselves."
suffix = "whitesands_surface_camp_combination.dmm"
allow_duplicates = FALSE
+
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index c294d25dee10..35e8ff81a580 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -365,4 +365,3 @@
file_name = "nanotrasen_falcon"
name = "Falcon Dropship"
prefix = "NTSV"
-
diff --git a/code/game/area/areas/ruins/icemoon.dm b/code/game/area/areas/ruins/icemoon.dm
index 0d449f6035a8..95200f5d51b9 100644
--- a/code/game/area/areas/ruins/icemoon.dm
+++ b/code/game/area/areas/ruins/icemoon.dm
@@ -61,3 +61,8 @@
/area/ruin/powered/slimelab/cafe
name = "Slime Lab Cafe"
icon_state = "green"
+
+// Crashed Holemaker
+/area/ruin/unpowered/crashed_holemaker
+ name = "NTSV Holemaker II" // In honor of the kugelblitz shenanigan of all time
+ icon_state = "green"
diff --git a/code/game/area/areas/ruins/sandplanet.dm b/code/game/area/areas/ruins/sandplanet.dm
index 5c3d509d589a..e2fb00acdc10 100644
--- a/code/game/area/areas/ruins/sandplanet.dm
+++ b/code/game/area/areas/ruins/sandplanet.dm
@@ -5,3 +5,7 @@
/area/ruin/whitesands/saloon
name = "Hermit Saloon"
icon_state = "green"
+
+/area/ruin/whitesands/pubbycrash
+ name = "Pubby Crash"
+ icon_state = "blue"
diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm
index e19e39cd0db7..a249ef4ec9f7 100644
--- a/code/game/area/areas/ruins/space.dm
+++ b/code/game/area/areas/ruins/space.dm
@@ -174,6 +174,7 @@
/area/solar/ancientstation
name = "Charlie Station Solar Array"
icon_state = "panelsP"
+ has_gravity = STANDARD_GRAVITY
//DERELICT
diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm
index 78f19dbf1a89..b8dcd669d385 100644
--- a/code/game/gamemodes/dynamic/dynamic.dm
+++ b/code/game/gamemodes/dynamic/dynamic.dm
@@ -159,10 +159,10 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
return
if(threatadd > 0)
create_threat(threatadd)
- threat_log += "[worldtime2text()]: [key_name(usr)] increased threat by [threatadd] threat."
+ threat_log += "[game_timestamp()]: [key_name(usr)] increased threat by [threatadd] threat."
else
spend_threat(-threatadd)
- threat_log += "[worldtime2text()]: [key_name(usr)] decreased threat by [-threatadd] threat."
+ threat_log += "[game_timestamp()]: [key_name(usr)] decreased threat by [-threatadd] threat."
else if (href_list["injectlate"])
latejoin_injection_cooldown = 0
forced_injection = TRUE
@@ -478,7 +478,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
var/added_threat = starting_rule.scale_up(extra_rulesets_amount, threat)
if(starting_rule.pre_execute())
spend_threat(starting_rule.cost + added_threat)
- threat_log += "[worldtime2text()]: Roundstart [starting_rule.name] spent [starting_rule.cost + added_threat]. [starting_rule.scaling_cost ? "Scaled up[starting_rule.scaled_times]/3 times." : ""]"
+ threat_log += "[game_timestamp()]: Roundstart [starting_rule.name] spent [starting_rule.cost + added_threat]. [starting_rule.scaling_cost ? "Scaled up[starting_rule.scaled_times]/3 times." : ""]"
if(starting_rule.flags & HIGHLANDER_RULESET)
highlander_executed = TRUE
else if(starting_rule.flags & ONLY_RULESET)
@@ -572,7 +572,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
new_rule.trim_candidates()
if (new_rule.ready(forced))
spend_threat(new_rule.cost)
- threat_log += "[worldtime2text()]: Forced rule [new_rule.name] spent [new_rule.cost]"
+ threat_log += "[game_timestamp()]: Forced rule [new_rule.name] spent [new_rule.cost]"
if (new_rule.execute()) // This should never fail since ready() returned 1
if(new_rule.flags & HIGHLANDER_RULESET)
highlander_executed = TRUE
@@ -591,7 +591,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
/datum/game_mode/dynamic/proc/execute_midround_latejoin_rule(sent_rule)
var/datum/dynamic_ruleset/rule = sent_rule
spend_threat(rule.cost)
- threat_log += "[worldtime2text()]: [rule.ruletype] [rule.name] spent [rule.cost]"
+ threat_log += "[game_timestamp()]: [rule.ruletype] [rule.name] spent [rule.cost]"
rule.pre_execute()
if (rule.execute())
log_game("DYNAMIC: Injected a [rule.ruletype == "latejoin" ? "latejoin" : "midround"] ruleset [rule.name].")
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets.dm b/code/game/gamemodes/dynamic/dynamic_rulesets.dm
index 44e6a5310d17..1e6a2da4d867 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets.dm
@@ -166,7 +166,7 @@
/// This one only handles refunding the threat, override in ruleset to clean up the rest.
/datum/dynamic_ruleset/proc/clean_up()
mode.refund_threat(cost + (scaled_times * scaling_cost))
- mode.threat_log += "[worldtime2text()]: [ruletype] [name] refunded [cost + (scaled_times * scaling_cost)]. Failed to execute."
+ mode.threat_log += "[game_timestamp()]: [ruletype] [name] refunded [cost + (scaled_times * scaling_cost)]. Failed to execute."
/// Gets weight of the ruleset
/// Note that this decreases weight if repeatable is TRUE and repeatable_weight_decrease is higher than 0
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
index 29333ce332d4..8c8fe19d0a97 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
@@ -355,7 +355,7 @@
message_admins("Starting a round of extended.")
log_game("Starting a round of extended.")
mode.spend_threat(mode.threat)
- mode.threat_log += "[worldtime2text()]: Extended ruleset set threat to 0."
+ mode.threat_log += "[game_timestamp()]: Extended ruleset set threat to 0."
return TRUE
//////////////////////////////////////////////
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index 589289c595db..f875defd6044 100644
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -44,6 +44,10 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
ui = new(user, src, "CrewConsole")
ui.open()
+/datum/crewmonitor/ui_close(mob/user)
+ ui_sources -= user
+ return ..()
+
/datum/crewmonitor/proc/show(mob/M, source)
ui_sources[M] = source
ui_interact(M)
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 498342d62891..17c5dc2ef39c 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -472,7 +472,7 @@
var/counter = 1
while(active2.fields[text("com_[]", counter)])
counter++
- active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [] [], []
[]", authenticated, rank, station_time_timestamp(), time2text(world.realtime, "MMM DD"), "504 FS", t1)
+ active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [], []
[]", authenticated, rank, station_time_timestamp(), sector_datestamp(), t1)
else if(href_list["del_c"])
if((istype(active2, /datum/data/record) && active2.fields[text("com_[]", href_list["del_c"])]))
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index de05cce3ac77..2dc9a2c98bed 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -478,7 +478,7 @@ What a mess.*/
var/counter = 1
while(active2.fields[text("com_[]", counter)])
counter++
- active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [] [], []
[]", src.authenticated, src.rank, station_time_timestamp(), time2text(world.realtime, "MMM DD"), "504 FS", t1)
+ active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [], []
[]", src.authenticated, src.rank, station_time_timestamp(), sector_datestamp(shortened = TRUE), t1)
if("Delete Record (ALL)")
if(active1)
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 48a1cedc2afa..ac66aa4f6f26 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -339,7 +339,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod/retro, 17)
var/list/frozen_details = list()
frozen_details["name"] = "[mob_occupant.real_name]"
frozen_details["rank"] = announce_rank || "[mob_occupant.job]"
- frozen_details["time"] = gameTimestamp()
+ frozen_details["time"] = station_time_timestamp()
control_computer_obj.frozen_crew += list(frozen_details)
diff --git a/code/game/objects/effects/anomalies/_anomalies.dm b/code/game/objects/effects/anomalies/_anomalies.dm
index 3c8340bb284b..e62b1e52f7b3 100644
--- a/code/game/objects/effects/anomalies/_anomalies.dm
+++ b/code/game/objects/effects/anomalies/_anomalies.dm
@@ -50,7 +50,7 @@
aSignal = new aSignal(src)
aSignal.code = rand(1,100)
aSignal.anomaly_type = type
- aSignal.research = rand(500,4000)
+ aSignal.research = research_value
var/frequency = rand(MIN_FREE_FREQ, MAX_FREE_FREQ)
if(ISMULTIPLE(frequency, 2))//signaller frequencies are always uneven!
diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm
index 218575737882..e8d1aca60520 100644
--- a/code/game/objects/effects/contraband.dm
+++ b/code/game/objects/effects/contraband.dm
@@ -963,13 +963,13 @@
icon_state = "poster-cmm_enlist"
/obj/structure/sign/poster/minutemen/bard
- name = "CMM BARD"
- desc = "A poster that was made by soldiers that attemps to recruit people in the BARD depecting a \"Sargent Clues\" mowing down waves and waves of xenofauna, and them exploding into blood. Somethinng tells you that service is a lot less intresting than this."
+ name = "CMM-BARD"
+ desc = "A poster made by soldiers to recruit people into the BARD, depecting a \"Sergeant Clues\" mowing down waves and waves of xenofauna, and them exploding into blood. Something tells you that service is a lot less interesting than this."
icon_state = "poster-cmm_bard"
/obj/structure/sign/poster/minutemen/gold
- name = "CMM GOLD"
- desc = "A poster listing job positions open in CMM GOLD and asking for applications, listing important but unintresting benifits like health insurance and such."
+ name = "CMM-GOLD"
+ desc = "A poster listing job positions open in the CMM GOLD and asking for applications, listing important but uninteresting benifits like health insurance and such."
icon_state = "poster-cmm_gold"
/obj/structure/sign/poster/minutemen/lunatown
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 63ff9b794ce4..00dfda5879f5 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -344,7 +344,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/ert_spawn
- name = "Emergencyresponseteam"
+ name = "Emergency response team spawn"
icon_state = "ert_spawn"
/obj/effect/landmark/ert_spawn/Initialize(mapload)
@@ -352,6 +352,23 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
GLOB.emergencyresponseteamspawn += loc
return INITIALIZE_HINT_QDEL
+/obj/effect/landmark/ert_outpost_spawn
+ name = "Emergency response team outpost spawn"
+ icon_state = "ert_spawn"
+
+/obj/effect/landmark/ert_outpost_spawn/Initialize(mapload)
+ ..()
+ GLOB.emergencyresponseteam_outpostspawn += loc
+ return INITIALIZE_HINT_QDEL
+
+/obj/effect/landmark/ert_shuttle_spawn
+ name = "Emergency response team shuttle spawn"
+ icon_state = "ert_spawn"
+
+/obj/effect/landmark/ert_shuttle_brief_spawn
+ name = "Emergency response team briefing officer spawn"
+ icon_state = "ert_brief_spawn"
+
//ninja energy nets teleport victims here
/obj/effect/landmark/holding_facility
name = "Holding Facility"
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index dff96fd8076d..34fdcad9f16b 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -229,9 +229,9 @@ GLOBAL_LIST_EMPTY(PDAs)
if(id)
dat += text("ID:
[id ? "[id.registered_name], [id.assignment]" : "----------"] [id ? "Update PDA Info" : ""]")
- dat += "[worldtime2text()]
" //:[world.time / 100 % 6][world.time / 100 % 10]"
- dat += "[time2text(world.realtime, "MMM DD")] 504 FS"
- dat += "
"
+ dat += "[station_time_timestamp()]
"
+ dat += "[sector_datestamp()]
"
+ dat += "
"
dat += "
General Functions
"
dat += "
"
dat += "- [PDAIMG(notes)] Notekeeper
"
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 05b02e77f8b1..fba5fd1b4fc7 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -303,6 +303,11 @@
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 6
+/obj/item/storage/belt/security/webbing/bulldog/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 3)
+ new /obj/item/ammo_box/magazine/m12g(src)
+
/obj/item/storage/belt/mining
name = "explorer's webbing"
desc = "A versatile chest rig, cherished by miners and hunters alike."
@@ -434,22 +439,40 @@
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_w_class = WEIGHT_CLASS_SMALL
+/obj/item/storage/belt/military/c20r/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/smgm45(src)
+
+/obj/item/storage/belt/military/assault/m90/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/m556(src)
+
/obj/item/storage/belt/military/minutemen
name = "minutemen tactical webbing"
desc = "A set of tactical webbing worn by the Colonial Minutemen of the frontier."
icon_state = "cmmwebbing"
item_state = "cmmwebbing"
-/obj/item/storage/belt/military/minutemen/loaded/PopulateContents()
- for(var/i in 1 to 7)
+/obj/item/storage/belt/military/minutemen/p16/PopulateContents()
+ for(var/i in 1 to 4)
new /obj/item/ammo_box/magazine/p16(src)
+/obj/item/storage/belt/military/minutemen/gal/PopulateContents()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/gal(src)
+
+/obj/item/storage/belt/military/minutemen/cm5/PopulateContents()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/smgm9mm(src)
+
/obj/item/storage/belt/military/snack
name = "tactical snack rig"
/obj/item/storage/belt/military/snack/Initialize()
. = ..()
- var/sponsor = pick("DonkCo", "Waffle Co.", "Roffle Co.", "Gorlax Marauders", "Tiger Cooperative")
+ var/sponsor = pick("Donk! Co.", "CyberSun")
desc = "A set of snack-tical webbing worn by athletes of the [sponsor] VR sports division."
/obj/item/storage/belt/military/snack/ComponentInitialize()
@@ -826,6 +849,11 @@
item_state = "inteq_webbing"
supports_variations = VOX_VARIATION
+/obj/item/storage/belt/security/webbing/inteq/ak47/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 7)
+ new /obj/item/ammo_box/magazine/ak47(src)
+
/obj/item/storage/belt/security/webbing/inteq/alt
name = "inteq drop pouch harness"
desc = "A harness with a bunch of pouches attached to them emblazoned in the colors of the IRMG, can hold security gear."
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index e2430be999b6..3729f41af36e 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -10,6 +10,7 @@
allow_dense = TRUE
dense_when_open = TRUE
climbable = TRUE
+ mouse_drag_pointer = TRUE
climb_time = 10 //real fast, because let's be honest stepping into or onto a crate is easy
delivery_icon = "deliverycrate"
open_sound = 'sound/machines/crate_open.ogg'
diff --git a/code/game/objects/structures/crateshelf.dm b/code/game/objects/structures/crateshelf.dm
index 1ede60f12e22..3b1387f5490b 100644
--- a/code/game/objects/structures/crateshelf.dm
+++ b/code/game/objects/structures/crateshelf.dm
@@ -15,7 +15,7 @@
var/use_delay = DEFAULT_SHELF_USE_DELAY
var/list/shelf_contents
-/obj/structure/crate_shelf/tall
+/obj/structure/crate_shelf/debug
capacity = 12
/obj/structure/crate_shelf/Initialize()
@@ -24,7 +24,10 @@
var/stack_layer // This is used to generate the sprite layering of the shelf pieces.
var/stack_offset // This is used to generate the vertical offset of the shelf pieces.
for(var/i in 1 to (capacity - 1))
- stack_layer = BELOW_OBJ_LAYER + (0.02 * i) - 0.01 // Make each shelf piece render above the last, but below the crate that should be on it.
+ if(i >= 3) // If we're at or above three, we'll be on the way to going off the tile we're on. This allows mobs to be below the shelf when this happens.
+ stack_layer = ABOVE_MOB_LAYER + (0.02 * i) - 0.01
+ else
+ stack_layer = BELOW_OBJ_LAYER + (0.02 * i) - 0.01 // Make each shelf piece render above the last, but below the crate that should be on it.
stack_offset = DEFAULT_SHELF_VERTICAL_OFFSET * i // Make each shelf piece physically above the last.
overlays += image(icon = 'icons/obj/objects.dmi', icon_state = "shelf_stack", layer = stack_layer, pixel_y = stack_offset)
return
@@ -35,12 +38,12 @@
/obj/structure/crate_shelf/examine(mob/user)
. = ..()
- . += "There are some bolts holding [src] together."
+ . += span_notice("There are some bolts holding [src] together.")
if(shelf_contents.Find(null)) // If there's an empty space in the shelf, let the examiner know.
- . += "You could drag a crate into [src]."
+ . += span_notice("You could drag and drop a crate into [src].")
if(contents.len) // If there are any crates in the shelf, let the examiner know.
- . += "You could drag a crate out of [src]."
- . += "[src] contains:"
+ . += span_notice("You could drag and drop a crate out of [src].")
+ . += span_notice("[src] contains:")
for(var/obj/structure/closet/crate/crate in shelf_contents)
. += " [icon2html(crate, user)] [crate]"
@@ -53,13 +56,13 @@
return ..()
/obj/structure/crate_shelf/relay_container_resist_act(mob/living/user, obj/structure/closet/crate)
- to_chat(user, "You begin attempting to knock [crate] out of [src].")
+ to_chat(user, span_notice("You begin attempting to knock [crate] out of [src]"))
if(do_after(user, 30 SECONDS, target = crate))
if(!user || user.stat != CONSCIOUS || user.loc != crate || crate.loc != src)
return // If the user is in a strange condition, return early.
- visible_message("[crate] falls off of [src]!",
- "You manage to knock [crate] free of [src].",
- "= 3) // If we're at or above three, we'll be on the way to going off the tile we're on. This allows mobs to be below the crate when this happens.
+ crate.layer = ABOVE_MOB_LAYER + 0.02 * (next_free - 1)
+ else
+ crate.layer = BELOW_OBJ_LAYER + 0.02 * (next_free - 1) // Adjust the layer of the crate to look like it's in the shelf.
handle_visuals()
return TRUE
return FALSE // If the do_after() is interrupted, return FALSE!
@@ -119,12 +125,12 @@
if(1) // Believe it or not, this does nothing.
if(2) // Open the crate!
if(crate.open()) // Break some open, cause a little chaos.
- crate.visible_message("[crate]'s lid falls open!")
+ crate.visible_message(span_warning("[crate]'s lid falls open!"))
else // If we somehow fail to open the crate, just break it instead!
- crate.visible_message("[crate] falls apart!")
+ crate.visible_message(span_warning("[crate] falls apart!"))
crate.deconstruct()
if(3) // Break that crate!
- crate.visible_message("[crate] falls apart!")
+ crate.visible_message(span_warning("[crate] falls apart!"))
crate.deconstruct()
shelf_contents[shelf_contents.Find(crate)] = null
if(!(flags_1&NODECONSTRUCT_1))
diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm
index b8931f740c4b..f4bfa034fa12 100644
--- a/code/game/turfs/open/floor.dm
+++ b/code/game/turfs/open/floor.dm
@@ -281,8 +281,6 @@
name = "floor"
icon_state = "materialfloor"
material_flags = MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS
- icon = 'icons/turf/floors/tiles.dmi'
- icon_state = "tiled"
/turf/open/floor/material/spawn_tile()
for(var/i in custom_materials)
diff --git a/code/game/turfs/open/floor/plating/planet.dm b/code/game/turfs/open/floor/plating/planet.dm
index d1577e516b6d..a86847ca8f78 100644
--- a/code/game/turfs/open/floor/plating/planet.dm
+++ b/code/game/turfs/open/floor/plating/planet.dm
@@ -59,6 +59,11 @@
if(prob(floor_variance))
icon_state = "[initial(icon_state)][rand(0,12)]"
+/turf/open/floor/plating/dirt/icemoon
+ initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ baseturfs = /turf/open/floor/plating/dirt/icemoon
+ planetary_atmos = TRUE
+
/turf/open/floor/plating/grass/jungle
name = "jungle grass"
planetary_atmos = TRUE
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index a4a70c00e429..bb46d7250b0b 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -125,13 +125,13 @@
log_admin("[key_name(usr)] spawned a blob with base resource gain [strength].")
new/datum/round_event/ghost_role/blob(TRUE, strength)
if("centcom")
- message_admins("[key_name(usr)] is creating a CentCom response team...")
+ message_admins("[key_name(usr)] is creating a response team...")
if(src.makeEmergencyresponseteam())
- message_admins("[key_name(usr)] created a CentCom response team.")
- log_admin("[key_name(usr)] created a CentCom response team.")
+ message_admins("[key_name(usr)] created a response team.")
+ log_admin("[key_name(usr)] created a response team.")
else
- message_admins("[key_name_admin(usr)] tried to create a CentCom response team. Unfortunately, there were not enough candidates available.")
- log_admin("[key_name(usr)] failed to create a CentCom response team.")
+ message_admins("[key_name_admin(usr)] tried to create a response team. Unfortunately, there were not enough candidates available.")
+ log_admin("[key_name(usr)] failed to create a response team.")
if("abductors")
message_admins("[key_name(usr)] is creating an abductor team...")
if(src.makeAbductorTeam())
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 225a074b1477..eed725fc3154 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -494,9 +494,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
dat += "[FOURSPACES][ticket_href("Refresh", ref_src)][FOURSPACES][ticket_href("Re-Title", ref_src, "retitle")]"
if(state != AHELP_ACTIVE)
dat += "[FOURSPACES][ticket_href("Reopen", ref_src, "reopen")]"
- dat += "
Opened at: [gameTimestamp(wtime = opened_at)] (Approx [DisplayTimeText(world.time - opened_at)] ago)"
+ dat += "
Opened at: [game_timestamp(wtime = opened_at)] (Approx [DisplayTimeText(world.time - opened_at)] ago)"
if(closed_at)
- dat += "
Closed at: [gameTimestamp(wtime = closed_at)] (Approx [DisplayTimeText(world.time - closed_at)] ago)"
+ dat += "
Closed at: [game_timestamp(wtime = closed_at)] (Approx [DisplayTimeText(world.time - closed_at)] ago)"
dat += "
"
if(initiator)
dat += "Actions:
[full_monty(ref_src)]
"
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 5b1e0e8ad082..6c303cddf060 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -1,3 +1,6 @@
+/// If we spawn an ERT with the "choose experienced leader" option, select the leader from the top X playtimes
+#define ERT_EXPERIENCED_LEADER_CHOOSE_TOP 3
+
/client/proc/one_click_antag()
set name = "Create Antagonist"
set desc = "Auto-create an antagonist of your choice"
@@ -17,7 +20,7 @@
Make Blob
Make Wizard (Requires Ghosts)
Make Nuke Team (Requires Ghosts)
- Make CentCom Response Team (Requires Ghosts)
+ Make Response Team (Requires Ghosts)
Make Abductor Team (Requires Ghosts)
Make Revenant (Requires Ghost)
"}
@@ -218,6 +221,11 @@
.["mainsettings"]["mission"]["value"] = newtemplate.mission
.["mainsettings"]["polldesc"]["value"] = newtemplate.polldesc
.["mainsettings"]["open_armory"]["value"] = newtemplate.opendoors ? "Yes" : "No"
+ .["mainsettings"]["leader_experience"]["value"] = newtemplate.leader_experience ? "Yes" : "No"
+ .["mainsettings"]["random_names"]["value"] = newtemplate.random_names ? "Yes" : "No"
+ .["mainsettings"]["spawn_admin"]["value"] = newtemplate.spawn_admin ? "Yes" : "No"
+ .["mainsettings"]["use_custom_shuttle"]["value"] = newtemplate.use_custom_shuttle ? "Yes" : "No"
+ .["mainsettings"]["spawn_at_outpost"]["value"] = newtemplate.spawn_at_outpost ? "Yes" : "No"
/datum/admins/proc/equipAntagOnDummy(mob/living/carbon/human/dummy/mannequin, datum/antagonist/antag)
@@ -226,8 +234,6 @@
if (ispath(antag, /datum/antagonist/ert))
var/datum/antagonist/ert/ert = antag
mannequin.equipOutfit(initial(ert.outfit), TRUE)
- else if (ispath(antag, /datum/antagonist/official))
- mannequin.equipOutfit(/datum/outfit/centcom/centcom_official, TRUE)
/datum/admins/proc/makeERTPreviewIcon(list/settings)
// Set up the dummy for its photoshoot
@@ -283,12 +289,17 @@
"teamsize" = list("desc" = "Team Size", "type" = "number", "value" = ertemplate.teamsize),
"mission" = list("desc" = "Mission", "type" = "string", "value" = ertemplate.mission),
"polldesc" = list("desc" = "Ghost poll description", "type" = "string", "value" = ertemplate.polldesc),
- "enforce_human" = list("desc" = "Enforce human authority", "type" = "boolean", "value" = "No"),
+ "enforce_human" = list("desc" = "Spawn as humans", "type" = "boolean", "value" = "[(ertemplate.enforce_human ? "Yes" : "No")]"),
"open_armory" = list("desc" = "Open armory doors", "type" = "boolean", "value" = "[(ertemplate.opendoors ? "Yes" : "No")]"),
+ "leader_experience" = list("desc" = "Pick an experienced leader", "type" = "boolean", "value" = "[(ertemplate.leader_experience ? "Yes" : "No")]"),
+ "random_names" = list("desc" = "Randomize names", "type" = "boolean", "value" = "[(ertemplate.random_names ? "Yes" : "No")]"),
+ "spawn_admin" = list("desc" = "Spawn yourself as briefing officer", "type" = "boolean", "value" = "[(ertemplate.spawn_admin ? "Yes" : "No")]"),
+ "use_custom_shuttle" = list("desc" = "Use the ERT's custom shuttle (if it has one)", "type" = "boolean", "value" = "[(ertemplate.use_custom_shuttle ? "Yes" : "No")]"),
+ "spawn_at_outpost" = list("desc" = "Spawn the ERT/Dock the ERT at the Outpost", "type" = "boolean", "value" = "[(ertemplate.spawn_at_outpost ? "Yes" : "No")]"),
)
)
- var/list/prefreturn = presentpreflikepicker(usr,"Customize ERT", "Customize ERT", Button1="Ok", width = 600, StealFocus = 1,Timeout = 0, settings=settings)
+ var/list/prefreturn = presentpreflikepicker(usr, "Customize ERT", "Customize ERT", Button1="Ok", width = 600, StealFocus = 1,Timeout = 0, settings=settings)
if (isnull(prefreturn))
return FALSE
@@ -306,79 +317,174 @@
ertemplate.teamsize = prefs["teamsize"]["value"]
ertemplate.mission = prefs["mission"]["value"]
ertemplate.polldesc = prefs["polldesc"]["value"]
- ertemplate.enforce_human = prefs["enforce_human"]["value"] == "Yes" ? TRUE : FALSE
- ertemplate.opendoors = prefs["open_armory"]["value"] == "Yes" ? TRUE : FALSE
-
- var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you wish to be considered for [ertemplate.polldesc]?", "deathsquad", null)
+ ertemplate.enforce_human = prefs["enforce_human"]["value"] == "Yes" // these next 7 are effectively toggles
+ ertemplate.opendoors = prefs["open_armory"]["value"] == "Yes"
+ ertemplate.leader_experience = prefs["leader_experience"]["value"] == "Yes"
+ ertemplate.random_names = prefs["random_names"]["value"] == "Yes"
+ ertemplate.spawn_admin = prefs["spawn_admin"]["value"] == "Yes"
+ ertemplate.use_custom_shuttle = prefs["use_custom_shuttle"]["value"] == "Yes"
+ ertemplate.spawn_at_outpost = prefs["use_custom_shuttle"]["value"] == "Yes"
+
+ var/list/spawnpoints = GLOB.emergencyresponseteamspawn
+ var/index = 0
+
+ var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you wish to be considered for [ertemplate.polldesc]?", "deathsquad")
var/teamSpawned = FALSE
- if(candidates.len > 0)
- //Pick the (un)lucky players
- var/numagents = min(ertemplate.teamsize,candidates.len)
-
- //Create team
- var/datum/team/ert/ert_team = new ertemplate.team
- if(ertemplate.rename_team)
- ert_team.name = ertemplate.rename_team
-
- //Asign team objective
- var/datum/objective/missionobj = new
- missionobj.team = ert_team
- missionobj.explanation_text = ertemplate.mission
- missionobj.completed = TRUE
- ert_team.objectives += missionobj
- ert_team.mission = missionobj
-
- var/list/spawnpoints = GLOB.emergencyresponseteamspawn
- var/index = 0
- while(numagents && candidates.len)
- var/spawnloc = spawnpoints[index+1]
- //loop through spawnpoints one at a time
- index = (index + 1) % spawnpoints.len
- var/mob/dead/observer/chosen_candidate = pick(candidates)
- candidates -= chosen_candidate
- if(!chosen_candidate.key)
- continue
+ // This list will take priority over spawnpoints if not empty
+ var/list/spawn_turfs = list()
- //Spawn the body
- var/mob/living/carbon/human/ERTOperative = new ertemplate.mobtype(spawnloc)
- chosen_candidate.client.prefs.copy_to(ERTOperative)
- ERTOperative.key = chosen_candidate.key
+ // Takes precedence over spawnpoints[1] if not null
+ var/turf/brief_spawn
- if(ertemplate.enforce_human || !(ERTOperative.dna.species.changesource_flags & ERT_SPAWN)) // Don't want any exploding plasmemes
- ERTOperative.set_species(/datum/species/human)
+ if(!length(candidates))
+ to_chat(usr, span_warning("No applicants for ERT. Aborting spawn."))
+ return FALSE
+
+ if(ertemplate.spawn_at_outpost && !ertemplate.use_custom_shuttle)
+ if(!length(GLOB.emergencyresponseteam_outpostspawn))
+ message_admins("No outpost spawns found!")
+ spawnpoints = GLOB.emergencyresponseteam_outpostspawn
- //Give antag datum
- var/datum/antagonist/ert/ert_antag
+ if(ertemplate.use_custom_shuttle && ertemplate.ert_template)
+ to_chat(usr, span_boldnotice("Attempting to spawn ERT custom shuttle, this may take a few seconds..."))
- if(numagents == 1)
- ert_antag = new ertemplate.leader_role
+ var/datum/map_template/shuttle/template = new ertemplate.ert_template
+ var/spawn_location
+
+ if(ertemplate.spawn_at_outpost)
+ if(length(SSovermap.outposts) > 1)
+ var/temp_loc = input(usr, "Select outpost to spawn at") as null|anything in SSovermap.outposts
+ if(!temp_loc)
+ message_admins("ERT Shuttle found no outpost to spawn at!")
+ return
+ spawn_location = temp_loc
else
- ert_antag = ertemplate.roles[WRAP(numagents,1,length(ertemplate.roles) + 1)]
- ert_antag = new ert_antag
-
- ERTOperative.mind.add_antag_datum(ert_antag,ert_team)
- ERTOperative.mind.assigned_role = ert_antag.name
-
- //Logging and cleanup
- log_game("[key_name(ERTOperative)] has been selected as an [ert_antag.name]")
- numagents--
- teamSpawned++
-
- if (teamSpawned)
- message_admins("[ertemplate.polldesc] has spawned with the mission: [ertemplate.mission]")
-
- //Open the Armory doors
- if(ertemplate.opendoors)
- for(var/obj/machinery/door/poddoor/ert/door in GLOB.airlocks)
- door.open()
- CHECK_TICK
- return TRUE
+ spawn_location = SSovermap.outposts[1]
+
+ if(!spawn_location)
+ spawn_location = SSovermap.get_unused_overmap_square()
+
+ var/datum/overmap/ship/controlled/ship = new(spawn_location, template)
+
+ if(!ship)
+ CRASH("Loading ERT shuttle failed!")
+
+ var/list/shuttle_turfs = ship.shuttle_port.return_turfs()
+
+ for(var/turf/ship_turfs as anything in shuttle_turfs)
+ for(var/obj/effect/landmark/ert_shuttle_spawn/spawner in ship_turfs)
+ spawn_turfs += get_turf(spawner)
+
+ if(!brief_spawn)
+ brief_spawn = locate(/obj/effect/landmark/ert_shuttle_brief_spawn) in shuttle_turfs
+
+ if(!length(spawn_turfs))
+ stack_trace("ERT shuttle loaded but found no spawnpoints, placing the ERT at wherever inside the shuttle instead.")
+ for(var/turf/open/floor/open_turf in shuttle_turfs)
+ if(!find_safe_turf(open_turf))
+ continue
+ spawn_turfs += open_turf
+
+ if(ertemplate.spawn_admin)
+ if(isobserver(usr))
+ var/mob/living/carbon/human/admin_officer = new (brief_spawn || spawn_turfs || spawnpoints[1])
+ var/chosen_outfit = usr.client?.prefs?.brief_outfit
+ usr.client.prefs.copy_to(admin_officer)
+ admin_officer.equipOutfit(chosen_outfit)
+ admin_officer.key = usr.key
+ else
+ to_chat(usr, span_warning("Could not spawn you in as briefing officer as you are not a ghost!"))
+
+ //Pick the (un)lucky players
+ var/numagents = min(ertemplate.teamsize, length(candidates))
+
+ //Create team
+ var/datum/team/ert/ert_team = new ertemplate.team
+ if(ertemplate.rename_team)
+ ert_team.name = ertemplate.rename_team
+
+ //Assign team objective
+ var/datum/objective/missionobj = new
+ missionobj.team = ert_team
+ missionobj.explanation_text = ertemplate.mission
+ missionobj.completed = TRUE
+ ert_team.objectives += missionobj
+ ert_team.mission = missionobj
+
+ var/mob/dead/observer/earmarked_leader
+ var/leader_spawned = FALSE // just in case the earmarked leader disconnects or becomes unavailable, we can try giving leader to the last guy to get chosen
+
+ if(ertemplate.leader_experience)
+ var/list/candidate_living_exps = list()
+ for(var/i in candidates)
+ var/mob/dead/observer/potential_leader = i
+ candidate_living_exps[potential_leader] = potential_leader.client?.get_exp_living(TRUE)
+
+ candidate_living_exps = sortList(candidate_living_exps, cmp=/proc/cmp_numeric_dsc)
+ if(candidate_living_exps.len > ERT_EXPERIENCED_LEADER_CHOOSE_TOP)
+ candidate_living_exps = candidate_living_exps.Cut(ERT_EXPERIENCED_LEADER_CHOOSE_TOP+1) // pick from the top ERT_EXPERIENCED_LEADER_CHOOSE_TOP contenders in playtime
+ earmarked_leader = pick(candidate_living_exps)
else
- return FALSE
+ earmarked_leader = pick(candidates)
+
+ while(numagents && candidates.len)
+ var/turf/spawnloc
+ if(length(spawn_turfs))
+ spawnloc = pick(spawn_turfs)
+ else
+ if(!spawnpoints.len)
+ CRASH("ERT has no spawnpoints!")
+ spawnloc = spawnpoints[index+1]
+ //loop through spawnpoints one at a time
+ index = (index + 1) % spawnpoints.len
+
+ var/mob/dead/observer/chosen_candidate = earmarked_leader || pick(candidates) // this way we make sure that our leader gets chosen
+ candidates -= chosen_candidate
+ if(!chosen_candidate.key)
+ continue
+
+ //Spawn the body
+ var/mob/living/carbon/human/ert_operative = new ertemplate.mobtype(spawnloc)
+ chosen_candidate.client.prefs.copy_to(ert_operative)
+ ert_operative.key = chosen_candidate.key
+
+ if(ertemplate.enforce_human || !(ert_operative.dna.species.changesource_flags & ERT_SPAWN)) // Don't want any exploding plasmemes
+ ert_operative.set_species(/datum/species/human)
+
+ //Give antag datum
+ var/datum/antagonist/ert/ert_antag
+
+ if((chosen_candidate == earmarked_leader) || (numagents == 1 && !leader_spawned))
+ ert_antag = new ertemplate.leader_role ()
+ earmarked_leader = null
+ leader_spawned = TRUE
+ else
+ ert_antag = ertemplate.roles[WRAP(numagents,1,length(ertemplate.roles) + 1)]
+ ert_antag = new ert_antag
+ ert_antag.random_names = ertemplate.random_names
+
+ ert_operative.mind.add_antag_datum(ert_antag,ert_team)
+ ert_operative.mind.assigned_role = ert_antag.name
+
+ //Logging and cleanup
+ log_game("[key_name(ert_operative)] has been selected as an [ert_antag.name]")
+ numagents--
+ teamSpawned++
+
+ if(teamSpawned)
+ message_admins("[ertemplate.rename_team] has spawned with the mission: [ertemplate.mission]")
+
+ //Open the Armory doors
+ if(ertemplate.opendoors)
+ for(var/obj/machinery/door/poddoor/ert/door in GLOB.airlocks)
+ door.open()
+ CHECK_TICK
+ return TRUE
return
+
//Abductors
/datum/admins/proc/makeAbductorTeam()
new /datum/round_event/ghost_role/abductor
@@ -387,3 +493,5 @@
/datum/admins/proc/makeRevenant()
new /datum/round_event/ghost_role/revenant(TRUE, TRUE)
return 1
+
+#undef ERT_EXPERIENCED_LEADER_CHOOSE_TOP
diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm
index aa1717230c48..537afd8d4ff5 100644
--- a/code/modules/antagonists/_common/antag_spawner.dm
+++ b/code/modules/antagonists/_common/antag_spawner.dm
@@ -101,6 +101,7 @@
desc = "A single-use teleporter designed to quickly reinforce operatives in the field."
icon = 'icons/obj/device.dmi'
icon_state = "locator"
+ var/nukieonly = TRUE
var/borg_to_spawn
var/locked = TRUE
@@ -181,6 +182,10 @@
name = "syndicate medical teleporter"
borg_to_spawn = "Medical"
+/obj/item/antag_spawner/nuke_ops/borg_tele/medical/unlocked // used for cybersun ERT
+ locked = FALSE
+ nukieonly = FALSE
+
/obj/item/antag_spawner/nuke_ops/borg_tele/saboteur
name = "syndicate saboteur teleporter"
@@ -193,7 +198,7 @@
/obj/item/antag_spawner/nuke_ops/borg_tele/spawn_antag(client/C, turf/T, kind, datum/mind/user)
var/mob/living/silicon/robot/R
var/datum/antagonist/nukeop/creator_op = user.has_antag_datum(/datum/antagonist/nukeop,TRUE)
- if(!creator_op)
+ if(!creator_op && nukieonly)
return
switch(borg_to_spawn)
@@ -210,8 +215,9 @@
if(prob(50))
brainfirstname = pick(GLOB.first_names_female)
var/brainopslastname = pick(GLOB.last_names)
- if(creator_op.nuke_team.syndicate_name) //the brain inside the syndiborg has the same last name as the other ops.
- brainopslastname = creator_op.nuke_team.syndicate_name
+ if(nukieonly) //the brain inside the syndiborg has the same last name as the other ops.
+ if(creator_op.nuke_team.syndicate_name)
+ brainopslastname = creator_op.nuke_team.syndicate_name
var/brainopsname = "[brainfirstname] [brainopslastname]"
R.mmi.name = "[initial(R.mmi.name)]: [brainopsname]"
@@ -224,7 +230,8 @@
var/datum/antagonist/nukeop/new_borg = new()
new_borg.send_to_spawnpoint = FALSE
- R.mind.add_antag_datum(new_borg,creator_op.nuke_team)
+ if(nukieonly)
+ R.mind.add_antag_datum(new_borg,creator_op.nuke_team)
R.mind.special_role = "Syndicate Cyborg"
///////////SLAUGHTER DEMON
diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm
index c12fcb8eaf27..f28bd9e428bb 100644
--- a/code/modules/antagonists/ert/ert.dm
+++ b/code/modules/antagonists/ert/ert.dm
@@ -11,7 +11,7 @@
var/role = "Security Officer"
var/list/name_source
var/random_names = TRUE
- var/rip_and_tear = FALSE
+ var/deathsquad = FALSE
var/equip_ert = TRUE
var/forge_objectives_for_ert = TRUE
can_elimination_hijack = ELIMINATION_PREVENT
@@ -28,6 +28,20 @@
equipERT()
. = ..()
+/datum/antagonist/ert/create_team(datum/team/ert/new_team)
+ if(istype(new_team))
+ ert_team = new_team
+
+/datum/antagonist/ert/proc/forge_objectives()
+ if(ert_team)
+ objectives |= ert_team.objectives
+
+/datum/antagonist/ert/proc/equipERT()
+ var/mob/living/carbon/human/H = owner.current
+ if(!istype(H))
+ return
+ H.equipOutfit(outfit)
+
/datum/antagonist/ert/get_team()
return ert_team
@@ -38,15 +52,56 @@
/datum/antagonist/ert/proc/update_name()
owner.current.fully_replace_character_name(owner.current.real_name,"[role] [pick(name_source)]")
-/datum/antagonist/ert/deathsquad/New()
- . = ..()
- name_source = GLOB.commando_names
+/datum/antagonist/ert/greet()
+ if(!ert_team)
+ return
-/datum/antagonist/ert/deathsquad/apply_innate_effects(mob/living/mob_override)
- ADD_TRAIT(owner, TRAIT_DISK_VERIFIER, DEATHSQUAD_TRAIT)
+ to_chat(owner, "You are the [name].")
-/datum/antagonist/ert/deathsquad/remove_innate_effects(mob/living/mob_override)
- REMOVE_TRAIT(owner, TRAIT_DISK_VERIFIER, DEATHSQUAD_TRAIT)
+ var/missiondesc = "Your team is being sent to [station_name()].
"
+ if(leader) //If Squad Leader
+ missiondesc += " Lead your team to ensure the completion of your objectives."
+ else
+ missiondesc += " Follow orders given to you by your squad leader."
+ if(deathsquad)
+ missiondesc += "Leave no witnesses."
+
+ missiondesc += "
Your Mission: [ert_team.mission.explanation_text]"
+ to_chat(owner,missiondesc)
+
+// ********************************************************************
+// ** Nanotrasen **
+// ********************************************************************
+
+// Official
+/datum/antagonist/ert/official
+ name = "CentCom Official"
+ show_name_in_check_antagonists = TRUE
+ var/datum/objective/mission
+ role = "Inspector"
+ random_names = FALSE
+ outfit = /datum/outfit/centcom/centcom_official
+
+/datum/antagonist/ert/official/greet()
+ to_chat(owner, "You are a CentCom Official.")
+ if (ert_team)
+ to_chat(owner, "Central Command is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")
+ else
+ to_chat(owner, "Central Command is sending you to [station_name()] with the task: [mission.explanation_text]")
+
+/datum/antagonist/ert/official/forge_objectives()
+ if (ert_team)
+ return ..()
+ if(mission)
+ return
+ var/datum/objective/missionobj = new ()
+ missionobj.owner = owner
+ missionobj.explanation_text = "Conduct a routine performance review of [station_name()]'s vessels."
+ missionobj.completed = TRUE
+ mission = missionobj
+ objectives |= mission
+
+// Standard ERT
/datum/antagonist/ert/security // kinda handled by the base template but here for completion
@@ -74,43 +129,30 @@
/datum/antagonist/ert/commander/red
outfit = /datum/outfit/centcom/ert/commander/alert
+// Deathsquad
+
/datum/antagonist/ert/deathsquad
name = "Deathsquad Trooper"
outfit = /datum/outfit/centcom/death_commando
role = "Trooper"
- rip_and_tear = TRUE
-
-/datum/antagonist/ert/medic/inquisitor
- outfit = /datum/outfit/centcom/ert/medic/inquisitor
+ deathsquad = TRUE
-/datum/antagonist/ert/medic/inquisitor/on_gain()
- . = ..()
- owner.holy_role = HOLY_ROLE_PRIEST
-
-/datum/antagonist/ert/security/inquisitor
- outfit = /datum/outfit/centcom/ert/security/inquisitor
+/datum/antagonist/ert/deathsquad/leader
+ name = "Deathsquad Officer"
+ outfit = /datum/outfit/centcom/death_commando
+ role = "Officer"
-/datum/antagonist/ert/security/inquisitor/on_gain()
+/datum/antagonist/ert/deathsquad/New()
. = ..()
- owner.holy_role = HOLY_ROLE_PRIEST
-
-/datum/antagonist/ert/chaplain
- role = "Chaplain"
- outfit = /datum/outfit/centcom/ert/chaplain
-
-/datum/antagonist/ert/chaplain/inquisitor
- outfit = /datum/outfit/centcom/ert/chaplain/inquisitor
+ name_source = GLOB.commando_names
-/datum/antagonist/ert/chaplain/on_gain()
- . = ..()
- owner.holy_role = HOLY_ROLE_PRIEST
+/datum/antagonist/ert/deathsquad/apply_innate_effects(mob/living/mob_override)
+ ADD_TRAIT(owner, TRAIT_DISK_VERIFIER, DEATHSQUAD_TRAIT)
-/datum/antagonist/ert/commander/inquisitor
- outfit = /datum/outfit/centcom/ert/commander/inquisitor
+/datum/antagonist/ert/deathsquad/remove_innate_effects(mob/living/mob_override)
+ REMOVE_TRAIT(owner, TRAIT_DISK_VERIFIER, DEATHSQUAD_TRAIT)
-/datum/antagonist/ert/commander/inquisitor/on_gain()
- . = ..()
- owner.holy_role = HOLY_ROLE_PRIEST
+// Janitor
/datum/antagonist/ert/janitor
role = "Janitor"
@@ -120,10 +162,7 @@
role = "Heavy Duty Janitor"
outfit = /datum/outfit/centcom/ert/janitor/heavy
-/datum/antagonist/ert/deathsquad/leader
- name = "Deathsquad Officer"
- outfit = /datum/outfit/centcom/death_commando
- role = "Officer"
+// Intern
/datum/antagonist/ert/intern
name = "CentCom Intern"
@@ -136,45 +175,13 @@
outfit = /datum/outfit/centcom/centcom_intern/leader
role = "Head Intern"
-/datum/antagonist/ert/clown
- role = "Clown"
- outfit = /datum/outfit/centcom/ert/clown
+/datum/antagonist/ert/intern/unarmed
+ outfit = /datum/outfit/centcom/centcom_intern/unarmed
-/datum/antagonist/ert/clown/New()
- . = ..()
- name_source = GLOB.clown_names
+/datum/antagonist/ert/intern/leader/unarmed
+ outfit = /datum/outfit/centcom/centcom_intern/leader/unarmed
-/datum/antagonist/ert/create_team(datum/team/ert/new_team)
- if(istype(new_team))
- ert_team = new_team
-
-/datum/antagonist/ert/proc/forge_objectives()
- if(ert_team)
- objectives |= ert_team.objectives
-
-/datum/antagonist/ert/proc/equipERT()
- var/mob/living/carbon/human/H = owner.current
- if(!istype(H))
- return
- H.equipOutfit(outfit)
-
-
-/datum/antagonist/ert/greet()
- if(!ert_team)
- return
-
- to_chat(owner, "You are the [name].")
-
- var/missiondesc = "Your squad is being sent on a mission to [station_name()] by Nanotrasen's Security Division."
- if(leader) //If Squad Leader
- missiondesc += " Lead your squad to ensure the completion of the mission. Board the shuttle when your team is ready."
- else
- missiondesc += " Follow orders given to you by your squad leader."
- if(!rip_and_tear)
- missiondesc += "Avoid civilian casualties when possible."
-
- missiondesc += "
Your Mission : [ert_team.mission.explanation_text]"
- to_chat(owner,missiondesc)
+// Marine
/datum/antagonist/ert/marine
name = "Marine Commander"
@@ -196,8 +203,340 @@
outfit = /datum/outfit/centcom/ert/marine/medic
role = "Medical Officer"
+// Loss Prevention
+
+/datum/antagonist/ert/lp
+ name = "Loss Prevention Security Specialist"
+ outfit = /datum/outfit/centcom/ert/lp
+ role = "Security Specialist"
+
+/datum/antagonist/ert/lp/medic
+ name = "Loss Prevention Medical Specialist"
+ outfit = /datum/outfit/centcom/ert/lp/medic
+ role = "Medical Specialist"
+
+/datum/antagonist/ert/lp/engineer
+ name = "Loss Prevention Engineering Specialist"
+ outfit = /datum/outfit/centcom/ert/lp/engineer
+ role = "Engineering Specialist"
+
+/datum/antagonist/ert/lp/lieutenant
+ name = "Loss Prevention Lieutenant"
+ leader = TRUE
+ outfit = /datum/outfit/centcom/ert/lp/lieutenant
+ role = "Lieutenant"
+
+// ********************************************************************
+// ** Inteq **
+// ********************************************************************
+
+/datum/antagonist/ert/inteq
+ name = "Inteq Mercenary"
+ outfit = /datum/outfit/job/security/inteq
+ random_names = TRUE
+ role = "Enforcer"
+
+
+/datum/antagonist/ert/inteq/greet()
+ to_chat(owner, "You are the [name].")
+ var/missiondesc = "You're one of the many mercenaries under the Inteq Risk Management Group sent to [station_name()].
"
+ if(leader) //If Squad Leader
+ missiondesc += "Lead your squadron to ensure the completion of your contract."
+ else
+ missiondesc += "Follow orders given to you by your Vanguard."
+ if(deathsquad)
+ missiondesc += "Leave no witnesses."
+
+ missiondesc += "
Contract Terms: [ert_team.mission.explanation_text]"
+ to_chat(owner,missiondesc)
+
+/datum/antagonist/ert/inteq/leader
+ name = "Inteq Mercenary Leader"
+ outfit = /datum/outfit/job/captain/inteq
+ role = "Vanguard"
+
+// ********************************************************************
+// ** SolGov **
+// ********************************************************************
/datum/antagonist/ert/solgov
- name = "SolGov Sonnensoldner"
- outfit = /datum/outfit/solgov/sonnensoldner
+ name = "SolGov Sonnensöldner"
+ outfit = /datum/outfit/centcom/ert/solgov
random_names = FALSE
- role = "SolGov Sonnensoldner"
+ role = "Sonnensöldner"
+
+/datum/antagonist/ert/official/solgov
+ name = "SolGov Inspector"
+ outfit = /datum/outfit/centcom/ert/solgov/inspector
+ role = "Solarian Inspector"
+
+/datum/antagonist/ert/official/solgov/greet()
+ to_chat(owner, "You are a Solarian Inspector.")
+ if (ert_team)
+ to_chat(owner, "The Department of Administrative Affairs is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")
+ else
+ to_chat(owner, "The Department of Administrative Affairs is sending you to [station_name()] with the task: [mission.explanation_text]")
+
+
+// ********************************************************************
+// ** Minutemen **
+// ********************************************************************
+
+/datum/antagonist/ert/minutemen
+ name = "Minutemen Infantry"
+ outfit = /datum/outfit/centcom/ert/minutemen
+ role = "Minuteman"
+
+/datum/antagonist/ert/minutemen/greet()
+ to_chat(owner, "You are the [name].")
+ var/missiondesc = "You stand shoulder to shoulder with your fellow colonists in the Colonial Minutemen within [station_name()].
"
+ if(leader) //If Squad Leader
+ missiondesc += "Lead your team to ensure the completion of your objectives."
+ else
+ missiondesc += "Follow orders given to you by your Sergent."
+ if(deathsquad)
+ missiondesc += "Leave no witnesses."
+
+ missiondesc += "
Your Mission: [ert_team.mission.explanation_text]"
+ to_chat(owner,missiondesc)
+
+/datum/antagonist/ert/minutemen/leader
+ name = "Minutemen Leader"
+ leader = TRUE
+ outfit = /datum/outfit/centcom/ert/minutemen/leader
+ role = "Sergeant"
+
+/datum/antagonist/ert/minutemen/bard
+ name = "BARD Infantry"
+ outfit = /datum/outfit/centcom/ert/minutemen/bard
+ role = "Minuteman"
+
+/datum/antagonist/ert/minutemen/bard/leader
+ name = "BARD Leader"
+ leader = TRUE
+ outfit = /datum/outfit/centcom/ert/minutemen/bard/leader
+ role = "Sergeant"
+
+/datum/antagonist/ert/minutemen/riot
+ name = "Riot Officer"
+ outfit = /datum/outfit/centcom/ert/minutemen/riot
+ role = "Minuteman"
+
+/datum/antagonist/ert/minutemen/riot/leader
+ name = "Riot Sergeant"
+ leader = TRUE
+ outfit = /datum/outfit/centcom/ert/minutemen/riot/leader
+ role = "Sergeant"
+
+/datum/antagonist/ert/official/minutemen
+ name = "GOLD Inspector"
+ outfit = /datum/outfit/centcom/ert/minutemen/inspector
+ role = "Lieutenant"
+
+/datum/antagonist/ert/official/minutemen/greet()
+ to_chat(owner, "You are the GOLD Inspector.")
+ if (ert_team)
+ to_chat(owner, "The Galactic Optimum Labor Division is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")
+ else
+ to_chat(owner, "The Galactic Optimum Labor Division is sending you to [station_name()] with the task: [mission.explanation_text]")
+
+/datum/antagonist/ert/minutemen/piratehunters
+ name = "Pirate Hunter"
+ outfit = /datum/outfit/centcom/ert/minutemen/piratehunters
+ role = "Minuteman"
+
+/datum/antagonist/ert/minutemen/piratehunters/leader
+ name = "Pirate Hunter Leader"
+ leader = TRUE
+ outfit = /datum/outfit/centcom/ert/minutemen/piratehunters/leader
+ role = "Sergeant"
+
+// ********************************************************************
+// ** Syndicate **
+// ********************************************************************
+
+/datum/antagonist/ert/syndicate
+ name = "Syndicate Infantry"
+ outfit = /datum/outfit/centcom/ert/syndicate
+ role = "Squaddie"
+
+/datum/antagonist/ert/syndicate/greet()
+ to_chat(owner, "You are the [name].")
+ var/missiondesc = "You are but another member of the Syndicate sent to [station_name()].
"
+ if(leader) //If Squad Leader
+ missiondesc += "Lead your team to ensure the completion of your objectives."
+ else
+ missiondesc += "Follow orders given to you by your Sergeant."
+ if(deathsquad)
+ missiondesc += "Leave no witnesses."
+
+ missiondesc += "
Your Mission: [ert_team.mission.explanation_text]"
+ to_chat(owner,missiondesc)
+
+/datum/antagonist/ert/syndicate/leader
+ name = "Syndicate Sergeant"
+ leader = TRUE
+ outfit = /datum/outfit/centcom/ert/syndicate/leader
+ role = "Sergeant"
+
+/datum/antagonist/ert/syndicate/gorlex
+ name = "2nd Battlegroup Trooper"
+ outfit = /datum/outfit/centcom/ert/syndicate/gorlex
+ role = "Trooper"
+
+/datum/antagonist/ert/syndicate/gorlex/greet()
+ to_chat(owner, "You are the [name].")
+ var/missiondesc = "You're a soldier of the 2nd Battlegroup, sometimes known as Gorlex Loyalists, sent to [station_name()].
"
+ if(leader) //If Squad Leader
+ missiondesc += "Lead your team to ensure the completion of your objectives."
+ else
+ missiondesc += "Follow orders given to you by your Sergeant."
+
+ missiondesc += "
Your Mission: [ert_team.mission.explanation_text]"
+ to_chat(owner,missiondesc)
+
+/datum/antagonist/ert/syndicate/gorlex/pointman
+ name = "2nd Battlegroup Shotgunner"
+ outfit = /datum/outfit/centcom/ert/syndicate/gorlex/pointman
+ role = "Pointman"
+
+/datum/antagonist/ert/syndicate/gorlex/medic
+ name = "2nd Battlegroup Medic"
+ outfit = /datum/outfit/centcom/ert/syndicate/gorlex/medic
+ role = "Medic"
+
+/datum/antagonist/ert/syndicate/gorlex/sniper
+ name = "2nd Battlegroup Sniper"
+ outfit = /datum/outfit/centcom/ert/syndicate/gorlex/sniper
+ role = "Marksman"
+
+/datum/antagonist/ert/syndicate/gorlex/leader
+ name = "2nd Battlegroup Sergeant"
+ leader = TRUE
+ outfit = /datum/outfit/centcom/ert/syndicate/gorlex/leader
+ role = "Sergeant"
+
+/datum/antagonist/ert/syndicate/cybersun
+ name = "Cybersun Commando"
+ outfit = /datum/outfit/centcom/ert/syndicate/cybersun
+ role = "Operative"
+
+/datum/antagonist/ert/syndicate/cybersun/greet()
+ to_chat(owner, "You are the [name].")
+ var/missiondesc = "You are one of the commandos enlisted in Cybersun Industries, deployed to [station_name()].
"
+ if(leader) //If Squad Leader
+ missiondesc += "Lead your team to ensure the completion of your objectives."
+ else
+ missiondesc += "Follow orders given to you by your Sergeant."
+ if(prob(50) && !leader)
+ missiondesc += "
In addition to your contract with Cybersun, you are also a Gorlex Hardliner. You do not like Cybersun, but you work with them regardless."
+
+ missiondesc += "
Your Mission: [ert_team.mission.explanation_text]"
+ to_chat(owner,missiondesc)
+
+/datum/antagonist/ert/syndicate/cybersun/leader
+ name = "Cybersun Commando Leader"
+ leader = TRUE
+ outfit = /datum/outfit/centcom/ert/syndicate/cybersun/leader
+ role = "Lead Operative"
+
+/datum/antagonist/ert/syndicate/cybersun/medic
+ name = "Cybersun Paramedic"
+ outfit = /datum/outfit/centcom/ert/syndicate/cybersun/medic
+ role = "Medical Technician"
+
+/datum/antagonist/ert/syndicate/cybersun/medic/greet()
+ to_chat(owner, "You are the [name].")
+ var/missiondesc = "You are one of the many trained paramedics of Cybersun's Medical Intervention program, sent with your team to [station_name()] to aid Cybersun clients in distress.
"
+ if(leader) //If Squad Leader
+ missiondesc += "Lead your team to ensure the safety of Cybersun's clientele.
"
+ else
+ missiondesc += "Follow orders given to you by your Lead Technician. Assist Cybersun clients.
"
+
+ missiondesc += "
Your Mission: [ert_team.mission.explanation_text]"
+ to_chat(owner,missiondesc)
+
+/datum/antagonist/ert/syndicate/cybersun/medic/leader
+ name = "Cybersun Lead Paramedic"
+ leader = TRUE
+ outfit = /datum/outfit/centcom/ert/syndicate/cybersun/medic/leader
+ role = "Lead Medical Technician"
+
+// ********************************************************************
+// ** Frontiersmen **
+// ********************************************************************
+
+/datum/antagonist/ert/frontier
+ name = "Frontiersmen Pirate"
+ outfit = /datum/outfit/centcom/ert/frontiersmen
+ role = "Grunt"
+
+/datum/antagonist/ert/frontier/greet()
+ to_chat(owner, "You are the [name].")
+ var/missiondesc = "You are one of the ruthless, sadistic pirates in the Frontiersmen pirate fleet, stationed in [station_name()].
"
+ if(leader) //If Squad Leader
+ missiondesc += "Lead your team to complete your objectives."
+ else
+ missiondesc += "Follow orders given to you by your Officer."
+
+ missiondesc += "
Your Mission: [ert_team.mission.explanation_text]"
+ to_chat(owner,missiondesc)
+
+/datum/antagonist/ert/frontier/leader
+ name = "Frontiersmen Officer"
+ outfit = /datum/outfit/centcom/ert/frontiersmen/leader
+ role = "Officer"
+
+/datum/antagonist/ert/frontier/medic
+ name = "Frontiersmen Medic"
+ outfit = /datum/outfit/centcom/ert/frontiersmen/medic
+ role = "Stretcher-Bearer"
+
+/datum/antagonist/ert/frontier/engineer
+ name = "Frontiersmen Engineer"
+ outfit = /datum/outfit/centcom/ert/frontiersmen/engineer
+ role = "Sapper"
+
+// ********************************************************************
+// ** independent **
+// ********************************************************************
+
+/datum/antagonist/ert/independent
+ name = "Independent Security Officer"
+ outfit = /datum/outfit/centcom/ert/independent
+ role = "Security Officer"
+
+/datum/antagonist/ert/independent/greet()
+ to_chat(owner, "You are the [name].")
+ var/missiondesc = "You are one of the many Independent contractors, workers and students on [station_name()].
"
+ if(leader) //If Squad Leader
+ missiondesc += "Lead your team to complete your objectives."
+ else
+ missiondesc += "Follow orders given to you by your leader."
+
+ missiondesc += "
Your Mission: [ert_team.mission.explanation_text]"
+ to_chat(owner,missiondesc)
+
+/datum/antagonist/ert/independent/emt
+ name = "Independent Medical Technician"
+ outfit = /datum/outfit/centcom/ert/independent/emt
+ role = "Paramedic"
+
+/datum/antagonist/ert/independent/firefighter
+ name = "Independent Firefighter"
+ outfit = /datum/outfit/centcom/ert/independent/firefighter
+ role = "Firefighter"
+
+/datum/antagonist/ert/independent/firefighter/medic
+ name = "Independent Firefighter Paramedic"
+ outfit = /datum/outfit/centcom/ert/independent/firefighter/medic
+ role = "Paramedic"
+
+/datum/antagonist/ert/independent/firefighter/leader
+ name = "Independent Firefighter Group Captain"
+ outfit = /datum/outfit/centcom/ert/independent/firefighter/leader
+ role = "Group Captain"
+
+/datum/antagonist/ert/independent/technician
+ name = "Independent Technician"
+ outfit = /datum/outfit/centcom/ert/independent/technician
+ role = "Technician"
diff --git a/code/modules/antagonists/official/official.dm b/code/modules/antagonists/official/official.dm
deleted file mode 100644
index a258d6e68e76..000000000000
--- a/code/modules/antagonists/official/official.dm
+++ /dev/null
@@ -1,42 +0,0 @@
-/datum/antagonist/official
- name = "CentCom Official"
- show_name_in_check_antagonists = TRUE
- show_in_antagpanel = FALSE
- can_elimination_hijack = ELIMINATION_PREVENT
- var/datum/objective/mission
- var/datum/team/ert/ert_team
- show_to_ghosts = TRUE
-
-/datum/antagonist/official/greet()
- to_chat(owner, "You are a CentCom Official.")
- if (ert_team)
- to_chat(owner, "Central Command is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")
- else
- to_chat(owner, "Central Command is sending you to [station_name()] with the task: [mission.explanation_text]")
-
-/datum/antagonist/official/proc/equip_official()
- var/mob/living/carbon/human/H = owner.current
- if(!istype(H))
- return
- H.equipOutfit(/datum/outfit/centcom/centcom_official)
-
-/datum/antagonist/official/create_team(datum/team/new_team)
- if(istype(new_team))
- ert_team = new_team
-
-/datum/antagonist/official/proc/forge_objectives()
- if (ert_team)
- objectives |= ert_team.objectives
- else if (!mission)
- var/datum/objective/missionobj = new
- missionobj.owner = owner
- missionobj.explanation_text = "Conduct a routine performance review of [station_name()] and its Captain."
- missionobj.completed = 1
- mission = missionobj
- objectives |= mission
-
-
-/datum/antagonist/official/on_gain()
- forge_objectives()
- . = ..()
- equip_official()
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index 253d4c49eb3d..92f8a61ab4d7 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -307,6 +307,9 @@
outfit = /datum/outfit/job/assistant
icon_state = "corpsegreytider"
+/obj/effect/mob_spawn/human/corpse/assistant/husked
+ husk = TRUE
+
/obj/effect/mob_spawn/human/corpse/assistant/beesease_infection
disease = /datum/disease/beesease
@@ -326,6 +329,8 @@
outfit = /datum/outfit/job/cook
icon_state = "corpsecook"
+/obj/effect/mob_spawn/human/cook/husked
+ husk = TRUE
/obj/effect/mob_spawn/human/doctor
name = "Doctor"
@@ -391,6 +396,9 @@
outfit = /datum/outfit/job/botanist
icon_state = "corpsehuman"
+/obj/effect/mob_spawn/human/botanist/husked
+ husk = TRUE
+
/obj/effect/mob_spawn/human/sec
outfit = /datum/outfit/job/security
icon_state = "corpsehuman"
@@ -405,10 +413,14 @@
/obj/effect/mob_spawn/human/bartender
name = "Space Bartender"
+ icon_state = "corpsebartender"
id_job = "Bartender"
id_access_list = list(ACCESS_BAR)
outfit = /datum/outfit/spacebartender
+/obj/effect/mob_spawn/human/bartender/husked
+ husk = TRUE
+
/obj/effect/mob_spawn/human/bartender/alive
death = FALSE
roundstart = FALSE
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 69ea5e634cda..e73a186087f3 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -16,6 +16,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/lastchangelog = "" //Saved changlog filesize to detect if there was a change
var/ooccolor = "#c43b23"
var/asaycolor = "#ff4500" //This won't change the color for current admins, only incoming ones.
+ /// If we spawn an ERT as an admin and choose to spawn as the briefing officer, we'll be given this outfit
+ var/brief_outfit = /datum/outfit/centcom/commander
var/enable_tips = TRUE
var/tip_delay = 500 //tip delay in milliseconds
@@ -1097,6 +1099,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "Hide Prayers: [(chat_toggles & CHAT_PRAYER)?"Shown":"Hidden"]
"
dat += "Split Admin Tabs: [(toggles & SPLIT_ADMIN_TABS)?"Enabled":"Disabled"]
"
dat += "Ignore Being Summoned as Cult Ghost: [(toggles & ADMIN_IGNORE_CULT_GHOST)?"Don't Allow Being Summoned":"Allow Being Summoned"]
"
+ dat += "Briefing Officer Outfit: [brief_outfit]
"
if(CONFIG_GET(flag/allow_admin_asaycolor))
dat += "
"
dat += "ASAY Color: Change
"
@@ -1981,6 +1984,15 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(new_asaycolor)
asaycolor = new_asaycolor
+ if("briefoutfit")
+ var/list/valid_paths = list()
+ for(var/datum/outfit/outfit_path as anything in subtypesof(/datum/outfit))
+ valid_paths[initial(outfit_path.name)] = outfit_path
+ var/new_outfit = input(user, "Choose your briefing officer outfit:", "Game Preference") as null|anything in valid_paths
+ new_outfit = valid_paths[new_outfit]
+ if(new_outfit)
+ brief_outfit = new_outfit
+
if("bag")
var/new_backpack = input(user, "Choose your character's style of bag:", "Character Preference") as null|anything in GLOB.backpacklist
if(new_backpack)
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index e8015ce2fbb7..7800a7b57f33 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -161,6 +161,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
//general preferences
READ_FILE(S["asaycolor"], asaycolor)
+ READ_FILE(S["brief_outfit"], brief_outfit)
READ_FILE(S["ooccolor"], ooccolor)
READ_FILE(S["screentip_color"], screentip_color)
READ_FILE(S["lastchangelog"], lastchangelog)
@@ -265,6 +266,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
ghost_others = sanitize_inlist(ghost_others, GLOB.ghost_others_options, GHOST_OTHERS_DEFAULT_OPTION)
menuoptions = SANITIZE_LIST(menuoptions)
be_special = SANITIZE_LIST(be_special)
+ brief_outfit = sanitize_inlist(brief_outfit, subtypesof(/datum/outfit), null)
show_credits = sanitize_integer(show_credits, 0, 1, initial(show_credits))
pda_style = sanitize_inlist(pda_style, GLOB.pda_styles, initial(pda_style))
pda_color = sanitize_hexcolor(pda_color, 6, TRUE, initial(pda_color))
@@ -304,6 +306,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
//general preferences
WRITE_FILE(S["asaycolor"], asaycolor)
+ WRITE_FILE(S["brief_outfit"], brief_outfit)
WRITE_FILE(S["ooccolor"], ooccolor)
WRITE_FILE(S["screentip_color"], screentip_color)
WRITE_FILE(S["lastchangelog"], lastchangelog)
diff --git a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
new file mode 100644
index 000000000000..db934aaa9761
--- /dev/null
+++ b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
@@ -0,0 +1,60 @@
+/datum/outfit/centcom/ert/frontiersmen
+ name = "ERT - Frontiersman Basic"
+
+ head = /obj/item/clothing/head/beret/sec/frontier
+ mask = /obj/item/clothing/mask/gas/sechailer/minutemen
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof/frontier
+ suit_store = /obj/item/gun/ballistic/rifle/boltaction
+ uniform = /obj/item/clothing/under/rank/security/officer/frontier
+ shoes = /obj/item/clothing/shoes/combat
+ gloves = /obj/item/clothing/gloves/color/black
+ ears = /obj/item/radio/headset/pirate/alt
+ back = /obj/item/storage/backpack
+ belt = null
+ l_pocket = /obj/item/flashlight/seclite
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/double
+
+ backpack_contents = list(/obj/item/ammo_box/a762=5, /obj/item/grenade/frag=1)
+
+ id_role = "Grunt"
+
+/datum/outfit/centcom/ert/frontiersmen/leader
+ name = "ERT - Frontiersman Officer"
+
+ uniform = /obj/item/clothing/under/rank/security/officer/frontier/officer
+ head = /obj/item/clothing/head/beret/sec/frontier/officer
+ ears = /obj/item/radio/headset/pirate/alt/captain
+ back = /obj/item/storage/backpack/satchel/leather
+ suit = /obj/item/clothing/suit/armor/frontier
+ suit_store = /obj/item/gun/ballistic/revolver/nagant
+ belt = /obj/item/storage/belt/military/assault
+
+ backpack_contents = list(/obj/item/ammo_box/n762_clip=3, /obj/item/binoculars=1, /obj/item/kitchen/knife/combat/survival)
+
+ id_role = "Officer"
+
+/datum/outfit/centcom/ert/frontiersmen/medic
+ name = "ERT - Frontiersman Medic"
+
+ back = /obj/item/storage/backpack/medic
+ mask = /obj/item/clothing/mask/surgical
+ gloves = /obj/item/clothing/gloves/color/latex/nitrile
+ belt = /obj/item/storage/belt/medical/surgery
+ suit = null
+ suit_store = null
+
+ backpack_contents = list(/obj/item/storage/firstaid/medical=1, /obj/item/reagent_containers/hypospray/medipen/stimpack=3)
+
+ id_role = "Stretcher-Bearer"
+
+/datum/outfit/centcom/ert/frontiersmen/engineer
+ name = "ERT - Frontiersman Engineer"
+
+ back = /obj/item/storage/backpack/industrial
+ belt = /obj/item/storage/belt/utility/full
+ head = /obj/item/clothing/head/hardhat/weldhat
+ suit_store = null
+
+ backpack_contents = list(/obj/item/grenade/c4=3, /obj/item/crowbar/large=1)
+
+ id_role = "Sapper"
diff --git a/code/modules/clothing/outfits/ert/indie_ert.dm b/code/modules/clothing/outfits/ert/indie_ert.dm
new file mode 100644
index 000000000000..18b611d1183d
--- /dev/null
+++ b/code/modules/clothing/outfits/ert/indie_ert.dm
@@ -0,0 +1,88 @@
+/datum/outfit/centcom/ert/independent
+ name = "ERT - Independent Security Officer"
+
+ head = /obj/item/clothing/head/helmet/sec
+ ears = /obj/item/radio/headset/alt
+ mask = null
+ uniform = /obj/item/clothing/under/rank/security/officer
+ shoes = /obj/item/clothing/shoes/combat/swat
+ gloves = /obj/item/clothing/gloves/color/black
+ suit = /obj/item/clothing/suit/armor/vest
+ back = /obj/item/storage/backpack/security
+ belt = /obj/item/storage/belt/security/full
+ id = /obj/item/card/id
+
+ id_role = "Security Officer"
+
+/datum/outfit/centcom/ert/independent/emt
+ name = "ERT - Independent Paramedic"
+
+ head = /obj/item/clothing/head/soft/paramedic
+ mask = null
+ uniform = /obj/item/clothing/under/rank/medical/paramedic
+ shoes = /obj/item/clothing/shoes/sneakers/white
+ gloves = /obj/item/clothing/gloves/color/latex
+ ears = /obj/item/radio/headset
+ suit = /obj/item/clothing/suit/toggle/labcoat/paramedic
+ back = /obj/item/storage/backpack/medic
+ belt = /obj/item/storage/belt/medical/webbing/paramedic
+
+ id_role = "Emergency Medical Technician"
+
+/datum/outfit/centcom/ert/independent/firefighter
+ name = "ERT - Independent Firefighter (Standard)"
+
+ head = /obj/item/clothing/head/hardhat/red
+ uniform = /obj/item/clothing/under/utility
+ suit = /obj/item/clothing/suit/fire/firefighter
+ suit_store = /obj/item/extinguisher
+ glasses = /obj/item/clothing/glasses/heat
+ mask = /obj/item/clothing/mask/breath
+ shoes = /obj/item/clothing/shoes/workboots
+ gloves = /obj/item/clothing/gloves/color/black
+ back = /obj/item/tank/internals/oxygen/red
+
+ l_pocket = /obj/item/crowbar/red
+ r_pocket = /obj/item/radio
+
+ id_role = "Firefighter"
+
+/datum/outfit/centcom/ert/independent/firefighter/medic
+ name = "ERT - Independent Firefighter (Medic)"
+
+ mask = /obj/item/clothing/mask/breath/medical
+ back = /obj/item/storage/backpack/fireproof
+ gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil
+ glasses = /obj/item/clothing/glasses/hud/health
+ suit_store = /obj/item/tank/internals/emergency_oxygen
+
+ l_pocket = /obj/item/extinguisher/mini
+
+ backpack_contents = list(/obj/item/storage/firstaid/fire=1, /obj/item/storage/firstaid/o2=1, /obj/item/radio=1)
+
+ id_role = "Emergency Medical Technician"
+
+/datum/outfit/centcom/ert/independent/firefighter/leader
+ name = "ERT - Independent Firefighter (Group Captain)"
+
+ back = /obj/item/fireaxe
+ suit = /obj/item/clothing/suit/space/hardsuit/engine
+ suit_store = /obj/item/tank/internals/oxygen/red
+ head = null
+ belt = /obj/item/storage/belt/utility/atmostech
+ gloves = /obj/item/clothing/gloves/color/yellow
+
+ id_role = "Group Captain"
+
+/datum/outfit/centcom/ert/independent/technician
+ name = "ERT - Independent Technician"
+
+ head = /obj/item/clothing/head/hardhat
+ belt = /obj/item/storage/belt/utility/full/engi
+ suit = /obj/item/clothing/suit/toggle/hazard
+ shoes = /obj/item/clothing/shoes/workboots
+ back = /obj/item/storage/backpack/industrial
+ l_pocket = /obj/item/radio
+ r_pocket = /obj/item/analyzer
+
+ box = /obj/item/storage/box/survival/engineer
diff --git a/code/modules/clothing/outfits/ert/inteq_ert.dm b/code/modules/clothing/outfits/ert/inteq_ert.dm
new file mode 100644
index 000000000000..05d4f22eb69a
--- /dev/null
+++ b/code/modules/clothing/outfits/ert/inteq_ert.dm
@@ -0,0 +1,53 @@
+/datum/outfit/centcom/ert/inteq
+ name = "ERT - Inteq Rifleman"
+
+ mask = /obj/item/clothing/mask/gas/sechailer/inteq
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
+ uniform = /obj/item/clothing/under/syndicate/inteq
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq
+ suit_store = /obj/item/gun/ballistic/automatic/assault/ak47/inteq
+ gloves = /obj/item/clothing/gloves/combat
+ ears = /obj/item/radio/headset/inteq/alt
+ id = /obj/item/card/id
+ belt = /obj/item/storage/belt/security/webbing/inteq/ak47
+ back = /obj/item/storage/backpack/fireproof
+
+ l_pocket = /obj/item/kitchen/knife/combat
+ r_pocket = /obj/item/flashlight/seclite
+
+ backpack_contents = list(/obj/item/radio=1)
+
+ id_role = "Enforcer"
+
+/datum/outfit/centcom/ert/inteq/shotgun
+ name = "ERT - Inteq Shotgunner"
+
+ suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/compact
+ belt = /obj/item/storage/belt/security/webbing/inteq/alt
+
+ backpack_contents = list(/obj/item/storage/box/lethalshot=2, /obj/item/radio=1)
+
+ id_role = "Enforcer"
+
+/datum/outfit/centcom/ert/inteq/medic
+ name = "ERT - Inteq Corpsman"
+
+ uniform = /obj/item/clothing/under/syndicate/inteq/corpsman
+ belt = /obj/item/storage/belt/medical/webbing/paramedic
+ suit_store = null
+
+ l_pocket = /obj/item/healthanalyzer
+
+ id_role = "Corpsman"
+
+ backpack_contents = list(/obj/item/storage/firstaid/medical=1, /obj/item/radio=1)
+
+/datum/outfit/centcom/ert/inteq/leader
+ name = "ERT - Inteq Vanguard"
+
+ ears = /obj/item/radio/headset/inteq/alt/captain
+ back = /obj/item/storage/backpack/messenger/inteq
+ suit_store = /obj/item/gun/ballistic/automatic/pistol/commander/inteq
+ id = /obj/item/card/id/silver
+
+ id_role = "Vanguard"
diff --git a/code/modules/clothing/outfits/ert/minutemen_ert.dm b/code/modules/clothing/outfits/ert/minutemen_ert.dm
new file mode 100644
index 000000000000..6ec68e0799ca
--- /dev/null
+++ b/code/modules/clothing/outfits/ert/minutemen_ert.dm
@@ -0,0 +1,126 @@
+/datum/outfit/centcom/ert/minutemen
+ name = "ERT - Minutemen Basic"
+
+ head = /obj/item/clothing/head/helmet/bulletproof/minutemen
+ uniform = /obj/item/clothing/under/rank/security/officer/minutemen
+ mask = /obj/item/clothing/mask/gas/sechailer/minutemen
+ ears = /obj/item/radio/headset/minutemen/alt
+ back = /obj/item/storage/backpack/security/cmm
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof
+ id = /obj/item/card/id
+ r_pocket = /obj/item/kitchen/knife/combat
+ l_pocket = /obj/item/flashlight/seclite
+
+ box = /obj/item/storage/box/survival/security
+
+ id_role = "Minutemen"
+
+/datum/outfit/centcom/ert/minutemen/leader
+ name = "ERT - Minutemen Basic Sergeant"
+
+ ears = /obj/item/radio/headset/minutemen/alt/captain
+ back = /obj/item/storage/backpack/satchel/sec/cmm
+
+ id_role = "Sergeant"
+
+/datum/outfit/centcom/ert/minutemen/bard
+ name = "ERT - Minutemen BARD"
+
+ suit = /obj/item/clothing/suit/armor/vest/marine/medium
+ suit_store = /obj/item/gun/ballistic/automatic/smg/cm5
+ head = /obj/item/clothing/head/helmet/riot/minutemen
+ belt = /obj/item/storage/belt/military/minutemen/cm5
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ r_pocket = /obj/item/grenade/smokebomb
+ l_pocket = /obj/item/extinguisher/mini
+ r_hand = /obj/item/kitchen/knife/combat
+ l_hand = /obj/item/reagent_containers/hypospray/medipen/stimpack
+
+ backpack_contents = list(
+ /obj/item/flashlight/seclite = 1,
+ /obj/item/flashlight/flare = 2
+ )
+
+ id_role = "Minutemen"
+
+/datum/outfit/centcom/ert/minutemen/bard/leader
+ name = "ERT - Minutemen BARD Sergeant"
+
+ belt = /obj/item/storage/belt/military/assault/minutemen
+ uniform = /obj/item/clothing/under/rank/command/minutemen
+ suit = /obj/item/clothing/suit/armor/vest/marine/heavy
+ suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
+ glasses = /obj/item/clothing/glasses/hud/security/night
+ r_pocket = /obj/item/grenade/c4
+ l_pocket = /obj/item/reagent_containers/hypospray/medipen/stimpack
+
+ backpack_contents = list(
+ /obj/item/flashlight/flare = 3,
+ /obj/item/grenade/c4 = 2,
+ /obj/item/flashlight/seclite = 1
+ )
+
+ id_role = "Sergeant"
+
+/datum/outfit/centcom/ert/minutemen/riot
+ name = "ERT - Minutemen Riot Officer"
+
+ suit = /obj/item/clothing/suit/armor/riot/minutemen
+ head = /obj/item/clothing/head/helmet/riot/minutemen
+ l_hand = /obj/item/melee/baton/loaded
+ back = /obj/item/shield/riot
+ belt = /obj/item/gun/ballistic/automatic/smg/cm5/no_mag
+ r_pocket = /obj/item/ammo_box/magazine/smgm9mm/rubber
+ l_pocket = /obj/item/ammo_box/magazine/smgm9mm/rubber
+
+ backpack_contents = null
+ box = null
+
+ id_role = "Minutemen"
+
+/datum/outfit/centcom/ert/minutemen/riot/leader
+ name = "ERT - Minutemen Riot Officer Sergeant"
+
+ ears = /obj/item/radio/headset/minutemen/alt/captain
+ back = /obj/item/shield/riot/flash
+
+ id_role = "Sergeant"
+
+/datum/outfit/centcom/ert/minutemen/inspector
+ name = "ERT - Minutemen GOLD Inspector"
+
+ head = null
+ mask = null
+ belt = /obj/item/clipboard
+ glasses = /obj/item/clothing/glasses/sunglasses
+ uniform = /obj/item/clothing/under/rank/command/minutemen
+ suit = /obj/item/clothing/suit/toggle/lawyer/minutemen
+ ears = /obj/item/radio/headset/minutemen/alt/captain
+ back = /obj/item/storage/backpack/satchel/leather
+ id = /obj/item/card/id/silver
+
+ l_pocket = null
+ r_pocket = null
+
+ id_role = "Lieutenant"
+
+/datum/outfit/centcom/ert/minutemen/piratehunters
+ name = "ERT - Minutemen Pirate Hunter"
+
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/security/independent/minutemen
+ belt = /obj/item/storage/belt/military/minutemen/p16
+ suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
+
+ id_role = "Minutemen"
+
+/datum/outfit/centcom/ert/minutemen/piratehunters/leader
+ name = "ERT - Minutemen Pirate Hunter Leader"
+
+ uniform = /obj/item/clothing/under/rank/command/minutemen
+ ears = /obj/item/radio/headset/minutemen/alt/captain
+ belt = /obj/item/storage/belt/military/minutemen/gal
+ suit_store = /obj/item/gun/ballistic/automatic/gal
+ backpack_contents = list(/obj/item/ammo_box/magazine/gal=4)
+
+ id_role = "Sergeant"
diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
similarity index 73%
rename from code/modules/clothing/outfits/ert.dm
rename to code/modules/clothing/outfits/ert/nanotrasen_ert.dm
index aa0b01ff5398..6fb533504715 100644
--- a/code/modules/clothing/outfits/ert.dm
+++ b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
@@ -1,3 +1,4 @@
+// this is where the base ERT outfit goes
/datum/outfit/centcom/ert
name = "ERT Common"
@@ -6,19 +7,18 @@
shoes = /obj/item/clothing/shoes/combat/swat
gloves = /obj/item/clothing/gloves/combat
ears = /obj/item/radio/headset/headset_cent/alt
+ // determines what role goes on the ID of an ert member. cheap workaround for implementing it into the ert datum
+ var/id_role = "Emergency Response Officer"
-/datum/outfit/centcom/ert/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/datum/outfit/centcom/ert/post_equip(mob/living/carbon/human/human, visualsOnly = FALSE)
if(visualsOnly)
return
- var/obj/item/radio/R = H.ears
- R.set_frequency(FREQ_CENTCOM)
- R.freqlock = TRUE
-
- var/obj/item/card/id/W = H.wear_id
- if(W)
- W.registered_name = H.real_name
- W.update_label()
+ var/obj/item/card/id/id = human.wear_id
+ if(id)
+ id.registered_name = human.real_name
+ id.assignment = id_role
+ id.update_label()
..()
/datum/outfit/centcom/ert/commander
@@ -26,14 +26,16 @@
id = /obj/item/card/id/ert
suit = /obj/item/clothing/suit/space/hardsuit/ert
+ suit_store = /obj/item/gun/energy/e_gun/hades
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
back = /obj/item/storage/backpack/ert
belt = /obj/item/storage/belt/security/full
backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/gun/energy/e_gun=1)
+ /obj/item/melee/baton/loaded=1)
l_pocket = /obj/item/switchblade
+ id_role = "Emergency Response Team Commander"
+
/datum/outfit/centcom/ert/commander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
@@ -64,7 +66,7 @@
back = /obj/item/storage/backpack/ert/security
belt = /obj/item/storage/belt/security/full
backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/storage/box/handcuffs=1,\
+ /obj/item/storage/box/handcuffs=1,
/obj/item/melee/baton/loaded=1)
/datum/outfit/centcom/ert/security/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -80,28 +82,29 @@
/datum/outfit/centcom/ert/security/alert
name = "ERT Security - High Alert"
+ suit_store = /obj/item/gun/energy/pulse/carbine/loyalpin
mask = /obj/item/clothing/mask/gas/sechailer/swat
backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
/obj/item/storage/box/handcuffs=1,\
/obj/item/melee/baton/loaded=1)
- suit_store = /obj/item/gun/energy/pulse/carbine/loyalpin
-
/datum/outfit/centcom/ert/medic
name = "ERT Medic"
id = /obj/item/card/id/ert/medical
suit = /obj/item/clothing/suit/space/hardsuit/ert/med
+ suit_store = /obj/item/gun/energy/e_gun/hades
glasses = /obj/item/clothing/glasses/hud/health
back = /obj/item/storage/backpack/ert/medical
belt = /obj/item/storage/belt/medical
r_hand = /obj/item/storage/firstaid/regular
backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
/obj/item/melee/baton/loaded=1,\
- /obj/item/gun/energy/e_gun=1,\
/obj/item/reagent_containers/hypospray/combat=1,\
/obj/item/gun/medbeam=1)
+ id_role = "Medical Response Officer"
+
/datum/outfit/centcom/ert/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
@@ -127,6 +130,7 @@
id = /obj/item/card/id/ert/engineer
suit = /obj/item/clothing/suit/space/hardsuit/ert/engi
+ suit_store = /obj/item/gun/energy/e_gun/hades
glasses = /obj/item/clothing/glasses/meson/engine
back = /obj/item/storage/backpack/ert/engineer
belt = /obj/item/storage/belt/utility/full
@@ -134,9 +138,10 @@
r_hand = /obj/item/storage/firstaid/regular
backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
/obj/item/melee/baton/loaded=1,\
- /obj/item/gun/energy/e_gun=1,\
/obj/item/construction/rcd/loaded=1)
+ id_role = "Engineering Response Officer"
+
/datum/outfit/centcom/ert/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
@@ -156,6 +161,7 @@
/obj/item/gun/energy/pulse/pistol/loyalpin=1,\
/obj/item/construction/rcd/combat=1)
+// official
/datum/outfit/centcom/centcom_official
name = "CentCom Official"
@@ -190,67 +196,6 @@
W.update_label()
..()
-/datum/outfit/centcom/ert/commander/inquisitor
- name = "Inquisition Commander"
- r_hand = /obj/item/nullrod/scythe/talking/chainsword
- suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,
- /obj/item/gun/energy/e_gun=1)
-
-/datum/outfit/centcom/ert/security/inquisitor
- name = "Inquisition Security"
-
- suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor
- suit_store = /obj/item/gun/energy/e_gun/hades
-
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,
- /obj/item/storage/box/handcuffs=1,
- /obj/item/melee/baton/loaded=1,
- /obj/item/construction/rcd/loaded=1)
-
-/datum/outfit/centcom/ert/medic/inquisitor
- name = "Inquisition Medic"
-
- suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor
-
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,
- /obj/item/melee/baton/loaded=1,
- /obj/item/gun/energy/e_gun=1,
- /obj/item/reagent_containers/hypospray/combat=1,
- /obj/item/reagent_containers/hypospray/combat/heresypurge=1,
- /obj/item/gun/medbeam=1)
-
-/datum/outfit/centcom/ert/chaplain
- name = "ERT Chaplain"
-
- suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor // Chap role always gets this suit
- id = /obj/item/card/id/ert/chaplain
- glasses = /obj/item/clothing/glasses/hud/health
- back = /obj/item/storage/backpack/cultpack
- belt = /obj/item/storage/belt/soulstone
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,
- /obj/item/nullrod=1,
- /obj/item/gun/energy/e_gun=1,
- )
-
-/datum/outfit/centcom/ert/chaplain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
- if(visualsOnly)
- return
- var/obj/item/radio/R = H.ears
- R.keyslot = new /obj/item/encryptionkey/headset_com
- R.recalculateChannels()
-
-/datum/outfit/centcom/ert/chaplain/inquisitor
- name = "Inquisition Chaplain"
-
- belt = /obj/item/storage/belt/soulstone/full/chappy
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,
- /obj/item/grenade/chem_grenade/holy=1,
- /obj/item/nullrod=1,
- /obj/item/gun/energy/e_gun=1,
- )
-
/datum/outfit/centcom/ert/janitor
name = "ERT Janitor"
@@ -269,6 +214,8 @@
/obj/item/reagent_containers/glass/bucket=1,\
/obj/item/grenade/clusterbuster/cleaner=1)
+ id_role = "Janitorial Response Officer"
+
/datum/outfit/centcom/ert/janitor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
@@ -289,35 +236,6 @@
/obj/item/melee/baton/loaded=1,\
/obj/item/grenade/clusterbuster/cleaner=3)
-/datum/outfit/centcom/ert/clown
- name = "ERT Clown"
-
- suit = /obj/item/clothing/suit/space/hardsuit/ert/clown
- mask = /obj/item/clothing/mask/gas/clown_hat
- id = /obj/item/card/id/ert/clown
- glasses = /obj/item/clothing/glasses/godeye
- back = /obj/item/storage/backpack/ert/clown
- belt = /obj/item/storage/belt/champion
- shoes = /obj/item/clothing/shoes/clown_shoes/combat
- r_pocket = /obj/item/bikehorn/golden
- l_pocket = /obj/item/reagent_containers/food/snacks/grown/banana
- backpack_contents = list(/obj/item/storage/box/hug/survival=1,\
- /obj/item/melee/transforming/energy/sword/bananium=1,\
- /obj/item/shield/energy/bananium=1,\
- /obj/item/gun/ballistic/revolver/reverse=1)
-
-/datum/outfit/centcom/ert/clown/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
- if(visualsOnly)
- return
- var/obj/item/radio/R = H.ears
- R.keyslot = new /obj/item/encryptionkey/headset_com
- R.recalculateChannels()
- ADD_TRAIT(H, TRAIT_NAIVE, INNATE_TRAIT)
- H.dna.add_mutation(CLOWNMUT)
- for(var/datum/mutation/human/clumsy/M in H.dna.mutations)
- M.mutadone_proof = TRUE
-
/datum/outfit/centcom/centcom_intern
name = "CentCom Intern"
@@ -333,6 +251,12 @@
r_pocket = /obj/item/ammo_box/a762
id = /obj/item/card/id/centcom
backpack_contents = list(/obj/item/storage/box/survival = 1)
+/datum/outfit/centcom/centcom_intern/unarmed
+ name = "CentCom Intern (Unarmed)"
+ belt = null
+ l_hand = null
+ l_pocket = null
+ r_pocket = null
/datum/outfit/centcom/centcom_intern/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(visualsOnly)
@@ -353,6 +277,14 @@
r_hand = /obj/item/megaphone
head = /obj/item/clothing/head/intern
+/datum/outfit/centcom/centcom_intern/leader/unarmed // i'll be nice and let the leader keep their baton and vest
+ name = "CentCom Head Intern (Unarmed)"
+ suit_store = null
+ l_pocket = null
+ r_pocket = null
+
+// Marine
+
/datum/outfit/centcom/ert/marine
name = "Marine Commander"
@@ -372,6 +304,8 @@
mask = /obj/item/clothing/mask/gas/sechailer
head = /obj/item/clothing/head/helmet/marine
+ id_role = "Emergency Response Team Commander"
+
/datum/outfit/centcom/ert/marine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
@@ -419,6 +353,8 @@
belt = /obj/item/storage/belt/medical/paramedic
glasses = /obj/item/clothing/glasses/hud/health/sunglasses
+ id_role = "Medical Response Officer"
+
/datum/outfit/centcom/ert/marine/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
@@ -446,6 +382,8 @@
belt = /obj/item/storage/belt/utility/full/ert
glasses = /obj/item/clothing/glasses/hud/diagnostic/sunglasses
+ id_role = "Engineering Response Officer"
+
/datum/outfit/centcom/ert/marine/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
@@ -455,3 +393,88 @@
var/obj/item/radio/headset = H.ears
headset.keyslot = new /obj/item/encryptionkey/headset_com
headset.recalculateChannels()
+
+// Loss Prevention
+
+/datum/outfit/centcom/ert/lp
+ name = "ERT - Loss Prevention Security Specialist"
+
+ head = null
+ implants = list(/obj/item/implant/mindshield)
+ ears = /obj/item/radio/headset/nanotrasen/alt
+ id = /obj/item/card/id/lpsec
+ suit_store = /obj/item/gun/energy/laser/scatter/shotty
+ belt = /obj/item/storage/belt/security/full
+ glasses = /obj/item/clothing/glasses/sunglasses
+ gloves = /obj/item/clothing/gloves/tackler/combat
+ suit = /obj/item/clothing/suit/space/hardsuit/ert/lp/sec
+ uniform = /obj/item/clothing/under/rank/security/head_of_security/nt/lp
+ shoes = /obj/item/clothing/shoes/jackboots
+ back = /obj/item/storage/backpack/ert/security
+
+ box = /obj/item/storage/box/survival/security
+ l_pocket = /obj/item/restraints/handcuffs
+ r_pocket = /obj/item/kitchen/knife/combat
+
+ backpack_contents = list(/obj/item/radio=1, /obj/item/stock_parts/cell/gun/upgraded=2, /obj/item/screwdriver=1)
+
+ id_role = "Security Specialist"
+
+/datum/outfit/centcom/ert/lp/medic
+ name = "ERT - Loss Prevention Medical Specialist"
+
+ head = null
+ uniform = /obj/item/clothing/under/rank/medical/paramedic/lp
+ suit = /obj/item/clothing/suit/space/hardsuit/ert/lp/med
+ id = /obj/item/card/id/lpmed
+ gloves = /obj/item/clothing/gloves/color/latex/nitrile
+ back = /obj/item/storage/backpack/ert/medical
+ belt = /obj/item/storage/belt/medical/surgery
+
+ box = /obj/item/storage/box/survival/medical
+ l_pocket = /obj/item/healthanalyzer
+ r_pocket = /obj/item/reagent_containers/hypospray/medipen/atropine
+
+ backpack_contents = list(/obj/item/storage/firstaid/medical=1, /obj/item/radio=1)
+
+ id_role = "Medical Specialist"
+
+/datum/outfit/centcom/ert/lp/engineer
+ name = "ERT - Loss Prevention Engineering Specialist"
+
+ head = null
+ uniform = /obj/item/clothing/under/rank/engineering/engineer/nt/lp
+ suit = /obj/item/clothing/suit/space/hardsuit/ert/lp/engi
+ id = /obj/item/card/id/lpengie
+ belt = /obj/item/storage/belt/utility/full
+ gloves = /obj/item/clothing/gloves/combat
+ glasses = /obj/item/clothing/glasses/welding
+ back = /obj/item/storage/backpack/ert/engineer
+
+ box = /obj/item/storage/box/survival/engineer
+ l_pocket = /obj/item/extinguisher/mini
+ r_pocket = /obj/item/wrench/combat
+
+ id_role = "Engineering Specialist"
+
+ backpack_contents = list(/obj/item/stack/sheet/metal/fifty=1, /obj/item/stack/sheet/glass/fifty=1, /obj/item/radio=1)
+
+/datum/outfit/centcom/ert/lp/lieutenant
+ name = "ERT - Loss Prevention Lieutenant"
+
+ head = null
+ ears = /obj/item/radio/headset/nanotrasen/alt/captain
+ id = /obj/item/card/id/lplieu
+ belt = /obj/item/storage/belt/military/army
+ gloves = /obj/item/clothing/gloves/color/black
+ uniform = /obj/item/clothing/under/rank/security/warden/lp
+ suit = /obj/item/clothing/suit/space/hardsuit/ert/lp
+ shoes = /obj/item/clothing/shoes/combat
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ back = /obj/item/storage/backpack/ert
+
+ box = /obj/item/storage/box/survival/radio
+ l_pocket = /obj/item/megaphone/command
+ r_pocket = /obj/item/binoculars
+
+ id_role = "Lieutenant"
diff --git a/code/modules/clothing/outfits/ert/solgov_ert.dm b/code/modules/clothing/outfits/ert/solgov_ert.dm
new file mode 100644
index 000000000000..fbae8101728d
--- /dev/null
+++ b/code/modules/clothing/outfits/ert/solgov_ert.dm
@@ -0,0 +1,38 @@
+/datum/outfit/centcom/ert/solgov
+ name = "ERT - SolGov Sonnensöldner"
+
+ id = /obj/item/card/id/solgov
+ uniform = /obj/item/clothing/under/solgov
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof/solgov
+ mask = null
+ ears = /obj/item/radio/headset/solgov/alt
+ gloves = /obj/item/clothing/gloves/combat
+ head = /obj/item/clothing/head/solgov/sonnensoldner
+ shoes = /obj/item/clothing/shoes/workboots
+ back = /obj/item/storage/backpack
+
+ box = /obj/item/storage/box/survival
+ l_hand = /obj/item/energyhalberd
+
+ id_role = "Sonnensöldner"
+
+/datum/outfit/centcom/ert/solgov/inspector
+ name = "ERT - SolGov Inspector"
+
+ uniform = /obj/item/clothing/under/solgov/formal
+ belt = /obj/item/clipboard
+ ears = /obj/item/radio/headset/solgov/captain
+ back = /obj/item/storage/backpack/satchel/leather
+ head = /obj/item/clothing/head/solgov
+ gloves = /obj/item/clothing/gloves/color/white
+ shoes = /obj/item/clothing/shoes/laceup
+ suit = null
+ suit_store = null
+ mask = null
+ glasses = null
+
+ l_hand = null
+
+ backpack_contents = list(/obj/item/stamp/solgov=1)
+
+ id_role = "Inspector"
diff --git a/code/modules/clothing/outfits/ert/syndicate_ert.dm b/code/modules/clothing/outfits/ert/syndicate_ert.dm
new file mode 100644
index 000000000000..5ec318f41d24
--- /dev/null
+++ b/code/modules/clothing/outfits/ert/syndicate_ert.dm
@@ -0,0 +1,164 @@
+/datum/outfit/centcom/ert/syndicate
+ name = "ERT - Syndicate Basic"
+
+ uniform = /obj/item/clothing/under/syndicate
+ suit = /obj/item/clothing/suit/armor/vest/syndie
+ suit_store = /obj/item/gun/ballistic/automatic/smg/c20r
+ shoes = /obj/item/clothing/shoes/combat
+ ears = /obj/item/radio/headset/syndicate/alt
+ gloves = /obj/item/clothing/gloves/color/black
+ id = /obj/item/card/id/syndicate_command/crew_id
+ mask = /obj/item/clothing/mask/gas/sechailer/minutemen
+ head = /obj/item/clothing/head/helmet/operator
+ back = /obj/item/storage/backpack/fireproof
+ belt = /obj/item/storage/belt/military/c20r
+
+ r_pocket = /obj/item/kitchen/knife/combat
+ l_pocket = /obj/item/grenade/frag
+
+ implants = list(/obj/item/implant/weapons_auth)
+ backpack_contents = list(/obj/item/radio=1)
+ box = /obj/item/storage/box/survival/syndie
+
+ id_role = "Squaddie"
+
+/datum/outfit/centcom/ert/syndicate/leader
+ name = "ERT - Syndicate Basic Leader"
+
+ head = /obj/item/clothing/head/HoS/beret/syndicate
+ ears = /obj/item/radio/headset/syndicate/captain
+
+ backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol=1, /obj/item/ammo_box/magazine/m10mm=2, /obj/item/radio=1)
+
+ id_role = "Sergeant"
+
+// gorlex loyalist/2nd battlegroup
+
+/datum/outfit/centcom/ert/syndicate/gorlex
+ name = "ERT - Syndicate Gorlex Loyalist Trooper"
+
+ head = /obj/item/clothing/head/helmet/swat
+ uniform = /obj/item/clothing/under/syndicate/combat
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof
+ belt = /obj/item/storage/belt/military/assault/m90
+ back = /obj/item/storage/backpack/security
+ suit_store = /obj/item/gun/ballistic/automatic/smg/m90
+
+ id_role = "Trooper"
+
+/datum/outfit/centcom/ert/syndicate/gorlex/pointman
+ name = "ERT - Syndicate Gorlex Loyalist Pointman"
+
+ suit_store = /obj/item/gun/ballistic/shotgun/bulldog
+ belt = /obj/item/storage/belt/security/webbing/bulldog
+
+/datum/outfit/centcom/ert/syndicate/gorlex/medic
+ name = "ERT - Syndicate Gorlex Loyalist Medic"
+
+ head = /obj/item/clothing/head/soft/black
+ mask = null
+ suit = /obj/item/clothing/suit/armor/vest/alt
+ belt = /obj/item/storage/belt/medical/webbing/paramedic
+ glasses = /obj/item/clothing/glasses/hud/health/sunglasses
+ gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil
+ suit_store = /obj/item/gun/ballistic/automatic/pistol
+
+ l_pocket = /obj/item/radio
+
+ backpack_contents = list(/obj/item/ammo_box/magazine/m10mm=2, /obj/item/storage/firstaid/medical=1, /obj/item/defibrillator/compact/combat/loaded=1)
+
+ id_role = "Medic"
+
+/datum/outfit/centcom/ert/syndicate/gorlex/sniper
+ name = "ERT - Syndicate Gorlex Loyalist Sniper"
+
+ head = /obj/item/clothing/head/beret/black
+ back = /obj/item/storage/backpack/messenger/sec
+ glasses = /obj/item/clothing/glasses/night
+ gloves = /obj/item/clothing/gloves/fingerless
+ suit = /obj/item/clothing/suit/armor/vest
+ belt = /obj/item/storage/belt/security
+ suit_store = /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate
+
+ r_pocket = /obj/item/kitchen/knife/combat/survival
+ l_pocket = /obj/item/binoculars
+
+ backpack_contents = list(/obj/item/ammo_box/magazine/sniper_rounds=2, /obj/item/radio=1)
+
+ id_role = "Marksman"
+
+/datum/outfit/centcom/ert/syndicate/gorlex/leader
+ name = "ERT - Syndicate Gorlex Loyalist Sergeant"
+
+ uniform = /obj/item/clothing/under/syndicate/gorlex
+ head = /obj/item/clothing/head/HoS/beret/syndicate
+ back = /obj/item/storage/backpack/satchel/sec
+ mask = /obj/item/clothing/mask/gas/sechailer
+ glasses = /obj/item/clothing/glasses/hud/security/night
+ gloves = /obj/item/clothing/gloves/tackler/combat
+
+ l_pocket = /obj/item/megaphone/sec
+
+ id_role = "Sergeant"
+
+// commandos
+
+/datum/outfit/centcom/ert/syndicate/cybersun
+ name = "ERT - Syndicate Cybersun Commando"
+
+ head = null
+ uniform = /obj/item/clothing/under/syndicate/combat
+ belt = /obj/item/storage/belt/military/c20r
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/cybersun
+ suit_store = /obj/item/gun/ballistic/automatic/smg/c20r
+ ears = /obj/item/radio/headset/syndicate/alt
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+
+ implants = list(/obj/item/implant/adrenalin)
+ backpack_contents = list(/obj/item/autosurgeon/syndicate/laser_arm, /obj/item/ammo_box/magazine/m10mm=2, /obj/item/radio=1)
+
+ id_role = "Operative"
+
+/datum/outfit/centcom/ert/syndicate/cybersun/leader
+ name = "ERT - Syndicate Cybersun Commando Leader"
+
+ ears = /obj/item/radio/headset/syndicate/alt/captain
+ glasses = /obj/item/clothing/glasses/hud/security/night
+
+ backpack_contents = list(/obj/item/autosurgeon/syndicate/laser_arm=1, /obj/item/ammo_box/magazine/m10mm=2, /obj/item/antag_spawner/nuke_ops/borg_tele/medical/unlocked=1, /obj/item/radio=1)
+
+ id_role = "Lead Operative"
+
+// paramedics
+
+/datum/outfit/centcom/ert/syndicate/cybersun/medic
+ name = "ERT - Syndicate Cybersun Paramedic"
+
+ uniform = /obj/item/clothing/under/syndicate/medic
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed
+ suit_store = /obj/item/tank/internals/oxygen
+ mask = /obj/item/clothing/mask/breath/medical
+ glasses = /obj/item/clothing/glasses/hud/health/night
+ gloves = /obj/item/clothing/gloves/color/latex/nitrile
+ head = /obj/item/clothing/head/soft/cybersun/medical
+ belt = /obj/item/storage/belt/medical/webbing/paramedic
+ back = /obj/item/storage/backpack/ert/medical
+ l_pocket = /obj/item/kitchen/knife/combat/survival
+ r_pocket = /obj/item/pinpointer/crew
+ accessory = /obj/item/clothing/accessory/holster/marine
+
+ backpack_contents = list(/obj/item/storage/firstaid/tactical=1, /obj/item/holosign_creator/medical=1, /obj/item/radio=1)
+
+ id_role = "Medical Technician"
+
+/datum/outfit/centcom/ert/syndicate/cybersun/medic/leader
+ name = "ERT - Syndicate Cybersun Lead Paramedic"
+
+ head = /obj/item/clothing/head/beret/cmo
+ glasses = /obj/item/clothing/glasses/hud/security/night
+ ears = /obj/item/radio/headset/syndicate/captain
+ r_pocket = /obj/item/megaphone/command
+
+ backpack_contents = list(/obj/item/storage/firstaid/tactical=1, /obj/item/holosign_creator/medical=1, /obj/item/autosurgeon/cmo=1, /obj/item/radio=1, /obj/item/antag_spawner/nuke_ops/borg_tele/medical/unlocked=1)
+
+ id_role = "Lead Medical Technician"
diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm
index 37b548a0ab72..588a8f1600de 100644
--- a/code/modules/clothing/suits/wintercoats.dm
+++ b/code/modules/clothing/suits/wintercoats.dm
@@ -3,18 +3,28 @@
/obj/item/clothing/suit/hooded/wintercoat
name = "winter coat"
desc = "A heavy jacket made from 'synthetic' animal furs."
+ icon = 'icons/obj/clothing/suits/wintercoat.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/suits/wintercoat.dmi'
icon_state = "coatwinter"
item_state = "coatwinter"
body_parts_covered = CHEST|GROIN|ARMS
cold_protection = CHEST|GROIN|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
+ allowed = list( /obj/item/flashlight,
+ /obj/item/tank/internals/emergency_oxygen,
+ /obj/item/tank/internals/plasmaman,
+ /obj/item/toy,
+ /obj/item/storage/fancy/cigarettes,
+ /obj/item/lighter,
+ )
/obj/item/clothing/head/hooded/winterhood
name = "winter hood"
desc = "A hood attached to a heavy winter jacket."
- icon_state = "winterhood"
+ icon = 'icons/obj/clothing/head/winterhood.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/head/winterhood.dmi'
+ icon_state = "hood_winter"
body_parts_covered = HEAD
cold_protection = HEAD
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
@@ -33,7 +43,7 @@
allowed = GLOB.security_wintercoat_allowed
/obj/item/clothing/head/hooded/winterhood/captain
- icon_state = "winterhood_captain"
+ icon_state = "hood_captain"
armor = list("melee" = 25, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 50)
/obj/item/clothing/suit/hooded/wintercoat/security
@@ -48,7 +58,7 @@
allowed = GLOB.security_wintercoat_allowed
/obj/item/clothing/head/hooded/winterhood/security
- icon_state = "winterhood_security"
+ icon_state = "hood_security"
armor = list("melee" = 25, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 45)
/obj/item/clothing/suit/hooded/wintercoat/medical
@@ -60,7 +70,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/medical
/obj/item/clothing/head/hooded/winterhood/medical
- icon_state = "winterhood_medical"
+ icon_state = "hood_medical"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 0, "acid" = 45)
/obj/item/clothing/suit/hooded/wintercoat/medical/paramedic
@@ -70,7 +80,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/medical/paramedic
/obj/item/clothing/head/hooded/winterhood/medical/paramedic
- icon_state = "winterhood_paramedic"
+ icon_state = "hood_paramedic"
/obj/item/clothing/suit/hooded/wintercoat/science
name = "science winter coat"
@@ -81,7 +91,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/science
/obj/item/clothing/head/hooded/winterhood/science
- icon_state = "winterhood_science"
+ icon_state = "hood_science"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
/obj/item/clothing/suit/hooded/wintercoat/engineering
@@ -93,7 +103,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/engineering
/obj/item/clothing/head/hooded/winterhood/engineering
- icon_state = "winterhood_engineer"
+ icon_state = "hood_engineer"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 20, "fire" = 30, "acid" = 45)
/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos
@@ -103,7 +113,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/engineering/atmos
/obj/item/clothing/head/hooded/winterhood/engineering/atmos
- icon_state = "winterhood_atmos"
+ icon_state = "hood_atmos"
/obj/item/clothing/suit/hooded/wintercoat/hydro
name = "hydroponics winter coat"
@@ -113,7 +123,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/hydro
/obj/item/clothing/head/hooded/winterhood/hydro
- icon_state = "winterhood_hydro"
+ icon_state = "hood_hydro"
/obj/item/clothing/suit/hooded/wintercoat/cargo
name = "cargo winter coat"
@@ -122,7 +132,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/cargo
/obj/item/clothing/head/hooded/winterhood/cargo
- icon_state = "winterhood_cargo"
+ icon_state = "hood_cargo"
/obj/item/clothing/suit/hooded/wintercoat/miner
name = "mining winter coat"
@@ -133,7 +143,7 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/miner
/obj/item/clothing/head/hooded/winterhood/miner
- icon_state = "winterhood_miner"
+ icon_state = "hood_miner"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
// Inteq
@@ -147,28 +157,24 @@
supports_variations = KEPORI_VARIATION
/obj/item/clothing/head/hooded/winterhood/security/inteq
- icon_state = "winterhood_inteq"
+ icon_state = "hood_inteq"
supports_variations = KEPORI_VARIATION
-/obj/item/clothing/suit/hooded/coat/inteq
+/obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt
name = "inteq hooded coat"
desc = "A hooded coat with a fur trim around the hood, comfy! It has a small 'IRMG' embroidered onto the shoulder."
- icon_state = "hoodieinteq"
- item_state = "hoodieinteq"
+ icon_state = "coatinteq_alt"
+ item_state = "coatinteq_alt"
armor = list("melee" = 25, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 45)
- hoodtype = /obj/item/clothing/head/hooded/coat/inteq
+ hoodtype = /obj/item/clothing/head/hooded/winterhood/security/inteq/alt
-/obj/item/clothing/head/hooded/coat/inteq
+/obj/item/clothing/head/hooded/winterhood/security/inteq/alt
name = "inteq hood"
desc = "A comfortable looking brown hood."
- icon_state = "hoodinteq"
- item_state = "hoodinteq"
+ icon_state = "hood_inteq_alt"
+ item_state = "hood_inteq_alt"
armor = list("melee" = 25, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 45)
-/obj/item/clothing/suit/hooded/coat/inteq/Initialize()
- . = ..()
- allowed = GLOB.security_wintercoat_allowed
-
// CentCom
/obj/item/clothing/suit/hooded/wintercoat/centcom
name = "centcom winter coat"
@@ -183,7 +189,7 @@
allowed += GLOB.security_wintercoat_allowed
/obj/item/clothing/head/hooded/winterhood/centcom
- icon_state = "winterhood_centcom"
+ icon_state = "hood_centcom"
armor = list("melee" = 35, "bullet" = 40, "laser" = 40, "energy" = 50, "bomb" = 35, "bio" = 10, "rad" = 10, "fire" = 10, "acid" = 60)
// SolGov
@@ -197,5 +203,5 @@
hoodtype = /obj/item/clothing/head/hooded/winterhood/solgov
/obj/item/clothing/head/hooded/winterhood/solgov
- icon_state = "winterhood_solgov"
+ icon_state = "hood_solgov"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 20, "fire" = 30, "acid" = 45)
diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index a05f580781e2..01ed8b5a082a 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -89,6 +89,7 @@
name = "red polo and khaki pants"
desc = "A non-descript and slightly suspicious looking polo paired with a respectable yet also suspicious pair of khaki pants."
icon_state = "jake"
+ can_adjust = FALSE
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
alt_covers_chest = TRUE
@@ -96,6 +97,7 @@
name = "syndicate officer uniform"
desc = "A black uniform worn by officers of many branches of the Syndicate."
icon_state = "officer"
+ can_adjust = FALSE
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
alt_covers_chest = TRUE
@@ -103,6 +105,7 @@
name = "ACLF uniform"
desc = "A button-up in a tasteful shade of gray with red pants, used as the uniform of the Anti-Corporate Liberation front on the rim."
icon_state = "aclfgrunt"
+ can_adjust = FALSE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
alt_covers_chest = TRUE
@@ -110,6 +113,7 @@
name = "Gorlex Marauder uniform"
desc = "Originally worn by the miners of the Gorlex VII colony, it is now donned by veteran Gorlex Marauders."
icon_state = "gorlex"
+ can_adjust = FALSE
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
alt_covers_chest = TRUE
supports_variations = DIGITIGRADE_VARIATION | KEPORI_VARIATION
@@ -118,6 +122,7 @@
name = "cybersun jumpsuit"
desc = "The standard jumpsuit used by the agents employed by Cybersun, in its distinctive half-black-half-white aesthetic."
icon_state = "cybersun_agent"
+ can_adjust = FALSE
alt_covers_chest = TRUE
/obj/item/clothing/under/syndicate/cybersun/research
@@ -155,6 +160,7 @@
name = "Donk! Co. employee uniform"
desc = "The standard employee uniform of Donk Co. Smells like minimum wage."
icon_state = "donk_cargo"
+ can_adjust = FALSE
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
body_parts_covered = CHEST|GROIN|ARMS
alt_covers_chest = TRUE
@@ -181,6 +187,7 @@
name = "GEC engineer jumpsuit"
desc = "A jumpsuit worn by GEC engineers. This one is worn by low ranking engineers."
icon_state = "gec_engineer"
+ can_adjust = FALSE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 60, "acid" = 20)
resistance_flags = NONE
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index 465b7939c0b7..c4daa88869a7 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -304,6 +304,9 @@
reagent_flags = OPENCONTAINER
custom_materials = list(/datum/material/glass = 500)
w_class = WEIGHT_CLASS_NORMAL
+ fill_icon = 'icons/obj/food/soupsalad.dmi'
+ fill_icon_state = "fullbowl"
+ fill_icon_thresholds = list(1)
/obj/item/reagent_containers/glass/bowl/attackby(obj/item/I,mob/user, params)
if(istype(I, /obj/item/reagent_containers/food/snacks))
@@ -323,22 +326,6 @@
. = ..()
return
-/obj/item/reagent_containers/glass/bowl/on_reagent_change(changetype)
- ..()
- update_appearance()
-
-/obj/item/reagent_containers/glass/bowl/update_icon_state()
- if(!reagents || !reagents.total_volume)
- icon_state = "bowl"
- return ..()
-
-/obj/item/reagent_containers/glass/bowl/update_overlays()
- . = ..()
- if(reagents && reagents.total_volume)
- var/mutable_appearance/filling = mutable_appearance('icons/obj/food/soupsalad.dmi', "fullbowl")
- filling.color = mix_color_from_reagents(reagents.reagent_list)
- . += filling
-
#undef INGREDIENTS_FILL
#undef INGREDIENTS_SCATTER
#undef INGREDIENTS_STACK
diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm
index b098e79dadac..8035212c27c6 100644
--- a/code/modules/jobs/job_types/assistant.dm
+++ b/code/modules/jobs/job_types/assistant.dm
@@ -64,7 +64,7 @@ Assistant
uniform = /obj/item/clothing/under/color/white
accessory = /obj/item/clothing/accessory/armband/science
-/datum/outfit/job/assistant/engineeringspecialist
+/datum/outfit/job/assistant/deckhand
name = "Assistant (Deckhand)"
accessory = /obj/item/clothing/accessory/armband/cargo
diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm
index 3fe484c56986..16a42b26211c 100644
--- a/code/modules/jobs/job_types/security_officer.dm
+++ b/code/modules/jobs/job_types/security_officer.dm
@@ -164,7 +164,7 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S
name = "Minuteman (Colonial Minutemen) (Armed)"
suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
- belt = /obj/item/storage/belt/military/minutemen/loaded
+ belt = /obj/item/storage/belt/military/minutemen/p16
/datum/outfit/job/security/minutemen/mechpilot
name = "Mech Pilot (Colonial Minutemen)"
diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm
index f16d6119d147..7be829dbe619 100644
--- a/code/modules/jobs/job_types/warden.dm
+++ b/code/modules/jobs/job_types/warden.dm
@@ -78,7 +78,7 @@
name = "Field Commander (Colonial Minutemen) (Armed)"
suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
- belt = /obj/item/storage/belt/military/minutemen/loaded
+ belt = /obj/item/storage/belt/military/minutemen/p16
backpack_contents = list(/obj/item/melee/classic_baton=1, /obj/item/gun/ballistic/automatic/pistol/commander=1, /obj/item/restraints/handcuffs=1, /obj/item/gun/energy/e_gun/advtaser=1)
diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm
index cc90920f96a7..0bade04d3fe8 100644
--- a/code/modules/mining/lavaland/ash_flora.dm
+++ b/code/modules/mining/lavaland/ash_flora.dm
@@ -458,18 +458,7 @@
desc = "A bowl made out of mushrooms. Not food, though it might have contained some at some point."
icon = 'icons/obj/lavaland/ash_flora.dmi'
icon_state = "mushroom_bowl"
-
-/obj/item/reagent_containers/glass/bowl/mushroom_bowl/update_overlays()
- . = ..()
- if(reagents && reagents.total_volume)
- var/mutable_appearance/filling = mutable_appearance('icons/obj/lavaland/ash_flora.dmi', "fullbowl")
- filling.color = mix_color_from_reagents(reagents.reagent_list)
- . += filling
-
-/obj/item/reagent_containers/glass/bowl/mushroom_bowl/update_icon_state()
- if(!reagents || !reagents.total_volume)
- icon_state = "mushroom_bowl"
- return ..()
+ fill_icon = 'icons/obj/lavaland/ash_flora.dmi'
/obj/item/reagent_containers/glass/bowl/mushroom_bowl/attackby(obj/item/I,mob/user, params)
if(istype(I, /obj/item/reagent_containers/food/snacks))
diff --git a/code/modules/mob/dead/new_player/ship_select.dm b/code/modules/mob/dead/new_player/ship_select.dm
index 88146c9ea0fd..1515aa82f799 100644
--- a/code/modules/mob/dead/new_player/ship_select.dm
+++ b/code/modules/mob/dead/new_player/ship_select.dm
@@ -71,6 +71,9 @@
return
var/datum/map_template/shuttle/template = SSmapping.ship_purchase_list[params["name"]]
+ if(SSovermap.ship_spawning)
+ to_chat(spawnee, "A ship is currently spawning. Try again in a little while.")
+ return
if(!SSovermap.player_ship_spawn_allowed())
to_chat(spawnee, "No more ships may be spawned at this time!")
return
@@ -104,6 +107,10 @@
to_chat(spawnee, "Ship spawned, but you were unable to be spawned. You can likely try to spawn in the ship through joining normally, but if not, please contact an admin.")
spawnee.new_player_panel()
+/datum/ship_select/ui_data(mob/user)
+ . = list()
+ .["shipSpawning"] = SSovermap.ship_spawning
+
/datum/ship_select/ui_static_data(mob/user)
// tracks the number of existing ships of each template type so that their unavailability for purchase can be communicated to the user
var/list/template_num_lookup = list()
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm
index afe97c858cff..c39eaf4ef499 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm
@@ -47,23 +47,23 @@
return L
/datum/sprite_accessory
- var/icon //the icon file the accessory is located in
- var/icon_state //the icon_state of the accessory
- var/name //the preview name of the accessory
- var/gender = NEUTER //Determines if the accessory will be skipped or included in random hair generations
- var/gender_specific //Something that can be worn by either gender, but looks different on each
- var/use_static //determines if the accessory will be skipped by color preferences
- var/color_src = MUTCOLORS //Currently only used by mutantparts so don't worry about hair and stuff. This is the source that this accessory will get its color from. Default is MUTCOLOR, but can also be HAIR, FACEHAIR, EYECOLOR and 0 if none.
- var/secondary_color //Decides if this sprite has a secondary color in use.
- var/locked = FALSE //Is this part locked from roundstart selection? Used for parts that apply effects
- var/center = FALSE //Should we center the sprite?
- var/limbs_id //The limbs id supplied for full-body replacing features.
- var/image_alpha = 255 //The alpha for the accessory to use.
+ var/icon //the icon file the accessory is located in
+ var/icon_state //the icon_state of the accessory
+ var/name //the preview name of the accessory
+ var/gender = NEUTER //Determines if the accessory will be skipped or included in random hair generations
+ var/gender_specific //Something that can be worn by either gender, but looks different on each
+ var/use_static //determines if the accessory will be skipped by color preferences
+ var/color_src = MUTCOLORS //Currently only used by mutantparts so don't worry about hair and stuff. This is the source that this accessory will get its color from. Default is MUTCOLOR, but can also be HAIR, FACEHAIR, EYECOLOR and 0 if none.
+ var/secondary_color //Decides if this sprite has a secondary color in use.
+ var/locked = FALSE //Is this part locked from roundstart selection? Used for parts that apply effects
+ var/center = FALSE //Should we center the sprite?
+ var/limbs_id //The limbs id supplied for full-body replacing features.
+ var/image_alpha = 255 //The alpha for the accessory to use.
var/dimension_x = 32
var/dimension_y = 32
- var/body_zone = BODY_ZONE_CHEST //!The body zone this accessory affects
- var/synthetic_icon_state //!The icon_state to use when the bodypart it's attached to is synthetic
- var/synthetic_color_src //!The color src to use instead of the normal src when synthetic, leave blank to use the normal src
+ var/body_zone = BODY_ZONE_CHEST //The body zone this accessory affects
+ var/synthetic_icon_state //The icon_state to use when the bodypart it's attached to is synthetic
+ var/synthetic_color_src //The color src to use instead of the normal src when synthetic, leave blank to use the normal src
//Squids AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA whyyyy
/datum/sprite_accessory/squid_face
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/lizard.dm b/code/modules/mob/dead/new_player/sprite_accessories/lizard.dm
index ce536a403e48..3309212c4852 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/lizard.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/lizard.dm
@@ -20,68 +20,62 @@
name = "Light Belly"
icon_state = "lbelly"
+/datum/sprite_accessory/body_markings/cracks
+ name = "Cracks"
+ icon_state = "cracks"
+
//Start tails
/datum/sprite_accessory/tails
icon = 'icons/mob/species/lizard/tails.dmi'
body_zone = BODY_ZONE_CHEST
- synthetic_icon_state = "synth"
+ secondary_color = TRUE
/datum/sprite_accessory/tails_animated
icon = 'icons/mob/species/lizard/tails.dmi'
+ secondary_color = TRUE
body_zone = BODY_ZONE_CHEST
/datum/sprite_accessory/tails/lizard/smooth
- name = "Smooth"
+ name = "Smooth (Two color)"
icon_state = "smooth"
/datum/sprite_accessory/tails_animated/lizard/smooth
- name = "Smooth"
+ name = "Smooth (Two color)"
icon_state = "smooth"
-/datum/sprite_accessory/tails/lizard/dtiger
- name = "Dark Tiger"
- icon_state = "dtiger"
+/datum/sprite_accessory/tails/lizard/smooth_onecolor
+ name = "Smooth (One color)"
+ icon_state = "smooth2"
+ secondary_color = FALSE
-/datum/sprite_accessory/tails_animated/lizard/dtiger
- name = "Dark Tiger"
- icon_state = "dtiger"
+/datum/sprite_accessory/tails_animated/lizard/smooth_onecolor
+ name = "Smooth (One color)"
+ icon_state = "smooth2"
-/datum/sprite_accessory/tails/lizard/ltiger
- name = "Light Tiger"
- icon_state = "ltiger"
+/datum/sprite_accessory/tails/lizard/prosthetic
+ name = "Prosthetic"
+ icon_state = "synth"
-/datum/sprite_accessory/tails_animated/lizard/ltiger
- name = "Light Tiger"
- icon_state = "ltiger"
-
-/datum/sprite_accessory/tails/lizard/spikes
- name = "Spikes"
- icon_state = "spikes"
-
-/datum/sprite_accessory/tails_animated/lizard/spikes
- name = "Spikes"
- icon_state = "spikes"
+/datum/sprite_accessory/tails_animated/lizard/prosthetic
+ name = "Prosthetic"
+ icon_state = "synth"
/datum/sprite_accessory/tails/lizard/large
name = "Large"
icon_state = "large"
- synthetic_icon_state = "large" //fight me
/datum/sprite_accessory/tails_animated/lizard/large
name = "Large"
icon_state = "large"
- synthetic_icon_state = "large"
/datum/sprite_accessory/tails/lizard/small
name = "Small"
icon_state = "small"
- synthetic_icon_state = "none"
/datum/sprite_accessory/tails_animated/lizard/small
name = "Small"
icon_state = "small"
- synthetic_icon_state = "none"
//Start Face markings
@@ -107,6 +101,10 @@
name = "Alligator Skink"
icon_state = "eye"
+/datum/sprite_accessory/face_markings/dome
+ name = "Dome"
+ icon_state = "dome"
+
//Start Horns
/datum/sprite_accessory/horns
@@ -164,36 +162,32 @@
/datum/sprite_accessory/frills
icon = 'icons/mob/species/lizard/frills.dmi'
+ secondary_color = TRUE
/datum/sprite_accessory/frills/none
name = "None"
icon_state = "none"
-//Ears are here because having frills+ears would overlap and be weird.
-/datum/sprite_accessory/frills/ears
- name = "Normal ears"
- icon_state = "ears"
- secondary_color = TRUE
-//End ears
-/datum/sprite_accessory/frills/simple
- name = "Simple"
- icon_state = "simple"
-/datum/sprite_accessory/frills/short
- name = "Short"
- icon_state = "short"
+//Ears are here because having frills+ears would overlap and be weird.
/datum/sprite_accessory/frills/aquatic
name = "Aquatic"
icon_state = "aqua"
-/datum/sprite_accessory/frills/frillhawk
- name = "Frillhawk"
- icon_state = "frillhawk"
-
/datum/sprite_accessory/frills/droopy
name = "Droopy"
icon_state = "droopy"
+/datum/sprite_accessory/frills/ears
+ name = "Normal ears"
+ icon_state = "ears"
+
+//End ears
+
+/datum/sprite_accessory/frills/frillhawk
+ name = "Frillhawk"
+ icon_state = "frillhawk"
+
/datum/sprite_accessory/frills/neck
name = "Neck"
icon_state = "neck"
@@ -202,13 +196,21 @@
name = "Frilled Dragon"
icon_state = "neckbig"
+/datum/sprite_accessory/frills/short
+ name = "Short"
+ icon_state = "short"
+
+/datum/sprite_accessory/frills/simple
+ name = "Simple"
+ icon_state = "simple"
+
//Start Spines
/datum/sprite_accessory/spines
- icon = 'icons/mob/species/lizard/tails.dmi'
+ icon = 'icons/mob/species/lizard/spines.dmi'
/datum/sprite_accessory/spines_animated
- icon = 'icons/mob/species/lizard/tails.dmi'
+ icon = 'icons/mob/species/lizard/spines.dmi'
/datum/sprite_accessory/spines/none
name = "None"
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 4473b3156d27..7f8ca668d05b 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -541,7 +541,7 @@
var/counter = 1
while(R.fields[text("com_[]", counter)])
counter++
- R.fields[text("com_[]", counter)] = text("Made by [] on [] [], []
[]", allowed_access, station_time_timestamp(), time2text(world.realtime, "MMM DD"), "504 FS", t1)
+ R.fields[text("com_[]", counter)] = text("Made by [] on [], []
[]", allowed_access, station_time_timestamp(), sector_datestamp(shortened = TRUE), t1)
to_chat(usr, "Successfully added comment.")
return
diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
index e334655b3848..6615edb051f0 100644
--- a/code/modules/mob/living/death.dm
+++ b/code/modules/mob/living/death.dm
@@ -52,7 +52,7 @@
unset_machine()
timeofdeath = world.time
if(ckey)
- GLOB.respawn_timers[client?.ckey] = world.timeofday
+ GLOB.respawn_timers[client?.ckey] = REALTIMEOFDAY
tod = station_time_timestamp()
var/turf/T = get_turf(src)
for(var/obj/item/I in contents)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 2223a1491a6c..daa987904737 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -711,7 +711,7 @@
for (var/obj/machinery/camera/C in lit_cameras)
C.set_light(0)
- lit_cameras = list()
+ lit_cameras = list()
return
@@ -737,9 +737,15 @@
for (var/obj/machinery/camera/C in remove)
lit_cameras -= C //Removed from list before turning off the light so that it doesn't check the AI looking away.
C.Togglelight(0)
+ UnregisterSignal(C, COMSIG_PARENT_QDELETING, PROC_REF(camera_deleted))
for (var/obj/machinery/camera/C in add)
C.Togglelight(1)
lit_cameras |= C
+ RegisterSignal(C, COMSIG_PARENT_QDELETING, PROC_REF(camera_deleted))
+
+/mob/living/silicon/ai/proc/camera_deleted(obj/machinery/camera/camera)
+ SIGNAL_HANDLER
+ lit_cameras -= camera
/mob/living/silicon/ai/proc/control_integrated_radio()
set name = "Transceiver Settings"
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 6e60af7ed244..9af72b034998 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -705,7 +705,7 @@
log_game("[key_name(usr)] AM failed due to disconnect.")
if(GLOB.respawn_timers[usrkey] && !admin_bypass)
- var/time_left = GLOB.respawn_timers[usrkey] + respawn_timer - world.timeofday
+ var/time_left = GLOB.respawn_timers[usrkey] + respawn_timer - REALTIMEOFDAY
if(time_left > 0)
to_chat(usr, "You still have [DisplayTimeText(time_left)] left before you can respawn.")
return
diff --git a/code/modules/overmap/objects/dynamic_datum.dm b/code/modules/overmap/objects/dynamic_datum.dm
index 82b77b513469..69591c71dc8e 100644
--- a/code/modules/overmap/objects/dynamic_datum.dm
+++ b/code/modules/overmap/objects/dynamic_datum.dm
@@ -90,7 +90,7 @@
if(planet_name)
for(var/mob/Mob as anything in GLOB.player_list)
if(dock_requester.shuttle_port.is_in_shuttle_bounds(Mob))
- Mob.play_screen_text("[planet_name]
[station_time_timestamp_fancy("hh:mm")]")
+ Mob.play_screen_text("[planet_name]
[station_time_timestamp("hh:mm")]")
playsound(Mob, landing_sound, 50)
diff --git a/code/modules/overmap/objects/outpost/outpost.dm b/code/modules/overmap/objects/outpost/outpost.dm
index 2d493a12b64a..158827693335 100644
--- a/code/modules/overmap/objects/outpost/outpost.dm
+++ b/code/modules/overmap/objects/outpost/outpost.dm
@@ -217,7 +217,7 @@
/datum/overmap/outpost/post_docked(datum/overmap/ship/controlled/dock_requester)
for(var/mob/M as anything in GLOB.player_list)
if(dock_requester.shuttle_port.is_in_shuttle_bounds(M))
- M.play_screen_text("[name]
[station_time_timestamp_fancy("hh:mm")]")
+ M.play_screen_text("[name]
[station_time_timestamp("hh:mm")]")
// Instance the virtual speaker for use in radio messages. It needs an atom to trace things back to; we use the token.
// You might think "but wait, can't we just keep one speaker around instead of instancing it for each fucking radio message?"
diff --git a/code/modules/overmap/ships/controlled_ship_datum.dm b/code/modules/overmap/ships/controlled_ship_datum.dm
index 4397919593aa..da35c3b9df9c 100644
--- a/code/modules/overmap/ships/controlled_ship_datum.dm
+++ b/code/modules/overmap/ships/controlled_ship_datum.dm
@@ -116,6 +116,7 @@
. = ..()
SSovermap.controlled_ships -= src
helms.Cut()
+ QDEL_LIST(missions)
LAZYCLEARLIST(owner_candidates)
if(!QDELETED(shuttle_port))
shuttle_port.current_ship = null
diff --git a/code/modules/overmap/ships/owner_action.dm b/code/modules/overmap/ships/owner_action.dm
index 515db9b5f470..04169054b2e6 100644
--- a/code/modules/overmap/ships/owner_action.dm
+++ b/code/modules/overmap/ships/owner_action.dm
@@ -134,7 +134,7 @@
if("memo")
var/memo_result = sanitize(stripped_multiline_input(
- user, "Enter a message for prospective players joining your ship. Playstyle and RP level information is encouraged.",
+ user, "Enter a message for prospective players joining your ship. This information could include your goals for the outing, or details about the way your ship may play.",
"Ship Memo", parent_ship.memo
))
// stripped_multiline_input returns an empty string if people press Cancel, but
diff --git a/code/modules/paperwork/fax_manager.dm b/code/modules/paperwork/fax_manager.dm
index bde646712b96..0107e440bec2 100644
--- a/code/modules/paperwork/fax_manager.dm
+++ b/code/modules/paperwork/fax_manager.dm
@@ -121,7 +121,7 @@ GLOBAL_DATUM_INIT(fax_manager, /datum/fax_manager, new)
var/list/request = list()
var/obj/item/paper/request/message = new()
request["id_message"] = requests.len
- request["time"] = gameTimestamp()
+ request["time"] = game_timestamp()
request["sender"] = sender
request["sender_fax_id"] = sender_fax.fax_id
request["sender_fax_name"] = sender_fax.fax_name
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index ec83de125baa..03bb1651fd70 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -303,7 +303,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
if(auto_name)
name = "\improper [get_area_name(area, TRUE)] APC"
- update_icon()
+ update_appearance()
make_terminal()
@@ -342,12 +342,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
if(!cell) //it always peeved me that abandoned ships always had the apc lights on. this should fix it
icon_update_needed = FALSE
set_light(0)
- return
- if(cell.charge <= 0)
+ else if(cell.charge <= 0)
icon_update_needed = FALSE
set_light(0)
- return
//this may need to be moved up!!
. = ..()
// And now, separately for cleanness, the lighting changing
@@ -360,12 +358,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
if(APC_FULLY_CHARGED)
set_light_color(LIGHT_COLOR_GREEN)
set_light(lon_range)
- return
- if(update_state & UPSTATE_BLUESCREEN)
+ else if(update_state & UPSTATE_BLUESCREEN)
set_light_color(LIGHT_COLOR_BLUE)
set_light(lon_range)
- return
/obj/machinery/power/apc/update_icon_state()
if(!update_state)
@@ -501,7 +497,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
else if (opened!=APC_COVER_REMOVED)
opened = APC_COVER_CLOSED
coverlocked = TRUE //closing cover relocks it
- update_icon()
+ update_appearance()
return
else if (!(machine_stat & BROKEN))
if(coverlocked && !(machine_stat & MAINT)) // locked...
@@ -512,7 +508,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
return
else
opened = APC_COVER_OPENED
- update_icon()
+ update_appearance()
return
/obj/machinery/power/apc/screwdriver_act(mob/living/user, obj/item/W)
@@ -524,10 +520,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
user.visible_message("[user] removes \the [cell] from [src]!", "You remove \the [cell].")
var/turf/T = get_turf(user)
cell.forceMove(T)
- cell.update_icon()
+ cell.update_appearance()
cell = null
charging = APC_NOT_CHARGING
- update_icon()
+ update_appearance()
return
else
switch (has_electronics)
@@ -544,14 +540,14 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
else
to_chat(user, "There is nothing to secure!")
return
- update_icon()
+ update_appearance()
else if(obj_flags & EMAGGED)
to_chat(user, "The interface is broken!")
return
else
panel_open = !panel_open
to_chat(user, "The wires have been [panel_open ? "exposed" : "unexposed"].")
- update_icon()
+ update_appearance()
/obj/machinery/power/apc/wirecutter_act(mob/living/user, obj/item/W)
. = ..()
@@ -599,7 +595,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
user.visible_message("[user.name] inserts the power cell to [src.name]!",\
"You insert the power cell.")
chargecount = 0
- update_icon()
+ update_appearance()
else if (W.GetID())
togglelock(user)
else if (istype(W, /obj/item/stack/cable_coil) && opened)
@@ -677,7 +673,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
chargecount = 0
user.visible_message("[user] fabricates a weak power cell and places it into [src].", \
"Your [P.name] whirrs with strain as you create a weak power cell and place it into [src]!")
- update_icon()
+ update_appearance()
else
to_chat(user, "[src] has both electronics and a cell.")
return
@@ -692,7 +688,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
to_chat(user, "You replace missing APC's cover.")
qdel(W)
opened = APC_COVER_OPENED
- update_icon()
+ update_appearance()
return
if (has_electronics)
to_chat(user, "You cannot repair this APC until you remove the electronics still inside!")
@@ -706,7 +702,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
obj_integrity = max_integrity
if (opened==APC_COVER_REMOVED)
opened = APC_COVER_OPENED
- update_icon()
+ update_appearance()
else if(istype(W, /obj/item/apc_powercord))
return //because we put our fancy code in the right places, and this is all in the powercord's afterattack()
@@ -754,7 +750,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
chargecount = 0
user.visible_message("[user] fabricates a weak power cell and places it into [src].", \
"Your [the_rcd.name] whirrs with strain as you create a weak power cell and place it into [src]!")
- update_icon()
+ update_appearance()
return TRUE
else
to_chat(user, "[src] has both electronics and a cell.")
@@ -781,7 +777,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
if(allowed(usr) && !wires.is_cut(WIRE_IDSCAN) && !malfhack)
locked = !locked
to_chat(user, "You [ locked ? "lock" : "unlock"] the APC interface.")
- update_icon()
+ update_appearance()
updateUsrDialog()
else
to_chat(user, "Access denied.")
@@ -811,7 +807,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
opened = APC_COVER_REMOVED
coverlocked = FALSE
visible_message("The APC cover is knocked down!")
- update_icon()
+ update_appearance()
/obj/machinery/power/apc/emag_act(mob/user)
if(!(obj_flags & EMAGGED) && !malfhack)
@@ -827,7 +823,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
obj_flags |= EMAGGED
locked = FALSE
to_chat(user, "You emag the APC interface.")
- update_icon()
+ update_appearance()
// attack with hand - remove cell (if cover open) or interact with the APC
@@ -890,10 +886,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
if(cell)
user.visible_message("[user] removes \the [cell] from [src]!", "You remove \the [cell].")
user.put_in_hands(cell)
- cell.update_icon()
+ cell.update_appearance()
src.cell = null
charging = APC_NOT_CHARGING
- src.update_icon()
+ src.update_appearance()
return
if((machine_stat & MAINT) && !opened) //no board; no interface
return
@@ -1027,7 +1023,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
to_chat(usr, "The APC does not respond to the command!")
else
locked = !locked
- update_icon()
+ update_appearance()
. = TRUE
if("cover")
coverlocked = !coverlocked
@@ -1042,20 +1038,20 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
chargemode = !chargemode
if(!chargemode)
charging = APC_NOT_CHARGING
- update_icon()
+ update_appearance()
. = TRUE
if("channel")
if(params["eqp"])
equipment = setsubsystem(text2num(params["eqp"]))
- update_icon()
+ update_appearance()
update()
else if(params["lgt"])
lighting = setsubsystem(text2num(params["lgt"]))
- update_icon()
+ update_appearance()
update()
else if(params["env"])
environ = setsubsystem(text2num(params["env"]))
- update_icon()
+ update_appearance()
update()
. = TRUE
if("overload")
@@ -1076,7 +1072,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
malfhidehack(usr) //EndWS Edit - Malf AI Rework
if("reboot")
failure_timer = 0
- update_icon()
+ update_appearance()
update()
if("emergency_lighting")
emergency_lights = !emergency_lights
@@ -1094,7 +1090,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
add_hiddenprint(user)
log_game("[key_name(user)] turned [operating ? "on" : "off"] the [src] in [AREACOORD(src)]")
update()
- update_icon()
+ update_appearance()
/obj/machinery/power/apc/proc/malfhack(mob/living/silicon/ai/malf)
if(!istype(malf))
@@ -1136,7 +1132,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
A.target = src
malfhackhide = 1
- update_icon()
+ update_appearance()
/obj/machinery/power/apc/proc/malfunhidehack(mob/living/silicon/ai/malf)
if(src.machine_stat & BROKEN)
diff --git a/code/modules/projectiles/guns/ballistic/smg.dm b/code/modules/projectiles/guns/ballistic/smg.dm
index ab7c683ec423..7efd0a579925 100644
--- a/code/modules/projectiles/guns/ballistic/smg.dm
+++ b/code/modules/projectiles/guns/ballistic/smg.dm
@@ -261,6 +261,9 @@
. = ..()
AddComponent(/datum/component/automatic_fire, 0.15 SECONDS)
+/obj/item/gun/ballistic/automatic/smg/cm5/no_mag
+ spawnwithmagazine = FALSE
+
/obj/item/gun/ballistic/automatic/smg/aks74u
name = "\improper AKS-74U"
desc = "A pre-FTL era carbine, known to be incredibly cheap. Its extreme fire rate make it perfect for bandits, pirates and colonists on a budget."
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 735b232a6cd7..55fdd7ec0e0c 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -138,6 +138,8 @@
reagents.remove_reagent(reag.type, reag.volume * frac)
/obj/item/reagent_containers/AltClick(mob/user)
+ if(!can_interact(user))
+ return
. = ..()
if(can_have_cap)
if(cap_lost)
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index cc12fe0c638f..d4bfa21201be 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -62,6 +62,8 @@
#define TEST_OUTPUT_GREEN(text) (text)
#endif
+#ifdef BASIC_TESTS
+
#include "anchored_mobs.dm"
#include "autowiki.dm"
#include "bespoke_id.dm"
@@ -69,7 +71,6 @@
#include "combat.dm"
#include "component_tests.dm"
#include "connect_loc.dm"
-#include "create_and_destroy.dm"
#include "biome_lists.dm"
#include "emoting.dm"
#include "keybinding_init.dm"
@@ -78,7 +79,6 @@
#include "outfit_sanity.dm"
#include "overmap.dm"
#include "pills.dm"
-#include "planet_gen.dm"
#include "plantgrowth_tests.dm"
#include "projectiles.dm"
#include "quick_swap_sanity.dm"
@@ -90,10 +90,8 @@
#include "reagent_names.dm"
#include "reagent_recipe_collisions.dm"
#include "resist.dm"
-#include "ruin_placement.dm"
#include "say.dm"
#include "serving_tray.dm"
-#include "ship_outpost_placement.dm"
#include "spawn_humans.dm"
#include "species_unique_id.dm"
#include "species_whitelists.dm"
@@ -103,12 +101,31 @@
#include "supply_pack.dm"
#include "teleporters.dm"
#include "timer_sanity.dm"
-#include "unit_test.dm"
#ifdef REFERENCE_TRACKING_DEBUG //Don't try and parse this file if ref tracking isn't turned on. IE: don't parse ref tracking please mr linter
#include "find_reference_sanity.dm"
#endif
+#endif //BASIC_TESTS
+
+#ifdef CREATE_AND_DESTROY_TEST
+#include "create_and_destroy.dm"
+#endif //CREATE_AND_DESTROY_TEST
+
+#ifdef PLANET_GEN_TEST
+#include "planet_gen.dm"
+#endif //PLANET_GEN
+
+#ifdef RUIN_PLACEMENT_TEST
+#include "ruin_placement.dm"
+#endif //RUIN_PLACEMENT_TEST
+
+#ifdef SHIP_PLACEMENT_TEST
+#include "ship_outpost_placement.dm"
+#endif //SHIP_PLACEMENT_TEST
+
+#include "unit_test.dm"
+
#undef TEST_ASSERT
#undef TEST_ASSERT_EQUAL
#undef TEST_ASSERT_NOTEQUAL
diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm
index 6dee79d6e69a..8d6acea28452 100644
--- a/code/modules/vehicles/scooter.dm
+++ b/code/modules/vehicles/scooter.dm
@@ -76,7 +76,7 @@
/obj/vehicle/ridden/scooter/skateboard/Destroy()
if(sparks)
QDEL_NULL(sparks)
- . = ..()
+ return ..()
/obj/vehicle/ridden/scooter/skateboard/relaymove(mob/living/user, direction)
if (grinding || world.time < next_crash)
diff --git a/config/config.txt b/config/config.txt
index 0cdece6b6a16..7a579123028b 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -257,8 +257,8 @@ CHECK_RANDOMIZER
## Don't set this to the same server, BYOND will automatically restart players to the server when it has restarted.
# SERVER ss13.example.com:2506
-## forum address
-# FORUMURL https://shiptest.net/discord
+## Lore address
+# LOREURL https://shiptest.net/wiki/Lore_Primer
## Wiki address
# WIKIURL https://shiptest.net/wiki/
diff --git a/html/changelogs/AutoChangeLog-pr-2432.yml b/html/changelogs/AutoChangeLog-pr-2432.yml
deleted file mode 100644
index 9b162c910470..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2432.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: thgvr
-changes:
- - {balance: 'Goliaths no longer stun you, instead they apply a bear-trap like mass
- of tentacles that slows you. Resist to break them off.'}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2576.yml b/html/changelogs/AutoChangeLog-pr-2576.yml
deleted file mode 100644
index abd7b06d284e..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2576.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: MarkSuckerberg
-changes:
- - {tweak: Combining eyepatches should now try to put the result into your hands
- afterwards}
-delete-after: true
diff --git a/html/changelogs/archive/2023-12.yml b/html/changelogs/archive/2023-12.yml
index 6328cce0853b..11069def2978 100644
--- a/html/changelogs/archive/2023-12.yml
+++ b/html/changelogs/archive/2023-12.yml
@@ -33,3 +33,84 @@
- bugfix: Small playtime-based ship join restriction edge cases fixed.
- bugfix: Ship-spawn unit tests have been fixed and expanded.
- bugfix: fixes planetary outposts from having space underneath all the turfs
+2023-12-09:
+ Halcyon:
+ - rscadd: Winter coats have a new coat of paint.
+ MarkSuckerberg:
+ - tweak: Combining eyepatches should now try to put the result into your hands afterwards
+ thgvr:
+ - balance: Goliaths no longer stun you, instead they apply a bear-trap like mass
+ of tentacles that slows you. Resist to break them off.
+2023-12-10:
+ thgvr:
+ - tweak: Multiple Riggs-classes cannot be spawned by players anymore
+2023-12-11:
+ thgvr:
+ - rscadd: Votes have a new look and new sound.
+2023-12-12:
+ JimKil3:
+ - bugfix: Removed a duplicate air alarm in the Kansatsu-class Exploration Vessel
+ MarkSuckerberg:
+ - bugfix: Only one ship can spawn at a time.
+ - tweak: Adjusts spacing of the top-right BYOND window buttons
+ - rscadd: Adds a lore button to the top-right
+ SomeguyManperson:
+ - bugfix: you can no longer fold most syndicate undersuits casually into the letters
+ "SUIT"
+ thgvr:
+ - rscadd: Another Sarathi head marking, "Dome"
+ - rscadd: Sarathi frills now use secondary colors.
+ - rscadd: Sarathi tails now use secondary colors.
+ - rscadd: Added "Cracks" body marking for Sarathi
+ - rscdel: Removed dark tiger, light tiger, and spike Sarathi tails.
+2023-12-13:
+ MarkSuckerberg:
+ - tweak: Round end now shows the ship you spawned on when possible instead of just
+ the sector name
+ - tweak: Slightly moves around the statpanel info to emphasise LST
+ - bugfix: Round time should no longer act strange when midnight passes
+ - bugfix: Respawns should no longer be delayed 24h when done over midnight
+ Zonespace27, Ryll-Ryll, MeeMOfCourse:
+ - tweak: Admins can now spawn an unarmed horde of interns in addition to the old
+ armed horde
+ - tweak: Admins can toggle name randomization for ERT's, as well as if they'd like
+ to be spawned in the briefing room at the time of creation
+ - tweak: Admins can now force ERT's to pick the leader role from the most experienced
+ candidates in terms of playtime
+ - tweak: Menus like Create Response Team and Create Portal Storm now toggle boolean
+ options when clicked, rather than open a popup window to select one of the two
+ options
+ - refactor: Centcom Officials are now a full subtype of ERT, rather than being a
+ separate antagonist type with duplicated functionality
+ - admin: ERTs can now have a custom shuttle that they can spawn on, on a toggle
+ while creating said ERT.
+ - admin: Shiptest-Specific ERTs, and respective files.
+2023-12-17:
+ Immortalartisan:
+ - rscadd: A new sandworld ruin based on deprecated ship pubby
+ unit0016:
+ - rscadd: A new icemoon ruin has been added, should you be in need of service department
+ goodies.
+2023-12-19:
+ SomeguyManperson:
+ - bugfix: AB+ blood is no longer incompatible with + bloodtypes
+ - bugfix: obliterated a floating white pixel on the cleaning skillcape
+ - bugfix: skillcapes are no longer missing a pixel on their left side of the front
+2023-12-21:
+ FalloutFalcon:
+ - bugfix: Material tile sprites
+2023-12-23:
+ FalloutFalcon:
+ - bugfix: Fixes two assistant outfits having the same path
+ GenericDM:
+ - bugfix: crate shelves no longer have layering issues
+ Skies-Of-Blue:
+ - imageadd: Adds missing iconstates to vox hardhats. Taste the void no longer!
+ SomeguyManperson:
+ - bugfix: the charliestation ruin on ice planets now obeys local gravity
+ - bugfix: science goggles are now more accurate when judging the research value
+ of anomalies
+ Zevotech:
+ - bugfix: Removed a flora with a varedited error texture on jungle_paradise
+ thgvr:
+ - tweak: Changed the text shown to shipowners about making a memo.
diff --git a/icons/effects/landmarks_static.dmi b/icons/effects/landmarks_static.dmi
index 847c252bbfb6..05301f14a831 100644
Binary files a/icons/effects/landmarks_static.dmi and b/icons/effects/landmarks_static.dmi differ
diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi
index 1efce1eea691..50e88be487b0 100644
Binary files a/icons/effects/mapping_helpers.dmi and b/icons/effects/mapping_helpers.dmi differ
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index 2ad16e574534..35f629b7c864 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/head/winterhood.dmi b/icons/mob/clothing/head/winterhood.dmi
new file mode 100644
index 000000000000..321896641390
Binary files /dev/null and b/icons/mob/clothing/head/winterhood.dmi differ
diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi
index 63368044af97..cd64b37eaf3c 100644
Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ
diff --git a/icons/mob/clothing/suits/hooded.dmi b/icons/mob/clothing/suits/hooded.dmi
index 71255a115ee0..5988b39e8a6a 100644
Binary files a/icons/mob/clothing/suits/hooded.dmi and b/icons/mob/clothing/suits/hooded.dmi differ
diff --git a/icons/mob/clothing/suits/wintercoat.dmi b/icons/mob/clothing/suits/wintercoat.dmi
new file mode 100644
index 000000000000..4d09ed00a49b
Binary files /dev/null and b/icons/mob/clothing/suits/wintercoat.dmi differ
diff --git a/icons/mob/clothing/underwear/underwear_legs.dmi b/icons/mob/clothing/underwear/underwear_legs.dmi
index a3a60ccfc2a7..054daef8c0d1 100644
Binary files a/icons/mob/clothing/underwear/underwear_legs.dmi and b/icons/mob/clothing/underwear/underwear_legs.dmi differ
diff --git a/icons/mob/species/lizard/bodyparts.dmi b/icons/mob/species/lizard/bodyparts.dmi
index ce88a8ba93da..9f7a7ca89b50 100644
Binary files a/icons/mob/species/lizard/bodyparts.dmi and b/icons/mob/species/lizard/bodyparts.dmi differ
diff --git a/icons/mob/species/lizard/frills.dmi b/icons/mob/species/lizard/frills.dmi
index b8587a7bd8e2..beeb7887b8b5 100644
Binary files a/icons/mob/species/lizard/frills.dmi and b/icons/mob/species/lizard/frills.dmi differ
diff --git a/icons/mob/species/lizard/markings.dmi b/icons/mob/species/lizard/markings.dmi
index d2950ac19bbc..7a43feeda795 100644
Binary files a/icons/mob/species/lizard/markings.dmi and b/icons/mob/species/lizard/markings.dmi differ
diff --git a/icons/mob/species/lizard/spines.dmi b/icons/mob/species/lizard/spines.dmi
new file mode 100644
index 000000000000..eaadb820ebc1
Binary files /dev/null and b/icons/mob/species/lizard/spines.dmi differ
diff --git a/icons/mob/species/lizard/tails.dmi b/icons/mob/species/lizard/tails.dmi
index 16a7dc0b00ed..aea38b93e9ac 100644
Binary files a/icons/mob/species/lizard/tails.dmi and b/icons/mob/species/lizard/tails.dmi differ
diff --git a/icons/mob/species/vox/onmob_head_vox.dmi b/icons/mob/species/vox/onmob_head_vox.dmi
index d6b498ca0b5e..0ab1c3be9674 100644
Binary files a/icons/mob/species/vox/onmob_head_vox.dmi and b/icons/mob/species/vox/onmob_head_vox.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index f9eeb5d1d91d..3a77a2e55885 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/head/winterhood.dmi b/icons/obj/clothing/head/winterhood.dmi
new file mode 100644
index 000000000000..aa212eb48da2
Binary files /dev/null and b/icons/obj/clothing/head/winterhood.dmi differ
diff --git a/icons/obj/clothing/suits/hooded.dmi b/icons/obj/clothing/suits/hooded.dmi
index 120e9443fcb9..366b69d85139 100644
Binary files a/icons/obj/clothing/suits/hooded.dmi and b/icons/obj/clothing/suits/hooded.dmi differ
diff --git a/icons/obj/clothing/suits/wintercoat.dmi b/icons/obj/clothing/suits/wintercoat.dmi
new file mode 100644
index 000000000000..386b905064ae
Binary files /dev/null and b/icons/obj/clothing/suits/wintercoat.dmi differ
diff --git a/icons/obj/food/soupsalad.dmi b/icons/obj/food/soupsalad.dmi
index 8a0e61db9a57..1205fd888adc 100644
Binary files a/icons/obj/food/soupsalad.dmi and b/icons/obj/food/soupsalad.dmi differ
diff --git a/icons/obj/lavaland/ash_flora.dmi b/icons/obj/lavaland/ash_flora.dmi
index d35d013715b1..c804d82f1769 100644
Binary files a/icons/obj/lavaland/ash_flora.dmi and b/icons/obj/lavaland/ash_flora.dmi differ
diff --git a/icons/turf/floors/tiles.dmi b/icons/turf/floors/tiles.dmi
index 3f96841a71da..c3c773e8efa9 100644
Binary files a/icons/turf/floors/tiles.dmi and b/icons/turf/floors/tiles.dmi differ
diff --git a/interface/interface.dm b/interface/interface.dm
index e92c1cac13f1..0093e756393f 100644
--- a/interface/interface.dm
+++ b/interface/interface.dm
@@ -14,17 +14,17 @@
to_chat(src, "The wiki URL is not set in the server configuration.")
return
-/client/verb/forum()
- set name = "forum"
- set desc = "Visit the forum."
+/client/verb/lore()
+ set name = "lore"
+ set desc = "View the lore landing page."
set hidden = TRUE
- var/forumurl = CONFIG_GET(string/forumurl)
- if(forumurl)
- if(alert("This will open the forum in your browser. Are you sure?",,"Yes","No")!="Yes")
+ var/loreurl = CONFIG_GET(string/loreurl)
+ if(loreurl)
+ if(alert("This will open the lore page in your browser. Are you sure?",,"Yes","No")!="Yes")
return
- src << link(forumurl)
+ src << link(loreurl)
else
- to_chat(src, "The forum URL is not set in the server configuration.")
+ to_chat(src, "The lore page URL is not set in the server configuration.")
return
/client/verb/rules()
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 72e535bf7197..9d933e057c46 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -147,72 +147,72 @@ window "infowindow"
left = "statwindow"
right = "outputwindow"
is-vert = false
- elem "discord"
- type = BUTTON
- pos = 192,5
- size = 88x20
- anchor1 = 30,0
- anchor2 = 44,0
- font-family = "Verdana"
- text-color = #ffffff
- background-color = #40628a
- saved-params = "is-checked"
- text = "Join Discord"
- command = "discord"
elem "changelog"
type = BUTTON
pos = 8,5
- size = 80x20
+ size = 88x20
anchor1 = 1,0
anchor2 = 14,0
font-family = "Verdana"
text-color = #ffffff
background-color = #40628a
saved-params = "is-checked"
- text = "Changelog"
+ text = "Changes"
command = "changelog"
elem "rules"
type = BUTTON
- pos = 96,5
- size = 88x20
+ pos = 104,5
+ size = 80x20
anchor1 = 15,0
- anchor2 = 29,0
+ anchor2 = 28,0
font-family = "Verdana"
text-color = #ffffff
background-color = #40628a
saved-params = "is-checked"
text = "Rules"
command = "rules"
+ elem "discord"
+ type = BUTTON
+ pos = 192,5
+ size = 80x20
+ anchor1 = 29,0
+ anchor2 = 37,0
+ font-family = "Verdana"
+ text-color = #ffffff
+ background-color = #40628a
+ saved-params = "is-checked"
+ text = "Discord"
+ command = "discord"
elem "wiki"
type = BUTTON
- pos = 288,5
+ pos = 280,5
size = 80x20
- anchor1 = 45,0
- anchor2 = 58,0
+ anchor1 = 38,0
+ anchor2 = 51,0
font-family = "Verdana"
text-color = #ffffff
background-color = #40628a
saved-params = "is-checked"
text = "Wiki"
command = "wiki"
- elem "forum"
+ elem "lore"
type = BUTTON
- pos = 376,5
+ pos = 368,5
size = 80x20
- anchor1 = 59,0
- anchor2 = 71,0
+ anchor1 = 52,0
+ anchor2 = 65,0
font-family = "Verdana"
text-color = #ffffff
background-color = #40628a
saved-params = "is-checked"
- text = "Forum"
- command = "forum"
+ text = "Lore"
+ command = "lore"
elem "github"
type = BUTTON
- pos = 464,5
+ pos = 456,5
size = 80x20
- anchor1 = 73,0
- anchor2 = 85,0
+ anchor1 = 66,0
+ anchor2 = 79,0
font-family = "Verdana"
text-color = #ffffff
background-color = #40628a
@@ -221,10 +221,10 @@ window "infowindow"
command = "github"
elem "report-issue"
type = BUTTON
- pos = 552,5
+ pos = 544,5
size = 80x20
- anchor1 = 86,0
- anchor2 = 99,0
+ anchor1 = 80,0
+ anchor2 = 93,0
font-family = "Verdana"
font-size = 8
text-color = #ffffff
diff --git a/shiptest.dme b/shiptest.dme
index 919c61c53c36..e933dfe020ce 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -1683,7 +1683,6 @@
#include "code\modules\antagonists\nukeop\equipment\nuclear_challenge.dm"
#include "code\modules\antagonists\nukeop\equipment\nuclearbomb.dm"
#include "code\modules\antagonists\nukeop\equipment\pinpointer.dm"
-#include "code\modules\antagonists\official\official.dm"
#include "code\modules\antagonists\revenant\revenant.dm"
#include "code\modules\antagonists\revenant\revenant_abilities.dm"
#include "code\modules\antagonists\revenant\revenant_antag.dm"
@@ -1949,7 +1948,6 @@
#include "code\modules\clothing\masks\hailer.dm"
#include "code\modules\clothing\masks\miscellaneous.dm"
#include "code\modules\clothing\neck\_neck.dm"
-#include "code\modules\clothing\outfits\ert.dm"
#include "code\modules\clothing\outfits\event.dm"
#include "code\modules\clothing\outfits\gezena.dm"
#include "code\modules\clothing\outfits\plasmaman.dm"
@@ -1957,6 +1955,13 @@
#include "code\modules\clothing\outfits\standard.dm"
#include "code\modules\clothing\outfits\syndicate.dm"
#include "code\modules\clothing\outfits\vv_outfit.dm"
+#include "code\modules\clothing\outfits\ert\frontiersmen_ert.dm"
+#include "code\modules\clothing\outfits\ert\indie_ert.dm"
+#include "code\modules\clothing\outfits\ert\inteq_ert.dm"
+#include "code\modules\clothing\outfits\ert\minutemen_ert.dm"
+#include "code\modules\clothing\outfits\ert\nanotrasen_ert.dm"
+#include "code\modules\clothing\outfits\ert\solgov_ert.dm"
+#include "code\modules\clothing\outfits\ert\syndicate_ert.dm"
#include "code\modules\clothing\shoes\_shoes.dm"
#include "code\modules\clothing\shoes\bananashoes.dm"
#include "code\modules\clothing\shoes\colour.dm"
diff --git a/tgui/packages/tgui-panel/themes.js b/tgui/packages/tgui-panel/themes.js
index 63fb2774849f..a4e0b48d42bc 100644
--- a/tgui/packages/tgui-panel/themes.js
+++ b/tgui/packages/tgui-panel/themes.js
@@ -49,10 +49,12 @@ export const setClientTheme = (name) => {
'changelog.text-color': '#000000',
'rules.background-color': 'none',
'rules.text-color': '#000000',
+ 'discord.background-color': 'none',
+ 'discord.text-color': '#000000',
'wiki.background-color': 'none',
'wiki.text-color': '#000000',
- 'forum.background-color': 'none',
- 'forum.text-color': '#000000',
+ 'lore.background-color': 'none',
+ 'lore.text-color': '#000000',
'github.background-color': 'none',
'github.text-color': '#000000',
'report-issue.background-color': 'none',
@@ -101,10 +103,12 @@ export const setClientTheme = (name) => {
'changelog.text-color': COLOR_DARK_TEXT,
'rules.background-color': '#494949',
'rules.text-color': COLOR_DARK_TEXT,
+ 'discord.background-color': '#494949',
+ 'discord.text-color': COLOR_DARK_TEXT,
'wiki.background-color': '#494949',
'wiki.text-color': COLOR_DARK_TEXT,
- 'forum.background-color': '#494949',
- 'forum.text-color': COLOR_DARK_TEXT,
+ 'lore.background-color': '#494949',
+ 'lore.text-color': COLOR_DARK_TEXT,
'github.background-color': '#3a3a3a',
'github.text-color': COLOR_DARK_TEXT,
'report-issue.background-color': '#492020',
diff --git a/tgui/packages/tgui/interfaces/ShipSelect.js b/tgui/packages/tgui/interfaces/ShipSelect.js
index 11c48f96175e..72cff05306d2 100644
--- a/tgui/packages/tgui/interfaces/ShipSelect.js
+++ b/tgui/packages/tgui/interfaces/ShipSelect.js
@@ -67,7 +67,9 @@ export const ShipSelect = (props, context) => {
(data.purchaseBanned &&
'You are banned from purchasing ships.') ||
(!data.shipSpawnAllowed &&
- 'No more ships may be spawned at this time.')
+ 'No more ships may be spawned at this time.') ||
+ (data.shipSpawning &&
+ 'A ship is currently spawning. Please wait.')
}
disabled={data.purchaseBanned}
onClick={() => {
@@ -254,10 +256,13 @@ export const ShipSelect = (props, context) => {
'There are too many ships of this type.') ||
(!data.autoMeet &&
data.playMin < template.minTime &&
- 'You do not have enough playtime to buy this ship.')
+ 'You do not have enough playtime to buy this ship.') ||
+ (data.shipSpawning &&
+ 'A ship is currently spawning. Please wait.')
}
disabled={
!data.shipSpawnAllowed ||
+ data.shipSpawning ||
template.curNum >= template.limit ||
(!data.autoMeet && data.playMin < template.minTime)
}