"
diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm
index f89cfea14edb..1c605758a2cd 100644
--- a/code/__HELPERS/text.dm
+++ b/code/__HELPERS/text.dm
@@ -350,22 +350,32 @@ GLOBAL_LIST_INIT(binary, list("0","1"))
/proc/random_short_color()
return num2text(rand(0, 4095), 3, 16)
-/proc/short_color_from_seed(seed)
- return num2text(seed % 4095, 3, 16)
+/proc/color_from_seed(seed)
+ seed = md5(seed)
+
+ var/red = num2text(hex2num(copytext(seed, 1, 3)), 2, 16)
+ var/green = num2text(hex2num(copytext(seed, 3, 5)), 2, 16)
+ var/blue = num2text(hex2num(copytext(seed, 5, 7)), 2, 16)
+
+ return red + green + blue
/proc/random_color()
return num2text(rand(0, 16777215), 6, 16)
/proc/random_color_natural() //For use in natural haircolors.
- var red = num2text(rand(0,255), 2, 16)
- var green = num2text(rand(0,128), 2, 16) //Conversion to hex
- var blue = "00"
+ var/red = num2text(rand(0,255), 2, 16)
+ var/green = num2text(rand(0,128), 2, 16) //Conversion to hex
+ var/blue = "00"
+
return red + green + blue
/proc/color_natural_from_seed(seed)
- var red = num2text(seed % 255, 2, 16)
- var green = num2text(seed % 128, 2, 16) //Conversion to hex
- var blue = "00"
+ seed = md5(seed)
+
+ var/red = num2text(hex2num(copytext(seed, 1, 3)), 2, 16)
+ var/green = num2text(hex2num(copytext(seed, 3, 5)) / 2, 2, 16)
+ var/blue = "00"
+
return red + green + blue
//merges non-null characters (3rd argument) from "from" into "into". Returns result
diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm
index 4795dd29e5f7..cef23857bc7a 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
+ 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(0)
+ monthname = "January"
+ if(1)
+ monthname = "February"
+ if(2)
+ monthname = "March"
+ if(3)
+ monthname = "April"
+ if(4)
+ monthname = "May"
+ if(5)
+ monthname = "June"
+ if(6)
+ monthname = "Sol"
+ if(7)
+ monthname = "July"
+ if(8)
+ monthname = "August"
+ if(9)
+ monthname = "September"
+ if(10)
+ monthname = "October"
+ if(11)
+ monthname = "November"
+ if(12)
+ monthname = "December"
+ if(13)
+ 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/faxes.dm b/code/_globalvars/lists/faxes.dm
deleted file mode 100644
index 4051e489e1d6..000000000000
--- a/code/_globalvars/lists/faxes.dm
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * This defines the list of faxes managed by the server administrators. They are not physically present in
- * the game, but are shown in the fax list as existing.
- * Lists:
- * * additional_faxes_list - A list of "legal" faxes available with authorization.
- * * frontier_faxes_list - List of faxes available after hacking.
- *
- * The list consists of the following elements:
- * * fax_name - The name displayed in the fax list.
- * * button_color - The color of this fax button in the list of all faxes.
- */
-GLOBAL_LIST_INIT(additional_faxes_list, list(
- list("fax_name" = "NanoTrasen Central Command", "button_color" = "#46B946"),
- list("fax_name" = "Inteq Management Field Command", "button_color" = "#FACE65"),
- list("fax_name" = "Colonial Minutemen Headquarters", "button_color" = "#538ACF"),
- list("fax_name" = "Saint-Roumain Council of Huntsmen", "button_color" = "#6B443D"),
- list("fax_name" = "SolGov Department of Administrative Affairs", "button_color" = "#536380"),
- list("fax_name" = "Syndicate Coordination Center", "button_color" = "#B22C20"),
- list("fax_name" = "Outpost Administration", "button_color" = "#dddfc9"),
-))
-
-GLOBAL_LIST_INIT(frontier_faxes_list, list(
- list("fax_name" = "Frontiersmen Communications Outpost", "button_color" = "#70654C")
-))
-
-GLOBAL_LIST_EMPTY(fax_machines) //list of all fax machines
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/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm
index 0b517e50160c..ecc1acb6f0e1 100644
--- a/code/_globalvars/lists/names.dm
+++ b/code/_globalvars/lists/names.dm
@@ -14,7 +14,6 @@ GLOBAL_LIST_INIT(lizard_names_female, world.file2list("strings/names/lizard_fema
GLOBAL_LIST_INIT(clown_names, world.file2list("strings/names/clown.txt"))
GLOBAL_LIST_INIT(mime_names, world.file2list("strings/names/mime.txt"))
GLOBAL_LIST_INIT(carp_names, world.file2list("strings/names/carp.txt"))
-GLOBAL_LIST_INIT(golem_names, world.file2list("strings/names/golem.txt"))
GLOBAL_LIST_INIT(moth_first, world.file2list("strings/names/moth_first.txt"))
GLOBAL_LIST_INIT(moth_last, world.file2list("strings/names/moth_last.txt"))
GLOBAL_LIST_INIT(plasmaman_names, world.file2list("strings/names/plasmaman.txt"))
diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
index 6f3e2453440e..b4ce5c01c151 100644
--- a/code/_globalvars/lists/objects.dm
+++ b/code/_globalvars/lists/objects.dm
@@ -11,6 +11,7 @@ GLOBAL_LIST_EMPTY(wayfindingbeacons) //list of all navigation beacons used
GLOBAL_LIST_EMPTY(nuke_list)
GLOBAL_LIST_EMPTY(alarmdisplay) //list of all machines or programs that can display station alerts
GLOBAL_LIST_EMPTY(singularities) //list of all singularities on the station (actually technically all engines)
+GLOBAL_LIST_EMPTY(fax_machines) //list of all fax machines
GLOBAL_LIST(chemical_reactions_list) //list of all /datum/chemical_reaction datums. Used during chemical reactions
GLOBAL_LIST(chemical_reagents_list) //list of all /datum/reagent datums indexed by reagent id. Used by chemistry stuff
diff --git a/code/_globalvars/lists/poll_ignore.dm b/code/_globalvars/lists/poll_ignore.dm
index 674b15ceae2c..e25b0b6e9a87 100644
--- a/code/_globalvars/lists/poll_ignore.dm
+++ b/code/_globalvars/lists/poll_ignore.dm
@@ -11,7 +11,6 @@
#define POLL_IGNORE_CONSTRUCT "construct"
#define POLL_IGNORE_SPIDER "spider"
#define POLL_IGNORE_ASHWALKER "ashwalker"
-#define POLL_IGNORE_GOLEM "golem"
#define POLL_IGNORE_SWARMER "swarmer"
#define POLL_IGNORE_DRONE "drone"
#define POLL_IGNORE_FUGITIVE "fugitive"
@@ -36,7 +35,6 @@ GLOBAL_LIST_INIT(poll_ignore_desc, list(
POLL_IGNORE_CONSTRUCT = "Construct",
POLL_IGNORE_SPIDER = "Spiders",
POLL_IGNORE_ASHWALKER = "Ashwalker eggs",
- POLL_IGNORE_GOLEM = "Golems",
POLL_IGNORE_SWARMER = "Swarmer shells",
POLL_IGNORE_DRONE = "Drone shells",
POLL_IGNORE_FUGITIVE = "Fugitive Hunter",
diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
index 3239cb53b8d0..c91b96db8de9 100644
--- a/code/_globalvars/traits.dm
+++ b/code/_globalvars/traits.dm
@@ -17,7 +17,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_EMOTEMUTE " = TRAIT_EMOTEMUTE,
"TRAIT_DEAF" = TRAIT_DEAF,
"TRAIT_NEARSIGHT" = TRAIT_NEARSIGHT,
- "TRAIT_FAT" = TRAIT_FAT,
"TRAIT_HUSK" = TRAIT_HUSK,
"TRAIT_BADDNA" = TRAIT_BADDNA,
"TRAIT_CLUMSY" = TRAIT_CLUMSY,
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index 8a61e094fa1d..43ae8ffbe246 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -164,11 +164,6 @@ Override makes it so the alert is not replaced until cleared by a clear_alert wi
//End gas alerts
-/atom/movable/screen/alert/fat
- name = "Fat"
- desc = "You ate too much food, lardass. Run around and lose some weight."
- icon_state = "fat"
-
/atom/movable/screen/alert/hungry
name = "Hungry"
desc = "Some food would be good right about now."
diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm
index 0bf17de075bf..ca383805cc34 100644
--- a/code/_onclick/hud/parallax.dm
+++ b/code/_onclick/hud/parallax.dm
@@ -57,7 +57,7 @@
pref = PARALLAX_HIGH
switch(C.prefs.parallax)
if (PARALLAX_INSANE)
- C.parallax_throttle = FALSE
+ C.parallax_throttle = PARALLAX_DELAY_DEFAULT
C.parallax_layers_max = 5
return TRUE
@@ -298,13 +298,6 @@
speed = 3
layer = 3
-/atom/movable/screen/parallax_layer/random/space_gas
- icon_state = "space_gas"
-
-/atom/movable/screen/parallax_layer/random/space_gas/Initialize(mapload, view)
- . = ..()
- src.add_atom_colour(SSparallax.random_parallax_color, ADMIN_COLOUR_PRIORITY)
-
/atom/movable/screen/parallax_layer/random/asteroids
icon_state = "asteroids"
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/mapping.dm b/code/controllers/subsystem/mapping.dm
index f9c5c9c86399..92b8d146c4fc 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -22,7 +22,6 @@ SUBSYSTEM_DEF(mapping)
var/list/shuttle_templates = list()
var/list/shelter_templates = list()
- var/list/holodeck_templates = list()
// List mapping TYPES of outpost map templates to instances of their singletons.
var/list/outpost_templates = list()
@@ -91,13 +90,11 @@ SUBSYSTEM_DEF(mapping)
shuttle_templates = SSmapping.shuttle_templates
shelter_templates = SSmapping.shelter_templates
- holodeck_templates = SSmapping.holodeck_templates
outpost_templates = SSmapping.outpost_templates
shuttle_templates = SSmapping.shuttle_templates
shelter_templates = SSmapping.shelter_templates
- holodeck_templates = SSmapping.holodeck_templates
areas_in_z = SSmapping.areas_in_z
map_zones = SSmapping.map_zones
@@ -127,7 +124,6 @@ SUBSYSTEM_DEF(mapping)
preloadShuttleTemplates()
load_ship_templates()
preloadShelterTemplates()
- preloadHolodeckTemplates()
preloadOutpostTemplates()
/datum/controller/subsystem/mapping/proc/preloadRuinTemplates()
@@ -279,16 +275,6 @@ SUBSYSTEM_DEF(mapping)
add_new_zlevel("Quadrant Allocation Level", allocation_type = ALLOCATION_QUADRANT)
CHECK_TICK
-/datum/controller/subsystem/mapping/proc/preloadHolodeckTemplates()
- for(var/item in subtypesof(/datum/map_template/holodeck))
- var/datum/map_template/holodeck/holodeck_type = item
- if(!(initial(holodeck_type.mappath)))
- continue
- var/datum/map_template/holodeck/holo_template = new holodeck_type()
-
- holodeck_templates[holo_template.template_id] = holo_template
- map_templates[holo_template.template_id] = holo_template
-
/datum/controller/subsystem/mapping/proc/preloadOutpostTemplates()
for(var/datum/map_template/outpost/outpost_type as anything in subtypesof(/datum/map_template/outpost))
var/datum/map_template/outpost/outpost_template = new outpost_type()
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/parallax.dm b/code/controllers/subsystem/parallax.dm
index 3083fcfdaed7..90a6f2cfbbf1 100644
--- a/code/controllers/subsystem/parallax.dm
+++ b/code/controllers/subsystem/parallax.dm
@@ -8,14 +8,12 @@ SUBSYSTEM_DEF(parallax)
var/planet_x_offset = 128
var/planet_y_offset = 128
var/random_layer
- var/random_parallax_color
//These are cached per client so needs to be done asap so people joining at roundstart do not miss these.
/datum/controller/subsystem/parallax/PreInit()
. = ..()
- if(prob(70)) //70% chance to pick a special extra layer
- random_layer = pick(/atom/movable/screen/parallax_layer/random/space_gas, /atom/movable/screen/parallax_layer/random/asteroids)
- random_parallax_color = pick(COLOR_TEAL, COLOR_GREEN, COLOR_SILVER, COLOR_YELLOW, COLOR_CYAN, COLOR_ORANGE, COLOR_PURPLE)//Special color for random_layer1. Has to be done here so everyone sees the same color.
+ if(prob(20)) //20% chance to pick a special extra layer, in this case just asteroids, no space dirt
+ random_layer = /atom/movable/screen/parallax_layer/random/asteroids
planet_y_offset = rand(100, 160)
planet_x_offset = rand(100, 160)
diff --git a/code/controllers/subsystem/ping.dm b/code/controllers/subsystem/ping.dm
index 8886a4b61caa..cf99a4fe49c5 100644
--- a/code/controllers/subsystem/ping.dm
+++ b/code/controllers/subsystem/ping.dm
@@ -13,8 +13,8 @@ SUBSYSTEM_DEF(ping)
var/list/currentrun = list()
-/datum/controller/subsystem/ping/stat_entry()
- ..("P:[GLOB.clients.len]")
+/datum/controller/subsystem/ping/stat_entry(msg)
+ return ..("P:[GLOB.clients.len]")
/datum/controller/subsystem/ping/fire(resumed = FALSE)
// Prepare the new batch of clients
diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm
index b5b8113384df..9dc117783af9 100644
--- a/code/controllers/subsystem/processing/quirks.dm
+++ b/code/controllers/subsystem/processing/quirks.dm
@@ -23,7 +23,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
list("Ageusia","Vegetarian","Deviant Tastes"), \
list("Ananas Affinity","Ananas Aversion"), \
list("Alcohol Tolerance","Light Drinker"), \
- list("Clown Fan","Mime Fan"), \
+ list("Clown Fan","Mime Fan", "RILENA Super Fan"), \
list("Bad Touch", "Friendly"))
species_blacklist = list("Blood Deficiency" = list(SPECIES_IPC, SPECIES_JELLYPERSON, SPECIES_PLASMAMAN, SPECIES_VAMPIRE))
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/traumas.dm b/code/controllers/subsystem/traumas.dm
index ab220b4382b4..1e697327c844 100644
--- a/code/controllers/subsystem/traumas.dm
+++ b/code/controllers/subsystem/traumas.dm
@@ -78,8 +78,8 @@ SUBSYSTEM_DEF(traumas)
/obj/item/spear, /obj/item/clothing/mask/gas)),
"lizards" = typecacheof(list(
- /obj/item/toy/plush/lizardplushie, /obj/item/reagent_containers/food/snacks/kebab/tail, /obj/item/organ/tail/lizard,
- /obj/item/reagent_containers/food/drinks/bottle/lizardwine, /obj/item/clothing/head/lizard, /obj/item/clothing/shoes/cowboy/lizard)),
+ /obj/item/toy/plush/lizardplushie, /obj/item/organ/tail/lizard,
+ /obj/item/reagent_containers/food/drinks/bottle/lizardwine)),
"skeletons" = typecacheof(list(
/obj/item/organ/tongue/bone, /obj/item/clothing/suit/armor/bone, /obj/item/stack/sheet/bone,
@@ -156,7 +156,7 @@ SUBSYSTEM_DEF(traumas)
/obj/item/clothing/under/costume/schoolgirl, /obj/item/katana, /obj/item/reagent_containers/food/snacks/sashimi,
/obj/item/reagent_containers/food/snacks/chawanmushi,
/obj/item/reagent_containers/food/drinks/bottle/sake, /obj/item/throwing_star,
- /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/suit/space/space_ninja,
+ /obj/item/clothing/suit/space/space_ninja,
/obj/item/clothing/mask/gas/space_ninja, /obj/item/clothing/shoes/space_ninja, /obj/item/clothing/gloves/space_ninja,
/obj/item/vibro_weapon, /obj/item/nullrod/scythe/vibro, /obj/item/energy_katana, /obj/item/toy/katana,
/obj/item/nullrod/claymore/katana, /obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe))
@@ -177,7 +177,6 @@ SUBSYSTEM_DEF(traumas)
"skeletons" = typecacheof(list(/datum/species/skeleton, /datum/species/plasmaman)),
"conspiracies" = typecacheof(list(/datum/species/abductor, /datum/species/lizard)),
"robots" = typecacheof(list(/datum/species/android, /datum/species/ipc)),
- "the supernatural" = typecacheof(list(/datum/species/golem/runic)),
"aliens" = typecacheof(list(
/datum/species/abductor, /datum/species/jelly, /datum/species/pod)),
"spiders" = typecacheof(list(/datum/species/spider))
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/aquarium.dm b/code/datums/aquarium.dm
index 86551b9d25ce..da8c3afeb531 100644
--- a/code/datums/aquarium.dm
+++ b/code/datums/aquarium.dm
@@ -77,7 +77,7 @@
else
InitializeOther()
- ADD_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, src)
+ ADD_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, REF(src))
RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(enter_aquarium))
//If component is added to something already in aquarium at the time initialize it properly.
@@ -134,7 +134,7 @@
/datum/component/aquarium_content/PreTransfer()
. = ..()
- REMOVE_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, src)
+ REMOVE_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, REF(src))
/datum/component/aquarium_content/Destroy(force, silent)
if(current_aquarium)
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/components/aquarium.dm b/code/datums/components/aquarium.dm
index 86551b9d25ce..da8c3afeb531 100644
--- a/code/datums/components/aquarium.dm
+++ b/code/datums/components/aquarium.dm
@@ -77,7 +77,7 @@
else
InitializeOther()
- ADD_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, src)
+ ADD_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, REF(src))
RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(enter_aquarium))
//If component is added to something already in aquarium at the time initialize it properly.
@@ -134,7 +134,7 @@
/datum/component/aquarium_content/PreTransfer()
. = ..()
- REMOVE_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, src)
+ REMOVE_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, REF(src))
/datum/component/aquarium_content/Destroy(force, silent)
if(current_aquarium)
diff --git a/code/datums/components/art.dm b/code/datums/components/art.dm
index 3ed27f8297f9..e00261b6d9b3 100644
--- a/code/datums/components/art.dm
+++ b/code/datums/components/art.dm
@@ -51,3 +51,17 @@
if(!do_after(M, 20, target = parent))
return
on_obj_examine(source, M)
+
+/datum/component/art/rilena
+
+/datum/component/art/rilena/apply_moodlet(mob/living/user, impress)
+ var/msg
+ if(HAS_TRAIT(user, TRAIT_FAN_RILENA))
+ SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "artgreat", /datum/mood_event/artgreat)
+ msg = "You love this franchise!"
+ else
+ msg = "You don't get it. At least it's not ugly."
+ user.visible_message(
+ "
[user] stops and looks intently at [parent]. ",
+ "
You stop to take in [parent]. [msg] "
+ )
diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm
index 0961aa484a1d..9ec90bf09eac 100644
--- a/code/datums/components/crafting/recipes.dm
+++ b/code/datums/components/crafting/recipes.dm
@@ -113,35 +113,6 @@
category= CAT_WEAPONRY
subcategory = CAT_WEAPON
-/datum/crafting_recipe/tailclub
- name = "Tail Club"
- result = /obj/item/tailclub
- reqs = list(/obj/item/organ/tail/lizard = 1,
- /obj/item/stack/sheet/metal = 1)
- blacklist = list(/obj/item/organ/tail/lizard/fake)
- time = 40
- category = CAT_WEAPONRY
- subcategory = CAT_WEAPON
-
-/datum/crafting_recipe/tailwhip
- name = "Liz O' Nine Tails"
- result = /obj/item/melee/chainofcommand/tailwhip
- reqs = list(/obj/item/organ/tail/lizard = 1,
- /obj/item/stack/cable_coil = 1)
- blacklist = list(/obj/item/organ/tail/lizard/fake)
- time = 40
- category = CAT_WEAPONRY
- subcategory = CAT_WEAPON
-
-/datum/crafting_recipe/catwhip
- name = "Cat O' Nine Tails"
- result = /obj/item/melee/chainofcommand/tailwhip/kitty
- reqs = list(/obj/item/organ/tail/cat = 1,
- /obj/item/stack/cable_coil = 1)
- time = 40
- category = CAT_WEAPONRY
- subcategory = CAT_WEAPON
-
/datum/crafting_recipe/ed209
name = "ED209"
result = /mob/living/simple_animal/bot/secbot/ed209
@@ -372,28 +343,6 @@
parts = list(/obj/item/camera = 1)
category = CAT_MISC
-/datum/crafting_recipe/lizardhat
- name = "lizard Cloche Hat"
- result = /obj/item/clothing/head/lizard
- time = 10
- reqs = list(/obj/item/organ/tail/lizard = 1)
- category = CAT_CLOTHING
-
-/datum/crafting_recipe/lizardhat_alternate
- name = "lizard Cloche Hat"
- result = /obj/item/clothing/head/lizard
- time = 10
- reqs = list(/obj/item/stack/sheet/animalhide/lizard = 1)
- category = CAT_CLOTHING
-
-/datum/crafting_recipe/kittyears
- name = "Kitty Ears"
- result = /obj/item/clothing/head/kitty/genuine
- time = 10
- reqs = list(/obj/item/organ/tail/cat = 1,
- /obj/item/organ/ears/cat = 1)
- category = CAT_CLOTHING
-
/datum/crafting_recipe/skateboard
name = "Skateboard"
result = /obj/vehicle/ridden/scooter/skateboard
diff --git a/code/datums/components/crafting/tailoring.dm b/code/datums/components/crafting/tailoring.dm
index d02a60c0178f..4caaa55ded29 100644
--- a/code/datums/components/crafting/tailoring.dm
+++ b/code/datums/components/crafting/tailoring.dm
@@ -236,13 +236,3 @@
reqs = list(/obj/item/stack/sheet/leather = 2)
time = 45
category = CAT_CLOTHING
-
-/datum/crafting_recipe/lizardboots
- name = "lizard Skin Boots"
- result = /obj/effect/spawner/lootdrop/lizardboots
- reqs = list(
- /obj/item/stack/sheet/animalhide/lizard = 1,
- /obj/item/stack/sheet/leather = 1
- )
- time = 60
- category = CAT_CLOTHING
diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm
index 4c8b2a72cfa6..64fc96146527 100644
--- a/code/datums/components/mood.dm
+++ b/code/datums/components/mood.dm
@@ -322,12 +322,7 @@
if(HAS_TRAIT(L, TRAIT_NOHUNGER))
return FALSE //no mood events for nutrition
switch(L.nutrition)
- if(NUTRITION_LEVEL_FULL to INFINITY)
- if (!HAS_TRAIT(L, TRAIT_VORACIOUS))
- add_event(null, "nutrition", /datum/mood_event/fat)
- else
- add_event(null, "nutrition", /datum/mood_event/wellfed) // round and full
- if(NUTRITION_LEVEL_WELL_FED to NUTRITION_LEVEL_FULL)
+ if(NUTRITION_LEVEL_WELL_FED to INFINITY)
add_event(null, "nutrition", /datum/mood_event/wellfed)
if(NUTRITION_LEVEL_FED to NUTRITION_LEVEL_WELL_FED)
add_event(null, "nutrition", /datum/mood_event/fed)
diff --git a/code/datums/components/spooky.dm b/code/datums/components/spooky.dm
index 2cdefc057f85..9e75259536ef 100644
--- a/code/datums/components/spooky.dm
+++ b/code/datums/components/spooky.dm
@@ -31,7 +31,7 @@
H.Paralyze(15) //zombies can't resist the doot
C.Jitter(35)
C.stuttering = 20
- if((!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
+ if((!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
C.adjustStaminaLoss(25) //boneless humanoids don't lose the will to live
to_chat(C, "
DOOT ")
spectral_change(H)
@@ -41,7 +41,7 @@
C.stuttering = 20
/datum/component/spooky/proc/spectral_change(mob/living/carbon/human/H, mob/user)
- if((H.getStaminaLoss() > 95) && (!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
+ if((H.getStaminaLoss() > 95) && (!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
H.Paralyze(20)
H.set_species(/datum/species/skeleton)
H.visible_message("
[H] has given up on life as a mortal. ")
diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm
index 8ef68e3bfd0b..19d092156405 100644
--- a/code/datums/components/storage/concrete/pockets.dm
+++ b/code/datums/components/storage/concrete/pockets.dm
@@ -117,16 +117,6 @@
max_items = 2
max_w_class = WEIGHT_CLASS_BULKY
-/datum/component/storage/concrete/pockets/holster/lt/Initialize()
- original_parent = parent
- . = ..()
- can_hold = typecacheof(list(
- /obj/item/gun/energy/e_gun/adv_stopping,
- /obj/item/gun/energy/e_gun/mini,
- /obj/item/gun/energy/disabler,
- /obj/item/stock_parts/cell/gun
- ))
-
/datum/component/storage/concrete/pockets/holster/nukie/Initialize()
original_parent = parent
. = ..()
diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm
index 5c99377230c0..68c74921b8b7 100644
--- a/code/datums/components/tackle.dm
+++ b/code/datums/components/tackle.dm
@@ -208,26 +208,30 @@
to_chat(target, "
[user] lands an expert tackle on you, knocking you down hard and maintaining a passive grab! ")
user.SetKnockdown(0)
+ user.get_up(TRUE)
user.forceMove(get_turf(target))
target.adjustStaminaLoss(40)
target.Paralyze(5)
target.Knockdown(30)
if(ishuman(target) && ishuman(user))
INVOKE_ASYNC(S.dna.species, TYPE_PROC_REF(/datum/species, grab), S, T)
- S.setGrabState(GRAB_PASSIVE)
+ if(S.pulling == T)
+ S.setGrabState(GRAB_PASSIVE)
if(5 to INFINITY) // absolutely BODIED
user.visible_message("
[user] lands a monster tackle on [target], knocking [target.p_them()] senseless and applying an aggressive pin! ", "
You land a monster tackle on [target], knocking [target.p_them()] senseless and applying an aggressive pin! ", target)
to_chat(target, "
[user] lands a monster tackle on you, knocking you senseless and aggressively pinning you! ")
user.SetKnockdown(0)
+ user.get_up(TRUE)
user.forceMove(get_turf(target))
target.adjustStaminaLoss(40)
target.Paralyze(5)
target.Knockdown(30)
if(ishuman(target) && ishuman(user))
INVOKE_ASYNC(S.dna.species, TYPE_PROC_REF(/datum/species, grab), S, T)
- S.setGrabState(GRAB_AGGRESSIVE)
+ if(S.pulling == T)
+ S.setGrabState(GRAB_AGGRESSIVE)
return COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH
@@ -255,8 +259,6 @@
defense_mod -= 1
if(HAS_TRAIT(target, TRAIT_CLUMSY))
defense_mod -= 2
- if(HAS_TRAIT(target, TRAIT_FAT)) // chonkers are harder to knock over
- defense_mod += 1
if(HAS_TRAIT(target, TRAIT_GRABWEAKNESS))
defense_mod -= 2
if(HAS_TRAIT(target, TRAIT_DWARF))
diff --git a/code/datums/components/weatherannouncer.dm b/code/datums/components/weatherannouncer.dm
new file mode 100644
index 000000000000..3821f9a1b559
--- /dev/null
+++ b/code/datums/components/weatherannouncer.dm
@@ -0,0 +1,170 @@
+#define WEATHER_ALERT_CLEAR 0
+#define WEATHER_ALERT_INCOMING 1
+#define WEATHER_ALERT_IMMINENT_OR_ACTIVE 2
+
+/// Component which makes you yell about what the weather is
+/datum/component/weather_announcer
+ /// Currently displayed warning level
+ var/warning_level = WEATHER_ALERT_CLEAR
+ /// Whether the incoming weather is actually going to harm you
+ var/is_weather_dangerous = TRUE
+ /// Are we actually turned on right now?
+ var/enabled = TRUE
+ /// Overlay added when things are alright
+ var/state_normal
+ /// Overlay added when you should start looking for shelter
+ var/state_warning
+ /// Overlay added when you are in danger
+ var/state_danger
+
+/datum/component/weather_announcer/Initialize(
+ state_normal,
+ state_warning,
+ state_danger,
+)
+ . = ..()
+ if (!ismovable(parent))
+ return COMPONENT_INCOMPATIBLE
+
+ START_PROCESSING(SSprocessing, src)
+ RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_update_overlays))
+ RegisterSignal(parent, COMSIG_MACHINERY_POWER_RESTORED, PROC_REF(on_powered))
+ RegisterSignal(parent, COMSIG_MACHINERY_POWER_LOST, PROC_REF(on_power_lost))
+
+ src.state_normal = state_normal
+ src.state_warning = state_warning
+ src.state_danger = state_danger
+ var/atom/speaker = parent
+ speaker.update_appearance(UPDATE_ICON)
+ update_light_color()
+
+/datum/component/weather_announcer/Destroy(force, silent)
+ STOP_PROCESSING(SSprocessing, src)
+ return ..()
+
+/// Add appropriate overlays
+/datum/component/weather_announcer/proc/on_update_overlays(atom/parent_atom, list/overlays)
+ SIGNAL_HANDLER
+ if (!enabled || !state_normal || !state_warning || !state_danger)
+ return
+
+ switch (warning_level)
+ if(WEATHER_ALERT_CLEAR)
+ overlays += state_normal
+ if(WEATHER_ALERT_INCOMING)
+ overlays += state_warning
+ if(WEATHER_ALERT_IMMINENT_OR_ACTIVE)
+ overlays += (is_weather_dangerous) ? state_danger : state_warning
+
+/// If powered, receive updates
+/datum/component/weather_announcer/proc/on_powered()
+ SIGNAL_HANDLER
+ enabled = TRUE
+ var/atom/speaker = parent
+ speaker.update_appearance(UPDATE_ICON)
+
+/// If no power, don't receive updates
+/datum/component/weather_announcer/proc/on_power_lost()
+ SIGNAL_HANDLER
+ enabled = FALSE
+ var/atom/speaker = parent
+ speaker.update_appearance(UPDATE_ICON)
+
+/datum/component/weather_announcer/process(seconds_per_tick)
+ if (!enabled)
+ return
+
+ var/previous_level = warning_level
+ var/previous_danger = is_weather_dangerous
+ set_current_alert_level()
+ if(previous_level == warning_level && previous_danger == is_weather_dangerous)
+ return // No change
+ var/atom/movable/speaker = parent
+ speaker.say(get_warning_message())
+ speaker.update_appearance(UPDATE_ICON)
+ update_light_color()
+
+/datum/component/weather_announcer/proc/update_light_color()
+ var/atom/movable/light = parent
+ switch(warning_level)
+ if(WEATHER_ALERT_CLEAR)
+ light.set_light_color(LIGHT_COLOR_GREEN)
+ if(WEATHER_ALERT_INCOMING)
+ light.set_light_color(LIGHT_COLOR_YELLOW)
+ if(WEATHER_ALERT_IMMINENT_OR_ACTIVE)
+ light.set_light_color(LIGHT_COLOR_INTENSE_RED)
+ light.update_light()
+
+/// Returns a string we should display to communicate what you should be doing
+/datum/component/weather_announcer/proc/get_warning_message()
+ if (!is_weather_dangerous)
+ return "No risk expected from incoming weather front."
+ switch(warning_level)
+ if(WEATHER_ALERT_CLEAR)
+ return "All clear, no weather alerts to report."
+ if(WEATHER_ALERT_INCOMING)
+ return "Weather front incoming, begin to seek shelter."
+ if(WEATHER_ALERT_IMMINENT_OR_ACTIVE)
+ return "Weather front imminent, find shelter immediately."
+ return "Error in meteorological calculation. Please report this deviation to a trained programmer."
+
+/datum/component/weather_announcer/proc/time_till_storm()
+ var/datum/weather_controller/local_weather_controller = SSmapping.get_map_zone_weather_controller(parent)
+ if(!local_weather_controller.next_weather)
+ return null
+ for(var/type_index in local_weather_controller.current_weathers)
+ var/datum/weather/check_weather = local_weather_controller.current_weathers[type_index]
+ if(!check_weather.barometer_predictable || check_weather.stage == WIND_DOWN_STAGE || check_weather.stage == END_STAGE)
+ continue
+ warning_level = WEATHER_ALERT_IMMINENT_OR_ACTIVE
+ return 0
+
+ var/time_until_next = INFINITY
+ var/next_time = local_weather_controller.next_weather - world.time || INFINITY
+ if (next_time && next_time < time_until_next)
+ time_until_next = next_time
+ return time_until_next
+
+/// Polls existing weather for what kind of warnings we should be displaying.
+/datum/component/weather_announcer/proc/set_current_alert_level()
+ var/time_until_next = time_till_storm()
+ if(isnull(time_until_next))
+ return // No problems if there are no mining z levels
+ if(time_until_next >= 2 MINUTES)
+ warning_level = WEATHER_ALERT_CLEAR
+ return
+
+ if(time_until_next >= 30 SECONDS)
+ warning_level = WEATHER_ALERT_INCOMING
+ return
+
+ // Weather is here, now we need to figure out if it is dangerous
+ warning_level = WEATHER_ALERT_IMMINENT_OR_ACTIVE
+
+ var/datum/weather_controller/local_weather_controller = SSmapping.get_map_zone_weather_controller(parent)
+ for(var/type_index in local_weather_controller.current_weathers)
+ var/datum/weather/check_weather = local_weather_controller.current_weathers[type_index]
+ if(!check_weather.barometer_predictable || check_weather.stage == WIND_DOWN_STAGE || check_weather.stage == END_STAGE)
+ continue
+ is_weather_dangerous = !check_weather.aesthetic
+ return
+
+/datum/component/weather_announcer/proc/on_examine(atom/radio, mob/examiner, list/examine_texts)
+ var/time_until_next = time_till_storm()
+ if(isnull(time_until_next))
+ return
+ if (time_until_next == 0)
+ examine_texts += span_warning ("A storm is currently active, please seek shelter.")
+ else
+ examine_texts += span_notice("The next storm is inbound in [DisplayTimeText(time_until_next)].")
+
+/datum/component/weather_announcer/RegisterWithParent()
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
+
+/datum/component/weather_announcer/UnregisterFromParent()
+ .=..()
+ UnregisterSignal(parent, COMSIG_PARENT_EXAMINE)
+
+#undef WEATHER_ALERT_CLEAR
+#undef WEATHER_ALERT_INCOMING
+#undef WEATHER_ALERT_IMMINENT_OR_ACTIVE
diff --git a/code/datums/diseases/advance/symptoms/species.dm b/code/datums/diseases/advance/symptoms/species.dm
index 49a3cf8d07d5..b19a4d453dd5 100644
--- a/code/datums/diseases/advance/symptoms/species.dm
+++ b/code/datums/diseases/advance/symptoms/species.dm
@@ -27,7 +27,7 @@
severity = 0
/datum/symptom/inorganic_adaptation/OnAdd(datum/disease/advance/A)
- A.infectable_biotypes |= MOB_MINERAL //Mineral covers plasmamen and golems.
+ A.infectable_biotypes |= MOB_MINERAL //Mineral covers plasmamen
/datum/symptom/inorganic_adaptation/OnRemove(datum/disease/advance/A)
A.infectable_biotypes &= ~MOB_MINERAL
diff --git a/code/datums/ert.dm b/code/datums/ert.dm
index 8bb5f0e6e35a..844548748824 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,187 @@
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"
+
+/datum/ert/syndicate/inspector
+ teamsize = 1
+ leader_role = /datum/antagonist/ert/official/syndicate
+ roles = list(/datum/antagonist/ert/official/syndicate)
+ rename_team = "Syndicate Inspector"
+ polldesc = "a syndicate inspector"
+ spawn_at_outpost = FALSE
+
+/datum/ert/syndicate/inspector/New()
+ mission = "Conduct a routine review on [station_name()]'s vessels."
+
+// 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/random
+ teamsize = 8
+ leader_role = /datum/antagonist/ert/frontier/random
+ roles = list(/datum/antagonist/ert/frontier/random)
+ rename_team = "Randomly Equipped Frontiersmen Team"
+
+/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/holocall.dm b/code/datums/holocall.dm
index 6fd41b9df929..721444281653 100644
--- a/code/datums/holocall.dm
+++ b/code/datums/holocall.dm
@@ -349,21 +349,12 @@
/datum/preset_holoimage/engineer
outfit_type = /datum/outfit/job/engineer
-/datum/preset_holoimage/engineer/rig
- outfit_type = /datum/outfit/job/engineer/gloved/rig
-
/datum/preset_holoimage/engineer/ce
outfit_type = /datum/outfit/job/ce
-/datum/preset_holoimage/engineer/ce/rig
- outfit_type = /datum/outfit/job/engineer/gloved/rig
-
/datum/preset_holoimage/engineer/atmos
outfit_type = /datum/outfit/job/atmos
-/datum/preset_holoimage/engineer/atmos/rig
- outfit_type = /datum/outfit/job/engineer/gloved/rig
-
/datum/preset_holoimage/researcher
outfit_type = /datum/outfit/job/scientist
diff --git a/code/datums/mapgen/planetary/BeachGenerator.dm b/code/datums/mapgen/planetary/BeachGenerator.dm
index ca1d70b929fa..7999d76f3a11 100644
--- a/code/datums/mapgen/planetary/BeachGenerator.dm
+++ b/code/datums/mapgen/planetary/BeachGenerator.dm
@@ -119,7 +119,7 @@
/mob/living/simple_animal/butterfly = 4,
/mob/living/simple_animal/hostile/retaliate/poison/snake = 5,
- /mob/living/simple_animal/hostile/poison/bees/toxin = 3,
+ /mob/living/simple_animal/hostile/poison/bees = 3,
)
mob_spawn_chance = 2
feature_spawn_chance = 0.1
diff --git a/code/datums/mapgen/planetary/JungleGenerator.dm b/code/datums/mapgen/planetary/JungleGenerator.dm
index dd5635d4841f..45ae4a7120cc 100644
--- a/code/datums/mapgen/planetary/JungleGenerator.dm
+++ b/code/datums/mapgen/planetary/JungleGenerator.dm
@@ -228,7 +228,7 @@
)
mob_spawn_chance = 1
mob_spawn_list = list(
- /mob/living/simple_animal/hostile/poison/bees/toxin = 1,
+ /mob/living/simple_animal/hostile/poison/bees = 1,
/mob/living/simple_animal/hostile/mushroom = 1,
/mob/living/simple_animal/pet/dog/corgi/capybara = 1
)
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index f6d61833814e..af7d411245e2 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -57,7 +57,7 @@
var/hasSoul = TRUE // If false, renders the character unable to sell their soul.
var/holy_role = NONE //is this person a chaplain or admin role allowed to use bibles, Any rank besides 'NONE' allows for this.
- var/mob/living/enslaved_to //If this mind's master is another mob (i.e. adamantine golems)
+ var/mob/living/enslaved_to //If this mind's master is another mob
var/datum/language_holder/language_holder
var/unconvertable = FALSE
var/late_joiner = FALSE
diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm
index c16655ae59e3..dbaac99c4296 100644
--- a/code/datums/mood_events/generic_positive_events.dm
+++ b/code/datums/mood_events/generic_positive_events.dm
@@ -113,6 +113,14 @@
description = "
I love showing off my mime pin! \n"
mood_change = 1
+/datum/mood_event/rilena_fan
+ description = "
I love my RILENA merch! \n"
+ mood_change = 1
+
+/datum/mood_event/rilena_super_fan
+ description = "
I love my RILENA hoodie! \n"
+ mood_change = 1
+
/datum/mood_event/goodmusic
description = "
There is something soothing about this music. \n"
mood_change = 3
diff --git a/code/datums/mood_events/needs_events.dm b/code/datums/mood_events/needs_events.dm
index e9ce07165326..5f873cf40ff8 100644
--- a/code/datums/mood_events/needs_events.dm
+++ b/code/datums/mood_events/needs_events.dm
@@ -1,8 +1,4 @@
//nutrition
-/datum/mood_event/fat
- description = "
I'm so fat... \n" //muh fatshaming
- mood_change = -6
-
/datum/mood_event/wellfed
description = "
I'm stuffed! \n"
mood_change = 8
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/space.dm b/code/datums/ruins/space.dm
index ea5a6d0aa775..598f027fd016 100644
--- a/code/datums/ruins/space.dm
+++ b/code/datums/ruins/space.dm
@@ -103,12 +103,6 @@
description = "an abandoned secure storage location. there is no power left in the batteries and the former ocupants locked it pretty tight before leaving.\
You will have to power areas to raise the bolts on the doors. look out for secrets."
-/datum/map_template/ruin/space/spacegym
- id = "Space_Gym"
- suffix = "spacegym.dmm"
- name = "Space Gym"
- description = "A gym, lost in space, where many grunts and moaning could be heard."
-
/datum/map_template/ruin/space/oldshuttle
id = "oldcode-nukeops"
suffix = "oldcodeops.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..66919ca67f3b 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -366,3 +366,10 @@
name = "Falcon Dropship"
prefix = "NTSV"
+
+/datum/map_template/shuttle/subshuttles/haste
+ file_name = "inteq_haste"
+ name = "Haste-class Ambulance"
+ prefix = "IRMV"
+
+
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index 5932ee024359..52087f03174c 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -219,40 +219,6 @@
desc = "Your biological functions have halted. You could live forever this way, but it's pretty boring."
icon_state = "stasis"
-//GOLEM GANG
-
-//OTHER DEBUFFS
-/datum/status_effect/strandling //get it, strand as in durathread strand + strangling = strandling hahahahahahahahahahhahahaha i want to die
- id = "strandling"
- status_type = STATUS_EFFECT_UNIQUE
- alert_type = /atom/movable/screen/alert/status_effect/strandling
-
-/datum/status_effect/strandling/on_apply()
- ADD_TRAIT(owner, TRAIT_MAGIC_CHOKE, "dumbmoron")
- return ..()
-
-/datum/status_effect/strandling/on_remove()
- REMOVE_TRAIT(owner, TRAIT_MAGIC_CHOKE, "dumbmoron")
- return ..()
-
-/atom/movable/screen/alert/status_effect/strandling
- name = "Choking strand"
- desc = "A magical strand of Durathread is wrapped around your neck, preventing you from breathing! Click this icon to remove the strand."
- icon_state = "his_grace"
- alerttooltipstyle = "hisgrace"
-
-/atom/movable/screen/alert/status_effect/strandling/Click(location, control, params)
- . = ..()
- if(usr != owner)
- return
- to_chat(owner, "
You attempt to remove the durathread strand from around your neck. ")
- if(do_after(owner, 35, null, owner))
- if(isliving(owner))
- var/mob/living/L = owner
- to_chat(owner, "
You succesfuly remove the durathread strand. ")
- L.remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND)
-
-
/datum/status_effect/pacify/on_creation(mob/living/new_owner, set_duration)
if(isnum(set_duration))
duration = set_duration
diff --git a/code/datums/tgs_event_handler.dm b/code/datums/tgs_event_handler.dm
index 55c7c6427749..dda39c21df55 100644
--- a/code/datums/tgs_event_handler.dm
+++ b/code/datums/tgs_event_handler.dm
@@ -1,5 +1,6 @@
/datum/tgs_event_handler/impl
var/datum/timedevent/reattach_timer
+ var/datum/timedevent/delay_end_timer
/datum/tgs_event_handler/impl/HandleEvent(event_code, ...)
switch(event_code)
@@ -14,28 +15,44 @@
message_admins("TGS: Instance renamed to from [world.TgsInstanceName()] to [args[2]]")
if(TGS_EVENT_COMPILE_START)
message_admins("TGS: Deployment started, new game version incoming...")
+ SSticker.delay_end = ROUND_END_TGS
+ SSticker.admin_delay_notice = "TGS Deployment in progress, please wait..."
+ delay_end_timer = addtimer(CALLBACK(src, PROC_REF(end_delay)), 5 MINUTES, TIMER_STOPPABLE)
if(TGS_EVENT_COMPILE_CANCELLED)
message_admins("TGS: Deployment cancelled!")
+ end_delay()
if(TGS_EVENT_COMPILE_FAILURE)
message_admins("TGS: Deployment failed!")
+ end_delay()
if(TGS_EVENT_DEPLOYMENT_COMPLETE)
message_admins("TGS: Deployment complete!")
- to_chat(world, "
Server updated, changes will be applied on the next round... ")
+ to_chat(world, span_boldannounce("Server updated, changes will be applied on the next round..."))
+ end_delay()
if(TGS_EVENT_WATCHDOG_DETACH)
message_admins("TGS restarting...")
- reattach_timer = addtimer(CALLBACK(src, PROC_REF(LateOnReattach)), 1 MINUTES)
+ reattach_timer = addtimer(CALLBACK(src, PROC_REF(LateOnReattach)), 1 MINUTES, TIMER_STOPPABLE)
if(TGS_EVENT_WATCHDOG_REATTACH)
var/datum/tgs_version/old_version = world.TgsVersion()
var/datum/tgs_version/new_version = args[2]
if(!old_version.Equals(new_version))
- to_chat(world, "
TGS updated to v[new_version.deprefixed_parameter] ")
+ to_chat(world, span_boldannounce("TGS updated to v[new_version.deprefixed_parameter]"))
else
message_admins("TGS: Back online")
if(reattach_timer)
deltimer(reattach_timer)
reattach_timer = null
if(TGS_EVENT_WATCHDOG_SHUTDOWN)
- to_chat_immediate(world, "
Server is shutting down! ")
+ to_chat_immediate(world, span_boldannounce("Server is shutting down!"))
/datum/tgs_event_handler/impl/proc/LateOnReattach()
message_admins("Warning: TGS hasn't notified us of it coming back for a full minute! Is there a problem?")
+
+/datum/tgs_event_handler/impl/proc/end_delay()
+ if(SSticker.delay_end == ROUND_END_TGS)
+ SSticker.delay_end = ROUND_END_NOT_DELAYED
+ SSticker.admin_delay_notice = null
+ if(delay_end_timer)
+ deltimer(delay_end_timer)
+ delay_end_timer = null
+ if(SSticker.ready_for_reboot && !SSticker.delay_end) //we undelayed after standard reboot would occur
+ SSticker.standard_reboot()
diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm
index c3a473ecd992..52ee20e23c27 100644
--- a/code/datums/traits/good.dm
+++ b/code/datums/traits/good.dm
@@ -82,6 +82,26 @@
var/datum/atom_hud/fan = GLOB.huds[DATA_HUD_FAN]
fan.add_hud_to(H)
+/datum/quirk/fan_rilena
+ name = "RILENA Super Fan"
+ desc = "You are a major fan of the popular webseries RILENA: LMR. You get a mood boost from plushies of your favorite characters, and wearing your Xader pin."
+ value = 1
+ mob_traits = list(TRAIT_FAN_RILENA)
+ gain_text = "
You are a huge fan of a certain combination webcomic and bullet hell game. "
+ gain_text = "
Suddenly, bullet hell games and webcomics don't seem all that interesting anymore... "
+ medical_record_text = "Patient reports being a huge fan of RILENA."
+
+/datum/quirk/fan_rilena/on_spawn()
+ var/mob/living/carbon/human/H = quirk_holder
+ var/obj/item/clothing/accessory/rilena_pin/B = new(get_turf(H))
+ var/list/slots = list (
+ "backpack" = ITEM_SLOT_BACKPACK,
+ "hands" = ITEM_SLOT_HANDS,
+ )
+ H.equip_in_one_of_slots(B, slots , qdel_on_fail = TRUE)
+ var/datum/atom_hud/fan = GLOB.huds[DATA_HUD_FAN]
+ fan.add_hud_to(H)
+
/datum/quirk/fan_mime
name = "Mime Fan"
desc = "You enjoy mime antics and get a mood boost from wearing your mime pin."
diff --git a/code/game/MapData/shuttles/nanotrasen_ranger.dm b/code/game/MapData/shuttles/nanotrasen_ranger.dm
index ec41a611618f..df5a0a9b4a08 100644
--- a/code/game/MapData/shuttles/nanotrasen_ranger.dm
+++ b/code/game/MapData/shuttles/nanotrasen_ranger.dm
@@ -5,7 +5,7 @@
/obj/item/clothing/under/rank/security/head_of_security/nt/lp
name = "LP Security Specialist's Jumpsuit"
- desc = "The ERT ran out of outfits to give to the LP, so they gave them station spares. This one belongs to the LP Lieutenant."
+ desc = "The ERT ran out of outfits to give to the LP, so they gave them station spares. This one belongs to the LP Security Specialist."
/obj/item/clothing/under/rank/security/head_of_security/alt/lp
name = "LP Lieutentant's 'Dramatic' Jumpsuit"
@@ -91,7 +91,7 @@
//Holocalls
/datum/preset_holoimage/commissioner
- outfit_type = /datum/outfit/job/captain/nt/lp_lieutenant
+ outfit_type = /datum/outfit/job/nanotrasen/captain/lp
//hardsuits
/obj/item/clothing/suit/space/hardsuit/ert/lp
diff --git a/code/game/MapData/shuttles/srm_glaive.dm b/code/game/MapData/shuttles/srm_glaive.dm
index a40e9bd426c1..db6561b6550c 100644
--- a/code/game/MapData/shuttles/srm_glaive.dm
+++ b/code/game/MapData/shuttles/srm_glaive.dm
@@ -48,7 +48,7 @@
icon_state = "Sleep"
/datum/preset_holoimage/montagne
- outfit_type = /datum/outfit/job/hos/roumain
+ outfit_type = /datum/outfit/job/roumain/captain
/obj/item/disk/holodisk/roumain
name = "Grand Ideology Sermon"
diff --git a/code/game/area/areas/holodeck.dm b/code/game/area/areas/holodeck.dm
deleted file mode 100644
index c8741a23ae7e..000000000000
--- a/code/game/area/areas/holodeck.dm
+++ /dev/null
@@ -1,52 +0,0 @@
-/area/holodeck
- name = "Holodeck"
- icon_state = "Holodeck"
- dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
- flags_1 = NONE
- area_flags = VALID_TERRITORY | UNIQUE_AREA
- sound_environment = SOUND_ENVIRONMENT_PADDED_CELL
-
- var/obj/machinery/computer/holodeck/linked
- var/restricted = 0 // if true, program goes on emag list
-
-/*
- Power tracking: Use the holodeck computer's power grid
- Asserts are to avoid the inevitable infinite loops
-*/
-
-/area/holodeck/powered(chan)
- if(!requires_power)
- return TRUE
- if(always_unpowered)
- return FALSE
- if(!linked)
- return FALSE
- var/area/A = get_area(linked)
- ASSERT(!istype(A, /area/holodeck))
- return A.powered(chan)
-
-/area/holodeck/addStaticPower(value, powerchannel)
- if(!linked)
- return
- var/area/A = get_area(linked)
- ASSERT(!istype(A, /area/holodeck))
- return ..()
-
-/area/holodeck/use_power(amount, chan)
- if(!linked)
- return 0
- var/area/A = get_area(linked)
- ASSERT(!istype(A, /area/holodeck))
- return ..()
-
-
-/*
- This is the standard holodeck. It is intended to allow you to
- blow off steam by doing stupid things like laying down, throwing
- spheres at holes, or bludgeoning people.
-*/
-/area/holodeck/rec_center
- name = "\improper Recreational Holodeck"
-
-/area/holodeck/rec_center/offstation_one
- name = "\improper Recreational Holodeck"
diff --git a/code/game/area/areas/outpost.dm b/code/game/area/areas/outpost.dm
index 31d9f39c7e30..f50b7655a119 100644
--- a/code/game/area/areas/outpost.dm
+++ b/code/game/area/areas/outpost.dm
@@ -22,6 +22,9 @@
icon_state = "quartoffice"
sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
+/area/outpost/cargo/smeltery
+ name = "Smeltery"
+ icon_state = "mining_production"
/area/outpost/crew
name = "Crew Quarters"
@@ -68,6 +71,11 @@
icon_state = "library"
sound_environment = SOUND_AREA_LARGE_SOFTFLOOR
+/area/outpost/crew/bathroom
+ name = "Bathroom"
+ icon_state = "restrooms"
+ sound_environment = SOUND_ENVIRONMENT_BATHROOM
+
/area/outpost/crew/lounge
name = "Lounge"
icon_state = "lounge"
@@ -174,6 +182,9 @@
name = "Armory"
icon_state = "armory"
+/area/outpost/security/checkpoint
+ name = "Security Checkpoint"
+ icon_state = "checkpoint1"
/area/outpost/storage
name = "Storage"
@@ -181,7 +192,6 @@
lighting_colour_tube = "#ffce93"
lighting_colour_bulb = "#ffbc6f"
-
/area/outpost/vacant_rooms
name = "Vacant Rooms"
icon_state = "vacant_commissary"
@@ -190,6 +200,18 @@
name = "Vacant Office"
icon_state = "vacant_office"
+/area/outpost/vacant_rooms/shop
+ name = "Shop"
+ icon_state = "vacant_room"
+
+//for powered outdoors non-space areas -- uses ice planet ambience
+
+/area/outpost/exterior
+ name = "Exterior"
+ icon_state = "green"
+ sound_environment = SOUND_ENVIRONMENT_CAVE
+ ambientsounds = SPOOKY
+
// this might be redundant with /area/space/nearstation. unsure; use with caution?
/area/outpost/external
name = "External"
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 6bda9781b500..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
@@ -367,12 +368,6 @@
name = "Engineering Wing"
icon_state = "yellow"
-//Space Gym
-
-/area/ruin/space/has_grav/spacegym
- name = "Space Gym"
- icon_state = "firingrange"
-
//scav_mining
/area/ruin/space/has_grav/scav_mining/entrance
diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index 14b3887ca539..1dee49da7f54 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -244,10 +244,22 @@ Security HUDs! Basic mode shows only the job.
var/image/holder = hud_list[ID_HUD]
var/icon/I = icon(icon, icon_state, dir)
holder.pixel_y = I.Height() - world.icon_size
- holder.icon_state = "hudno_id"
+ holder.icon_state = "hudno_job"
var/obj/item/card/id/worn_id = wear_id?.GetID()
if(worn_id && worn_id.job_icon)
holder.icon_state = "hud[worn_id.job_icon]"
+
+ var/underlay_icon_state = "hudunknown"
+ if(worn_id && worn_id.faction_icon)
+ underlay_icon_state = "hud[worn_id.faction_icon]"
+
+ var/mutable_appearance/faction_background = mutable_appearance(
+ icon = holder.icon,
+ icon_state = underlay_icon_state
+ )
+ holder.underlays.Cut()
+ holder.underlays += faction_background
+
sec_hud_set_security_status()
/mob/living/proc/sec_hud_set_implants()
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/autolathe.dm b/code/game/machinery/autolathe.dm
index 5f8412ff25a3..d83831f2c634 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -5,6 +5,7 @@
/obj/machinery/autolathe
name = "autolathe"
desc = "It produces items using metal and glass and maybe other materials, can take design disks."
+ icon = 'icons/obj/machines/autolathe.dmi'
icon_state = "autolathe"
density = TRUE
use_power = IDLE_POWER_USE
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/machinery/fat_sucker.dm b/code/game/machinery/fat_sucker.dm
deleted file mode 100644
index 9d556bf422ed..000000000000
--- a/code/game/machinery/fat_sucker.dm
+++ /dev/null
@@ -1,217 +0,0 @@
-/obj/machinery/fat_sucker
- name = "lipid extractor"
- desc = "Safely and efficiently extracts excess fat from a subject."
- icon = 'icons/obj/machines/fat_sucker.dmi'
- icon_state = "fat"
-
- state_open = FALSE
- density = TRUE
- req_access = list(ACCESS_KITCHEN)
- var/processing = FALSE
- var/start_at = NUTRITION_LEVEL_WELL_FED
- var/stop_at = NUTRITION_LEVEL_STARVING
- var/free_exit = TRUE //set to false to prevent people from exiting before being completely stripped of fat
- var/bite_size = 15 //amount of nutrients we take per process
- var/nutrients //amount of nutrients we got build up
- var/nutrient_to_meat = 90 //one slab of meat gives about 52 nutrition
- var/datum/looping_sound/microwave/soundloop //100% stolen from microwaves
- var/breakout_time = 600
-
- var/next_fact = 10 //in ticks, so about 20 seconds
- var/static/list/fat_facts = list(\
- "Fats are triglycerides made up of a combination of different building blocks; glycerol and fatty acids.", \
- "Adults should get a recommended 20-35% of their energy intake from fat.", \
- "Being overweight or obese puts you at an increased risk of chronic diseases, such as cardiovascular diseases, metabolic syndrome, type 2 diabetes and some types of cancers.", \
- "Not all fats are bad. A certain amount of fat is an essential part of a healthy balanced diet. " , \
- "Saturated fat should form no more than 11% of your daily calories.", \
- "Unsaturated fat, that is monounsaturated fats, polyunsaturated fats and omega-3 fatty acids, is found in plant foods and fish." \
- )
-
-/obj/machinery/fat_sucker/Initialize()
- . = ..()
- soundloop = new(list(src), FALSE)
- update_appearance()
-
-/obj/machinery/fat_sucker/Destroy()
- QDEL_NULL(soundloop)
- return ..()
-
-/obj/machinery/fat_sucker/RefreshParts()
- ..()
- var/rating = 0
- for(var/obj/item/stock_parts/micro_laser/L in component_parts)
- rating += L.rating
- bite_size = initial(bite_size) + rating * 5
- nutrient_to_meat = initial(nutrient_to_meat) - rating * 5
-
-/obj/machinery/fat_sucker/examine(mob/user)
- . = ..()
- . += {"
Alt-Click to toggle the safety hatch.
-
Removing [bite_size] nutritional units per operation.
-
Requires [nutrient_to_meat] nutritional units per meat slab. "}
-
-/obj/machinery/fat_sucker/close_machine(mob/user)
- if(panel_open)
- to_chat(user, "
You need to close the maintenance hatch first! ")
- return
- ..()
- playsound(src, 'sound/machines/click.ogg', 50)
- if(occupant)
- if(!iscarbon(occupant))
- occupant.forceMove(drop_location())
- occupant = null
- return
- to_chat(occupant, "
You enter [src]. ")
- addtimer(CALLBACK(src, PROC_REF(start_extracting)), 20, TIMER_OVERRIDE|TIMER_UNIQUE)
- update_appearance()
-
-/obj/machinery/fat_sucker/open_machine(mob/user)
- make_meat()
- playsound(src, 'sound/machines/click.ogg', 50)
- if(processing)
- stop()
- ..()
-
-/obj/machinery/fat_sucker/container_resist_act(mob/living/user)
- if(!free_exit || state_open)
- to_chat(user, "
The emergency release is not responding! You start pushing against the hull! ")
- user.changeNext_move(CLICK_CD_BREAKOUT)
- user.last_special = world.time + CLICK_CD_BREAKOUT
- user.visible_message("
You see [user] kicking against the door of [src]! ", \
- "
You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].) ", \
- "
You hear a metallic creaking from [src]. ")
- if(do_after(user, breakout_time, target = src))
- if(!user || user.stat != CONSCIOUS || user.loc != src || state_open)
- return
- free_exit = TRUE
- user.visible_message("
[user] successfully broke out of [src]! ", \
- "
You successfully break out of [src]! ")
- open_machine()
- return
- open_machine()
-
-/obj/machinery/fat_sucker/interact(mob/user)
- if(state_open)
- close_machine()
- else if(!processing || free_exit)
- open_machine()
- else
- to_chat(user, "
The safety hatch has been disabled! ")
-
-/obj/machinery/fat_sucker/AltClick(mob/living/user)
- if(!user.canUseTopic(src, BE_CLOSE))
- return
- if(user == occupant)
- to_chat(user, "
You can't reach the controls from inside! ")
- return
- if(!(obj_flags & EMAGGED) && !allowed(user))
- to_chat(user, "
You lack the required access. ")
- return
- free_exit = !free_exit
- to_chat(user, "
Safety hatch [free_exit ? "unlocked" : "locked"]. ")
-
-/obj/machinery/fat_sucker/update_overlays()
- . = ..()
-
- if(!state_open)
- if(processing)
- . += "[icon_state]_door_on"
- . += "[icon_state]_stack"
- . += "[icon_state]_smoke"
- . += "[icon_state]_green"
- else
- . += "[icon_state]_door_off"
- if(occupant)
- if(powered())
- . += "[icon_state]_stack"
- . += "[icon_state]_yellow"
- else
- . += "[icon_state]_red"
- else if(powered())
- . += "[icon_state]_red"
- if(panel_open)
- . += "[icon_state]_panel"
-
-/obj/machinery/fat_sucker/process()
- if(!processing)
- return
- if(!powered() || !occupant || !iscarbon(occupant))
- open_machine()
- return
-
- var/mob/living/carbon/C = occupant
- if(C.nutrition <= stop_at)
- open_machine()
- playsound(src, 'sound/machines/microwave/microwave-end.ogg', 100, FALSE)
- return
- C.adjust_nutrition(-bite_size)
- nutrients += bite_size
-
- if(next_fact <= 0)
- next_fact = initial(next_fact)
- say(pick(fat_facts))
- playsound(loc, 'sound/machines/chime.ogg', 30, FALSE)
- else
- next_fact--
- use_power(500)
-
-/obj/machinery/fat_sucker/proc/start_extracting()
- if(state_open || !occupant || processing || !powered())
- return
- if(iscarbon(occupant))
- var/mob/living/carbon/C = occupant
- if(C.nutrition > start_at)
- processing = TRUE
- soundloop.start()
- update_appearance()
- set_light(2, 1, "#ff0000")
- else
- say("Subject not fat enough.")
- playsound(src, 'sound/machines/buzz-sigh.ogg', 40, FALSE)
- overlays += "[icon_state]_red" //throw a red light icon over it, to show that it wont work
-
-/obj/machinery/fat_sucker/proc/stop()
- processing = FALSE
- soundloop.stop()
- set_light(0, 0)
-
-/obj/machinery/fat_sucker/proc/make_meat()
- if(occupant && iscarbon(occupant))
- var/mob/living/carbon/C = occupant
- if(C.type_of_meat)
- if(nutrients >= nutrient_to_meat * 2)
- C.put_in_hands(new /obj/item/reagent_containers/food/snacks/cookie (), TRUE)
- while(nutrients >= nutrient_to_meat)
- nutrients -= nutrient_to_meat
- new C.type_of_meat (drop_location())
- while(nutrients >= nutrient_to_meat / 3)
- nutrients -= nutrient_to_meat / 3
- new /obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain (drop_location())
- nutrients = 0
-
-/obj/machinery/fat_sucker/screwdriver_act(mob/living/user, obj/item/I)
- . = TRUE
- if(..())
- return
- if(occupant)
- to_chat(user, "
[src] is currently occupied! ")
- return
- if(state_open)
- to_chat(user, "
[src] must be closed to [panel_open ? "close" : "open"] its maintenance hatch! ")
- return
- if(default_deconstruction_screwdriver(user, icon_state, icon_state, I))
- update_appearance()
- return
- return FALSE
-
-/obj/machinery/fat_sucker/crowbar_act(mob/living/user, obj/item/I)
- if(default_deconstruction_crowbar(I))
- return TRUE
-
-/obj/machinery/fat_sucker/emag_act(mob/living/user)
- if(obj_flags & EMAGGED)
- return
- start_at = 100
- stop_at = 0
- to_chat(user, "
You remove the access restrictions and lower the automatic ejection threshold! ")
- obj_flags |= EMAGGED
diff --git a/code/game/machinery/scan_gate.dm b/code/game/machinery/scan_gate.dm
index bc7ffd566340..afc154a0c95a 100644
--- a/code/game/machinery/scan_gate.dm
+++ b/code/game/machinery/scan_gate.dm
@@ -5,7 +5,6 @@
#define SCANGATE_GUNS "Guns"
#define SCANGATE_WANTED "Wanted"
#define SCANGATE_SPECIES "Species"
-#define SCANGATE_NUTRITION "Nutrition"
#define SCANGATE_HUMAN "human"
#define SCANGATE_LIZARD "lizard"
@@ -14,7 +13,6 @@
#define SCANGATE_MOTH "moth"
#define SCANGATE_JELLY "jelly"
#define SCANGATE_POD "pod"
-#define SCANGATE_GOLEM "golem"
#define SCANGATE_ZOMBIE "zombie"
#define SCANGATE_SPIDER "rachnid"
#define SCANGATE_IPC "ipc"
@@ -39,7 +37,6 @@
var/nanite_cloud = 1
var/detect_species = SCANGATE_HUMAN
var/reverse = FALSE //If true, signals if the scan returns false
- var/detect_nutrition = NUTRITION_LEVEL_FAT
/obj/machinery/scanner_gate/Initialize()
. = ..()
@@ -143,8 +140,6 @@
scan_species = /datum/species/jelly
if(SCANGATE_POD)
scan_species = /datum/species/pod
- if(SCANGATE_GOLEM)
- scan_species = /datum/species/golem
if(SCANGATE_ZOMBIE)
scan_species = /datum/species/zombie
if(SCANGATE_SPIDER)
@@ -165,13 +160,6 @@
if(istype(I, /obj/item/gun))
beep = TRUE
break
- if(SCANGATE_NUTRITION)
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(H.nutrition <= detect_nutrition && detect_nutrition == NUTRITION_LEVEL_STARVING)
- beep = TRUE
- if(H.nutrition >= detect_nutrition && detect_nutrition == NUTRITION_LEVEL_FAT)
- beep = TRUE
if(reverse)
beep = !beep
@@ -207,7 +195,6 @@
data["nanite_cloud"] = nanite_cloud
data["disease_threshold"] = disease_threshold
data["target_species"] = detect_species
- data["target_nutrition"] = detect_nutrition
return data
/obj/machinery/scanner_gate/ui_act(action, params)
@@ -240,19 +227,6 @@
var/new_species = params["new_species"]
detect_species = new_species
. = TRUE
- if("set_target_nutrition")
- var/new_nutrition = params["new_nutrition"]
- var/nutrition_list = list(
- "Starving",
- "Obese"
- )
- if(new_nutrition && (new_nutrition in nutrition_list))
- switch(new_nutrition)
- if("Starving")
- detect_nutrition = NUTRITION_LEVEL_STARVING
- if("Obese")
- detect_nutrition = NUTRITION_LEVEL_FAT
- . = TRUE
#undef SCANGATE_NONE
#undef SCANGATE_MINDSHIELD
@@ -261,7 +235,6 @@
#undef SCANGATE_GUNS
#undef SCANGATE_WANTED
#undef SCANGATE_SPECIES
-#undef SCANGATE_NUTRITION
#undef SCANGATE_HUMAN
#undef SCANGATE_LIZARD
@@ -270,7 +243,6 @@
#undef SCANGATE_MOTH
#undef SCANGATE_JELLY
#undef SCANGATE_POD
-#undef SCANGATE_GOLEM
#undef SCANGATE_ZOMBIE
#undef SCANGATE_SPIDER
#undef SCANGATE_IPC
diff --git a/code/game/machinery/telecomms/machines/relay.dm b/code/game/machinery/telecomms/machines/relay.dm
index 15f96e69022b..773faec875f4 100644
--- a/code/game/machinery/telecomms/machines/relay.dm
+++ b/code/game/machinery/telecomms/machines/relay.dm
@@ -73,6 +73,36 @@
toggled = FALSE
autolinkers = list("r_relay")
+/obj/machinery/telecomms/relay/preset/nanotrasen
+ freq_listening = list(FREQ_COMMAND, FREQ_NANOTRASEN, FREQ_COMMON)
+ id = "Nanotrasen Relay"
+ network = "nt_commnet"
+
+/obj/machinery/telecomms/relay/preset/inteq
+ freq_listening = list(FREQ_COMMAND, FREQ_INTEQ, FREQ_COMMON)
+ id = "IRMG Relay"
+ network = "irmg_commnet"
+
+/obj/machinery/telecomms/relay/preset/minutemen
+ freq_listening = list(FREQ_COMMAND, FREQ_MINUTEMEN, FREQ_COMMON)
+ id = "CMM Relay"
+ network = "cmm_commnet"
+
+/obj/machinery/telecomms/relay/preset/solgov
+ freq_listening = list(FREQ_COMMAND, FREQ_SOLGOV, FREQ_COMMON)
+ id = "SolGov Relay"
+ network = "solgov_commnet"
+
+/obj/machinery/telecomms/relay/preset/syndicate
+ freq_listening = list(FREQ_COMMAND, FREQ_SYNDICATE, FREQ_COMMON)
+ id = "Syndicate Relay"
+ network = "synd_commnet"
+
+/obj/machinery/telecomms/relay/preset/frontiersmen
+ freq_listening = list(FREQ_COMMAND, FREQ_PIRATE, FREQ_COMMON)
+ id = "Frontiersmen Relay"
+ network = "frontier_commnet"
+
//Generic preset relay
/obj/machinery/telecomms/relay/preset/auto
hide = TRUE
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 4c5553c4bfbc..a6d2fff1571f 100644
--- a/code/game/objects/effects/contraband.dm
+++ b/code/game/objects/effects/contraband.dm
@@ -60,6 +60,11 @@
poster_type = /obj/structure/sign/poster/minutemen/random
icon_state = "rolled_legit"
+/obj/item/poster/random_rilena
+ name = "random rilena poster"
+ poster_type = /obj/structure/sign/poster/rilena/random
+ icon_state = "rolled_rilena"
+
// The poster sign/structure
/obj/structure/sign/poster
@@ -716,11 +721,6 @@
desc = "This informational poster teaches the viewer what carbon dioxide is."
icon_state = "poster_co2"
-/obj/structure/sign/poster/official/sgt
- name = "Sapient Trafficking Awareness"
- desc = "A poster calling for an end to sapient trafficking. Over sixty percent of victims are jellywomen."
- icon_state = "poster_sgt" // Maybe this will be what finally fixes it.
-
/obj/structure/sign/poster/official/focus
name = "Focus! Motivational Poster"
desc = "\"Focus! Let your energy be pinpointed!\""
@@ -958,13 +958,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
@@ -1015,6 +1015,51 @@
/obj/structure/sign/poster/contraband/d_day_promo,
)
+//RILENA poster pool. There are only five of these, so try not to go overboard with the random posters, okay? Expect not to see these mapped onto ships except in rolled up form, since they're supposed to be bought in the RILENA merch crate.
+
+/obj/structure/sign/poster/rilena
+ poster_item_name = "rilena poster"
+ poster_item_desc = "A poster with a vibrant purple backing, indicating it is for the popular webseries RILENA: LMR. It comes with adhesive backing, for easy pinning to any vertical surface."
+ poster_item_icon_state = "rolled_rilena"
+
+/obj/structure/sign/poster/rilena/Initialize(mapload, obj/structure/sign/poster/new_poster_structure)
+ . = ..()
+ AddComponent(/datum/component/art/rilena, GOOD_ART)
+
+/obj/structure/sign/poster/rilena/random
+ name = "random rilena poster"
+ icon_state = "random_rilena"
+ never_random = TRUE
+ random_basetype = /obj/structure/sign/poster/rilena
+ random_type = POSTER_SUBTYPES
+
+/obj/structure/sign/poster/rilena/rilena
+ name = "RILENA"
+ desc = "A RILENA: LMR poster featuring two of the more fan favorite characters, Ri and T4L1."
+ icon_state = "poster-rilena_rilena"
+
+/obj/structure/sign/poster/rilena/ri
+ name = "Ri"
+ desc = "A RILENA: LMR poster featuring Ri on her own."
+ icon_state = "poster-rilena_ri"
+
+/obj/structure/sign/poster/rilena/tali
+ name = "T4L1"
+ desc = "A RILENA: LMR poster featuring a fan favorite miniboss, T4L1."
+ icon_state = "poster-rilena_tali"
+
+/obj/structure/sign/poster/rilena/run
+ name = "Lenelasa Me Refi"
+ desc = "A RILENA: LMR poster featuring Ri running, a core mechanic of the series."
+ icon_state = "poster-rilena_run"
+
+/obj/structure/sign/poster/rilena/timeline
+ name = "Timeline"
+ desc = "A RILENA: LMR poster split in two to represent the series' disregard for conventional timeline aspects."
+ icon_state = "poster-rilena_timeline"
+
+
+
#undef PLACE_SPEED
#undef POSTER_SUBTYPES
#undef POSTER_LIST
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 63ff9b794ce4..c8332e1dd0cd 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -219,10 +219,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
name = "Brig Physician"
icon_state = "Brig Physician"
-/obj/effect/landmark/start/lieutenant
- name = "SolGov Representative" //WS Edit - SolGov Rep
- icon_state = "SolGov Representative" //WS Edit - SolGov Rep
-
//Department Security spawns
/obj/effect/landmark/start/depsec
@@ -344,7 +340,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 +348,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/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index 8d46f5bfa7d8..d1f47ff647f6 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -105,7 +105,6 @@
/obj/item/paper/fluff/jobs/prisoner/letter = 1,
/obj/item/grenade/smokebomb = 1,
/obj/item/flashlight/seclite = 1,
- /obj/item/tailclub = 1, //want to buy makeshift wooden club sprite
/obj/item/kitchen/knife/shiv = 4,
/obj/item/kitchen/knife/shiv/carrot = 1,
/obj/item/kitchen/knife = 1,
@@ -565,29 +564,11 @@
/obj/item/stack/sheet/mineral/wood/fifty,
/obj/item/stack/sheet/mineral/diamond/twenty,
/obj/item/stack/sheet/mineral/gold/fifty,
- /obj/item/stack/sheet/mineral/adamantine/ten,
+
/obj/item/stack/cable_coil/red,
/obj/item/stack/rods/fifty
)
-/obj/effect/spawner/lootdrop/spacegym
- name = "spacegym loot spawner"
- lootdoubles = FALSE
-
- loot = list(
- /obj/item/dnainjector/hulkmut = 1,
- /obj/item/dnainjector/dwarf = 1,
- /obj/item/dnainjector/gigantism = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet/chicken = 1,
- /obj/item/clothing/under/shorts/black = 1,
- /obj/item/clothing/under/shorts/blue = 1,
- /obj/item/clothing/under/shorts/red = 1,
- /obj/item/restraints/handcuffs = 1,
- /obj/item/storage/pill_bottle/stimulant = 1,
- /obj/item/storage/firstaid/regular = 1,
- /obj/item/storage/box/handcuffs = 1,
- )
-
/obj/effect/spawner/lootdrop/singularitygen
name = "Tesla or Singulo spawner"
lootdoubles = FALSE
@@ -645,7 +626,6 @@
/obj/item/stack/sheet/mineral/wood/fifty,
/obj/item/stack/sheet/mineral/diamond/twenty,
/obj/item/stack/sheet/mineral/gold/fifty,
- /obj/item/stack/sheet/mineral/adamantine/ten,
/obj/item/stack/cable_coil/red,
/obj/item/stack/rods/fifty
)
diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm
index 76412acf2a5b..16d1d35e31ff 100644
--- a/code/game/objects/effects/step_triggers.dm
+++ b/code/game/objects/effects/step_triggers.dm
@@ -70,7 +70,7 @@
return
if(immobilize)
- ADD_TRAIT(AM, TRAIT_IMMOBILIZED, src)
+ ADD_TRAIT(AM, TRAIT_IMMOBILIZED, REF(src))
affecting.Add(AM)
while(AM && !stopthrow)
@@ -104,7 +104,7 @@
affecting.Remove(AM)
- REMOVE_TRAIT(AM, TRAIT_IMMOBILIZED, src)
+ REMOVE_TRAIT(AM, TRAIT_IMMOBILIZED, REF(src))
/* Stops things thrown by a thrower, doesn't do anything */
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index c4e48f1a629a..ad440817942b 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -161,6 +161,7 @@
var/icon/cached_flat_icon
var/registered_age = 13 // default age for ss13 players
var/job_icon
+ var/faction_icon
/obj/item/card/id/Initialize(mapload)
. = ..()
@@ -435,11 +436,6 @@ update_label()
registered_name = "Emergency Command Hologram"
access = list(ACCESS_CHANGE_IDS)
-/obj/item/card/id/silver/reaper
- access = list(ACCESS_MAINT_TUNNELS)
- assignment = "Reaper"
- registered_name = "Thirteen"
-
/obj/item/card/id/gold
name = "gold identification card"
desc = "A golden card which shows power and might."
@@ -525,6 +521,8 @@ update_label()
else if (popup_input == "Forge/Reset" && forged)
registered_name = initial(registered_name)
assignment = initial(assignment)
+ faction_icon = initial(faction_icon)
+ job_icon = initial(job_icon)
log_game("[key_name(user)] has reset \the [initial(name)] named \"[src]\" to default.")
update_label()
forged = FALSE
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index 44857142e4db..8800dee20016 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -342,10 +342,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
smoke_all = TRUE
list_reagents = list(/datum/reagent/drug/nicotine = 10, /datum/reagent/medicine/omnizine = 15)
-/obj/item/clothing/mask/cigarette/shadyjims
- desc = "A Shady Jim's Super Slims cigarette."
- list_reagents = list(/datum/reagent/drug/nicotine = 15, /datum/reagent/toxin/lipolicide = 4, /datum/reagent/ammonia = 2, /datum/reagent/toxin/plantbgone = 1, /datum/reagent/toxin = 1.5)
-
/obj/item/clothing/mask/cigarette/xeno
desc = "A Xeno Filtered brand cigarette."
list_reagents = list (/datum/reagent/drug/nicotine = 20, /datum/reagent/medicine/regen_jelly = 15, /datum/reagent/drug/krokodil = 4)
diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm
index 8cbda2b3af5a..54dcfb36c131 100644
--- a/code/game/objects/items/circuitboards/computer_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm
@@ -180,11 +180,6 @@
icon_state = "generic"
build_path = /obj/machinery/computer/arcade/orion_trail
-/obj/item/circuitboard/computer/holodeck// Not going to let people get this, but it's just here for future
- name = "Holodeck Control (Computer Board)"
- icon_state = "generic"
- build_path = /obj/machinery/computer/holodeck
-
/obj/item/circuitboard/computer/libraryconsole
name = "Library Visitor Console (Computer Board)"
build_path = /obj/machinery/computer/libraryconsole
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index 7e7bd499a19b..306634a639fc 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -687,7 +687,6 @@
name = "Fax Machine"
build_path = /obj/machinery/fax
req_components = list(
- /obj/item/stock_parts/subspace/crystal = 1,
/obj/item/stock_parts/scanning_module = 1,
/obj/item/stock_parts/micro_laser = 1,
/obj/item/stock_parts/manipulator = 1,)
@@ -802,13 +801,6 @@
/obj/item/stack/cable_coil = 1,
/obj/item/stack/sheet/glass = 4)
-/obj/item/circuitboard/machine/fat_sucker
- name = "Lipid Extractor (Machine Board)"
- icon_state = "medical"
- build_path = /obj/machinery/fat_sucker
- req_components = list(/obj/item/stock_parts/micro_laser = 1,
- /obj/item/kitchen/fork = 1)
-
/obj/item/circuitboard/machine/harvester
name = "Harvester (Machine Board)"
icon_state = "medical"
@@ -1502,3 +1494,32 @@
/obj/item/stock_parts/cell = 3,
/obj/item/stock_parts/capacitor = 2
)
+
+/obj/item/circuitboard/machine/printer
+ name = "Poster Printer (Machine Board)"
+ build_path = /obj/machinery/printer
+ req_components = list(
+ /obj/item/stock_parts/scanning_module = 2,
+ /obj/item/stock_parts/micro_laser = 1,
+ /obj/item/stock_parts/manipulator = 2,
+ )
+
+/obj/item/circuitboard/machine/coffeemaker
+ name = "Modello 3 Coffeemaker"
+ build_path = /obj/machinery/coffeemaker
+ req_components = list(
+ /obj/item/stack/sheet/glass = 1,
+ /obj/item/reagent_containers/glass/beaker = 2,
+ /obj/item/stock_parts/capacitor = 1,
+ /obj/item/stock_parts/micro_laser = 2,
+ )
+
+/obj/item/circuitboard/machine/coffeemaker/impressa
+ name = "Impressa Coffeemaker"
+ build_path = /obj/machinery/coffeemaker/impressa
+ req_components = list(
+ /obj/item/stack/sheet/glass = 1,
+ /obj/item/reagent_containers/glass/beaker = 2,
+ /obj/item/stock_parts/capacitor = 1,
+ /obj/item/stock_parts/micro_laser = 2,
+ )
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index dff96fd8076d..e259e56ccd0e 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 [PDAIMG(mail)] ExperTrak® Skill Tracker V4.26.2 "
- dat += "Thank you for choosing ExperTrak® brand software! ExperTrak® inc. is proud to be a NanoTrasen employee expertise and effectiveness department subsidary! "
- dat += "Thank you for choosing ExperTrak® brand software! ExperTrak® inc. is proud to be a Nanotrasen employee expertise and effectiveness department subsidary! "
+ dat += "[L] triggers \the [src]. ", \
- "You trigger \the [src]! ")
+ L.visible_message("[L] gets caught by \the [src]! ", \
+ "You get caught by \the [src]! ")
L.apply_damage(trap_damage, BRUTE, def_zone)
/obj/item/restraints/legcuffs/beartrap/energy
diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm
index 504c07299c45..8247d02cb549 100644
--- a/code/game/objects/items/implants/implantchair.dm
+++ b/code/game/objects/items/implants/implantchair.dm
@@ -158,23 +158,6 @@
if(auto_inject && ready && ready_implants > 0)
implant(user,null)
-/obj/machinery/implantchair/genepurge
- name = "Genetic purifier"
- desc = "Used to purge a human genome of foreign influences."
- special = TRUE
- special_name = "Purge genome"
- injection_cooldown = 0
- replenish_cooldown = 300
-
-/obj/machinery/implantchair/genepurge/implant_action(mob/living/carbon/human/H,mob/user)
- if(!istype(H))
- return 0
- H.set_species(/datum/species/human, 1)//lizards go home
- H.purrbation_remove()//remove cats
- H.dna.remove_all_mutations()//hulks out
- return 1
-
-
/obj/machinery/implantchair/brainwash
name = "Neural Imprinter"
desc = "Used to indoctrinate rehabilitate hardened recidivists."
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index 153c3a75564d..2dbec7311bd1 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -542,7 +542,7 @@
return
if (is_type_in_typecache(target, ovens))
if (held_sausage && held_sausage.roasted)
- to_chat("Your [held_sausage] has already been cooked! ")
+ to_chat(src, "Your [held_sausage] has already been cooked! ")
return
if (istype(target, /obj/singularity) && get_dist(user, target) < 10)
to_chat(user, "You send [held_sausage] towards [target]. ")
@@ -763,12 +763,12 @@
/obj/item/storage/belt/weebstick/afterattack(atom/A, mob/living/user, proximity_flag, params)
. = ..()
if(primed && length(contents))
+ if(!(A in view(user.client.view, user)))
+ return
var/obj/item/I = contents[1]
if(!user.put_in_inactive_hand(I))
to_chat(user, "You need a free hand! ")
return
- if(!(A in view(user.client.view, user)))
- return
var/datum/component/storage/CP = GetComponent(/datum/component/storage)
CP.locked = FALSE
primed = FALSE
diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index e2461af4175a..a6ef402ecad4 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -653,7 +653,7 @@
/obj/item/toy/plush/moth/punished
name = "punished moth plushie"
- desc = "An adorable mothperson plushy. It's a sad bug... that's quite sad actualy."
+ desc = "An adorable mothperson plushy. It's a sad bug... that's quite sad actually."
icon_state = "moffplush_punished"
/obj/item/toy/plush/moth/firewatch
@@ -772,6 +772,46 @@
lefthand_file = 'icons/mob/inhands/misc/plushes_lefthand.dmi' //todo: sort the god damn plushie inhands
righthand_file = 'icons/mob/inhands/misc/plushes_righthand.dmi'
+/obj/item/toy/plush/rilena
+ name = "Ri plushie"
+ desc = "A plush of the protagonist of the popular combination video game series and webcomic RILENA."// Makes the iconic hurt sound from the game!" //sadly does not :pensive:
+ icon_state = "rilenaplush_ri"
+ attack_verb = list("blasted", "shot", "shmupped")
+ //squeak_override = list('sound/voice/ //kepori lack a voice :(
+ gender = FEMALE
+
+/obj/item/toy/plush/tali
+ name = "T4L1 plushie"
+ desc = "A surprisingly soft plushie of a recurring miniboss from the popular combination video game series and webcomic RILENA. The cannon arm does not function."
+ icon_state = "rilenaplush_t4l1"
+ attack_verb = list("blasted", "shot", "cannoned")
+ gender = FEMALE
+
+/obj/item/toy/plush/sharai
+ name = "Sharai plushie"
+ desc = "A plushie of the four winged kepori boss from the popular combination video game series and webcomic RILENA."
+ icon_state = "rilenaplush_sharai"
+ attack_verb = list("blasted", "shot", "radial bursted")
+ gender = FEMALE
+
+/obj/item/toy/plush/xader
+ name = "Xader plushie"
+ desc = "A plushie of the recurring transdimensional transgender shopkeep from the popular webseries RILENA."
+ icon_state = "rilenaplush_xader"
+ gender = FEMALE
+
+/obj/item/toy/plush/mora
+ name = "Mora plushie"
+ desc = "A plushie of Mora from the popular webseries RILENA."
+ icon_state = "rilenaplush_mora"
+ gender = FEMALE
+
+/obj/item/toy/plush/kari
+ name = "knockoff RILENA plushie"
+ desc = "A plushie of a FBP Kepori. The tag calls it 'Kari' and claims it to be from 'RAYALA: RUNNING FROM EVIL'. The cannon arm does not function."
+ icon_state = "fbplush"
+ gender = FEMALE
+
/obj/item/toy/plush/among
name = "amoung pequeño"
desc = "A little pill shaped guy, with a price tag of 3€."
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index f4aff30791f8..1296e889181d 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -322,7 +322,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
var/hit_hand = ((user.active_hand_index % 2 == 0) ? "r_" : "l_") + "arm"
if(ishuman(user))
var/mob/living/carbon/human/H = user
- if(!H.gloves && !HAS_TRAIT(H, TRAIT_PIERCEIMMUNE)) // golems, etc
+ if(!H.gloves && !HAS_TRAIT(H, TRAIT_PIERCEIMMUNE))
to_chat(H, "[src] cuts into your hand! ")
H.apply_damage(force*0.5, BRUTE, hit_hand)
else if(ismonkey(user))
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index 04a9898c523d..200fc408768f 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -465,11 +465,6 @@ GLOBAL_LIST_INIT(snow_recipes, list ( \
* Adamantine
*/
-
-GLOBAL_LIST_INIT(adamantine_recipes, list(
- new /datum/stack_recipe("incomplete servant golem shell", /obj/item/golem_shell/servant, req_amount=1, res_amount=1),
- ))
-
/obj/item/stack/sheet/mineral/adamantine
name = "adamantine"
icon_state = "sheet-adamantine"
@@ -479,10 +474,6 @@ GLOBAL_LIST_INIT(adamantine_recipes, list(
merge_type = /obj/item/stack/sheet/mineral/adamantine
grind_results = list(/datum/reagent/liquidadamantine = 10)
-/obj/item/stack/sheet/mineral/adamantine/get_main_recipes()
- . = ..()
- . += GLOB.adamantine_recipes
-
/obj/item/stack/sheet/mineral/adamantine/ten
amount = 10
diff --git a/code/game/objects/items/stacks/tape.dm b/code/game/objects/items/stacks/tape.dm
index 92fe31d32a98..d22b1be85344 100644
--- a/code/game/objects/items/stacks/tape.dm
+++ b/code/game/objects/items/stacks/tape.dm
@@ -47,7 +47,7 @@
/obj/item/stack/sticky_tape/super
name = "super sticky tape"
singular_name = "super sticky tape"
- desc = "Quite possibly the most mischevious substance in the galaxy. Use with extreme lack of caution."
+ desc = "Quite possibly the most mischievous substance in the galaxy. Use with extreme lack of caution."
icon_state = "tape_y"
prefix = "super sticky"
conferred_embed = EMBED_HARMLESS_SUPERIOR
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 300b5a9461b3..b4ec267bd770 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -336,7 +336,6 @@
/obj/item/reagent_containers/food/drinks/bottle/absinthe,
/obj/item/clothing/under/syndicate/tacticool,
/obj/item/storage/fancy/cigarettes/cigpack_syndicate,
- /obj/item/storage/fancy/cigarettes/cigpack_shadyjims,
/obj/item/clothing/mask/gas/syndicate,
/obj/item/clothing/neck/necklace/dope,
/obj/item/vending_refill/donksoft)
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/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 9e8d4e94745c..7b1710cd8960 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -1542,3 +1542,54 @@
/obj/item/stack/wrapping_paper/small=1
)
generate_items_inside(items_inside,src)
+
+/obj/item/storage/box/coffeepack
+ icon_state = "arabica_beans"
+ name = "arabica beans"
+ desc = "A bag containing fresh, dry coffee arabica beans. Ethically sourced and packaged by Donk! Co."
+ illustration = null
+ icon = 'icons/obj/food/containers.dmi'
+ var/beantype = /obj/item/reagent_containers/food/snacks/grown/coffee
+
+/obj/item/storage/box/cofeepack/Initialize(mapload)
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_items = 5
+ STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/grown/coffee))
+
+/obj/item/storage/box/coffeepack/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/reagent_containers/food/snacks/grown/coffee = 5,
+ /obj/item/reagent_containers/food/snacks/grown/coffee/robusta = 5)
+ generate_items_inside(items_inside,src)
+
+/obj/item/storage/box/coffeepack/robusta
+ icon_state = "robusta_beans"
+ name = "robusta beans"
+ desc = "A bag containing fresh, dry coffee robusta beans. Ethically sourced and packaged by Donk! Co."
+ beantype = /obj/item/reagent_containers/food/snacks/grown/coffee/robusta
+
+
+/*
+ * Coffee condiments display -- someone can make this fancy eventually, i cant fucking figure it out for the life of me -- it exists in TG
+ */
+
+/obj/item/storage/box/coffee_condi_display
+ name = "coffee condiments display"
+ desc = "A neat small box, holding all your favorite coffee condiments."
+
+/obj/item/storage/box/coffee_condi_display/Initialize(mapload)
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_items = 14
+ STR.set_holdable(list(
+ /obj/item/reagent_containers/food/condiment/pack/sugar,
+ /obj/item/reagent_containers/food/condiment/pack/creamer,
+ /obj/item/reagent_containers/food/condiment/pack/astrotame,
+ ))
+
+/obj/item/storage/box/coffee_condi_display/PopulateContents()
+ for(var/i in 1 to 4)
+ new /obj/item/reagent_containers/food/condiment/pack/sugar(src)
+ new /obj/item/reagent_containers/food/condiment/pack/creamer(src)
+ new /obj/item/reagent_containers/food/condiment/pack/astrotame(src)
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index 58f10b2ccd8d..41f214998ffd 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -306,13 +306,6 @@
if(prob(7))
spawn_type = /obj/item/clothing/mask/cigarette/candy/nicotine //uh oh!
-/obj/item/storage/fancy/cigarettes/cigpack_shadyjims
- name = "\improper Shady Jim's Super Slims packet"
- desc = "Is your weight slowing you down? Having trouble running away from gravitational singularities? Can't stop stuffing your mouth? Smoke Shady Jim's Super Slims and watch all that fat burn away. Guaranteed results!"
- icon_state = "shadyjim"
- base_icon_state = "shadyjim"
- spawn_type = /obj/item/clothing/mask/cigarette/shadyjims
-
/obj/item/storage/fancy/cigarettes/cigpack_xeno
name = "\improper Xeno Filtered packet"
desc = "Loaded with 100% pure slime. And also nicotine."
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index dc9aea782406..4505f596907f 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -176,14 +176,10 @@
/obj/item/storage/firstaid/radiation
name = "radiation treatment kit"
desc = "Used to treat severe radiation poisoning."
- icon_state = "antitoxin"
- item_state = "firstaid-toxin"
+ icon_state = "radiation"
+ item_state = "firstaid-ointment" //its yellow
damagetype_healed = TOX
-/obj/item/storage/firstaid/radiation/Initialize(mapload)
- . = ..()
- icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2")
-
/obj/item/storage/firstaid/radiation/PopulateContents()
if(empty)
return
diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm
index 4b91fc6caae3..e1ad81e21413 100644
--- a/code/game/objects/items/stunbaton.dm
+++ b/code/game/objects/items/stunbaton.dm
@@ -296,6 +296,9 @@
QDEL_NULL(sparkler)
return ..()
+/obj/item/melee/baton/cattleprod/loaded
+ preload_cell_type = /obj/item/stock_parts/cell/high
+
/obj/item/melee/baton/boomerang
name = "\improper OZtek Boomerang"
desc = "A device invented in 2486 for the great Space Emu War by the confederacy of Australicus, these high-tech boomerangs also work exceptionally well at stunning crewmembers. Just be careful to catch it when thrown!"
diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm
index 235e267e43c3..e2dfc9a81dc3 100644
--- a/code/game/objects/items/tools/wirecutters.dm
+++ b/code/game/objects/items/tools/wirecutters.dm
@@ -65,11 +65,6 @@
user.visible_message("[user] cuts [C]'s restraints with [src]! ")
qdel(C.handcuffed)
return
- else if(istype(C) && C.has_status_effect(STATUS_EFFECT_CHOKINGSTRAND))
- to_chat(C, "You attempt to remove the durathread strand from around your neck. ")
- if(do_after(user, 15, null, C))
- to_chat(C, "You succesfuly remove the durathread strand. ")
- C.remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND)
else
..()
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index a4ec930ec0e2..a976c49fb45c 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -617,7 +617,6 @@
icon_state = "deck_nanotrasen_full"
w_class = WEIGHT_CLASS_SMALL
var/cooldown = 0
- var/obj/machinery/computer/holodeck/holo = null // Holodeck cards should not be infinite
var/list/cards = list()
/obj/item/toy/cards/deck/Initialize()
@@ -649,8 +648,6 @@
to_chat(user, "There are no more cards to draw! ")
return
var/obj/item/toy/cards/singlecard/H = new/obj/item/toy/cards/singlecard(user.loc)
- if(holo)
- holo.spawned += H // track them leaving the holodeck
choice = cards[1]
H.cardname = choice
H.parentdeck = src
@@ -1370,6 +1367,18 @@
icon_state = "vanguard"
toysay = "I'm too old for this shit."
+/obj/item/toy/figure/tali
+ name = "T4L1 action figure"
+ desc = "An action figure modeled after a recurring miniboss from the popular combination webcomic and video game RILENA. Unfortunately, the gun arm does not function."
+ icon_state = "tali"
+ toysay = "I'll take you down this time!"
+
+/obj/item/toy/figure/kari
+ name = "knockoff RILENA action figure"
+ desc = "An action figure that seems to be labeled as 'Kari' from RAYALA: RUNNING FROM EVIL. Unfortunately, the gun arm does not function."
+ icon_state = "kari"
+ toysay = "I will defeat you for good!"
+
/obj/item/toy/dummy
name = "ventriloquist dummy"
desc = "It's a dummy, dummy."
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 7749f6d50274..c019471e3cdd 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -523,29 +523,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
icon_state = "hippocratic"
impressiveness = 50
-/obj/item/tailclub
- name = "tail club"
- desc = "For the beating to death of lizards with their own tails."
- icon_state = "tailclub"
- force = 14
- throwforce = 1 // why are you throwing a club do you even weapon
- throw_speed = 1
- throw_range = 1
- attack_verb = list("clubbed", "bludgeoned")
-
-/obj/item/melee/chainofcommand/tailwhip
- name = "liz o' nine tails"
- desc = "A whip fashioned from the severed tails of lizards."
- icon_state = "tailwhip"
- item_state = "tailwhip"
- item_flags = NONE
-
-/obj/item/melee/chainofcommand/tailwhip/kitty
- name = "cat o' nine tails"
- desc = "A whip fashioned from the severed tails of cats."
- icon_state = "catwhip"
- item_state = "catwhip"
-
/obj/item/melee/skateboard
name = "improvised skateboard"
desc = "A skateboard. It can be placed on its wheels and ridden, or used as a strong weapon."
diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index d90b1846a4f0..3c84cea0de27 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -447,20 +447,10 @@
/obj/structure/chair/plastic/post_buckle_mob(mob/living/Mob)
Mob.pixel_y += 2
.=..()
- if(iscarbon(Mob))
- INVOKE_ASYNC(src, PROC_REF(snap_check), Mob)
/obj/structure/chair/plastic/post_unbuckle_mob(mob/living/Mob)
Mob.pixel_y -= 2
-/obj/structure/chair/plastic/proc/snap_check(mob/living/carbon/Mob)
- if (Mob.nutrition >= NUTRITION_LEVEL_FAT)
- to_chat(Mob, "The chair begins to pop and crack, you're too heavy! ")
- if(do_after(Mob, 60, 1, Mob, 0))
- Mob.visible_message("The plastic chair snaps under [Mob]'s weight! ")
- new /obj/effect/decal/cleanable/plastic(loc)
- qdel(src)
-
/obj/item/chair/plastic
name = "folding plastic chair"
desc = "Somehow, you can always find one under the wrestling ring."
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index bc1155ec34aa..35b7663ca05e 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -134,13 +134,6 @@ LINEN BINS
item_state = "sheetrd"
dream_messages = list("authority", "a silvery ID", "a bomb", "a mech", "a facehugger", "maniacal laughter", "the research director")
-// for Free Golems.
-/obj/item/bedsheet/rd/royal_cape
- name = "Royal Cape of the Liberator"
- desc = "Majestic."
- dream_messages = list("mining", "stone", "a golem", "freedom", "doing whatever")
- custom_price = 500
-
/obj/item/bedsheet/medical
name = "medical blanket"
desc = "It's a sterilized* blanket commonly used in the Medbay. *Sterilization is voided if a virologist is present within a 10 LY radius*."
diff --git a/code/game/objects/structures/crates_lockers/closets/infinite.dm b/code/game/objects/structures/crates_lockers/closets/infinite.dm
index 8657b764b9bb..ddfe7b50a1c5 100644
--- a/code/game/objects/structures/crates_lockers/closets/infinite.dm
+++ b/code/game/objects/structures/crates_lockers/closets/infinite.dm
@@ -26,7 +26,7 @@
/obj/structure/closet/infinite/open(mob/living/user, force = FALSE)
. = ..()
if(. && auto_close_time)
- addtimer(CALLBACK(src, PROC_REF(close_on_my_own)), auto_close_time, TIMER_OVERRIDE)
+ addtimer(CALLBACK(src, PROC_REF(close_on_my_own)), auto_close_time, TIMER_UNIQUE|TIMER_OVERRIDE)
/obj/structure/closet/infinite/proc/close_on_my_own()
if(close())
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 27a9e423110b..66b803e7d041 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -378,43 +378,3 @@
new /obj/item/clothing/suit/toggle/labcoat/brig_phys(src)
new /obj/item/clothing/suit/armor/vest/security/brig_phys(src)
new /obj/item/clothing/head/beret/sec/brig_phys(src)
-
-/obj/structure/closet/secure_closet/lieutenant
- name = "SolGov official's locker"
- req_access = list(ACCESS_SOLGOV)
- icon_state = "solgov"
-
-/obj/structure/closet/secure_closet/lieutenant/PopulateContents()
- ..()
- new /obj/item/clothing/head/beret/solgov(src)
- new /obj/item/storage/briefcase(src)
- new /obj/item/storage/firstaid/regular(src)
- new /obj/item/clothing/glasses/sunglasses(src)
- new /obj/item/clothing/suit/armor/vest/bulletproof/solgov(src)
- new /obj/item/clothing/suit/armor/solgov_trenchcoat(src)
- new /obj/item/clothing/accessory/waistcoat/solgov(src)
- new /obj/item/clothing/shoes/laceup(src)
-
-/obj/structure/closet/secure_closet/true_lieutenant
- name = "\proper lieutenant's locker"
- req_access = list(ACCESS_HEADS)
- icon_state = "blueshield"
-
-/obj/structure/closet/secure_closet/true_lieutenant/PopulateContents()
- ..()
- new /obj/item/clothing/head/beret/lt(src)
- new /obj/item/storage/briefcase(src)
- new /obj/item/storage/firstaid/regular(src)
- new /obj/item/storage/belt/security/full(src)
- new /obj/item/clothing/glasses/sunglasses(src)
- new /obj/item/clothing/suit/armor/vest/lieutenant(src)
- new /obj/item/clothing/suit/toggle/lieutenant(src)
- new /obj/item/clothing/suit/armor/lieutenant_trenchcoat(src)
- new /obj/item/clothing/accessory/holster/lieutenant(src)
- new /obj/item/clothing/shoes/jackboots(src)
- new /obj/item/clothing/head/beret/lt(src)
- new /obj/item/clothing/head/beret/black(src)
- new /obj/item/clothing/under/rank/command(src)
- new /obj/item/clothing/under/rank/command/skirt(src)
- new /obj/item/clothing/under/rank/command/nt(src)
- new /obj/item/clothing/under/rank/command/nt/skirt(src)
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/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index 727187aa14df..3360f35d05d3 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -166,102 +166,6 @@
if(4)
to_chat(new_spawn, "You wished for immortality, even as your friends lay dying behind you. No matter how many times you cast yourself into the lava, you awaken in this room again within a few days. There is no escape. ")
-//Golem shells: Spawns in Free Golem ships in lavaland. Ghosts become mineral golems and are advised to spread personal freedom.
-/obj/effect/mob_spawn/human/golem
- name = "inert free golem shell"
- desc = "A humanoid shape, empty, lifeless, and full of potential."
- mob_name = "a free golem"
- icon = 'icons/obj/wizard.dmi'
- icon_state = "construct"
- mob_species = /datum/species/golem
- roundstart = FALSE
- death = FALSE
- anchored = FALSE
- move_resist = MOVE_FORCE_NORMAL
- density = FALSE
- var/has_owner = FALSE
- var/can_transfer = TRUE //if golems can switch bodies to this new shell
- var/mob/living/owner = null //golem's owner if it has one
- short_desc = "You are a Free Golem. Your family worships The Liberator."
- flavour_text = "In his infinite and divine wisdom, he set your clan free to \
- travel the stars with a single declaration: \"Yeah go do whatever.\" Though you are bound to the one who created you, it is customary in your society to repeat those same words to newborn \
- golems, so that no golem may ever be forced to serve again."
-
-/obj/effect/mob_spawn/human/golem/Initialize(mapload, datum/species/golem/species = null, mob/creator = null)
- if(species) //spawners list uses object name to register so this goes before ..()
- name += " ([initial(species.prefix)])"
- mob_species = species
- . = ..()
- var/area/A = get_area(src)
- if(!mapload && A)
- notify_ghosts("\A [initial(species.prefix)] golem shell has been completed in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE, ignore_key = POLL_IGNORE_GOLEM)
- if(has_owner && creator)
- short_desc = "You are a golem."
- flavour_text = "You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools."
- important_info = "Serve [creator], and assist [creator.p_them()] in completing [creator.p_their()] goals at any cost."
- owner = creator
-
-/obj/effect/mob_spawn/human/golem/special(mob/living/new_spawn, name)
- var/datum/species/golem/X = mob_species
- to_chat(new_spawn, "[initial(X.info_text)]")
- if(!owner)
- to_chat(new_spawn, "Build golem shells in the autolathe, and feed refined mineral sheets to the shells to bring them to life! You are generally a peaceful group unless provoked.")
- else
- new_spawn.mind.store_memory("Serve [owner.real_name], your creator. ")
- new_spawn.mind.enslave_mind_to_creator(owner)
- log_game("[key_name(new_spawn)] possessed a golem shell enslaved to [key_name(owner)].")
- log_admin("[key_name(new_spawn)] possessed a golem shell enslaved to [key_name(owner)].")
- if(ishuman(new_spawn))
- var/mob/living/carbon/human/H = new_spawn
- if(has_owner)
- var/datum/species/golem/G = H.dna.species
- G.owner = owner
- H.set_cloned_appearance()
- if(!name)
- if(has_owner)
- H.fully_replace_character_name(null, "[initial(X.prefix)] Golem ([rand(1,999)])")
- else
- H.fully_replace_character_name(null, H.dna.species.random_name())
- else
- H.fully_replace_character_name(null, name)
- if(has_owner)
- new_spawn.mind.assigned_role = "Servant Golem"
- else
- new_spawn.mind.assigned_role = "Free Golem"
-
-/obj/effect/mob_spawn/human/golem/attack_hand(mob/user)
- . = ..()
- if(.)
- return
- if(isgolem(user) && can_transfer)
- var/mob/living/carbon/human/H = user
- var/transfer_choice = alert("Transfer your soul to [src]? (Warning, your old body will die!)",,"Yes","No")
- if(transfer_choice != "Yes")
- return
- if(QDELETED(src) || uses <= 0)
- return
- log_game("[key_name(H)] golem-swapped into [src]")
- H.visible_message("A faint light leaves [H], moving to [src] and animating it! ","You leave your old body behind, and transfer into [src]! ")
- show_flavour = FALSE
- var/mob/living/carbon/human/newgolem = create(newname = H.real_name)
- H.transfer_trait_datums(newgolem)
- H.mind.transfer_to(newgolem)
- H.death()
- return
-
-/obj/effect/mob_spawn/human/golem/servant
- has_owner = TRUE
- name = "inert servant golem shell"
- mob_name = "a servant golem"
-
-
-/obj/effect/mob_spawn/human/golem/adamantine
- name = "dust-caked free golem shell"
- desc = "A humanoid shape, empty, lifeless, and full of potential."
- mob_name = "a free golem"
- can_transfer = FALSE
- mob_species = /datum/species/golem/adamantine
-
//Malfunctioning cryostasis sleepers: Spawns in makeshift shelters in lavaland. Ghosts become hermits with knowledge of how they got to where they are now.
/obj/effect/mob_spawn/human/hermit
name = "malfunctioning cryostasis sleeper"
@@ -649,7 +553,7 @@
flavour_text = "You were mining peacefully, then a ash drake suddenly attacked, then you have died... or so you thought?\
You have no idea where you now, but you are glad to be alive."
assignedrole = "Lost Shaft Miner"
- outfit = /datum/outfit/job/miner/equipped
+ outfit = /datum/outfit/job/miner
/obj/effect/mob_spawn/human/lost/ashwalker_heir
icon = 'icons/obj/machines/sleeper.dmi'
diff --git a/code/game/objects/structures/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm
index 50cadf2f8801..a20702886c24 100644
--- a/code/game/objects/structures/icemoon/cave_entrance.dm
+++ b/code/game/objects/structures/icemoon/cave_entrance.dm
@@ -210,7 +210,7 @@ GLOBAL_LIST_INIT(ore_probability, list(
*/
/obj/effect/collapsing_demonic_portal/proc/drop_loot()
visible_message("Something slips out of [src]! ")
- var/loot = rand(1, 24)
+ var/loot = rand(1, 23)
switch(loot)
if(1)//Clown hell. God help you if you roll this.
visible_message("You can hear screaming and joyful honking. ")//now THIS is what we call a critical failure
@@ -726,7 +726,7 @@ GLOBAL_LIST_INIT(ore_probability, list(
new /mob/living/simple_animal/hostile/asteroid/goliath/beast(loc)
new /mob/living/simple_animal/hostile/asteroid/goliath/beast(loc)
new /mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient(loc)
- new /obj/effect/mob_spawn/human/miner/old(loc)
+ new /obj/effect/mob_spawn/human/miner(loc)
new /turf/open/floor/plating/asteroid/basalt(loc)
if(12)//sailing the ocean blue
visible_message("Water pours out of the portal, followed by a strange vessel. It's occupied. ")
@@ -965,62 +965,19 @@ GLOBAL_LIST_INIT(ore_probability, list(
new /obj/effect/mob_spawn/human/scientist(loc)
new /turf/open/floor/mineral/titanium/purple(loc)
new /mob/living/simple_animal/slime/random(loc)
- if(19)//lost abductor
- visible_message("You glimpse a frigid wreckage. A large block of something slips through the portal. ")
- playsound(loc,'sound/effects/break_stone.ogg', 100, FALSE, 50, TRUE, TRUE)
- if(prob(45))
- new /obj/item/stack/sheet/mineral/abductor(loc)
- new /mob/living/simple_animal/hostile/asteroid/polarbear(loc)
- if(prob(30))
- new /obj/item/clothing/under/abductor(loc)
- new /mob/living/simple_animal/hostile/asteroid/polarbear(loc)
- if(prob(35))
- new /obj/item/weldingtool/abductor(loc)
- if(prob(30))
- new /obj/item/scalpel/alien(loc)
- if(prob(35))
- new /obj/item/circuitboard/machine/plantgenes/vault(loc)
- new /mob/living/simple_animal/hostile/asteroid/polarbear(loc)
- if(prob(35))
- new /obj/item/organ/heart/gland/heal(loc)
- new /mob/living/simple_animal/hostile/asteroid/polarbear(loc)
- if(prob(35))
- new /obj/item/organ/heart/gland/ventcrawling(loc)
- new /mob/living/simple_animal/hostile/asteroid/polarbear(loc)
- if(prob(35))
- new /obj/item/organ/heart/gland/slime(loc)
- new /mob/living/simple_animal/hostile/asteroid/polarbear(loc)
- if(prob(10))
- new /obj/item/organ/heart/gland/spiderman(loc)
- new /mob/living/simple_animal/hostile/asteroid/polarbear(loc)
- if(prob(35))
- new /obj/item/wrench/abductor(loc)
- new /obj/item/screwdriver/abductor(loc)
- if(prob(35))
- new /obj/item/crowbar/abductor(loc)
- new /obj/item/multitool/abductor(loc)
- if(prob(15))
- new /obj/item/abductor_machine_beacon/chem_dispenser(loc)
- new /mob/living/simple_animal/hostile/asteroid/polarbear(loc)
- if(prob(35))
- new /obj/item/clothing/suit/armor/abductor/vest(loc)
- new /mob/living/simple_animal/hostile/asteroid/polarbear(loc)
- new /obj/structure/fluff/iced_abductor(loc)
- new /mob/living/simple_animal/hostile/asteroid/polarbear(loc)
- new /turf/open/floor/mineral/abductor(loc)
- if(20)//hey, free elite tumor!
+ if(19)//hey, free elite tumor!
visible_message("A large, pulsating structure falls through the portal and crashes to the floor. ")
playsound(loc,'sound/effects/break_stone.ogg', 100, FALSE, 50, TRUE, TRUE)
new /obj/structure/elite_tumor(loc)
new /turf/open/floor/plating/asteroid/basalt(loc)
- if(21)//*you flush the toilet.*
+ if(20)//*you flush the toilet.*
visible_message("You hear the faint noise of a long flush. ")
new /obj/structure/toilet(loc)
new /obj/effect/decal/remains(loc)
new /obj/item/newspaper(loc)
new /turf/open/floor/plastic(loc)
new /obj/item/clothing/head/papersack/smiley(loc) //welcome to the bathroom
- if(22)//Research & Zombies
+ if(21)//Research & Zombies
visible_message("Flashing lights and quarantine alarms echo through the portal. You smell rotting flesh and plasma. ")
playsound(loc,'sound/misc/bloblarm.ogg', 120, FALSE, 50, TRUE, TRUE)
if(prob(35))
@@ -1065,7 +1022,7 @@ GLOBAL_LIST_INIT(ore_probability, list(
new /obj/item/research_notes/loot/small(loc)
new/turf/open/floor/mineral/titanium/purple(loc)
new /mob/living/simple_animal/hostile/zombie(loc)
- if(23)//Silverback's locker room
+ if(22)//Silverback's locker room
visible_message("You catch a glimpse of verdant green. Smells like a locker room. ")
playsound(loc,'sound/creatures/gorilla.ogg', 75, FALSE, 50, TRUE, TRUE)
new /mob/living/simple_animal/hostile/gorilla(loc)
diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm
index 2e540611f343..c07dbe92f990 100644
--- a/code/game/objects/structures/mirror.dm
+++ b/code/game/objects/structures/mirror.dm
@@ -200,23 +200,23 @@
H.update_mutations_overlay() // no hulk lizard
if("gender")
- if(!(H.gender in list("male", "female"))) //blame the patriarchy
+ if(!(H.gender in list("male", "female")))
return
if(H.gender == "male")
- if(alert(H, "Become a Witch?", "Confirmation", "Yes", "No") == "Yes")
+ if(alert(H, "Become a Woman?", "Confirmation", "Yes", "No") == "Yes")
if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
return
H.gender = "female"
- to_chat(H, "Man, you feel like a woman! ")
+ to_chat(H, "You trans your gender. You're now a woman. ")
else
return
else
- if(alert(H, "Become a Warlock?", "Confirmation", "Yes", "No") == "Yes")
+ if(alert(H, "Become a Man?", "Confirmation", "Yes", "No") == "Yes")
if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
return
H.gender = "male"
- to_chat(H, "Whoa man, you feel like a man! ")
+ to_chat(H, "You trans your gender. You're now a man. ")
else
return
H.dna.update_ui_block(DNA_GENDER_BLOCK)
diff --git a/code/game/objects/structures/printer.dm b/code/game/objects/structures/printer.dm
new file mode 100644
index 000000000000..c4c1abea9cf7
--- /dev/null
+++ b/code/game/objects/structures/printer.dm
@@ -0,0 +1,185 @@
+/obj/machinery/printer
+ name = "poster printer"
+ desc = "Used to print out various posters using toner cartridges."
+ icon = 'icons/obj/printer.dmi'
+ icon_state = "printer"
+ density = TRUE
+ power_channel = AREA_USAGE_EQUIP
+ max_integrity = 100
+ pass_flags = PASSTABLE
+ circuit = /obj/item/circuitboard/machine/printer
+ var/busy = FALSE
+ var/datum/weakref/loaded_item_ref
+ var/datum/weakref/printed_poster
+ var/obj/item/toner/toner_cartridge
+ var/poster_type
+
+/obj/machinery/printer/Initialize()
+ . = ..()
+ toner_cartridge = new(src)
+
+/obj/machinery/printer/update_overlays()
+ . = ..()
+ if(panel_open)
+ . += mutable_appearance(icon, "printer_panel")
+ var/obj/item/loaded = loaded_item_ref?.resolve()
+ var/obj/item/poster = printed_poster?.resolve()
+ if(loaded)
+ . += mutable_appearance(icon, "contain_paper")
+ if(poster)
+ . += mutable_appearance(icon, "contain_poster")
+
+/obj/machinery/printer/screwdriver_act(mob/living/user, obj/item/screwdriver)
+ . = ..()
+ default_deconstruction_screwdriver(user, icon_state, icon_state, screwdriver)
+ update_icon()
+ return TRUE
+
+/obj/machinery/printer/Destroy()
+ QDEL_NULL(toner_cartridge)
+ QDEL_NULL(loaded_item_ref)
+ QDEL_NULL(printed_poster)
+ return ..()
+
+/obj/machinery/printer/attackby(obj/item/item, mob/user, params)
+ if(panel_open)
+ if(is_wire_tool(item))
+ wires.interact(user)
+ return
+ if(can_load_item(item))
+ if(!loaded_item_ref?.resolve())
+ loaded_item_ref = WEAKREF(item)
+ item.forceMove(src)
+ update_icon()
+ return
+ else if(istype(item, /obj/item/toner))
+ if(toner_cartridge)
+ to_chat(user, "[src] already has a toner cartridge inserted. Remove that one first. ")
+ return
+ item.forceMove(src)
+ toner_cartridge = item
+ to_chat(user, "You insert [item] into [src]. ")
+ else return ..()
+
+/obj/machinery/printer/proc/can_load_item(obj/item/item)
+ if(busy)
+ return FALSE //no loading the printer if there's already a print job happening!
+ if(!istype(item, /obj/item/paper))
+ return FALSE
+ if(!istype(item, /obj/item/stack))
+ return TRUE
+ var/obj/item/stack/stack_item = item
+ return stack_item.amount == 1
+
+/obj/machinery/printer/ui_data(mob/user)
+ var/list/data = list()
+ data["has_paper"] = !!loaded_item_ref?.resolve()
+ data["has_poster"] = !!printed_poster?.resolve()
+
+ if(toner_cartridge)
+ data["has_toner"] = TRUE
+ data["current_toner"] = toner_cartridge.charges
+ data["max_toner"] = toner_cartridge.max_charges
+ data["has_enough_toner"] = has_enough_toner()
+ else
+ data["has_toner"] = FALSE
+ data["has_enough_toner"] = FALSE
+
+ return data
+
+/obj/machinery/printer/proc/has_enough_toner()
+ return toner_cartridge.charges >= 1
+
+/obj/machinery/printer/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "PosterPrinter")
+ ui.open()
+
+/obj/machinery/printer/ui_act(action, list/params)
+ . = ..()
+ if(.)
+ return
+ var/obj/item/poster = printed_poster?.resolve()
+ var/obj/item/loaded = loaded_item_ref?.resolve()
+ switch(action)
+ if("remove")
+ if(!loaded)
+ return
+ loaded.forceMove(drop_location())
+ loaded_item_ref = null
+ update_icon()
+ return TRUE
+ if("remove_poster")
+ if(!poster)
+ to_chat(usr, span_warning("No poster! waddaheeeeell"))
+ return
+ if(busy)
+ to_chat(usr, span_warning("[src] is still printing your poster! Please wait until it is finished."))
+ return FALSE
+ poster.forceMove(drop_location())
+ printed_poster = null
+ update_icon()
+ return TRUE
+ if("choose_type")
+ poster_type = params["poster_type"]
+ return TRUE
+ if("print")
+ if(busy)
+ to_chat(usr, span_warning("[src] is currently busy printing a poster. Please wait until it is finished."))
+ return FALSE
+ if(toner_cartridge.charges - 1 < 0)
+ to_chat(usr, span_warning("There is not enough toner in [src] to print the poster, please replace the cartridge."))
+ return FALSE
+ if(!loaded)
+ to_chat(usr, span_warning("[src] has no paper in it! Please insert a sheet of paper."))
+ return FALSE
+ if(!poster_type)
+ to_chat(usr, span_warning("[src] has no poster type selected! Please select a type first!"))
+ return FALSE
+ if(poster)
+ to_chat(usr, span_warning("[src] ejects its current poster before printing a new one."))
+ poster.forceMove(drop_location())
+ printed_poster = null
+ update_icon()
+ print_poster()
+ return TRUE
+ if("remove_toner")
+ if(issilicon(usr) || (ishuman(usr) && !usr.put_in_hands(toner_cartridge)))
+ toner_cartridge.forceMove(drop_location())
+ toner_cartridge = null
+ return TRUE
+
+/obj/machinery/printer/proc/print_poster()
+ busy = TRUE
+ loaded_item_ref = null
+ playsound(src, 'sound/items/poster_being_created.ogg', 20, FALSE)
+ toner_cartridge.charges -= 1
+ icon_state = "print"
+ var/mutable_appearance/overlay = mutable_appearance(icon, "print_poster")
+ overlays += overlay
+ update_icon()
+ addtimer(CALLBACK(src, PROC_REF(print_complete), overlay), 2.6 SECONDS)
+
+/obj/machinery/printer/proc/print_complete(mutable_appearance/remove_overlay)
+ icon_state = "printer"
+ overlays -= remove_overlay
+ switch(poster_type)
+ if("Syndicate")
+ var/obj/item/poster/random_contraband/poster = new()
+ printed_poster = WEAKREF(poster)
+ if("SolGov")
+ var/obj/item/poster/random_solgov/poster = new()
+ printed_poster = WEAKREF(poster)
+ if("Nanotrasen")
+ var/obj/item/poster/random_official/poster = new()
+ printed_poster = WEAKREF(poster)
+ if("RILENA")
+ var/obj/item/poster/random_rilena/poster = new()
+ printed_poster = WEAKREF(poster)
+ if("Nanotrasen (Retro)")
+ var/obj/item/poster/random_retro/poster = new()
+ printed_poster = WEAKREF(poster)
+ update_icon()
+ busy = FALSE
+ poster_type = null
diff --git a/code/game/objects/structures/salvaging.dm b/code/game/objects/structures/salvaging.dm
index 3d90a25a1013..4f3bee0cff60 100644
--- a/code/game/objects/structures/salvaging.dm
+++ b/code/game/objects/structures/salvaging.dm
@@ -704,19 +704,4 @@
/obj/item/crowbar/syndie = 30,
/obj/item/wirecutters/syndie = 30,
/obj/item/multitool/syndie = 30,
-
- /obj/item/scalpel/alien = 1,
- /obj/item/hemostat/alien = 1,
- /obj/item/cautery/alien = 1,
- /obj/item/retractor/alien = 1,
- /obj/item/circular_saw/alien = 1,
- /obj/item/surgicaldrill/alien = 1,
-
- /obj/item/wrench/abductor = 1,
- /obj/item/screwdriver/abductor = 1,
- /obj/item/weldingtool/abductor = 1,
- /obj/item/crowbar/abductor = 1,
- /obj/item/wirecutters/abductor = 1,
- /obj/item/multitool/abductor = 1,
-
)
diff --git a/code/game/objects/structures/tribal_torch.dm b/code/game/objects/structures/tribal_torch.dm
index 0c093662a5aa..5704b0bc5b06 100644
--- a/code/game/objects/structures/tribal_torch.dm
+++ b/code/game/objects/structures/tribal_torch.dm
@@ -24,7 +24,7 @@
if(!burning)
user.visible_message("[user] starts to pull [src] free from the ground.... ", "You start to pull [src] free from the ground... ")
if(do_after(user, 20, progress = 1, target = src))
- to_chat("You pull [src] free from the ground. ")
+ to_chat(user, "You pull [src] free from the ground. ")
var/torch = new /obj/item/candle/tribal_torch
user.put_in_hands(torch)
qdel(src)
diff --git a/code/game/turfs/change_turf.dm b/code/game/turfs/change_turf.dm
index a8567072f56b..07976f05631f 100644
--- a/code/game/turfs/change_turf.dm
+++ b/code/game/turfs/change_turf.dm
@@ -255,10 +255,12 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
if(flags_1 & INITIALIZED_1)
stack_trace("CHANGETURF_SKIP was used in a PlaceOnTop call for a turf that's initialized. This is a mistake. [src]([type])")
assemble_baseturfs()
+
+ if(!length(baseturfs))
+ baseturfs = list(baseturfs)
+
if(fake_turf_type)
if(!new_baseturfs) // If no baseturfs list then we want to create one from the turf type
- if(!length(baseturfs))
- baseturfs = list(baseturfs)
var/list/old_baseturfs = baseturfs.Copy()
if(!istype(src, /turf/closed))
old_baseturfs += type
@@ -269,25 +271,23 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
// The old baseturfs are put underneath, and we sort out the unwanted ones
newT.baseturfs = baseturfs_string_list(old_baseturfs + (newT.baseturfs - GLOB.blacklisted_automated_baseturfs), newT)
return newT
- if(!length(baseturfs))
- baseturfs = list(baseturfs)
- if(!istype(src, /turf/closed))
- new_baseturfs = list(type) + new_baseturfs
- baseturfs = baseturfs_string_list(baseturfs + new_baseturfs, src)
- return ChangeTurf(fake_turf_type, null, flags)
- if(!length(baseturfs))
- baseturfs = list(baseturfs)
- if(!istype(src, /turf/closed))
- baseturfs = baseturfs_string_list(baseturfs + type, src)
- var/turf/change_type
- if(length(new_baseturfs))
- change_type = new_baseturfs[new_baseturfs.len]
- new_baseturfs.len--
- if(new_baseturfs.len)
+ else
+ if(!istype(src, /turf/closed))
+ new_baseturfs = list(type) + new_baseturfs
baseturfs = baseturfs_string_list(baseturfs + new_baseturfs, src)
+ return ChangeTurf(fake_turf_type, null, flags)
else
- change_type = new_baseturfs
- return ChangeTurf(change_type, null, flags)
+ if(!istype(src, /turf/closed))
+ baseturfs = baseturfs_string_list(baseturfs + type, src)
+ var/turf/change_type
+ if(length(new_baseturfs))
+ change_type = new_baseturfs[new_baseturfs.len]
+ new_baseturfs.len--
+ if(new_baseturfs.len)
+ baseturfs = baseturfs_string_list(baseturfs + new_baseturfs, src)
+ else
+ change_type = new_baseturfs
+ return ChangeTurf(change_type, null, flags)
// Copy an existing turf and put it on top
// Returns the new turf
diff --git a/code/game/turfs/closed/_closed.dm b/code/game/turfs/closed/_closed.dm
index 4f493685e60c..c7a1d9dd6f29 100644
--- a/code/game/turfs/closed/_closed.dm
+++ b/code/game/turfs/closed/_closed.dm
@@ -230,7 +230,7 @@
/turf/closed/indestructible/fakedoor
name = "CentCom Access"
icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi'
- icon_state = "fake_door"
+ icon_state = "fakedoor"
/turf/closed/indestructible/rock
name = "dense rock"
@@ -261,6 +261,13 @@
bullet_sizzle = TRUE
bullet_bounce_sound = null
+/turf/closed/indestructible/rock/schist
+ name = "schist"
+ desc = "Extremely densely-packed layers of schist. Say it ten times fast."
+ icon = 'icons/turf/walls/rockwall_icemoon.dmi'
+ icon_state = "rockwall_icemoon-0"
+ base_icon_state = "rockwall_icemoon"
+
/turf/closed/indestructible/paper
name = "thick paper wall"
desc = "A wall layered with impenetrable sheets of paper."
diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm
index ac8d2185b940..321a5ce25e90 100644
--- a/code/game/turfs/closed/minerals.dm
+++ b/code/game/turfs/closed/minerals.dm
@@ -161,6 +161,7 @@
//Currently, Adamantine won't spawn as it has no uses. -Durandan
var/mineralChance = 13
+
/turf/closed/mineral/random/Initialize(mapload, inherited_virtual_z)
mineralSpawnChanceList = typelist("mineralSpawnChanceList", mineralSpawnChanceList)
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/icemoon.dm b/code/game/turfs/open/floor/plating/icemoon.dm
index 2b1892d5a4ed..ca1819af2531 100644
--- a/code/game/turfs/open/floor/plating/icemoon.dm
+++ b/code/game/turfs/open/floor/plating/icemoon.dm
@@ -105,6 +105,7 @@
/turf/open/floor/plating/asteroid/snow/temperatre
initial_gas_mix = "o2=22;n2=82;TEMP=255.37"
+ baseturfs = /turf/open/floor/plating/asteroid/icerock/temperate
/turf/open/floor/plating/asteroid/snow/atmosphere
initial_gas_mix = FROZEN_ATMOS
@@ -156,6 +157,9 @@
icon_state = "icemoon_ground_smooth"
base_icon_state = "icemoon_ground_smooth"
+/turf/open/floor/plating/asteroid/icerock/temperate
+ initial_gas_mix = "o2=22;n2=82;TEMP=255.37"
+
/turf/open/floor/plating/asteroid/iceberg
gender = PLURAL
name = "cracked ice floor"
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/game/turfs/open/floor/reinf_floor.dm b/code/game/turfs/open/floor/reinf_floor.dm
index 04f005417eb0..68a96846adbb 100644
--- a/code/game/turfs/open/floor/reinf_floor.dm
+++ b/code/game/turfs/open/floor/reinf_floor.dm
@@ -3,7 +3,6 @@
name = "reinforced floor"
desc = "Extremely sturdy."
icon_state = "engine"
- holodeck_compatible = TRUE
thermal_conductivity = 0.025
heat_capacity = INFINITY
floor_tile = /obj/item/stack/sheet/metal
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index ca5a6fe3fd25..4202be74b347 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -12,7 +12,7 @@ GLOBAL_LIST_EMPTY(created_baseturf_lists)
// In class definition like here it should always be a single type.
// A list will be created in initialization that figures out the baseturf's baseturf etc.
// In the case of a list it is sorted from bottom layer to top.
- // This shouldn't be modified directly, use the helper procs.
+ // This shouldn't be modified directly; use the helper procs, as many baseturf lists are shared between turfs.
var/list/baseturfs = /turf/baseturf_bottom
/// How hot the turf is, in kelvin
@@ -73,9 +73,6 @@ GLOBAL_LIST_EMPTY(created_baseturf_lists)
/// Used to stop radiation from travelling across virtual z-levels such as transit zones and planetary encounters.
var/rad_fullblocker = FALSE
- ///the holodeck can load onto this turf if TRUE
- var/holodeck_compatible = FALSE
-
hitsound_volume = 90
/turf/vv_edit_var(var_name, new_value)
@@ -388,7 +385,11 @@ GLOBAL_LIST_EMPTY(created_baseturf_lists)
if(!AM.zfalling)
zFall(AM)
-// A proc in case it needs to be recreated or badmins want to change the baseturfs
+// Initializes the baseturfs list, given an optional "fake_baseturf_type".
+// If "fake_baseturf_type" is a list, then this turf's baseturfs are set to that list.
+// Otherwise, if "fake_baseturf_type" is non-null, it is used as the top of the baseturf stack.
+// If no fake_baseturf_type is passed, and the current turf's baseturfs variable is not a list,
+// baseturfs are initialized using the intial baseturfs variable as the top of the baseturf stack.
/turf/proc/assemble_baseturfs(turf/fake_baseturf_type)
var/turf/current_target
if(fake_baseturf_type)
diff --git a/code/game/world.dm b/code/game/world.dm
index 8365283c7897..a9881d19d977 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -310,14 +310,23 @@ GLOBAL_VAR(restart_counter)
features += "AI allowed"
hostedby = CONFIG_GET(string/hostedby)
+ var/discord_url
+ var/github_url
+ if(isnull(config))
+ discord_url = "https://shiptest.net/discord"
+ github_url = "https://github.com/shiptest-ss13/Shiptest"
+ else
+ discord_url = CONFIG_GET(string/discordurl)
+ github_url = CONFIG_GET(string/githuburl)
+
s += "[station_name()] ";
s += " ("
- s += "" //Change this to wherever you want the hub to link to.
+ s += " " //Change this to wherever you want the hub to link to.
s += "Discord" //Replace this with something else. Or ever better, delete it and uncomment the game version.
s += " "
s += ")"
s += " ("
- s += ""
+ s += " "
s += "Github"
s += " "
s += ")"
diff --git a/code/modules/admin/admin_fax_panel.dm b/code/modules/admin/admin_fax_panel.dm
new file mode 100644
index 000000000000..32f523584a39
--- /dev/null
+++ b/code/modules/admin/admin_fax_panel.dm
@@ -0,0 +1,145 @@
+/**
+ * If client have R_ADMIN flag, opens an admin fax panel.
+ */
+/client/proc/fax_panel()
+ set name = "Send Fax Message"
+ set category = "Admin"
+
+ if(!check_rights(R_ADMIN))
+ return
+
+ var/datum/fax_panel_interface/ui = new(usr)
+ ui.ui_interact(usr)
+
+/// Admin Fax Panel. Tool for sending fax messages faster.
+/datum/fax_panel_interface
+ /// All faxes in from machinery list()
+ var/available_faxes = list()
+ /// List with available stamps
+ var/stamp_list = list()
+
+ /// Paper which admin edit and send.
+ var/obj/item/paper/fax_paper = new /obj/item/paper(null)
+
+ /// Default name of fax. Used when field with fax name not edited.
+ var/sending_fax_name = "Secret"
+ /// Default name of paper. paper - bluh-bluh. Used when field with paper name not edited.
+ var/default_paper_name = "Standard Report"
+
+/datum/fax_panel_interface/New()
+ //Get all faxes, and save them to our list.
+ for(var/obj/machinery/fax/fax as anything in GLOB.fax_machines)
+ available_faxes += WEAKREF(fax)
+
+ //Get all stamps
+ for(var/stamp in subtypesof(/obj/item/stamp))
+ var/obj/item/stamp/real_stamp = new stamp()
+ if(!istype(real_stamp, /obj/item/stamp/chameleon))
+ var/stamp_detail = real_stamp.get_writing_implement_details()
+ stamp_list += list(list(real_stamp.name, real_stamp.icon_state, stamp_detail["stamp_class"]))
+
+ //Give our paper special status, to read everywhere.
+ fax_paper.request_state = TRUE
+
+/**
+ * Return fax if name exists
+ * Arguments:
+ * * name - Name of fax what we try to find.
+ */
+/datum/fax_panel_interface/proc/get_fax_by_name(name)
+ if(!length(available_faxes))
+ return null
+
+ for(var/datum/weakref/weakrefed_fax as anything in available_faxes)
+ var/obj/machinery/fax/potential_fax = weakrefed_fax.resolve()
+ if(potential_fax && istype(potential_fax))
+ if(potential_fax.fax_name == name)
+ return potential_fax
+ return null
+
+/datum/fax_panel_interface/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "AdminFax")
+ ui.open()
+
+/datum/fax_panel_interface/ui_state(mob/user)
+ return GLOB.admin_state
+
+/datum/fax_panel_interface/ui_static_data(mob/user)
+ var/list/data = list()
+
+ data["faxes"] = list()
+ data["stamps"] = list()
+
+ for(var/stamp in stamp_list)
+ data["stamps"] += list(stamp[1]) // send only names.
+
+ for(var/datum/weakref/weakrefed_fax as anything in available_faxes)
+ var/obj/machinery/fax/another_fax = weakrefed_fax.resolve()
+ if(another_fax && istype(another_fax))
+ data["faxes"] += list(another_fax.fax_name)
+
+ return data
+
+/datum/fax_panel_interface/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ if(..())
+ return
+
+ if(!check_rights(R_ADMIN))
+ return
+
+ var/obj/machinery/fax/action_fax
+
+ if(params["faxName"])
+ action_fax = get_fax_by_name(params["faxName"])
+
+ switch(action)
+
+ if("follow")
+ if(!isobserver(usr))
+ usr.client?.admin_ghost()
+
+ usr.client?.holder?.admin_follow(action_fax)
+
+ if("preview") // see saved variant
+ if(!fax_paper)
+ return
+ fax_paper.ui_interact(usr)
+
+ if("save") // save paper
+ if(params["paperName"])
+ default_paper_name = params["paperName"]
+ if(params["fromWho"])
+ sending_fax_name = params["fromWho"]
+
+ fax_paper.clear_paper()
+ var/stamp
+ var/stamp_class
+
+ for(var/needed_stamp in stamp_list)
+ if(needed_stamp[1] == params["stamp"])
+ stamp = needed_stamp[2]
+ stamp_class = needed_stamp[3]
+ break
+
+ fax_paper.name = "paper — [default_paper_name]"
+ fax_paper.add_raw_text(params["rawText"], advanced_html = TRUE)
+
+ if(stamp)
+ fax_paper.add_stamp(stamp_class, params["stampX"], params["stampY"], params["stampAngle"], stamp)
+
+ fax_paper.update_static_data(usr) // OK, it's work, and update UI.
+
+ if("send")
+ //copy
+ var/obj/item/paper/our_fax = fax_paper.copy(/obj/item/paper)
+ our_fax.name = fax_paper.name
+ //send
+ action_fax.receive(our_fax, sending_fax_name, important = TRUE)
+ message_admins("[key_name_admin(usr)] has sent a custom fax message to [action_fax.name][ADMIN_FLW(action_fax)][ADMIN_SHOW_PAPER(fax_paper)].")
+ log_admin("[key_name(usr)] has sent a custom fax message to [action_fax.name]")
+
+ if("createPaper")
+ var/obj/item/paper/our_paper = fax_paper.copy(/obj/item/paper, usr.loc)
+ our_paper.name = fax_paper.name
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 6f1809098f9d..a853f66963af 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -27,7 +27,8 @@ GLOBAL_PROTECT(admin_verbs_default)
/client/proc/fix_air, /*resets air in designated radius to its default atmos composition*/
/client/proc/addbunkerbypass,
/client/proc/revokebunkerbypass,
- /client/proc/report_sgt //TEMP
+ /client/proc/requests,
+ /client/proc/fax_panel, /*send a paper to fax*/
)
GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin())
GLOBAL_PROTECT(admin_verbs_admin)
@@ -120,7 +121,6 @@ GLOBAL_LIST_INIT(admin_verbs_fun, list(
/client/proc/polymorph_all,
/client/proc/show_tip,
/client/proc/smite,
- /client/proc/fax_manager,
/client/proc/spawn_ruin,
))
GLOBAL_PROTECT(admin_verbs_fun)
@@ -284,7 +284,6 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
/client/proc/cmd_display_del_log,
/client/proc/toggle_combo_hud,
/client/proc/debug_huds,
- /client/proc/fax_manager
))
GLOBAL_PROTECT(admin_verbs_hideable)
@@ -776,13 +775,3 @@ GLOBAL_PROTECT(admin_verbs_hideable)
src << link("?debug=profile&type=sendmaps&window=test")
#endif
-
-//FIXME TODO REMOVE THIS
-/client/proc/report_sgt()
- set name = "SGT Report"
- set category = "000_PANIC BUTTON"
- set desc = "Report a Slimegirl Trafficking Incident"
- if(!holder)
- return
- log_shuttle("CRITICAL: !!INCIDENT REPORTED!!")
- message_debug("[key_name_admin(usr)]: Shuttle Incident Reported.")
diff --git a/code/modules/admin/chat_commands.dm b/code/modules/admin/chat_commands.dm
index baa52e38c7da..eed57f6d6c0b 100644
--- a/code/modules/admin/chat_commands.dm
+++ b/code/modules/admin/chat_commands.dm
@@ -12,16 +12,24 @@
break
if(!active_admins)
SSticker.Reboot("Restart requested from the discord.", "discord")
- return "Rebooting..."
+ return new /datum/tgs_message_content("Rebooting...")
else
- return "There are active admins on the server! Ask them to restart."
+ return new /datum/tgs_message_content("There are active admins on the server! Ask them to restart.")
/datum/tgs_chat_command/join
name = "join"
help_text = "Sends a join link."
/datum/tgs_chat_command/join/Run(datum/tgs_chat_user/sender, params)
- return "<[world.internet_address]:[world.port]>"
+ var/datum/tgs_chat_embed/structure/embed = new()
+ embed.title = "Join Server"
+ embed.colour = COLOR_DARK_CYAN
+ embed.description = "Enter this URL into the BYOND pager to join the server: byond://[world.internet_address]:[world.port]"
+
+ var/datum/tgs_message_content/join = new()
+ join.embed = embed
+
+ return join
/datum/tgs_chat_command/tgsstatus
name = "status"
@@ -32,14 +40,64 @@
/datum/tgs_chat_command/tgsstatus/Run(datum/tgs_chat_user/sender, params)
var/rtod = REALTIMEOFDAY
if(rtod - last_tgs_status < TGS_STATUS_THROTTLE)
- return
+ return new /datum/tgs_message_content("Please wait a few seconds before using this command again.")
last_tgs_status = rtod
- var/list/adm = get_admin_counts()
- var/list/allmins = adm["total"]
- var/status = "Admins: [allmins.len] (Active: [english_list(adm["present"])] AFK: [english_list(adm["afk"])] Stealth: [english_list(adm["stealth"])] Skipped: [english_list(adm["noflags"])]). "
- status += "Players: [GLOB.clients.len] (Active: [get_active_player_count(0,1,0)]). Mode: [SSticker.mode ? SSticker.mode.name : "Not started"]."
+
+ var/datum/tgs_chat_embed/structure/embed = new()
+ embed.title = "Server Admin Status"
+ embed.colour = COLOR_DARK_CYAN
+
+ embed.fields = list()
+ embed.fields += new /datum/tgs_chat_embed/field("Round", "[GLOB.round_id ? "Round #[GLOB.round_id]" : "Not started"]\n[station_name()]\n[length(SSovermap.controlled_ships)] ships")
+ embed.fields += new /datum/tgs_chat_embed/field("Admins", tgsadminwho())
+ embed.fields += new /datum/tgs_chat_embed/field("Players", "Total: [length(GLOB.clients)]\nActive: [get_active_player_count(FALSE, TRUE, FALSE)]\nAlive: [get_active_player_count(TRUE, TRUE, TRUE)]")
+
+ embed.fields += new /datum/tgs_chat_embed/field("Tickets", "Active: [length(GLOB.ahelp_tickets.active_tickets)]\nResolved: [length(GLOB.ahelp_tickets.resolved_tickets)]\nClosed: [length(GLOB.ahelp_tickets.closed_tickets)]")
+ embed.fields += new /datum/tgs_chat_embed/field("Interviews", "Open: [length(GLOB.interviews.open_interviews) - length(GLOB.interviews.interview_queue)]\nSubmitted: [length(GLOB.interviews.interview_queue)]\nClosed: [length(GLOB.interviews.closed_interviews)]")
+
+ embed.fields += new /datum/tgs_chat_embed/field("Mode", "[SSticker.mode ? SSticker.mode.name : "Not started"]")
+ embed.fields += new /datum/tgs_chat_embed/field("Round Time", ROUND_TIME)
+ embed.fields += new /datum/tgs_chat_embed/field("Time Dilation", "[round(SStime_track.time_dilation_current, 0.1)]% ([round(SStime_track.time_dilation_avg, 0.1)]% avg)")
+
+ for(var/datum/tgs_chat_embed/field/field as anything in embed.fields)
+ field.is_inline = TRUE
+
+ var/datum/tgs_message_content/status = new()
+ status.embed = embed
+
return status
+/datum/tgs_chat_command/subsystems
+ name = "subsystems"
+ help_text = "Gets the status of the server subsystems"
+ admin_only = TRUE
+ var/last_tgs_subsystems = 0
+
+/datum/tgs_chat_command/subsystems/Run(datum/tgs_chat_user/sender, params)
+ var/rtod = REALTIMEOFDAY
+ if(rtod - last_tgs_subsystems < TGS_STATUS_THROTTLE)
+ return new /datum/tgs_message_content("Please wait a few seconds before using this command again.")
+ last_tgs_subsystems = rtod
+
+ var/datum/tgs_chat_embed/structure/embed = new()
+ embed.title = "Server Subsystems"
+ embed.colour = COLOR_DARK_CYAN
+
+ embed.description = Master.stat_entry()
+
+ embed.fields = list()
+ for(var/datum/controller/subsystem/sub_system as anything in Master.subsystems)
+ if(params && !findtext(sub_system.name, params))
+ continue
+ var/datum/tgs_chat_embed/field/sub_system_entry = new ("\[[sub_system.state_letter()]] [sub_system.name]", sub_system.stat_entry())
+ sub_system_entry.is_inline = TRUE
+ embed.fields += sub_system_entry
+
+ var/datum/tgs_message_content/subsystems = new()
+ subsystems.embed = embed
+
+ return subsystems
+
/datum/tgs_chat_command/tgscheck
name = "check"
help_text = "Gets the playercount, gamemode, and address of the server"
@@ -48,10 +106,27 @@
/datum/tgs_chat_command/tgscheck/Run(datum/tgs_chat_user/sender, params)
var/rtod = REALTIMEOFDAY
if(rtod - last_tgs_check < TGS_STATUS_THROTTLE)
- return
+ return new /datum/tgs_message_content("Please wait a few seconds before using this command again.")
last_tgs_check = rtod
- var/server = CONFIG_GET(string/server)
- return "[GLOB.round_id ? "Round #[GLOB.round_id]: " : ""][GLOB.clients.len] players, Mode: [GLOB.master_mode]; Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting"] -- [server ? server : "[world.internet_address]:[world.port]"]"
+
+ var/datum/tgs_chat_embed/structure/embed = new()
+ embed.title = "Server Status"
+ embed.colour = COLOR_DARK_CYAN
+
+ embed.fields = list()
+ embed.fields += new /datum/tgs_chat_embed/field("Round", "[GLOB.round_id ? "Round #[GLOB.round_id]" : "Not started"]")
+ embed.fields += new /datum/tgs_chat_embed/field("Players", "[length(GLOB.player_list) || "No players"]")
+ embed.fields += new /datum/tgs_chat_embed/field("Admins", "[length(GLOB.admins) || "No admins"]")
+ embed.fields += new /datum/tgs_chat_embed/field("Round Time", ROUND_TIME)
+ embed.fields += new /datum/tgs_chat_embed/field("Time Dilation", "[round(SStime_track.time_dilation_current, 0.1)]% ([round(SStime_track.time_dilation_avg, 0.1)]% avg)")
+
+ for(var/datum/tgs_chat_embed/field/field as anything in embed.fields)
+ field.is_inline = TRUE
+
+ var/datum/tgs_message_content/status = new()
+ status.embed = embed
+
+ return status
/datum/tgs_chat_command/ahelp
name = "ahelp"
@@ -61,7 +136,7 @@
/datum/tgs_chat_command/ahelp/Run(datum/tgs_chat_user/sender, params)
var/list/all_params = splittext(params, " ")
if(all_params.len < 2)
- return "Insufficient parameters"
+ return new /datum/tgs_message_content("Insufficient parameters")
var/target = all_params[1]
all_params.Cut(1, 2)
var/id = text2num(target)
@@ -70,10 +145,10 @@
if(AH)
target = AH.initiator_ckey
else
- return "Ticket #[id] not found!"
+ return new /datum/tgs_message_content("Ticket #[id] not found.")
var/res = TgsPm(target, all_params.Join(" "), sender.friendly_name)
if(res != "Message Successful")
- return res
+ return new /datum/tgs_message_content(res)
/datum/tgs_chat_command/namecheck
name = "namecheck"
@@ -83,10 +158,10 @@
/datum/tgs_chat_command/namecheck/Run(datum/tgs_chat_user/sender, params)
params = trim(params)
if(!params)
- return "Insufficient parameters"
+ return new /datum/tgs_message_content("Please specify a target.")
log_admin("Chat Name Check: [sender.friendly_name] on [params]")
message_admins("Name checking [params] from [sender.friendly_name]")
- return keywords_lookup(params, 1)
+ return new /datum/tgs_message_content(keywords_lookup(params, TRUE))
/datum/tgs_chat_command/adminwho
name = "adminwho"
@@ -94,7 +169,15 @@
admin_only = TRUE
/datum/tgs_chat_command/adminwho/Run(datum/tgs_chat_user/sender, params)
- return tgsadminwho()
+ var/datum/tgs_chat_embed/structure/embed = new()
+ embed.title = "Admins"
+ embed.colour = COLOR_DARK_CYAN
+ embed.description = tgsadminwho() || "No admins online."
+
+ var/datum/tgs_message_content/adminwho = new()
+ adminwho.embed = embed
+
+ return adminwho
GLOBAL_LIST(round_end_notifiees)
@@ -107,7 +190,7 @@ GLOBAL_LIST(round_end_notifiees)
if(!SSticker.IsRoundInProgress() && SSticker.HasRoundStarted())
return "[sender.mention], the round has already ended!"
LAZYSET(GLOB.round_end_notifiees, sender.mention, TRUE)
- return "I will notify [sender.mention] when the round ends."
+ return new /datum/tgs_message_content( "I will notify [sender.mention] when the round ends.")
/datum/tgs_chat_command/sdql
name = "sdql"
@@ -116,15 +199,26 @@ GLOBAL_LIST(round_end_notifiees)
/datum/tgs_chat_command/sdql/Run(datum/tgs_chat_user/sender, params)
if(GLOB.AdminProcCaller)
- return "Unable to run query, another admin proc call is in progress. Try again later."
+ return new /datum/tgs_message_content("Unable to run query, another admin proc call is in progress. Try again later.")
GLOB.AdminProcCaller = "CHAT_[sender.friendly_name]" //_ won't show up in ckeys so it'll never match with a real admin
var/list/results = world.SDQL2_query(params, GLOB.AdminProcCaller, GLOB.AdminProcCaller)
GLOB.AdminProcCaller = null
if(!results)
- return "Query produced no output"
+ return new /datum/tgs_message_content("Query produced no output.")
var/list/text_res = results.Copy(1, 3)
var/list/refs = results.len > 3 ? results.Copy(4) : null
- . = "[text_res.Join("\n")][refs ? "\nRefs: [refs.Join(" ")]" : ""]"
+
+ var/datum/tgs_chat_embed/structure/embed = new()
+ embed.title = "SDQL Query Results"
+ embed.colour = COLOR_DARK_CYAN
+ embed.description = text_res.Join("\n") || "No results."
+ embed.fields = list()
+ embed.fields += new /datum/tgs_chat_embed/field("Refs", refs ? refs.Join("\n") : "None")
+
+ var/datum/tgs_message_content/sdql = new()
+ sdql.embed = embed
+
+ return sdql
/datum/tgs_chat_command/reload_admins
name = "reload_admins"
@@ -134,8 +228,60 @@ GLOBAL_LIST(round_end_notifiees)
/datum/tgs_chat_command/reload_admins/Run(datum/tgs_chat_user/sender, params)
ReloadAsync()
log_admin("[sender.friendly_name] reloaded admins via chat command.")
- return "Admins reloaded."
+ return new /datum/tgs_message_content("Admins reloaded.")
/datum/tgs_chat_command/reload_admins/proc/ReloadAsync()
set waitfor = FALSE
load_admins()
+
+/datum/tgs_chat_command/manifest
+ name = "manifest"
+ help_text = "Displays the current crew manifest"
+
+/datum/tgs_chat_command/manifest/Run(datum/tgs_chat_user/sender, params)
+ var/list/manifest = SSovermap.get_manifest()
+
+ var/datum/tgs_chat_embed/structure/embed = new()
+ embed.title = "__Crew Manifest:__"
+ embed.colour = COLOR_DARK_CYAN
+
+ if(!length(manifest))
+ embed.description = "No crew manifest available."
+ else
+ embed.fields = list()
+ for(var/ship in manifest)
+ var/list/entries = manifest[ship]
+ var/list/ship_entries = list()
+ for(var/entry in entries)
+ var/list/entry_list = entry
+ ship_entries += "[entry_list["name"]]: [entry_list["rank"]]"
+
+ var/datum/tgs_chat_embed/field/ship_field = new(ship, ship_entries.Join("\n"))
+ ship_field.is_inline = TRUE
+ embed.fields += ship_field
+
+ var/datum/tgs_message_content/manifest_content = new()
+ manifest_content.embed = embed
+
+ return manifest_content
+
+/datum/tgs_chat_command/who
+ name = "who"
+ help_text = "Displays the current player list"
+
+/datum/tgs_chat_command/who/Run(datum/tgs_chat_user/sender, params)
+ var/datum/tgs_chat_embed/structure/embed = new()
+ embed.colour = COLOR_DARK_CYAN
+
+ if(!length(GLOB.clients))
+ embed.title = "__Players:__"
+ embed.description = "No players online."
+ else
+ embed.title = "__Players ([length(GLOB.clients)]):__"
+ for(var/client/player as anything in GLOB.clients)
+ embed.description += "[player.ckey]\n"
+
+ var/datum/tgs_message_content/who = new()
+ who.embed = embed
+
+ return who
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index a4a70c00e429..b917501d0bb8 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())
@@ -2218,10 +2218,14 @@
return
GLOB.interviews.ui_interact(usr)
- else if(href_list["open_fax_manager"])
+ else if(href_list["show_paper"])
if(!check_rights(R_ADMIN))
return
- usr.client.fax_manager()
+
+ var/obj/item/paper/paper_to_show = locate(href_list["show_paper"])
+ if(!istype(paper_to_show))
+ return
+ paper_to_show.ui_interact(usr)
/datum/admins/proc/HandleCMode()
if(!check_rights(R_ADMIN))
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 225a074b1477..5ac4714257ef 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 += "Actions: 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) [icon2html(cross, GLOB.admins)][prayer_type][deity ? " (to [deity])" : ""]: [ADMIN_FULLMONTY(src)] [ADMIN_SC(src)]:[msg] "
for(var/client/C in GLOB.admins)
if(C.prefs.chat_toggles & CHAT_PRAYER)
to_chat(C, msg, confidential = TRUE)
- if(C.prefs.toggles & SOUND_PRAYERS)
- if(usr.job == "Chaplain")
- SEND_SOUND(C, sound('sound/effects/pray.ogg'))
to_chat(usr, "You pray to the gods: \"[msg_tmp]\" ", confidential = TRUE)
SSredbot.send_discord_message("admin", "Prayer from [src.key]/([src.name]): [msg]")
SSblackbox.record_feedback("tally", "admin_verb", 1, "Prayer") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- //log_admin("HELP: [key_name(src)]: [msg]")
/// Used by communications consoles to message CentCom
/proc/message_centcom(text, mob/sender)
var/msg = copytext_char(sanitize(text), 1, MAX_MESSAGE_LEN)
+ GLOB.requests.message_centcom(sender.client, msg)
msg = "CENTCOM: [ADMIN_FULLMONTY(sender)] [ADMIN_CENTCOM_REPLY(sender)]:SYNDICATE: [ADMIN_FULLMONTY(sender)] [ADMIN_SYNDICATE_REPLY(sender)]:NUKE CODE REQUEST: [ADMIN_FULLMONTY(sender)] [ADMIN_CENTCOM_REPLY(sender)] [ADMIN_SET_SD_CODE]:You are the [name]. 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. You are the [name]. Your Mission : [ert_team.mission.explanation_text]"
- to_chat(owner,missiondesc)
+// Marine
/datum/antagonist/ert/marine
name = "Marine Commander"
@@ -196,8 +203,355 @@
outfit = /datum/outfit/centcom/ert/marine/medic
role = "Medical Officer"
+// Loss Prevention
+
+/datum/antagonist/ert/lp
+ name = "Loss Prevention Security Specialist"
+ outfit = /datum/outfit/job/nanotrasen/ert/lp
+ role = "Security Specialist"
+
+/datum/antagonist/ert/lp/medic
+ name = "Loss Prevention Medical Specialist"
+ outfit = /datum/outfit/job/nanotrasen/ert/lp/medic
+ role = "Medical Specialist"
+
+/datum/antagonist/ert/lp/engineer
+ name = "Loss Prevention Engineering Specialist"
+ outfit = /datum/outfit/job/nanotrasen/ert/lp/engineer
+ role = "Engineering Specialist"
+
+/datum/antagonist/ert/lp/lieutenant
+ name = "Loss Prevention Lieutenant"
+ leader = TRUE
+ outfit = /datum/outfit/job/nanotrasen/ert/lp/lieutenant
+ role = "Lieutenant"
+
+// ********************************************************************
+// ** Inteq **
+// ********************************************************************
+
+/datum/antagonist/ert/inteq
+ name = "Inteq Mercenary"
+ outfit = /datum/outfit/job/inteq/security
+ random_names = TRUE
+ role = "Enforcer"
+
+
+/datum/antagonist/ert/inteq/greet()
+ to_chat(owner, "You are the [name]. Contract Terms : [ert_team.mission.explanation_text]"
+ to_chat(owner,missiondesc)
+
+/datum/antagonist/ert/inteq/leader
+ name = "Inteq Mercenary Leader"
+ outfit = /datum/outfit/job/inteq/captain
+ role = "Vanguard"
+
+// ********************************************************************
+// ** SolGov **
+// ********************************************************************
/datum/antagonist/ert/solgov
- name = "SolGov Sonnensoldner"
- outfit = /datum/outfit/solgov/sonnensoldner
+ name = "SolGov Sonnensöldner"
+ outfit = /datum/outfit/job/solgov/ert
random_names = FALSE
- role = "SolGov Sonnensoldner"
+ role = "Sonnensöldner"
+
+/datum/antagonist/ert/official/solgov
+ name = "SolGov Inspector"
+ outfit = /datum/outfit/job/solgov/ert/inspector
+ role = "Solarian Inspector"
+
+/datum/antagonist/ert/official/solgov/greet()
+ to_chat(owner, "You are a Solarian Inspector. You are the [name]. Your Mission : [ert_team.mission.explanation_text]"
+ to_chat(owner,missiondesc)
+
+/datum/antagonist/ert/minutemen/leader
+ name = "Minutemen Leader"
+ leader = TRUE
+ outfit = /datum/outfit/job/minutemen/ert/leader
+ role = "Sergeant"
+
+/datum/antagonist/ert/minutemen/bard
+ name = "BARD Infantry"
+ outfit = /datum/outfit/job/minutemen/ert/bard
+ role = "Minuteman"
+
+/datum/antagonist/ert/minutemen/bard/leader
+ name = "BARD Sergeant"
+ leader = TRUE
+ outfit = /datum/outfit/job/minutemen/ert/bard/leader
+ role = "Sergeant"
+
+/datum/antagonist/ert/minutemen/riot
+ name = "Riot Officer"
+ outfit = /datum/outfit/job/minutemen/ert/riot
+ role = "Minuteman"
+
+/datum/antagonist/ert/minutemen/riot/leader
+ name = "Riot Sergeant"
+ leader = TRUE
+ outfit = /datum/outfit/job/minutemen/ert/riot/leader
+ role = "Sergeant"
+
+/datum/antagonist/ert/official/minutemen
+ name = "GOLD Inspector"
+ outfit = /datum/outfit/job/minutemen/ert/inspector
+ role = "Lieutenant"
+
+/datum/antagonist/ert/official/minutemen/greet()
+ to_chat(owner, "You are the GOLD Inspector. You are the [name]. Your Mission : [ert_team.mission.explanation_text]"
+ to_chat(owner,missiondesc)
+
+/datum/antagonist/ert/syndicate/leader
+ name = "Syndicate Sergeant"
+ leader = TRUE
+ outfit = /datum/outfit/job/syndicate/ert/leader
+ role = "Sergeant"
+
+/datum/antagonist/ert/syndicate/gorlex
+ name = "2nd Battlegroup Trooper"
+ outfit = /datum/outfit/job/syndicate/ert/gorlex
+ role = "Trooper"
+
+/datum/antagonist/ert/syndicate/gorlex/greet()
+ to_chat(owner, "You are the [name]. Your Mission : [ert_team.mission.explanation_text]"
+ to_chat(owner,missiondesc)
+
+/datum/antagonist/ert/syndicate/gorlex/pointman
+ name = "2nd Battlegroup Shotgunner"
+ outfit = /datum/outfit/job/syndicate/ert/gorlex/pointman
+ role = "Pointman"
+
+/datum/antagonist/ert/syndicate/gorlex/medic
+ name = "2nd Battlegroup Medic"
+ outfit = /datum/outfit/job/syndicate/ert/gorlex/medic
+ role = "Medic"
+
+/datum/antagonist/ert/syndicate/gorlex/sniper
+ name = "2nd Battlegroup Sniper"
+ outfit = /datum/outfit/job/syndicate/ert/gorlex/sniper
+ role = "Marksman"
+
+/datum/antagonist/ert/syndicate/gorlex/leader
+ name = "2nd Battlegroup Sergeant"
+ leader = TRUE
+ outfit = /datum/outfit/job/syndicate/ert/gorlex/leader
+ role = "Sergeant"
+
+/datum/antagonist/ert/syndicate/cybersun
+ name = "Cybersun Commando"
+ outfit = /datum/outfit/job/syndicate/ert/cybersun
+ role = "Operative"
+
+/datum/antagonist/ert/syndicate/cybersun/greet()
+ to_chat(owner, "You are the [name]. 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/job/syndicate/ert/cybersun/leader
+ role = "Lead Operative"
+
+/datum/antagonist/ert/syndicate/cybersun/medic
+ name = "Cybersun Paramedic"
+ outfit = /datum/outfit/job/syndicate/ert/cybersun/medic
+ role = "Medical Technician"
+
+/datum/antagonist/ert/syndicate/cybersun/medic/greet()
+ to_chat(owner, "You are the [name]. 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/job/syndicate/ert/cybersun/medic/leader
+ role = "Lead Medical Technician"
+
+/datum/antagonist/ert/official/syndicate
+ name = "Syndicate Inspector"
+ outfit = /datum/outfit/job/syndicate/ert/inspector
+ role = "Syndicate Inspector"
+
+/datum/antagonist/ert/official/solgov/greet()
+ to_chat(owner, "You are a Syndicate Inspector. You are the [name]. Your Mission : [ert_team.mission.explanation_text]"
+ to_chat(owner,missiondesc)
+
+/datum/antagonist/ert/frontier/random
+ outfit = /datum/outfit/job/frontiersmen/ert/random
+
+/datum/antagonist/ert/frontier/leader
+ name = "Frontiersmen Officer"
+ outfit = /datum/outfit/job/frontiersmen/ert/leader
+ role = "Officer"
+
+/datum/antagonist/ert/frontier/medic
+ name = "Frontiersmen Medic"
+ outfit = /datum/outfit/job/frontiersmen/ert/medic
+ role = "Stretcher-Bearer"
+
+/datum/antagonist/ert/frontier/engineer
+ name = "Frontiersmen Engineer"
+ outfit = /datum/outfit/job/frontiersmen/ert/engineer
+ role = "Sapper"
+
+// ********************************************************************
+// ** independent **
+// ********************************************************************
+
+/datum/antagonist/ert/independent
+ name = "Independent Security Officer"
+ outfit = /datum/outfit/job/independent/ert
+ role = "Security Officer"
+
+/datum/antagonist/ert/independent/greet()
+ to_chat(owner, "You are the [name]. Your Mission : [ert_team.mission.explanation_text]"
+ to_chat(owner,missiondesc)
+
+/datum/antagonist/ert/independent/emt
+ name = "Independent Medical Technician"
+ outfit = /datum/outfit/job/independent/ert/emt
+ role = "Paramedic"
+
+/datum/antagonist/ert/independent/firefighter
+ name = "Independent Firefighter"
+ outfit = /datum/outfit/job/independent/ert/firefighter
+ role = "Firefighter"
+
+/datum/antagonist/ert/independent/firefighter/medic
+ name = "Independent Firefighter Paramedic"
+ outfit = /datum/outfit/job/independent/ert/firefighter/medic
+ role = "Paramedic"
+
+/datum/antagonist/ert/independent/firefighter/leader
+ name = "Independent Firefighter Group Captain"
+ outfit = /datum/outfit/job/independent/ert/firefighter/leader
+ role = "Group Captain"
+
+/datum/antagonist/ert/independent/technician
+ name = "Independent Technician"
+ outfit = /datum/outfit/job/independent/ert/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. You don't have enough credits in [uplink] for [I] with [method] shipping. ")
+ to_chat(user, "You don't have enough credits in [uplink] for [I] with [method] shipping. ")
return FALSE
if(I.buy(uplink, user, method))
diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm
index e7b13006a7a7..3ddc15dfa33b 100644
--- a/code/modules/cargo/bounties/assistant.dm
+++ b/code/modules/cargo/bounties/assistant.dm
@@ -139,12 +139,6 @@
wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/poppy)
include_subtypes = FALSE
-/datum/bounty/item/assistant/shadyjims
- name = "Shady Jim's"
- description = "There's an irate officer at CentCom demanding that he receive a box of Shady Jim's cigarettes. Please ship one. He's starting to make threats."
- reward = 500
- wanted_types = list(/obj/item/storage/fancy/cigarettes/cigpack_shadyjims)
-
/datum/bounty/item/assistant/potted_plants
name = "Potted Plants"
description = "Central Command is looking to commission a new BirdBoat-class station. You've been ordered to supply the potted plants."
@@ -217,12 +211,6 @@
required_count = 5
wanted_types = list(/obj/item/toy/figure)
-/datum/bounty/item/assistant/tail_whip
- name = "Nine Tails whip"
- description = "Commander Jackson is looking for a fine addition to her exotic weapons collection. She will reward you handsomely for either a Cat or Liz o' Nine Tails."
- reward = 4000
- wanted_types = list(/obj/item/melee/chainofcommand/tailwhip)
-
/datum/bounty/item/assistant/dead_mice
name = "Dead Mice"
description = "Station 14 ran out of freeze-dried mice. Ship some fresh ones so their janitor doesn't go on strike."
diff --git a/code/modules/cargo/bounties/medical.dm b/code/modules/cargo/bounties/medical.dm
index 38f1fea99906..c0bcb1bd6f69 100644
--- a/code/modules/cargo/bounties/medical.dm
+++ b/code/modules/cargo/bounties/medical.dm
@@ -45,15 +45,3 @@
reward = 10000
required_count = 3
wanted_types = list(/obj/item/organ/tongue)
-
-/datum/bounty/item/medical/lizard_tail
- name = "lizard Tail"
- description = "The Wizard Federation has made off with Nanotrasen's supply of lizard tails. While CentCom is dealing with the wizards, can the station spare a tail of their own?"
- reward = 3000
- wanted_types = list(/obj/item/organ/tail/lizard)
-
-/datum/bounty/item/medical/cat_tail
- name = "Cat Tail"
- description = "Central Command has run out of heavy duty pipe cleaners. Can you ship over a cat tail to help us out?"
- reward = 3000
- wanted_types = list(/obj/item/organ/tail/cat)
diff --git a/code/modules/cargo/exports/gear.dm b/code/modules/cargo/exports/gear.dm
index 1282d52b5a58..8af6b567fef5 100644
--- a/code/modules/cargo/exports/gear.dm
+++ b/code/modules/cargo/exports/gear.dm
@@ -15,7 +15,6 @@
unit_name = "riot shield"
export_types = list(/obj/item/shield/riot)
-
/datum/export/gear/mask/breath
cost = 2
unit_name = "breath mask"
@@ -27,7 +26,6 @@
export_types = list(/obj/item/clothing/mask/gas)
include_subtypes = FALSE
-
/datum/export/gear/space/helmet
cost = 75
unit_name = "space helmet"
@@ -51,7 +49,6 @@
unit_name = "Syndicate space suit"
export_types = list(/obj/item/clothing/suit/space/syndicate)
-
/datum/export/gear/radhelmet
cost = 50
unit_name = "radsuit hood"
@@ -82,17 +79,6 @@
unit_name = "bomb suit"
export_types = list(/obj/item/clothing/suit/bomb_suit)
-/datum/export/gear/lizardboots
- cost = 350
- unit_name = "lizard skin boots"
- export_types = list(/obj/item/clothing/shoes/cowboy/lizard)
- include_subtypes = FALSE
-
-/datum/export/gear/lizardmasterwork
- cost = 1000
- unit_name = "Hugs-the-Feet lizard boots"
- export_types = list(/obj/item/clothing/shoes/cowboy/lizard/masterwork)
-
/datum/export/gear/bilton
cost = 2500
unit_name = "bilton wrangler boots"
diff --git a/code/modules/cargo/packs/costumes_toys.dm b/code/modules/cargo/packs/costumes_toys.dm
index 4cdebc0bdcb4..5bce9871719a 100644
--- a/code/modules/cargo/packs/costumes_toys.dm
+++ b/code/modules/cargo/packs/costumes_toys.dm
@@ -213,3 +213,21 @@
for(var/i in 1 to 3)
var/item = pick_n_take(L)
new item(C)
+
+/datum/supply_pack/costumes_toys/rilena_merch
+ name = "RILENA Merchandise Crate"
+ desc = "A crate full of all the RILENA merch you could ever want. Except the offbrand stuff. That's not in here."
+ cost = 1000 //lots of loot
+ contains = list(/obj/item/toy/figure/tali,
+ /obj/item/toy/plush/rilena,
+ /obj/item/toy/plush/tali,
+ /obj/item/toy/plush/sharai,
+ /obj/item/toy/plush/xader,
+ /obj/item/toy/plush/mora,
+ /obj/item/poster/random_rilena,
+ /obj/item/poster/random_rilena,
+ /obj/item/poster/random_rilena,
+ /obj/item/clothing/suit/hooded/hoodie/rilena,
+ /obj/item/clothing/under/dress/rilena,
+ /obj/item/gun/energy/buster)
+ crate_name = "collectable merchandise crate"
diff --git a/code/modules/cargo/packs/food.dm b/code/modules/cargo/packs/food.dm
index 86e6f293908d..398233a64488 100644
--- a/code/modules/cargo/packs/food.dm
+++ b/code/modules/cargo/packs/food.dm
@@ -258,3 +258,41 @@
/obj/effect/spawner/lootdrop/ration)
crate_name = "ration crate"
crate_type = /obj/structure/closet/crate
+
+/datum/supply_pack/food/syrup
+ name = "Coffee Syrups Box"
+ desc = "A packaged box of various syrups, perfect for making your delicious coffee even more diabetic."
+ cost = 200
+ contains = list(
+ /obj/item/reagent_containers/food/drinks/bottle/syrup_bottle/caramel,
+ /obj/item/reagent_containers/food/drinks/bottle/syrup_bottle/liqueur,
+ )
+ crate_name = "coffee syrups box"
+ crate_type = /obj/structure/closet/crate
+
+/datum/supply_pack/food/coffeekit
+ name = "Coffee Equipment Crate"
+ desc = "A complete kit to setup your own cozy coffee shop, the coffeemaker is for some reason not included."
+ cost = 1000
+ contains = list(
+ /obj/item/storage/box/coffeepack/robusta,
+ /obj/item/storage/box/coffeepack,
+ /obj/item/reagent_containers/food/drinks/bottle/coffeepot,
+ /obj/item/storage/box/coffee_condi_display,
+ /obj/item/reagent_containers/food/condiment/milk,
+ /obj/item/reagent_containers/food/condiment/soymilk,
+ /obj/item/reagent_containers/food/condiment/sugar,
+ /obj/item/reagent_containers/food/drinks/bottle/syrup_bottle/caramel, //one extra syrup as a treat
+ )
+ crate_name = "coffee equipment crate"
+
+/datum/supply_pack/food/coffeemaker
+ name = "Impressa Coffeemaker Crate"
+ desc = "An assembled Impressa model coffeemaker."
+ cost = 500
+ contains = list(
+ /obj/machinery/coffeemaker/impressa,
+ /obj/item/reagent_containers/food/drinks/bottle/coffeepot,
+ )
+ crate_name = "coffeemaker crate"
+ crate_type = /obj/structure/closet/crate
diff --git a/code/modules/cargo/packs/machinery.dm b/code/modules/cargo/packs/machinery.dm
index 20f0af7a03a3..510ec7841417 100644
--- a/code/modules/cargo/packs/machinery.dm
+++ b/code/modules/cargo/packs/machinery.dm
@@ -326,3 +326,4 @@
contains = list(/obj/machinery/the_singularitygen/tesla)
crate_name = "tesla generator crate"
crate_type = /obj/structure/closet/crate/secure/engineering
+
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 334818c0e1f9..8db2e8454828 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -143,7 +143,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
return
..() //redirect to hsrc.Topic()
-///dumb workaround because byond doesnt seem to recognize the .proc/Topic() typepath for /datum/proc/Topic() from the client Topic,
+///dumb workaround because byond doesnt seem to recognize the PROC_REF(Topic()) typepath for /datum/proc/Topic() from the client Topic,
///so we cant queue it without this
/client/proc/_Topic(datum/hsrc, href, list/href_list)
return hsrc.Topic(href, href_list)
@@ -231,6 +231,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
GLOB.ahelp_tickets.client_login(src)
GLOB.interviews.client_login(src)
+ GLOB.requests.client_login(src)
var/connecting_admin = FALSE //because de-admined admins connecting should be treated like admins.
//Admin Authorisation
holder = GLOB.admin_datums[ckey]
@@ -501,6 +502,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
log_access("Logout: [key_name(src)]")
GLOB.ahelp_tickets.client_logout(src)
GLOB.interviews.client_logout(src)
+ GLOB.requests.client_logout(src)
SSserver_maint.UpdateHubStatus()
if(credits)
QDEL_LIST(credits)
diff --git a/code/modules/client/loadout/loadout_general.dm b/code/modules/client/loadout/loadout_general.dm
index 671c0efe9602..042315cc981f 100644
--- a/code/modules/client/loadout/loadout_general.dm
+++ b/code/modules/client/loadout/loadout_general.dm
@@ -42,6 +42,10 @@
display_name = "coffee mug"
path = /obj/item/reagent_containers/food/drinks/britcup
+/datum/gear/rilena_mug
+ display_name = "coffee mug, rilena"
+ path = /obj/item/reagent_containers/food/drinks/rilenacup
+
/datum/gear/lighter
display_name = "cheap lighter"
path = /obj/item/lighter/greyscale
@@ -78,6 +82,10 @@
display_name = "laptop computer"
path = /obj/item/modular_computer/laptop/preset/civilian
+/datum/gear/rilena_laptop
+ display_name = "rilena laptop computer"
+ path = /obj/item/modular_computer/laptop/preset/civilian/rilena
+
/datum/gear/pen
display_name = "pen, black"
path = /obj/item/pen
@@ -123,6 +131,14 @@
display_name = "toy, marketable knight plushie"
path = /obj/item/toy/plush/knight
+/datum/gear/ri
+ display_name = "toy, rilena ri plushie"
+ path = /obj/item/toy/plush/rilena
+
+/datum/gear/tali
+ display_name = "toy, rilena tali plushie"
+ path = /obj/item/toy/plush/tali
+
// Shiptest edit
/datum/gear/amongus
display_name = "toy, suspicious pill plushie"
@@ -163,3 +179,8 @@
/datum/gear/surgical_mask
display_name = "surgical mask"
path = /obj/item/clothing/mask/surgical
+
+/datum/gear/rilena_poster
+ display_name = "poster, rilena"
+ path = /obj/item/poster/random_rilena
+ description = "A random poster of the RILENA series."
diff --git a/code/modules/client/loadout/loadout_suit.dm b/code/modules/client/loadout/loadout_suit.dm
index e2800a87e9e1..ec9fc916723e 100644
--- a/code/modules/client/loadout/loadout_suit.dm
+++ b/code/modules/client/loadout/loadout_suit.dm
@@ -73,6 +73,14 @@
display_name = "hoodie, gray"
path = /obj/item/clothing/suit/hooded/hoodie/gray
+/datum/gear/suit/jacket/hoodie_fbp
+ display_name = "hoodie, fbp kepori"
+ path = /obj/item/clothing/suit/hooded/hoodie/fbp
+
+/datum/gear/suit/jacket/hoodie_rilena
+ display_name = "hoodie, T4L1"
+ path = /obj/item/clothing/suit/hooded/hoodie/rilena
+
/datum/gear/suit/jacket/highvis
display_name = "industrial jacket"
path = /obj/item/clothing/suit/toggle/industrial
diff --git a/code/modules/client/loadout/loadout_uniform.dm b/code/modules/client/loadout/loadout_uniform.dm
index 4edb59b74076..1410bdb0fe4d 100644
--- a/code/modules/client/loadout/loadout_uniform.dm
+++ b/code/modules/client/loadout/loadout_uniform.dm
@@ -233,6 +233,10 @@
display_name = "dress-suitskirt, navy"
path = /obj/item/clothing/under/suit/dresssuit/skirt
+/datum/gear/uniform/dress/rilena
+ display_name = "red dress, Ri cosplay"
+ path = /obj/item/clothing/under/dress/rilena
+
//Premium
/datum/gear/uniform/tacticool
display_name = "tacticool turtleneck"
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"] Split Admin Tabs: [(toggles & SPLIT_ADMIN_TABS)?"Enabled":"Disabled"] Ignore Being Summoned as Cult Ghost: [(toggles & ADMIN_IGNORE_CULT_GHOST)?"Don't Allow Being Summoned":"Allow Being Summoned"] Briefing Officer Outfit: [brief_outfit] ASAY Color: Change The voice changer is now [voice_change ? "on" : "off"]! ")
-
/obj/item/clothing/mask/chameleon/drone
//Same as the drone chameleon hat, undroppable and no protection
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
diff --git a/code/modules/clothing/factions/suns.dm b/code/modules/clothing/factions/suns.dm
new file mode 100644
index 000000000000..019cb82224d9
--- /dev/null
+++ b/code/modules/clothing/factions/suns.dm
@@ -0,0 +1,615 @@
+
+
+//////////////
+//Jumpsuits//
+/////////////
+
+
+/obj/item/clothing/under/syndicate/suns
+ name = "\improper SUNS formal suit"
+ desc = "A fancy-looking tailored suit with purple slacks. Worn typically by students in the first half of their academic journey."
+ icon_state = "suns_uniform1"
+ item_state = "suns_uniwhite"
+ armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
+ can_adjust = TRUE
+ icon = 'icons/obj/clothing/faction/suns/uniforms.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/uniforms.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/under/syndicate/suns/alt
+ name = "\improper SUNS formal suit"
+ desc = "A fancy-looking tailored shirt with a purple skirt. Worn typically by students in the first half of their academic journey."
+ icon_state = "suns_uniskirt1"
+ item_state = "suns_uniwhite"
+
+/obj/item/clothing/under/syndicate/suns/uniform2
+ desc = "A uniform typically worn by students in the final years of their academic journey."
+ icon_state = "suns_uniform2"
+ item_state = "suns_uniwhite"
+ can_adjust = TRUE
+
+/obj/item/clothing/under/syndicate/suns/uniform2/alt
+ desc = "A long skirt and blouse typically worn by students in the final years of their academic journey."
+ icon_state = "suns_uniskirt2"
+ item_state = "suns_uniwhite"
+
+/obj/item/clothing/under/syndicate/suns/uniform3
+ desc = "A suit typically worn by SUNS graduates and SUNS academic staff. You've come a long way, friend."
+ icon_state = "suns_uniform3"
+ item_state = "suns_unipurple"
+ can_adjust = TRUE
+
+/obj/item/clothing/under/syndicate/suns/uniform3/alt
+ desc = "A skirt and blouse typically worn by SUNS graduates and SUNS academic staff. You've come a long way, friend."
+ icon_state = "suns_uniskirt3"
+ item_state = "suns_unipurple"
+
+/obj/item/clothing/under/syndicate/suns/pkuniform
+ name = "\improper SUNS peacekeeper uniform"
+ desc = "A uniform designed for ease of movement for both the classroom and the frontier."
+ icon_state = "suns_pkuniform"
+ item_state = "suns_uniblack"
+
+/obj/item/clothing/under/syndicate/suns/workerjumpsuit
+ name = "\improper SUNS work jumpsuit"
+ desc = "A casual uniform worn by students and staff to protect from blue collar work."
+ icon_state = "suns_workerjumpsuit"
+ item_state = "suns_unipurple"
+ can_adjust = TRUE
+
+/obj/item/clothing/under/syndicate/suns/captain
+ name = "\improper SUNS captain suit"
+ desc = "An elaborate uniform to set high ranking staff from academia apart from the rest."
+ icon_state = "suns_captain"
+ item_state = "suns_uniblack"
+ can_adjust = TRUE
+
+/obj/item/clothing/under/syndicate/suns/xo
+ name = "\improper SUNS academic suit"
+ desc = "A style of suit typically worn by academic staff."
+ icon_state = "suns_xo"
+ item_state = "suns_uniblack"
+ can_adjust = TRUE
+
+/obj/item/clothing/under/syndicate/suns/sciencejumpsuit
+ name = "\improper SUNS lab jumpsuit"
+ desc = "A comfortable suit meant to protect the individual from exposure to harmful objects."
+ icon_state = "suns_sciencejumpsuit"
+ item_state = "suns_uniwhite"
+ can_adjust = FALSE
+
+/obj/item/clothing/under/syndicate/suns/doctorscrubs
+ name = "\improper SUNS medical scrubs"
+ desc = "Work safe medical scrubs for both the professionals and the trainees."
+ icon_state = "suns_doctorscrubs"
+ item_state = "suns_unipurple"
+ can_adjust = FALSE
+
+
+////////////////////
+//Unarmored suits//
+///////////////////
+
+
+/obj/item/clothing/suit/toggle/suns
+ name = "\improper SUNS jacket"
+ desc = "A plain purple SUNS jacket, used fairly often on the frontier."
+ icon_state = "suns_jacket"
+ item_state = "suns_overpurple"
+ icon = 'icons/obj/clothing/faction/suns/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/suits.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/suit/toggle/suns/alt
+ name = "black school jacket"
+ desc = "A plain black jacket with gold detailing. Found in universities all over the galaxy."
+ icon_state = "suns_schooljacket"
+ item_state = "suns_overblack"
+
+/obj/item/clothing/suit/toggle/suns/workervest
+ name = "SUNS work vest"
+ desc = "A protective vest worn by some of the more practically minded students and staff during field work."
+ icon_state = "suns_workervest"
+ item_state = "suns_overblack"
+
+/obj/item/clothing/suit/toggle/labcoat/suns/cmo
+ name = "medical instructor coat"
+ desc = "A labcoat often worn by the more eccentric medical instructors."
+ icon_state = "suns_cmocoat"
+ item_state = "suns_overblack"
+ icon = 'icons/obj/clothing/faction/suns/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/suits.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/suit/toggle/labcoat/suns/doctorlabcoat
+ name = "SUNS work vest"
+ desc = "A stylized white labcoat frequently worn by SUNS medical staff."
+ icon_state = "suns_doctorlabcoat"
+ item_state = "suns_overwhite"
+ icon = 'icons/obj/clothing/faction/suns/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/suits.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/suit/hooded/suns
+ name = "\improper SUNS labcoat"
+ desc = "An academic labcoat designed to protect the wearer from chemical and non chemical spills."
+ icon_state = "suns_labcoat"
+ item_state = "suns_overwhite"
+ hoodtype = /obj/item/clothing/head/hooded/hood/suns
+ allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
+ icon = 'icons/obj/clothing/faction/suns/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/suits.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/head/hooded/hood/suns
+ name = "\improper SUNS labcoat hood"
+ desc = "A hood to protect you from chemical spills."
+ icon_state = "suns_labcoathood"
+ item_state = "suns_labcoathood"
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
+ icon = 'icons/obj/clothing/faction/suns/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/head.dmi'
+
+
+//////////////////
+//Armored suits//
+/////////////////
+
+
+/obj/item/clothing/suit/armor/vest/bulletproof/suns
+ name = "peacekeeper plating"
+ desc = "A standard issue set of plate assigned to peacekeepers, both durable and stylish."
+ icon_state = "suns_pkarmor"
+ item_state = "suns_pkarmor"
+ icon = 'icons/obj/clothing/faction/suns/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/suits.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/suit/armor/vest/bulletproof/suns/hos
+ name = "gilded peacekeeper plating"
+ desc = "A set of plate assigned to peacekeepers, both durable and stylish. This one has a gold lining to indicate rank."
+ icon_state = "suns_lpkarmor"
+ item_state = "suns_pkarmor"
+
+/obj/item/clothing/suit/armor/vest/bulletproof/suns/ehos //remind me to make this something to buy
+ name = "peacekeeper greatcoat"
+ desc = "A funky armored coat worn by eccentric peacekeepers. Closing the coat is socially improper."
+ icon_state = "suns_greatcoat"
+ item_state = "suns_greatcoat"
+
+/obj/item/clothing/suit/toggle/suns/pkcoat
+ name = "peacekeeper coat"
+ desc = "An armored coat used during special occasions. This one is used in academic security."
+ icon_state = "suns_pkjacket"
+ item_state = "suns_overblack"
+ armor = list("melee" = 15, "bullet" = 30, "laser" = 10, "energy" = 10, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 25)
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/suit/armor/vest/bulletproof/suns/captain
+ name = "decorated academic coat"
+ desc = "An armored coat intended for SUNS captains on the frontier. Go forth, and spread the message of the academy."
+ icon_state = "suns_captaincoat"
+ item_state = "suns_overblack"
+
+/obj/item/clothing/suit/armor/vest/bulletproof/suns/xo
+ name = "academic staff coat"
+ desc = "A white coat used by SUNS academic staff. It designates the second in command on the ship."
+ icon_state = "suns_xojacket"
+ item_state = "suns_overwhite"
+
+
+///////////////
+//Spacesuits//
+//////////////
+
+
+/obj/item/clothing/head/helmet/space/syndicate/suns
+ name = "SUNS space helmet"
+ icon_state = "suns_vachelm"
+ item_state = "suns_vachelm"
+ desc = "An academic standard spacesuit helmet. Normally reserved for low budget tasks in space."
+ icon = 'icons/obj/clothing/faction/suns/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/head.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/suit/space/syndicate/suns
+ name = "SUNS spacesuit"
+ icon_state = "suns_vacsuit"
+ item_state = "suns_vacsuit"
+ desc = "An academic standard spacesuit. Normally reserved for low budget tasks in space."
+ icon = 'icons/obj/clothing/faction/suns/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/suits.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/head/helmet/space/hardsuit/security/suns
+ name = "\improper SUNS peacekeeper hardsuit helmet"
+ icon_state = "hardsuit0-suns_pk"
+ item_state = "hardsuit0-suns_pk"
+ icon = 'icons/obj/clothing/faction/suns/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/head.dmi'
+ hardsuit_type = "suns_pk"
+
+/obj/item/clothing/suit/space/hardsuit/security/suns
+ name = "\improper SUNS peacekeeper hardsuit"
+ icon_state = "suns_pkhardsuit"
+ item_state = "suns_pkhardsuit"
+ icon = 'icons/obj/clothing/faction/suns/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/suits.dmi'
+ hardsuit_type = "suns_pk"
+ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/suns
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/head/helmet/space/hardsuit/mining/suns
+ name = "\improper SUNS industrial hardsuit helmet"
+ icon_state = "hardsuit0-suns_mining"
+ item_state = "hardsuit0-suns_mining"
+ icon = 'icons/obj/clothing/faction/suns/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/head.dmi'
+ hardsuit_type = "suns_mining"
+
+/obj/item/clothing/suit/space/hardsuit/mining/suns
+ name = "\improper SUNS industrial hardsuit"
+ icon_state = "suns_miningsuit"
+ item_state = "suns_miningsuit"
+ icon = 'icons/obj/clothing/faction/suns/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/suits.dmi'
+ hardsuit_type = "suns_mining"
+ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/mining/suns
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/head/helmet/space/hardsuit/solgov/suns
+ name = "\improper SUNS captain's hardsuit helmet"
+ icon_state = "hardsuit0-suns_solgov"
+ item_state = "hardsuit0-suns_solgov"
+ icon = 'icons/obj/clothing/faction/suns/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/head.dmi'
+ hardsuit_type = "suns_solgov"
+ desc = "An armored spaceproof helmet, the white glass on the side signifies a captain level rank."
+
+/obj/item/clothing/suit/space/hardsuit/solgov/suns
+ name = "\improper SUNS captain's hardsuit"
+ desc = "A well decorated spaceworthy suit. The design was co-created by SolGov and SUNS academics."
+ icon_state = "suns_commandsuit"
+ item_state = "suns_commandsuit"
+ icon = 'icons/obj/clothing/faction/suns/suits.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/suits.dmi'
+ hardsuit_type = "suns_solgov"
+ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/solgov/suns
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+
+/////////
+//Hats//
+////////
+
+
+/obj/item/clothing/head/suns
+ name = "academic staff beret"
+ desc = "A soft beret sporting a discontinued inkwell quill feather. If only it could hold ink once more."
+ icon_state = "suns_xoberet"
+ item_state = "suns_captainberet"
+ icon = 'icons/obj/clothing/faction/suns/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/head.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/head/safety_helmet/suns
+ desc = "A piece of headgear used in dangerous working conditions to protect the head."
+ icon_state = "suns_workerhelmet"
+ item_state = "suns_workerhelmet"
+ icon = 'icons/obj/clothing/faction/suns/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/head.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/head/HoS/syndicate/suns //remind me to make this something to buy
+ name = "peacekeeper cap"
+ desc = "A black cap worn by the more eccentric peacekeepers."
+ icon_state = "suns_pkcap"
+ item_state = "suns_pkcap"
+ icon = 'icons/obj/clothing/faction/suns/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/head.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/head/suns/surgery
+ name = "\improper SUNS surgery cap"
+ desc = "A surgery cap used by academic students and profesionals alike."
+ icon_state = "suns_doctorcap"
+ item_state = "suns_doctorcap"
+
+/obj/item/clothing/head/welding/suns
+ name = "peacekeeper visor"
+ desc = "A head-mounted helmet designed to protect those on the field from bright lights, while also allowing a life support connection. The warnings on this helmet suggest it is not spaceworthy."
+ icon_state = "sunsvisor"
+ item_state = "suns_pkhelmet"
+ tint = 0
+ clothing_flags = BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS //Why? Because I'm not giving PK's sec masks nor hud sunglasses.
+ icon = 'icons/obj/clothing/faction/suns/head.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/head.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/head/welding/suns/hos
+ name = "gilded peacekeeper visor"
+ desc = "A head-mounted helmet designed to protect those on the field, this one has a gold lining to indicate rank. The warnings on this helmet suggest it is not spaceworthy."
+ icon_state = "sunslpkvisor"
+ item_state = "suns_pkhelmet"
+
+/obj/item/clothing/head/suns/captain
+ name = "\improper SUNS bicorne hat"
+ desc = "A unique bicorne hat given to SUNS Captains to display academic seniority."
+ icon_state = "suns_captainbicorne"
+ item_state = "suns_captainbicorne"
+ worn_y_offset = 2
+ dog_fashion = null
+
+/obj/item/clothing/head/suns/cmo //I was told I get one plague doctor outfit and I'm using it
+ name = "medical instructor hat"
+ desc = "A hat worn by the more eccentric medical staff."
+ icon_state = "suns_doctorhat"
+ item_state = "suns_doctorhat"
+ permeability_coefficient = 0.01
+
+
+////////////
+//Glasses//
+///////////
+
+
+/obj/item/clothing/glasses/science/suns //This needs a sprite/lense in the eye of the mask to show its science goggles
+ name = "eye mask science goggles"
+ desc = "A fancy looking mask to help against chemical spills. This one is fitted with an analyzer for scanning items and reagents."
+ icon_state = "suns_sciencemask"
+ item_state = "suns_sciencemask"
+ glass_colour_type = /datum/client_colour/glass_colour/purple
+ icon = 'icons/obj/clothing/faction/suns/eyes.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/eyes.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/glasses/hud/health/suns //I need to figure out a way to make the masks toggleable for #style points.
+ name = "eye mask health scanner HUD"
+ desc = "A peculiar looking mask commonly seen at academic functions. This one has a health HUD lense in it."
+ icon_state = "suns_doctormask"
+ item_state = "suns_doctormask"
+ glass_colour_type = /datum/client_colour/glass_colour/lightblue
+ icon = 'icons/obj/clothing/faction/suns/eyes.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/eyes.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/glasses/hud/security/suns
+ name = "eye mask security HUD"
+ desc = "A peculiar looking mask commonly seen at academic functions. This one gives a heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records."
+ icon_state = "suns_pkmask"
+ item_state = "suns_pkmask"
+ glass_colour_type = /datum/client_colour/glass_colour/red
+ icon = 'icons/obj/clothing/faction/suns/eyes.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/eyes.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+
+//////////
+//Masks//
+/////////
+
+
+/obj/item/clothing/mask/gas/suns //someone mentioned they were interested in using this sprite as the regular gasmask re-sprite, I forgor who so we'll deal with that when I PR this
+ name = "black gas mask"
+ desc = "A black face covering that allows the user to connect to a personal gas supply. Suprisingly not great at preventing gas inhalation."
+ icon_state = "suns_gasmask"
+ item_state = "suns_gasmask2"
+ icon = 'icons/obj/clothing/faction/suns/mask.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/mask.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/mask/surgical/suns
+ name = "purple sterile mask"
+ desc = "A sterile mask designed to help prevent the spread of diseases. Now in purple! Pretty!"
+ icon_state = "suns_sterile"
+ item_state = "suns_doctorcap"
+ icon = 'icons/obj/clothing/faction/suns/mask.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/mask.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/mask/breath/suns
+ name = "\improper SUNS half face mask"
+ desc = "A close-fitting mask that covers JUST enough to connect an air supply."
+ icon_state = "suns_captainmask"
+ item_state = "suns_captainmask"
+ icon = 'icons/obj/clothing/faction/suns/mask.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/mask.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+
+///////////
+//Gloves//
+//////////
+
+// The following employ a slapjob fix to remove the /color subtype, as per maintainer request.
+// These should be addressed in any future glove refactor, as that is out of the scope of this PR.
+/obj/item/clothing/gloves/suns
+ name = "stitched fingerless gloves"
+ desc = "These gloves offer style, purely and plainly."
+ icon_state = "suns_glovesfingerless"
+ item_state = "suns_blackgloves"
+ icon = 'icons/obj/clothing/faction/suns/hands.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/hands.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/gloves/suns/captain
+ name = "\improper SUNS captain's gloves"
+ desc = "Fancy black gloves for trusted SUNS members. Sports a complex lining that prevents the wearer from being shocked."
+ icon_state = "suns_captaingloves"
+ item_state = "suns_blackgloves"
+ siemens_coefficient = 0
+ permeability_coefficient = 0.05
+ cold_protection = HANDS
+ min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+ heat_protection = HANDS
+ max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 50)
+
+/obj/item/clothing/gloves/suns/xo
+ name = "academic staff gloves"
+ desc = "White gloves that offer a good grip with writing utensils."
+ icon_state = "suns_xogloves"
+ item_state = "suns_whitegloves"
+
+/obj/item/clothing/gloves/suns/yellow
+ name = "insulated gloves"
+ desc = "Padded academic gloves that hopefully keep students out of the nurses office."
+ icon_state = "suns_insulated"
+ item_state = "suns_blackgloves"
+ siemens_coefficient = 0
+ permeability_coefficient = 0.05
+
+/obj/item/clothing/gloves/color/latex/nitrile/suns
+ name = "white nitrile gloves"
+ desc = "Thick sterile white gloves that reach up to the elbows. The nanochips that transfer basic paramedic knowledge are disabled during finals week."
+ icon_state = "suns_latexgloves"
+ item_state = "suns_whitegloves"
+ icon = 'icons/obj/clothing/faction/suns/hands.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/hands.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/gloves/tackler/dolphin/suns
+ name = "peacekeeper tackle gloves"
+ desc = "Sleek tackle gloves that allows the user to sail through the air. The main cause of accidents during finals week."
+ icon_state = "suns_longglovesblack"
+ item_state = "suns_blackgloves"
+ icon = 'icons/obj/clothing/faction/suns/hands.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/hands.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+
+//////////
+//Shoes//
+/////////
+
+
+/obj/item/clothing/shoes/sneakers/suns
+ name = "white clogs"
+ desc = "Comfortable clogs for general use."
+ icon_state = "suns_doctorclogs"
+ item_state = "suns_doctorclogs" //I know what the state says, I'm not fixing it.
+ icon = 'icons/obj/clothing/faction/suns/feet.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/feet.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/shoes/combat/suns
+ name = "fancy combat boots"
+ desc = "Decent traction combat boots worn by high ranking academic staff."
+ icon_state = "suns_captainboots"
+ item_state = "suns_blackboots"
+ icon = 'icons/obj/clothing/faction/suns/feet.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/feet.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/shoes/jackboots/suns
+ name = "work safe jackboots"
+ desc = "Academic issued steel toed boots. For those with physically demanding majors."
+ icon_state = "suns_jackboots"
+ item_state = "suns_blackboots"
+ icon = 'icons/obj/clothing/faction/suns/feet.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/feet.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/shoes/jackboots/suns/long
+ name = "peacekeeper longboots"
+ desc = "Longboots worn by academic security staff and trainees."
+ icon_state = "suns_longboots"
+ item_state = "suns_blackboots"
+
+/obj/item/clothing/shoes/laceup/suns
+ name = "academy laceup shoes"
+ desc = "Standard issue laceups from the syndicates resident academy."
+ icon_state = "suns_laceups"
+ item_state = "suns_blackboots"
+ icon = 'icons/obj/clothing/faction/suns/feet.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/feet.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+
+//////////
+//Cloaks//
+//////////
+
+
+/obj/item/clothing/neck/cloak/suns
+ name = "\improper SUNS short cloak"
+ desc = "Worn by both the young and old alike. You can almost feel the academic pride."
+ icon_state = "suns_shouldercape"
+ item_state = "suns_overpurple"
+ icon = 'icons/obj/clothing/faction/suns/neck.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/suns/neck.dmi'
+ lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi'
+
+/obj/item/clothing/neck/cloak/suns/xo
+ name = "\improper SUNS academic staff cloak"
+ desc = "Worn by SUNS staff, you can almost smell all of the failing grades this cloak has given."
+ icon_state = "suns_xocape"
+ item_state = "suns_xocape"
+
+/obj/item/clothing/neck/cloak/suns/cap
+ name = "\improper SUNS captain's cloak"
+ desc = "Worn by SUNS captains. This cloak has a very imposing aura to it."
+ icon_state = "suns_captaincloak"
+ item_state = "suns_captaincloak"
+
+
+///////////////
+//Accessories//
+///////////////
+
+//These are stored in clothing/accessories.dmi instead of a factional variant due to accessory code being dogwater
+//Please transfer them over to a factional file if accessory code is ever fixed
+
+/obj/item/clothing/accessory/waistcoat/suns
+ name = "\improper SUNS waistcoat"
+ desc = "An academic issued run of the mill waistcoat."
+ icon_state = "suns_waistcoat"
+ icon = 'icons/obj/clothing/accessories.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/accessories.dmi'
+ minimize_when_attached = TRUE
+
+/obj/item/clothing/accessory/waistcoat/suns/ribbon
+ name = "\improper SUNS ribbon"
+ desc = "An academic issued bow, for when you want to feel pretty."
+ icon_state = "suns_ribbon"
+
+/obj/item/clothing/accessory/waistcoat/suns/gembow
+ name = "\improper SUNS gem bow"
+ desc = "An academic issued bow, for when you want to feel REALLY pretty."
+ icon_state = "suns_gembow"
+
+/obj/item/clothing/accessory/waistcoat/suns/poof
+ name = "\improper SUNS chest poof"
+ desc = "An academic issued bow, for when you want to feel sophisticated."
+ icon_state = "suns_poof"
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index f4c2a5a27f4e..8245a3333e4c 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -148,11 +148,11 @@
. = ..()
if(istype(I, /obj/item/clothing/glasses/eyepatch))
var/obj/item/clothing/glasses/eyepatch/old_patch = I
- var/obj/item/clothing/glasses/blindfold/eyepatch/double_patch = new/obj/item/clothing/glasses/blindfold/eyepatch
- double_patch.forceMove(user.drop_location())
+ var/obj/item/clothing/glasses/blindfold/eyepatch/double_patch = new()
to_chat(user, "You combine the eyepatches with a knot. ")
- old_patch.Destroy()
- Destroy()
+ qdel(old_patch)
+ qdel(src)
+ user.put_in_hands(double_patch)
/obj/item/clothing/glasses/monocle
name = "monocle"
diff --git a/code/modules/clothing/gloves/boxing.dm b/code/modules/clothing/gloves/boxing.dm
index 807bfb217516..68f64cdd515e 100644
--- a/code/modules/clothing/gloves/boxing.dm
+++ b/code/modules/clothing/gloves/boxing.dm
@@ -4,7 +4,6 @@
icon_state = "boxing"
item_state = "boxing"
equip_delay_other = 60
- species_exception = list(/datum/species/golem) // now you too can be a golem boxing champion
supports_variations = VOX_VARIATION
/obj/item/clothing/gloves/boxing/green
diff --git a/code/modules/clothing/head/berets.dm b/code/modules/clothing/head/berets.dm
index 2c6139e54169..4c8595f2541d 100644
--- a/code/modules/clothing/head/berets.dm
+++ b/code/modules/clothing/head/berets.dm
@@ -1,7 +1,7 @@
//Mime
/obj/item/clothing/head/beret
name = "beret"
- desc = "A beret, a mime's favorite headwear."
+ desc = "A red beret."
icon_state = "beret"
dog_fashion = /datum/dog_fashion/head/beret
dynamic_hair_suffix = "+generic"
@@ -15,13 +15,13 @@
/obj/item/clothing/head/beret/archaic
name = "archaic beret"
- desc = "An absolutely ancient beret, allegedly worn by the first mime to ever step foot on a NanoTrasen station."
+ desc = "An absolutely ancient beret."
icon_state = "archaicberet"
dog_fashion = null
/obj/item/clothing/head/beret/black
name = "black beret"
- desc = "A black beret, perfect for war veterans and dark, brooding, anti-hero mimes."
+ desc = "A black beret."
icon_state = "beret_black"
/obj/item/clothing/head/beret/highlander
@@ -97,7 +97,7 @@
icon_state = "beret_officer"
/obj/item/clothing/head/beret/sec/brig_phys
- desc = "A beret made out of black reinforced fabric with lue cross emblazoned on it. Denotes security's personal medic."
+ desc = "A beret made out of black reinforced fabric with a lue cross emblazoned on it. Denotes security's personal medic."
icon_state = "beret_brigphys"
//Engineering
@@ -162,6 +162,11 @@
icon_state = "beret_cmo"
armor = list("bio" = 30, "acid" = 20)
+/obj/item/clothing/head/beret/cmo/cybersun
+ name = "medical director beret"
+ desc = "A burgundy-red beret with a silver cross. It smells very sterile."
+ icon_state = "meddirectorberet"
+
//Command
/obj/item/clothing/head/beret/captain
name = "captain beret"
@@ -184,12 +189,6 @@
armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 15, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25)
strip_delay = 90
-/obj/item/clothing/head/beret/lt
- name = "officer beret"
- desc = "A showy lieutenants's beret. Smells of spilled coffee and crushed dreams."
- icon_state = "beret_com"
- armor = list("melee" = 40, "bullet" = 20, "laser" = 10, "energy" = 10, "rad" = 10, "bio" = 5, "rad" = 5, "fire" = 5, "rad" = 30)
-
// SolGov
/obj/item/clothing/head/beret/solgov
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index ae7ecd5b121e..c4d13ef36948 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -55,7 +55,7 @@
/obj/item/clothing/head/caphat/frontier/admiral
name = "\improper Frontiersmen admiral's cap"
- desc = "An imposing peaked cap meant for only the highest of officers of the Frontiersman pirate fleet."
+ desc = "An imposing peaked cap meant for only the highest of officers of the Frontiersmen pirate fleet."
icon_state = "frontier_admiral_cap"
//Head of Personnel
@@ -156,10 +156,9 @@
/obj/item/clothing/head/cowboy/sec/minutemen
name = "colonial minutmen officer's slouch hat"
- desc = "A commanding slouch hat adorned with a offier's badge, used by the Colonial Minutemen."
+ desc = "A commanding slouch hat adorned with a officer's badge, used by the Colonial Minutemen."
icon_state = "minuteman_officer_hat"
-
/obj/item/clothing/head/cowboy/sec/roumain
name = "hunter's hat"
desc = "A fancy hat with a nice feather. The way it covers your eyes makes you feel like a badass."
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index d63003422e29..94de3eda735d 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -122,7 +122,7 @@
/obj/item/clothing/head/rabbitears
name = "rabbit ears"
- desc = "Wearing these makes you look useless, and only good for your sex appeal."
+ desc = "A headband with a pair of faux rabbit ears."
icon_state = "bunny"
dynamic_hair_suffix = ""
@@ -313,11 +313,6 @@
desc = "Welcome to the rice fields, motherfucker."
icon_state = "rice_hat"
-/obj/item/clothing/head/lizard
- name = "lizardskin cloche hat"
- desc = "How many lizards died to make this hat? Not enough."
- icon_state = "lizard"
-
/obj/item/clothing/head/papersack
name = "paper sack hat"
desc = "A paper sack with crude holes cut out for eyes. Useful for hiding one's identity or ugliness."
@@ -423,11 +418,6 @@
desc = "Signals that you follow the Jewish Halakha. Keeps the head covered and the soul extra-Orthodox."
icon_state = "kippah"
-/obj/item/clothing/head/medievaljewhat
- name = "medieval Jewish hat"
- desc = "A silly looking hat, intended to be placed on the heads of oppressed religious minorities."
- icon_state = "medievaljewhat"
-
/obj/item/clothing/head/taqiyahwhite
name = "white taqiyah"
desc = "An extra-mustahabb way of showing your devotion to Allah."
@@ -476,11 +466,11 @@
icon_state = "JackFrostHat"
item_state = "JackFrostHat"
-/obj/item/clothing/head/aclfcap
+/obj/item/clothing/head/gorlexcap
name = "2nd Battlegroup peaked cap"
- desc = "A cap worn by officers of the Gorlex Marauders 2nd Battlegroup, or as they say, the ACLF."
- icon_state = "aclfcap"
- item_state = "aclfcap"
+ desc = "A cap worn by officers of the Gorlex Marauders 2nd Battlegroup."
+ icon_state = "gorlexcap"
+ item_state = "gorlexcap"
flags_inv = 0
armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
strip_delay = 60
@@ -530,3 +520,4 @@
name = "SolGov surgery cap"
desc = "It's a surgery cap utilized by solarian doctors."
icon_state = "solgov_surgery"
+
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 3e188c253169..eeea7622b4d9 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -182,9 +182,6 @@
if(ishuman(user))
add_atom_colour("#[user.hair_color]", FIXED_COLOUR_PRIORITY)
-/obj/item/clothing/head/kitty/genuine
- desc = "A pair of kitty ears. A tag on the inside says \"Hand made from real cats.\""
-
/obj/item/clothing/head/hardhat/reindeer
name = "novelty reindeer hat"
desc = "Some fake antlers and a very fake red nose."
@@ -378,3 +375,4 @@
. = ..()
if(!warped)
warp_up()
+
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index c5c53a20b699..8ff4e6bcb0d9 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -35,3 +35,4 @@
item_state = "m_mask"
permeability_coefficient = 0.01
equip_delay_other = 10
+
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 467377f722dd..9d1bdc939fd3 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -273,3 +273,4 @@
item_state = "hunter"
resistance_flags = FIRE_PROOF | ACID_PROOF
flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEYES|HIDEEARS|HIDEHAIR
+
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..27d89d1b7226
--- /dev/null
+++ b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
@@ -0,0 +1,154 @@
+/datum/outfit/job/frontiersmen/ert
+ 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
+ l_pocket = /obj/item/flashlight/seclite
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/double
+
+ id = null // lol
+
+ backpack_contents = list(/obj/item/ammo_box/a762=5, /obj/item/grenade/frag=1)
+
+/datum/outfit/job/frontiersmen/ert/random
+ name = "ERT - Frontiersman Randomized"
+
+ head = null
+ mask = null
+ suit = null
+ suit_store = null
+ back = null
+ l_pocket = null
+ r_pocket = /obj/item/radio
+ backpack_contents = list()
+
+/datum/outfit/job/frontiersmen/ert/random/pre_equip(mob/living/carbon/human/H, visualsOnly, client/preference_source)
+ . = ..()
+ if(visualsOnly)
+ return
+
+ if(prob(90))
+ head = pickweight(list(
+ /obj/item/clothing/head/beret/sec/frontier = 10,
+ /obj/item/clothing/head/helmet/bulletproof/x11/frontier = 5,
+ /obj/item/reagent_containers/glass/bucket = 1))
+
+ if(prob(60))
+ suit = pickweight(list(
+ /obj/item/clothing/suit/armor/vest = 5,
+ /obj/item/clothing/suit/armor/vest/bulletproof/frontier = 5,
+ /obj/item/clothing/suit/armor/vest/scrap_armor = 1))
+
+ if(prob(30))
+ mask = pickweight(list(
+ /obj/item/clothing/mask/gas = 5,
+ /obj/item/clothing/mask/gas/sechailer/minutemen = 5,
+ /obj/item/clothing/mask/breath = 5,
+ /obj/item/clothing/mask/whistle = 3))
+
+ if(prob(90))
+ back = pickweight(list(
+ /obj/item/storage/backpack = 20,
+ /obj/item/storage/backpack/satchel = 20,
+ /obj/item/storage/backpack/messenger = 20,
+ /obj/item/melee/baton/cattleprod/loaded = 5,
+ /obj/item/reagent_containers/food/snacks/baguette = 2, // yes you can put this on your back
+ /obj/item/deployable_turret_folded = 1,
+ ))
+
+ if(prob(90))
+ shoes = pickweight(list(
+ /obj/item/clothing/shoes/jackboots = 10,
+ /obj/item/clothing/shoes/sneakers = 5,
+ ))
+
+ var/extra_class = pick(list("Doctor", "Breacher", "Ammo Carrier"))
+ switch(extra_class)
+ if("Doctor")
+ backpack_contents += list(/obj/item/storage/firstaid/regular = 1)
+ gloves = /obj/item/clothing/gloves/color/latex
+ if(prob(50))
+ belt = /obj/item/storage/belt/medical/surgery
+ if(prob(30))
+ glasses = /obj/item/clothing/glasses/hud/health
+ if("Breacher")
+ backpack_contents += list(/obj/item/grenade/c4 = 2)
+ if(prob(10))
+ belt = /obj/item/storage/belt/grenade/full
+ if("Ammo Carrier")
+ backpack_contents += list(/obj/item/ammo_box/a762_39 = 1)
+
+ var/weapon = pick(list("Bolt-Action", "Pistol", "Melee"))
+ switch(weapon)
+ if("Bolt-Action")
+ r_hand = /obj/item/gun/ballistic/rifle/boltaction
+ if(prob(70) && istype(back, /obj/item/storage/backpack))
+ backpack_contents += list(/obj/item/ammo_box/a762 = rand(1,4))
+ if(prob(55))
+ l_pocket = /obj/item/ammo_box/a762
+ if("Pistol")
+ r_hand = pick(list(
+ /obj/item/gun/ballistic/automatic/pistol/disposable,
+ /obj/item/gun/ballistic/automatic/pistol,
+ /obj/item/gun/ballistic/revolver/pepperbox,
+ /obj/item/gun/energy/e_gun/mini))
+ if(prob(30))
+ l_hand = pick(list(
+ /obj/item/gun/ballistic/automatic/pistol/disposable,
+ /obj/item/gun/ballistic/automatic/pistol,
+ /obj/item/gun/ballistic/revolver/pepperbox,
+ /obj/item/gun/energy/e_gun/mini))
+ if("Melee")
+ r_hand = pickweight(list(
+ /obj/item/kitchen/knife = 15,
+ /obj/item/melee/baseball_bat = 10,
+ /obj/item/melee/cleric_mace = 7,
+ /obj/item/melee/roastingstick = 2,
+ /obj/item/kitchen/fork = 1,
+ /obj/item/melee/flyswatter = 1,
+ ))
+
+
+/datum/outfit/job/frontiersmen/ert/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)
+
+/datum/outfit/job/frontiersmen/ert/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)
+
+
+/datum/outfit/job/frontiersmen/ert/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)
+
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..6a8b228aec94
--- /dev/null
+++ b/code/modules/clothing/outfits/ert/indie_ert.dm
@@ -0,0 +1,91 @@
+/datum/outfit/job/independent/ert
+ name = "ERT - Independent Security Officer"
+ jobtype = /datum/job/officer
+ job_icon = "securityofficer"
+
+ 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
+
+/datum/outfit/job/independent/ert/emt
+ name = "ERT - Independent Paramedic"
+ jobtype = /datum/job/paramedic
+ job_icon = "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
+
+/datum/outfit/job/independent/ert/firefighter
+ name = "ERT - Independent Firefighter (Standard)"
+ jobtype = /datum/job/atmos
+ job_icon = "atmospherictechnician"
+
+ 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
+
+/datum/outfit/job/independent/ert/firefighter/medic
+ name = "ERT - Independent Firefighter (Medic)"
+ jobtype = /datum/job/paramedic
+ job_icon = "paramedic"
+
+ 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)
+
+/datum/outfit/job/independent/ert/firefighter/leader
+ name = "ERT - Independent Firefighter (Group Captain)"
+ jobtype = /datum/job/chief_engineer
+ job_icon = "chiefengineer"
+
+ 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
+
+/datum/outfit/job/independent/ert/technician
+ name = "ERT - Independent Technician"
+ jobtype = /datum/job/engineer
+ job_icon = "stationengineer"
+
+ head = /obj/item/clothing/head/hardhat
+ uniform = /obj/item/clothing/under/rank/engineering/engineer
+ 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..5a39d3ea3da4
--- /dev/null
+++ b/code/modules/clothing/outfits/ert/inteq_ert.dm
@@ -0,0 +1,52 @@
+/datum/outfit/job/inteq/ert
+ name = "ERT - Inteq Rifleman"
+ jobtype = /datum/job/officer
+ job_icon = "securityofficer"
+
+ 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)
+
+
+/datum/outfit/job/inteq/ert/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)
+
+/datum/outfit/job/inteq/ert/medic
+ name = "ERT - Inteq Corpsman"
+ jobtype = /datum/job/paramedic
+ job_icon = "paramedic"
+
+ uniform = /obj/item/clothing/under/syndicate/inteq/corpsman
+ belt = /obj/item/storage/belt/medical/webbing/paramedic
+ suit_store = null
+
+ l_pocket = /obj/item/healthanalyzer
+
+ backpack_contents = list(/obj/item/storage/firstaid/medical=1, /obj/item/radio=1)
+
+/datum/outfit/job/inteq/ert/leader
+ name = "ERT - Inteq Vanguard"
+ jobtype = /datum/job/hos
+ job_icon = "headofsecurity"
+
+ 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
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..8acb733e48f0
--- /dev/null
+++ b/code/modules/clothing/outfits/ert/minutemen_ert.dm
@@ -0,0 +1,123 @@
+/datum/outfit/job/minutemen/ert
+ name = "ERT - Minuteman"
+ jobtype = /datum/job/officer
+ job_icon = "securityofficerOld"
+
+ 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
+ suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
+ id = /obj/item/card/id
+ belt = /obj/item/storage/belt/military/minutemen/p16
+ r_pocket = /obj/item/kitchen/knife/combat
+ l_pocket = /obj/item/flashlight/seclite
+
+ box = /obj/item/storage/box/survival/security
+
+/datum/outfit/job/minutemen/ert/leader
+ name = "ERT - Minuteman Sergeant"
+ job_icon = "lieutenant"
+
+ ears = /obj/item/radio/headset/minutemen/alt/captain
+ back = /obj/item/storage/backpack/satchel/sec/cmm
+ head = /obj/item/clothing/head/beret/command
+
+/datum/outfit/job/minutemen/ert/bard
+ name = "ERT - Minuteman (BARD)"
+ job_icon = "securityofficerOld"
+
+ 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
+ )
+
+
+/datum/outfit/job/minutemen/ert/bard/leader
+ name = "ERT - Minuteman Sergeant (BARD)"
+ job_icon = "lieutenant"
+
+ 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
+ )
+
+/datum/outfit/job/minutemen/ert/riot
+ name = "ERT - Minuteman (Riot Officer)"
+ job_icon = "securityofficerOld"
+
+ 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
+
+/datum/outfit/job/minutemen/ert/riot/leader
+ name = "ERT - Minutemen Sergeant (Riot Officer)"
+ job_icon = "lieutenant"
+
+ ears = /obj/item/radio/headset/minutemen/alt/captain
+ back = /obj/item/shield/riot/flash
+
+/datum/outfit/job/minutemen/ert/inspector
+ name = "ERT - Inspector (Minutemen GOLD)"
+ jobtype = /datum/job/head_of_personnel
+ job_icon = "minutemen"
+
+ head = /obj/item/clothing/head/cowboy/sec/minutemen
+ 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
+ suit_store = null
+ 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
+
+/datum/outfit/job/minutemen/ert/pirate_hunter
+ name = "ERT - Minuteman (Pirate Hunter)"
+ job_icon = "securityofficerOld"
+
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/security/independent/minutemen
+
+/datum/outfit/job/minutemen/ert/pirate_hunter/leader
+ name = "ERT - Minutemen Sergeant (Pirate Hunter)"
+ job_icon = "lieutenant"
+
+ 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)
diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
similarity index 74%
rename from code/modules/clothing/outfits/ert.dm
rename to code/modules/clothing/outfits/ert/nanotrasen_ert.dm
index aa0b01ff5398..97c4756bee9a 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"
@@ -7,18 +8,14 @@
gloves = /obj/item/clothing/gloves/combat
ears = /obj/item/radio/headset/headset_cent/alt
-/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.update_label()
..()
/datum/outfit/centcom/ert/commander
@@ -26,12 +23,12 @@
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
/datum/outfit/centcom/ert/commander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -64,7 +61,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,25 +77,24 @@
/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)
@@ -127,6 +123,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 +131,9 @@
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)
+
/datum/outfit/centcom/ert/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
@@ -156,6 +153,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 +188,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"
@@ -289,35 +226,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 +241,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 +267,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"
@@ -455,3 +377,89 @@
var/obj/item/radio/headset = H.ears
headset.keyslot = new /obj/item/encryptionkey/headset_com
headset.recalculateChannels()
+
+// Loss Prevention
+/datum/outfit/job/nanotrasen/ert/lp
+ name = "ERT - Loss Prevention Security Specialist"
+ jobtype = /datum/job/officer
+ job_icon = "securityresponseofficer"
+
+ 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)
+
+
+/datum/outfit/job/nanotrasen/ert/lp/medic
+ name = "ERT - Loss Prevention Medical Specialist"
+ jobtype = /datum/job/doctor
+ job_icon = "medicalresponseofficer"
+
+ 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)
+
+
+/datum/outfit/job/nanotrasen/ert/lp/engineer
+ name = "ERT - Loss Prevention Engineering Specialist"
+ jobtype = /datum/job/engineer
+ job_icon = "engineeringresponseofficer"
+
+ 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
+
+ backpack_contents = list(/obj/item/stack/sheet/metal/fifty=1, /obj/item/stack/sheet/glass/fifty=1, /obj/item/radio=1)
+
+/datum/outfit/job/nanotrasen/ert/lp/lieutenant
+ name = "ERT - Loss Prevention Lieutenant"
+ jobtype = /datum/job/captain
+ job_icon = "emergencyresponseteamcommander"
+
+ 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
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..bc09a74c1786
--- /dev/null
+++ b/code/modules/clothing/outfits/ert/solgov_ert.dm
@@ -0,0 +1,39 @@
+/datum/outfit/job/solgov/ert
+ name = "ERT - SolGov Sonnensöldner"
+ jobtype = /datum/job/officer
+ job_icon = "sonnensoldner"
+
+ 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
+
+
+/datum/outfit/job/solgov/ert/inspector
+ name = "ERT - Inspector (SolGov)"
+ jobtype = /datum/job/head_of_personnel
+ job_icon = "solgovrepresentative"
+
+ 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)
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..ab256d094a38
--- /dev/null
+++ b/code/modules/clothing/outfits/ert/syndicate_ert.dm
@@ -0,0 +1,184 @@
+/datum/outfit/job/syndicate/ert
+ name = "ERT - Syndicate Basic"
+ jobtype = /datum/job/officer
+ job_icon = "securityofficer"
+
+ 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/security
+ 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)
+
+/datum/outfit/job/syndicate/ert/leader
+ name = "ERT - Syndicate Basic Leader"
+ job_icon = "lieutenant"
+
+ 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)
+
+// gorlex loyalist/2nd battlegroup
+
+/datum/outfit/job/syndicate/ert/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
+
+/datum/outfit/job/syndicate/ert/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/job/syndicate/ert/gorlex/medic
+ name = "ERT - Syndicate Gorlex Loyalist Medic"
+ jobtype = /datum/job/paramedic
+ job_icon = "paramedic"
+
+ 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)
+
+/datum/outfit/job/syndicate/ert/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)
+
+/datum/outfit/job/syndicate/ert/gorlex/leader
+ name = "ERT - Syndicate Gorlex Loyalist Sergeant"
+ job_icon = "lieutenant"
+
+ 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
+
+// commandos
+
+/datum/outfit/job/syndicate/ert/cybersun
+ name = "ERT - Syndicate Cybersun Commando"
+ job_icon = "syndicate"
+
+ 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/radio=1)
+
+/datum/outfit/job/syndicate/ert/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/antag_spawner/nuke_ops/borg_tele/medical/unlocked=1, /obj/item/radio=1)
+
+// paramedics
+
+/datum/outfit/job/syndicate/ert/cybersun/medic
+ name = "ERT - Syndicate Cybersun Paramedic"
+ job_icon = "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)
+
+ jobtype = /datum/job/paramedic
+ job_icon = "paramedic"
+
+/datum/outfit/job/syndicate/ert/cybersun/medic/leader
+ name = "ERT - Syndicate Cybersun Lead Paramedic"
+ job_icon = "chiefmedicalofficer"
+
+ 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)
+
+// inspector
+
+/datum/outfit/job/syndicate/ert/inspector
+ name = "ERT - Inspector (Syndicate)"
+ jobtype = /datum/job/head_of_personnel
+ job_icon = "syndicate"
+
+ uniform = /obj/item/clothing/under/syndicate/officer
+ head = /obj/item/clothing/head/HoS/beret/syndicate
+ mask = null
+ belt = /obj/item/clipboard
+ back = /obj/item/storage/backpack/satchel/leather
+ ears = /obj/item/radio/headset/syndicate/captain
+ shoes = /obj/item/clothing/shoes/laceup
+ gloves = /obj/item/clothing/gloves/color/white
+ suit = /obj/item/clothing/suit/armor/hos
+ l_pocket = null
+ r_pocket = null
+ suit_store = null
+
+ backpack_contents = list(/obj/item/stamp/syndicate)
+
+/datum/outfit/job/syndicate/ert/inspector/post_equip(mob/living/carbon/human/H, visualsOnly)
+ . = ..()
+ var/obj/item/card/id/W = H.wear_id
+ if(W)
+ W.registered_name = H.real_name
+ W.assignment = "Inspector"
+ W.update_label()
diff --git a/code/modules/clothing/outfits/factions/frontiersmen.dm b/code/modules/clothing/outfits/factions/frontiersmen.dm
new file mode 100644
index 000000000000..7e97c7341fe7
--- /dev/null
+++ b/code/modules/clothing/outfits/factions/frontiersmen.dm
@@ -0,0 +1,184 @@
+/datum/outfit/job/frontiersmen
+ name = "Frontiersmen - Base Outfit"
+
+ // faction_icon = "bg_frontiersmen"
+
+ uniform = /obj/item/clothing/under/rank/security/officer/frontier
+ r_pocket = /obj/item/radio
+ shoes = /obj/item/clothing/shoes/jackboots
+ ears = /obj/item/radio/headset/pirate
+ box = /obj/item/storage/box/survival
+ id = /obj/item/card/id
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
+
+/datum/outfit/job/frontiersmen/post_equip(mob/living/carbon/human/H, visualsOnly)
+ . = ..()
+ if(visualsOnly)
+ return
+ H.faction |= list(FACTION_PLAYER_FRONTIERSMEN)
+
+// Assistant
+
+/datum/outfit/job/frontiersmen/assistant
+ name = "Frontiersmen - Rookie"
+ job_icon = "assistant"
+ jobtype = /datum/job/assistant
+
+ head = /obj/item/clothing/head/beret/sec/frontier
+
+// Atmospheric Technician
+
+/datum/outfit/job/frontiersmen/atmos
+ name = "Frontiersmen - Atmospheric Specialist"
+ job_icon = "atmospherictechnician"
+ jobtype = /datum/job/atmos
+
+ accessory = /obj/item/clothing/accessory/armband/engine
+ head = /obj/item/clothing/head/hardhat
+
+// Cargo Technician
+
+/datum/outfit/job/frontiersmen/cargo_tech
+ name = "Frontiersmen - Cargo Tech"
+ job_icon = "cargotechnician"
+ jobtype = /datum/job/cargo_tech
+
+ accessory = /obj/item/clothing/accessory/armband/cargo
+ suit = /obj/item/clothing/suit/hazardvest
+ shoes = /obj/item/clothing/shoes/workboots
+ head = /obj/item/clothing/head/soft
+ backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo)
+
+// Captain
+
+/datum/outfit/job/frontiersmen/captain
+ name = "Frontiersmen - Captain"
+ job_icon = "captain"
+ jobtype = /datum/job/captain
+
+ ears = /obj/item/radio/headset/pirate/alt/captain
+ uniform = /obj/item/clothing/under/rank/security/officer/frontier/officer
+ head = /obj/item/clothing/head/caphat/frontier
+ mask = /obj/item/clothing/mask/gas/sechailer
+ suit = /obj/item/clothing/suit/armor/frontier
+ shoes = /obj/item/clothing/shoes/cowboy/black
+ gloves = /obj/item/clothing/gloves/combat
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
+
+/datum/outfit/job/frontiersmen/captain/admiral
+ name = "Frontiersmen - Admiral"
+
+ uniform = /obj/item/clothing/under/rank/security/officer/frontier/admiral
+ head = /obj/item/clothing/head/caphat/frontier/admiral
+ shoes = /obj/item/clothing/shoes/cowboy/white
+ ears = /obj/item/radio/headset/pirate/captain
+ gloves = /obj/item/clothing/gloves/color/evening
+ suit = null
+ mask = null
+ glasses = null
+
+// Chief Engineer
+/datum/outfit/job/frontiersmen/ce
+ name = "Frontiersmen - Senior Sapper"
+ job_icon = "chiefengineer"
+ jobtype = /datum/job/chief_engineer
+
+ accessory = /obj/item/clothing/accessory/armband/engine
+ ears = /obj/item/radio/headset/pirate/captain
+ uniform = /obj/item/clothing/under/rank/security/officer/frontier/officer
+ head = /obj/item/clothing/head/hardhat/weldhat/white
+ shoes = /obj/item/clothing/shoes/combat
+ gloves = /obj/item/clothing/gloves/combat
+ belt = /obj/item/storage/belt/utility/full
+
+// Engineer
+/datum/outfit/job/frontiersmen/engineer
+ name = "Frontiersmen - Sapper"
+ job_icon = "stationengineer"
+ jobtype = /datum/job/engineer
+
+ accessory = /obj/item/clothing/accessory/armband/engine
+ belt = /obj/item/storage/belt/utility/full/engi
+ suit = /obj/item/clothing/suit/toggle/industrial
+ shoes = /obj/item/clothing/shoes/workboots
+ glasses = /obj/item/clothing/glasses/welding
+ head = /obj/item/clothing/head/beret/sec/frontier
+
+ l_pocket = /obj/item/radio
+ r_pocket = /obj/item/analyzer
+
+// Cook
+
+/datum/outfit/job/frontiersmen/cook
+ name = "Frontiersmen - Steward"
+ job_icon = "cook"
+ jobtype = /datum/job/cook
+
+ uniform = /obj/item/clothing/under/rank/security/officer/frontier
+ head = /obj/item/clothing/head/chefhat
+ suit = /obj/item/clothing/suit/apron/chef
+
+// Head of Personnel
+
+/datum/outfit/job/frontiersmen/hop
+ name = "Frontiersmen - Helmsman"
+ job_icon = "headofpersonnel"
+ jobtype = /datum/job/head_of_personnel
+
+ ears = /obj/item/radio/headset/pirate/alt
+ uniform = /obj/item/clothing/under/rank/security/officer/frontier/officer
+ shoes = /obj/item/clothing/shoes/cowboy/black
+ head = /obj/item/clothing/head/beret/sec/frontier/officer
+ gloves = /obj/item/clothing/gloves/combat
+ r_pocket = /obj/item/kitchen/knife/combat/survival
+
+// Head of Security
+/datum/outfit/job/frontiersmen/hos
+ name = "Frontiersmen - Shipswain"
+ job_icon = "headofsecurity"
+ jobtype = /datum/job/hos
+
+ accessory = /obj/item/clothing/accessory/armband
+ uniform = /obj/item/clothing/under/rank/security/officer/frontier/officer
+ head = /obj/item/clothing/head/beret/sec/frontier/officer
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof/frontier
+ shoes = /obj/item/clothing/shoes/cowboy/black
+ gloves = /obj/item/clothing/gloves/combat
+ backpack_contents = list(/obj/item/melee/baton/loaded=1)
+ suit_store = null
+
+// Security Officer
+
+/datum/outfit/job/frontiersmen/security
+ name = "Frontiersmen - Boarder"
+ job_icon = "securityofficer"
+ jobtype = /datum/job/officer
+
+ accessory = /obj/item/clothing/accessory/armband
+ head = /obj/item/clothing/head/beret/sec/frontier
+ mask = /obj/item/clothing/mask/gas/sechailer/minutemen
+ suit = null
+ 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
+
+ l_pocket = /obj/item/flashlight/seclite
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/double
+
+// Medical Doctor
+
+/datum/outfit/job/frontiersmen/doctor
+ name = "Frontiersmen - Aidman"
+ job_icon = "medicaldoctor"
+ jobtype = /datum/job/doctor
+
+ accessory = /obj/item/clothing/accessory/armband/med
+ uniform = /obj/item/clothing/under/rank/security/officer/frontier
+ glasses = /obj/item/clothing/glasses/hud/health/prescription
+ r_pocket = /obj/item/kitchen/knife/combat/survival
+ backpack_contents = list(/obj/item/storage/firstaid/medical)
diff --git a/code/modules/clothing/outfits/gezena.dm b/code/modules/clothing/outfits/factions/gezena.dm
similarity index 74%
rename from code/modules/clothing/outfits/gezena.dm
rename to code/modules/clothing/outfits/factions/gezena.dm
index b9fc26afeff1..b5b077fa63f7 100644
--- a/code/modules/clothing/outfits/gezena.dm
+++ b/code/modules/clothing/outfits/factions/gezena.dm
@@ -1,14 +1,17 @@
/datum/outfit/job/gezena
+ name = "PGF - Base Outfit"
+ // faction_icon = "bg_pgf"
/datum/outfit/job/gezena/post_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
if(visualsOnly)
return
- H.faction |= list("playergezena")
+ H.faction |= list(FACTION_PLAYER_GEZENA)
/datum/outfit/job/gezena/assistant
- name = "Deckhand (PGF)"
+ name = "PGF - Deckhand"
jobtype = /datum/job/assistant
+ job_icon = "assistant"
head = /obj/item/clothing/head/gezena
uniform = /obj/item/clothing/under/gezena
diff --git a/code/modules/clothing/outfits/factions/independent.dm b/code/modules/clothing/outfits/factions/independent.dm
new file mode 100644
index 000000000000..e31e03e10eba
--- /dev/null
+++ b/code/modules/clothing/outfits/factions/independent.dm
@@ -0,0 +1,830 @@
+/datum/outfit/job/independent
+ name = "Independent - Base Outfit"
+ faction_icon = "bg_indie"
+
+ uniform = /obj/item/clothing/under/utility
+ box = /obj/item/storage/box/survival
+ id = /obj/item/card/id
+
+ r_pocket = /obj/item/storage/wallet
+
+// Assistant
+
+/datum/outfit/job/independent/assistant
+ name = "Independent - Assistant"
+ jobtype = /datum/job/assistant
+ job_icon = "assistant"
+
+ shoes = /obj/item/clothing/shoes/sneakers/black
+
+/datum/outfit/job/independent/assistant/waiter
+ name = "Independent - Assistant (Waiter)"
+ uniform = /obj/item/clothing/under/suit/waiter
+ shoes = /obj/item/clothing/shoes/laceup
+
+/datum/outfit/job/independent/assistant/fancy
+ name = "Independent - Assistant (Formal Uniform)"
+
+ shoes = /obj/item/clothing/shoes/laceup
+ uniform = /obj/item/clothing/under/misc/assistantformal
+ head = /obj/item/clothing/head/beret/grey
+
+/datum/outfit/job/independent/assistant/pirate
+ name = "Independent - Assistant (Pirate)"
+
+ uniform = /obj/item/clothing/under/costume/pirate
+ suit = /obj/item/clothing/suit/pirate
+ head = /obj/item/clothing/head/bandana
+
+/datum/outfit/job/independent/assistant/pirate/jupiter
+ name = "Independent - Assistant (Nodesman)" // technically, this is part of SEC, but we have jackshit for SEC
+
+ uniform = /obj/item/clothing/under/utility
+ head = /obj/item/clothing/head/soft/black
+ shoes = /obj/item/clothing/shoes/combat
+ l_pocket = /obj/item/kitchen/knife/combat/survival
+ gloves = /obj/item/clothing/gloves/combat
+ implants = list(/obj/item/implant/radio)
+
+/datum/outfit/job/independent/assistant/artist
+ name = "Independent - Assistant (Artist)"
+
+ uniform = /obj/item/clothing/under/suit/burgundy
+ suit = /obj/item/clothing/suit/toggle/suspenders
+ head = /obj/item/clothing/head/beret/black
+ shoes = /obj/item/clothing/shoes/laceup
+ gloves = /obj/item/clothing/gloves/color/white
+ accessory = /obj/item/clothing/neck/scarf/darkblue
+
+/datum/outfit/job/independent/assistant/pharma
+ name = "Independent - Assistant (Pharmacology Student)"
+
+ uniform = /obj/item/clothing/under/rank/medical/chemist
+ shoes = /obj/item/clothing/shoes/sneakers/white
+ accessory = /obj/item/clothing/neck/scarf/orange
+ l_pocket = /obj/item/reagent_containers/pill/floorpill
+ belt = /obj/item/reagent_scanner
+ backpack_contents = list(/obj/item/book/manual/wiki/chemistry=1)
+
+// Captain
+
+/datum/outfit/job/independent/captain
+ name = "Independent - Captain"
+ job_icon = "captain"
+ jobtype = /datum/job/captain
+
+ id = /obj/item/card/id/gold
+ gloves = /obj/item/clothing/gloves/color/captain
+ ears = /obj/item/radio/headset/headset_com
+ uniform = /obj/item/clothing/under/rank/command/captain
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain //WS Edit - Alt Uniforms
+ shoes = /obj/item/clothing/shoes/laceup
+ head = /obj/item/clothing/head/caphat
+ backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
+
+ backpack = /obj/item/storage/backpack/captain
+ satchel = /obj/item/storage/backpack/satchel/cap
+ duffelbag = /obj/item/storage/backpack/duffelbag/captain
+ courierbag = /obj/item/storage/backpack/messenger/com
+
+ accessory = /obj/item/clothing/accessory/medal/gold/captain
+
+ chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/captain)
+
+/datum/outfit/job/independent/captain/western
+ name = "Independent - Captain (Western)"
+ head = /obj/item/clothing/head/caphat/cowboy
+ shoes = /obj/item/clothing/shoes/cowboy/fancy
+ glasses = /obj/item/clothing/glasses/sunglasses
+
+/datum/outfit/job/independent/captain/masinyane
+ name = "Independent - Captain (Masinyane)"
+ uniform = /obj/item/clothing/under/suit/black
+ head = null
+ belt = null
+ gloves = null
+ shoes = /obj/item/clothing/shoes/laceup
+
+ backpack_contents = list(/obj/item/clothing/accessory/medal/gold/captain=1, /obj/item/spacecash/bundle/c10000=1)
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel/
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
+
+/datum/outfit/job/independent/captain/pirate
+ name = "Captain (Pirate)"
+
+ ears = /obj/item/radio/headset/pirate/captain
+ uniform = /obj/item/clothing/under/costume/pirate
+ shoes = /obj/item/clothing/shoes/jackboots
+ head = /obj/item/clothing/head/pirate/captain
+ suit = /obj/item/clothing/suit/pirate/captain
+
+/datum/outfit/job/independent/captain/pirate/jupiter
+ name = "Independent - Captain (Nodesman)" // technically, this is part of SEC, but we have jackshit for SEC
+
+ uniform = /obj/item/clothing/under/utility
+ gloves = /obj/item/clothing/gloves/combat
+ suit = /obj/item/clothing/suit/armor/vest/marine/medium
+ head = /obj/item/clothing/head/soft/black
+ shoes = /obj/item/clothing/shoes/combat
+ l_pocket = /obj/item/kitchen/knife/combat
+ implants = list(/obj/item/implant/radio)
+ accessory = null
+
+// Head of Personnel
+
+/datum/outfit/job/independent/hop
+ name = "Independent - Head of Personnel"
+ job_icon = "headofpersonnel"
+ jobtype = /datum/job/head_of_personnel
+
+ id = /obj/item/card/id/silver
+ ears = /obj/item/radio/headset/headset_com
+ uniform = /obj/item/clothing/under/rank/command/head_of_personnel
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain
+ shoes = /obj/item/clothing/shoes/sneakers/brown
+ head = /obj/item/clothing/head/hopcap
+
+ backpack_contents = list(/obj/item/storage/box/ids=1,\
+ /obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
+
+ backpack = /obj/item/storage/backpack/captain
+ satchel = /obj/item/storage/backpack/satchel/cap
+ duffelbag = /obj/item/storage/backpack/duffelbag/captain
+ courierbag = /obj/item/storage/backpack/messenger/com
+
+ chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/head_of_personnel)
+
+/datum/outfit/job/independent/hop/western
+ name = "Independent - Head of Personnel (Western)"
+
+ uniform = /obj/item/clothing/under/rank/security/detective/grey
+ shoes = /obj/item/clothing/shoes/cowboy/black
+ accessory = /obj/item/clothing/accessory/waistcoat
+ head = /obj/item/clothing/head/cowboy
+
+/datum/outfit/job/independent/hop/pirate
+ name = "Independent - Head of Personnel (Pirate)"
+
+ ears = /obj/item/radio/headset/pirate
+ uniform = /obj/item/clothing/under/costume/pirate
+ shoes = /obj/item/clothing/shoes/jackboots
+ head = /obj/item/clothing/head/pirate
+ suit = /obj/item/clothing/suit/pirate
+
+// Head of Security
+
+/datum/outfit/job/independent/hos
+ name = "Independent - Head of Security"
+ job_icon = "headofsecurity"
+ jobtype = /datum/job/hos
+
+ id = /obj/item/card/id/silver
+ ears = /obj/item/radio/headset/headset_com
+ uniform = /obj/item/clothing/under/rank/security/head_of_security
+ alt_uniform = null
+ shoes = /obj/item/clothing/shoes/jackboots
+ suit = /obj/item/clothing/suit/armor/hos/trenchcoat
+ alt_suit = /obj/item/clothing/suit/armor/vest/security/hos
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/security
+ gloves = /obj/item/clothing/gloves/color/black
+ head = /obj/item/clothing/head/beret/sec/hos
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ suit_store = null
+ l_pocket = /obj/item/restraints/handcuffs
+ backpack_contents = list(/obj/item/melee/classic_baton=1)
+
+ backpack = /obj/item/storage/backpack/security
+ satchel = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/duffelbag/sec
+ courierbag = /obj/item/storage/backpack/messenger/sec
+ box = /obj/item/storage/box/survival/security
+
+ chameleon_extras = list(/obj/item/gun/energy/e_gun/hos, /obj/item/stamp/hos)
+
+// Roboticist
+
+/datum/outfit/job/independent/roboticist
+ name = "Independent - Roboticist"
+ job_icon = "roboticist"
+ jobtype = /datum/job/roboticist
+
+ belt = /obj/item/storage/belt/utility/full
+ ears = /obj/item/radio/headset/headset_sci
+ uniform = /obj/item/clothing/under/rank/rnd/roboticist
+ suit = /obj/item/clothing/suit/toggle/labcoat
+ alt_suit = /obj/item/clothing/suit/toggle/suspenders/gray
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/science
+
+ backpack = /obj/item/storage/backpack/science
+ satchel = /obj/item/storage/backpack/satchel/tox
+ courierbag = /obj/item/storage/backpack/messenger/tox
+
+// Security Officer
+
+/datum/outfit/job/independent/security
+ name = "Independent - Security Officer"
+ jobtype = /datum/job/officer
+ job_icon = "securityofficer"
+
+ ears = /obj/item/radio/headset/alt
+ uniform = /obj/item/clothing/under/rank/security/officer
+ gloves = /obj/item/clothing/gloves/color/black
+ head = /obj/item/clothing/head/helmet/sec
+ suit = /obj/item/clothing/suit/armor/vest/alt
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/security
+ shoes = /obj/item/clothing/shoes/jackboots
+ l_pocket = /obj/item/restraints/handcuffs
+ backpack_contents = null
+
+ backpack = /obj/item/storage/backpack/security
+ satchel = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/duffelbag/sec
+ courierbag = /obj/item/storage/backpack/messenger/sec
+ box = /obj/item/storage/box/survival/security
+
+ chameleon_extras = list(/obj/item/gun/energy/disabler, /obj/item/clothing/glasses/hud/security/sunglasses, /obj/item/clothing/head/helmet)
+ //The helmet is necessary because /obj/item/clothing/head/helmet/sec is overwritten in the chameleon list by the standard helmet, which has the same name and icon state
+
+/datum/outfit/job/independent/security/western
+ name = "Independent - Security Officer (Western)"
+
+ uniform = /obj/item/clothing/under/rank/security/officer/blueshirt
+ shoes = /obj/item/clothing/shoes/jackboots
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ head = /obj/item/clothing/head/cowboy/sec
+
+/datum/outfit/job/independent/security/pirate
+ name = "Independent - Security Officer (Pirate)"
+
+ uniform = /obj/item/clothing/under/syndicate/camo
+ shoes = /obj/item/clothing/shoes/jackboots
+ head = /obj/item/clothing/head/bandana
+ suit = /obj/item/clothing/suit/armor/vest
+
+/datum/outfit/job/independent/security/pirate/jupiter
+ name = "Independent - Security Officer (Nodesman)" // technically, this is part of SEC, but we have jackshit for SEC
+
+ uniform = /obj/item/clothing/under/utility
+ head = /obj/item/clothing/head/soft/black
+ shoes = /obj/item/clothing/shoes/combat
+ l_pocket = /obj/item/kitchen/knife/combat
+
+ backpack_contents = list(/obj/item/melee/baton/loaded=1)
+
+ implants = list(/obj/item/implant/radio)
+
+// Engineer
+
+/datum/outfit/job/independent/engineer
+ name = "Independent - Engineer"
+ job_icon = "stationengineer"
+ jobtype = /datum/job/engineer
+
+ belt = /obj/item/storage/belt/utility/full/engi
+ l_pocket = /obj/item/storage/wallet
+ gloves = /obj/item/clothing/gloves/color/yellow
+ ears = /obj/item/radio/headset/headset_eng
+ uniform = /obj/item/clothing/under/rank/engineering/engineer
+ alt_uniform = /obj/item/clothing/under/rank/engineering/engineer/hazard
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering
+ shoes = /obj/item/clothing/shoes/workboots
+ head = /obj/item/clothing/head/hardhat/dblue
+ l_pocket = /obj/item/t_scanner
+
+ backpack = /obj/item/storage/backpack/industrial
+ satchel = /obj/item/storage/backpack/satchel/eng
+ duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+ courierbag = /obj/item/storage/backpack/messenger/engi
+
+ box = /obj/item/storage/box/survival/engineer
+ backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
+
+/datum/outfit/job/independent/engineer/salvage
+ name = "Independent - Engineer (Salvager)"
+
+ belt = null
+ l_pocket = null
+
+/datum/outfit/job/independent/engineer/pirate
+ name = "Independent - Engineer (Pirate)"
+
+ uniform = /obj/item/clothing/under/costume/sailor
+ head = /obj/item/clothing/head/bandana
+ shoes = /obj/item/clothing/shoes/jackboots
+
+/datum/outfit/job/independent/engineer/pirate/jupiter
+ name = "Independent - Engineer (Nodesman)" // technically, this is part of SEC, but we have jackshit for SEC
+
+ uniform = /obj/item/clothing/under/utility
+ head = /obj/item/clothing/head/soft/black
+ shoes = /obj/item/clothing/shoes/combat
+ l_pocket = /obj/item/kitchen/knife/combat/survival
+ gloves = /obj/item/clothing/gloves/combat
+
+ implants = list(/obj/item/implant/radio)
+
+// Warden
+
+/datum/outfit/job/independent/warden
+ name = "Independent - Warden"
+ job_icon = "warden"
+ jobtype = /datum/job/warden
+
+ ears = /obj/item/radio/headset/headset_sec/alt
+ uniform = /obj/item/clothing/under/rank/security/warden
+ shoes = /obj/item/clothing/shoes/jackboots
+ suit = /obj/item/clothing/suit/armor/vest/security/warden
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/security
+ gloves = /obj/item/clothing/gloves/color/black
+ head = /obj/item/clothing/head/warden
+ glasses = /obj/item/clothing/glasses/hud/security
+ l_pocket = /obj/item/restraints/handcuffs
+ suit_store = null
+ backpack_contents = list(/obj/item/melee/classic_baton)
+
+ backpack = /obj/item/storage/backpack/security
+ satchel = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/duffelbag/sec
+ courierbag = /obj/item/storage/backpack/messenger/sec
+ box = /obj/item/storage/box/survival/security
+
+ chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/combat/compact
+
+// Chief Engineer
+
+/datum/outfit/job/independent/ce
+ name = "Independent - Chief Engineer"
+ jobtype = /datum/job/chief_engineer
+ job_icon = "chiefengineer"
+
+ id = /obj/item/card/id/silver
+ belt = /obj/item/storage/belt/utility/chief/full
+ l_pocket = /obj/item/storage/wallet
+ ears = /obj/item/radio/headset/headset_com
+ uniform = /obj/item/clothing/under/rank/engineering/chief_engineer
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering
+ shoes = /obj/item/clothing/shoes/sneakers/brown
+ head = /obj/item/clothing/head/hardhat/white
+ gloves = /obj/item/clothing/gloves/color/black
+ backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced=1)
+
+ backpack = /obj/item/storage/backpack/industrial
+ satchel = /obj/item/storage/backpack/satchel/eng
+ duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+ courierbag = /obj/item/storage/backpack/messenger/engi
+
+ box = /obj/item/storage/box/survival/engineer
+ chameleon_extras = /obj/item/stamp/ce
+
+// Medical Doctor
+
+/datum/outfit/job/independent/doctor
+ name = "Independent - Medical Doctor"
+ job_icon = "medicaldoctor"
+ jobtype = /datum/job/doctor
+
+ ears = /obj/item/radio/headset/headset_med
+ uniform = /obj/item/clothing/under/rank/medical/doctor/blue
+ shoes = /obj/item/clothing/shoes/sneakers/white
+ suit = /obj/item/clothing/suit/apron/surgical
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical
+
+ backpack = /obj/item/storage/backpack/medic
+ satchel = /obj/item/storage/backpack/satchel/med
+ duffelbag = /obj/item/storage/backpack/duffelbag/med
+ courierbag = /obj/item/storage/backpack/messenger/med
+
+ box = /obj/item/storage/box/survival/medical
+
+ chameleon_extras = /obj/item/gun/syringe
+
+/datum/outfit/job/independent/doctor/pirate
+
+// Cargo Tech
+
+/datum/outfit/job/independent/cargo_tech
+ name = "Independent - Cargo Tech"
+ jobtype = /datum/job/cargo_tech
+ job_icon = "cargotechnician"
+
+ ears = /obj/item/radio/headset/headset_cargo
+ uniform = /obj/item/clothing/under/color/khaki
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo
+ backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1)
+
+// Atmos Tech
+
+/datum/outfit/job/independent/atmos
+ name = "Independent - Atmos Tech"
+ jobtype = /datum/job/atmos
+ job_icon = "atmospherictechnician"
+
+ belt = /obj/item/storage/belt/utility/atmostech
+ ears = /obj/item/radio/headset/headset_eng
+ uniform = /obj/item/clothing/under/rank/engineering/engineer/hazard
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering
+ l_pocket = /obj/item/analyzer
+
+ backpack = /obj/item/storage/backpack/industrial
+ satchel = /obj/item/storage/backpack/satchel/eng
+ duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+ courierbag = /obj/item/storage/backpack/messenger/engi
+
+ box = /obj/item/storage/box/survival/engineer
+
+ backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
+
+// Scientist
+
+/datum/outfit/job/independent/scientist
+ name = "Independent - Scientist"
+ jobtype = /datum/job/scientist
+ job_icon = "scientist"
+
+ ears = /obj/item/radio/headset/headset_sci
+ uniform = /obj/item/clothing/under/rank/rnd/scientist
+ shoes = /obj/item/clothing/shoes/sneakers/white
+ suit = /obj/item/clothing/suit/toggle/labcoat/science
+ alt_suit = /obj/item/clothing/suit/toggle/suspenders/blue
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/science
+
+ backpack = /obj/item/storage/backpack/science
+ satchel = /obj/item/storage/backpack/satchel/tox
+ courierbag = /obj/item/storage/backpack/messenger/tox
+
+// Brig Physician
+
+/datum/outfit/job/independent/brig_phys
+ name = "Independent - Brig Physician"
+ jobtype = /datum/job/brig_phys
+ job_icon = "brigphysician"
+
+ ears = /obj/item/radio/headset/headset_medsec/alt
+ uniform = /obj/item/clothing/under/rank/security/brig_phys
+ shoes = /obj/item/clothing/shoes/sneakers/white
+ glasses = /obj/item/clothing/glasses/hud/health
+ suit = /obj/item/clothing/suit/toggle/labcoat/brig_phys
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/security
+ head = /obj/item/clothing/head/soft/sec/brig_phys
+
+// Paramedic
+
+/datum/outfit/job/independent/paramedic
+ name = "Independent - Paramedic"
+ jobtype = /datum/job/paramedic
+ job_icon = "paramedic"
+
+ ears = /obj/item/radio/headset/headset_med
+ uniform = /obj/item/clothing/under/rank/medical/paramedic/emt
+ head = /obj/item/clothing/head/soft/paramedic
+ shoes = /obj/item/clothing/shoes/sneakers/blue
+ suit = /obj/item/clothing/suit/toggle/labcoat/paramedic
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical/paramedic
+ gloves = /obj/item/clothing/gloves/color/latex
+
+ backpack_contents = list(/obj/item/roller=1)
+
+ backpack = /obj/item/storage/backpack/medic
+ satchel = /obj/item/storage/backpack/satchel/med
+ duffelbag = /obj/item/storage/backpack/duffelbag/med
+ courierbag = /obj/item/storage/backpack/messenger/para
+
+ box = /obj/item/storage/box/survival/medical
+
+ chameleon_extras = /obj/item/gun/syringe
+
+// Quartermaster
+
+/datum/outfit/job/independent/quartermaster
+ name = "Independent - Quartermaster"
+ jobtype = /datum/job/qm
+ job_icon = "quartermaster"
+
+ ears = /obj/item/radio/headset/headset_cargo
+ uniform = /obj/item/clothing/under/rank/cargo/qm
+ head = /obj/item/clothing/head/supply_chief
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo
+ shoes = /obj/item/clothing/shoes/sneakers/brown
+ glasses = /obj/item/clothing/glasses/sunglasses
+ l_hand = /obj/item/clipboard
+ backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1)
+
+ chameleon_extras = /obj/item/stamp/qm
+
+/datum/outfit/job/independent/quartermaster/western
+ name = "Independent - Quartermaster (Western)"
+
+ uniform = /obj/item/clothing/under/rank/cargo/qm
+ suit = /obj/item/clothing/suit/toggle/hazard
+ shoes = /obj/item/clothing/shoes/workboots
+ glasses = /obj/item/clothing/glasses/sunglasses
+ head = /obj/item/clothing/head/cowboy/sec
+
+/datum/outfit/job/independent/miner
+ name = "Independent - Miner"
+ jobtype = /datum/job/mining
+ job_icon = "shaftminer"
+
+ ears = /obj/item/radio/headset/headset_cargo/mining
+ shoes = /obj/item/clothing/shoes/workboots/mining
+ gloves = /obj/item/clothing/gloves/explorer
+ uniform = /obj/item/clothing/under/rank/cargo/miner
+ suit = /obj/item/clothing/suit/hazardvest
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/miner
+ l_pocket = /obj/item/storage/bag/ore
+ backpack_contents = list(
+ /obj/item/flashlight/seclite=1,\
+ /obj/item/kitchen/knife/combat/survival=1,\
+ /obj/item/stack/marker_beacon/ten=1,\
+ /obj/item/radio/weather_monitor=1)
+
+ backpack = /obj/item/storage/backpack/explorer
+ satchel = /obj/item/storage/backpack/satchel/explorer
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ box = /obj/item/storage/box/survival/mining
+
+ chameleon_extras = /obj/item/gun/energy/kinetic_accelerator
+
+/datum/outfit/job/independent/miner/hazard
+ name = "Independent - Miner (Hazard Uniform)"
+
+ uniform = /obj/item/clothing/under/rank/cargo/miner/hazard
+ alt_uniform = null
+ alt_suit = /obj/item/clothing/suit/toggle/hazard
+
+/datum/outfit/job/independent/miner/scientist
+ name = "Independent - Miner (Minerologist)"
+
+ uniform = /obj/item/clothing/under/rank/cargo/miner/hazard
+ alt_uniform = /obj/item/clothing/under/rank/rnd/roboticist
+ suit = /obj/item/clothing/suit/toggle/labcoat/science
+ alt_suit = /obj/item/clothing/suit/toggle/hazard
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/science
+
+ backpack = /obj/item/storage/backpack/science
+ satchel = /obj/item/storage/backpack/satchel/tox
+ courierbag = /obj/item/storage/backpack/messenger/tox
+
+// Cook
+
+/datum/outfit/job/independent/cook
+ name = "Independent - Cook"
+ jobtype = /datum/job/cook
+ job_icon = "cook"
+
+ ears = /obj/item/radio/headset/headset_srv
+ uniform = /obj/item/clothing/under/rank/civilian/chef //WS Edit - Alt Uniforms
+ suit = /obj/item/clothing/suit/toggle/chef
+ alt_suit = /obj/item/clothing/suit/apron/chef
+ head = /obj/item/clothing/head/chefhat
+ mask = /obj/item/clothing/mask/fakemoustache/italian
+ backpack_contents = list(/obj/item/sharpener = 1)
+
+/datum/outfit/job/independent/cook/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ ..()
+ if(visualsOnly)
+ return
+ var/list/possible_boxes = subtypesof(/obj/item/storage/box/ingredients)
+ var/chosen_box = pick(possible_boxes)
+ var/obj/item/storage/box/I = new chosen_box(src)
+ H.equip_to_slot_or_del(I,ITEM_SLOT_BACKPACK)
+ var/datum/martial_art/cqc/under_siege/justacook = new
+ justacook.teach(H)
+
+// Bartender
+
+/datum/outfit/job/independent/bartender
+ name = "Independent - Bartender"
+
+ glasses = /obj/item/clothing/glasses/sunglasses/reagent
+ ears = /obj/item/radio/headset/headset_srv
+ uniform = /obj/item/clothing/under/rank/civilian/bartender
+ alt_uniform = /obj/item/clothing/under/rank/civilian/bartender/purple
+ alt_suit = /obj/item/clothing/suit/apron/purple_bartender
+ suit = /obj/item/clothing/suit/armor/vest
+ backpack_contents = list(/obj/item/storage/box/beanbag=1)
+ shoes = /obj/item/clothing/shoes/laceup
+
+/datum/outfit/job/independent/bartender/pharma
+ name = "Independent - Bartender (Mixologist)"
+
+ backpack_contents = list(/obj/item/storage/box/syringes=1, /obj/item/storage/box/drinkingglasses = 1)
+ ears = /obj/item/radio/headset/headset_med
+ suit = /obj/item/clothing/suit/toggle/labcoat
+ l_pocket = /obj/item/reagent_containers/food/drinks/shaker
+ belt = /obj/item/storage/belt
+ gloves = /obj/item/clothing/gloves/color/latex/nitrile
+ uniform = /obj/item/clothing/under/suit/black
+
+// Lawyer
+
+/datum/outfit/job/independent/lawyer
+ name = "Independent - Lawyer"
+ job_icon = "lawyer"
+ jobtype = /datum/job/lawyer
+
+ ears = /obj/item/radio/headset/headset_srvsec
+ uniform = /obj/item/clothing/under/rank/civilian/lawyer/bluesuit
+ suit = /obj/item/clothing/suit/toggle/lawyer
+ shoes = /obj/item/clothing/shoes/laceup
+ l_hand = /obj/item/storage/briefcase/lawyer
+ l_pocket = /obj/item/clothing/accessory/lawyers_badge
+
+ chameleon_extras = /obj/item/stamp/law
+
+// Curator
+
+/datum/outfit/job/independent/curator
+ name = "Independent - Curator"
+ job_icon = "curator"
+ jobtype = /datum/job/curator
+
+ shoes = /obj/item/clothing/shoes/laceup
+ ears = /obj/item/radio/headset/headset_srv
+ uniform = /obj/item/clothing/under/rank/civilian/curator
+ l_hand = /obj/item/storage/bag/books
+ l_pocket = /obj/item/key/displaycase
+ accessory = /obj/item/clothing/accessory/pocketprotector/full
+ backpack_contents = list(
+ /obj/item/choice_beacon/hero = 1,
+ /obj/item/barcodescanner = 1
+ )
+
+/datum/outfit/job/independent/curator/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ ..()
+
+ if(visualsOnly)
+ return
+
+ H.grant_all_languages(TRUE, TRUE, TRUE, LANGUAGE_CURATOR)
+
+/datum/outfit/job/independent/curator/dungeonmaster
+
+
+// Chaplain
+
+/datum/outfit/job/independent/chaplain
+ name = "Independent - Chaplain"
+ job_icon = "chaplain"
+ jobtype = /datum/job/chaplain
+
+ ears = /obj/item/radio/headset/headset_srv
+ uniform = /obj/item/clothing/under/rank/civilian/chaplain
+ backpack_contents = list(
+ /obj/item/stamp/chap = 1,
+ /obj/item/camera/spooky = 1
+ )
+
+ backpack = /obj/item/storage/backpack/cultpack
+ satchel = /obj/item/storage/backpack/cultpack
+
+ chameleon_extras = /obj/item/stamp/chap
+
+// Chemist
+
+/datum/outfit/job/independent/chemist
+ name = "Independent - Chemist"
+ job_icon = "chemist"
+ jobtype = /datum/job/chemist
+
+ glasses = /obj/item/clothing/glasses/science
+ ears = /obj/item/radio/headset/headset_med
+ uniform = /obj/item/clothing/under/rank/medical/chemist
+ shoes = /obj/item/clothing/shoes/sneakers/white
+ suit = /obj/item/clothing/suit/toggle/labcoat/chemist
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical
+
+ backpack = /obj/item/storage/backpack/chemistry
+ satchel = /obj/item/storage/backpack/satchel/chem
+ duffelbag = /obj/item/storage/backpack/duffelbag/med
+ courierbag = /obj/item/storage/backpack/messenger/chem
+
+ box = /obj/item/storage/box/survival/medical
+
+ chameleon_extras = /obj/item/gun/syringe
+
+/datum/outfit/job/independent/chemist/pharma
+
+// Janitor
+
+/datum/outfit/job/independent/janitor
+ name = "Independent - Janitor"
+ job_icon = "janitor"
+ jobtype = /datum/job/janitor
+
+ ears = /obj/item/radio/headset/headset_srv
+ uniform = /obj/item/clothing/under/rank/civilian/janitor
+
+ backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
+
+// Research Director
+
+/datum/outfit/job/independent/rd
+ name = "Independent - Research Director"
+ job_icon = "researchdirector"
+ jobtype = /datum/job/rd
+
+ id = /obj/item/card/id/silver
+ ears = /obj/item/radio/headset/heads/rd
+ uniform = /obj/item/clothing/under/rank/rnd/research_director/turtleneck
+ shoes = /obj/item/clothing/shoes/sneakers/brown
+ suit = /obj/item/clothing/suit/toggle/labcoat
+ alt_suit = /obj/item/clothing/suit/toggle/suspenders
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/science //WS Edit - Alt Uniforms
+ l_hand = /obj/item/clipboard
+ backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced=1)
+
+ backpack = /obj/item/storage/backpack/science
+ satchel = /obj/item/storage/backpack/satchel/tox
+ courierbag = /obj/item/storage/backpack/messenger/tox
+
+ chameleon_extras = /obj/item/stamp/rd
+
+// Chief Medical Officer
+
+/datum/outfit/job/independent/cmo
+ name = "Independent - Chief Medical Officer"
+ job_icon = "chiefmedicalofficer"
+ jobtype = /datum/job/cmo
+
+ id = /obj/item/card/id/silver
+ l_pocket = /obj/item/pinpointer/crew
+ ears = /obj/item/radio/headset/headset_com
+ uniform = /obj/item/clothing/under/rank/medical/doctor/blue
+ shoes = /obj/item/clothing/shoes/sneakers/brown
+ suit = /obj/item/clothing/suit/toggle/labcoat/cmo
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical
+ backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
+
+ backpack = /obj/item/storage/backpack/medic
+ satchel = /obj/item/storage/backpack/satchel/med
+ duffelbag = /obj/item/storage/backpack/duffelbag/med
+ courierbag = /obj/item/storage/backpack/messenger/med
+
+ box = /obj/item/storage/box/survival/medical
+
+ chameleon_extras = list(/obj/item/gun/syringe, /obj/item/stamp/cmo)
+
+/datum/outfit/job/independent/cmo/pharma
+
+// Detective
+
+/datum/outfit/job/independent/detective
+ name = "Independent - Detective"
+ job_icon = "detective"
+ jobtype = /datum/job/detective
+
+ ears = /obj/item/radio/headset/headset_sec/alt
+ uniform = /obj/item/clothing/under/rank/security/detective
+ neck = /obj/item/clothing/neck/tie/detective
+ shoes = /obj/item/clothing/shoes/sneakers/brown
+ suit = /obj/item/clothing/suit/det_suit
+ gloves = /obj/item/clothing/gloves/color/black
+ head = /obj/item/clothing/head/fedora/det_hat
+ l_pocket = /obj/item/toy/crayon/white
+ backpack_contents = list(/obj/item/storage/box/evidence=1,\
+ /obj/item/detective_scanner=1,\
+ /obj/item/melee/classic_baton=1)
+ mask = /obj/item/clothing/mask/cigarette
+
+ implants = list(/obj/item/implant/mindshield)
+
+ chameleon_extras = list(/obj/item/gun/ballistic/revolver/detective, /obj/item/clothing/glasses/sunglasses)
+
+/datum/outfit/job/independent/detective/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ ..()
+ var/obj/item/clothing/mask/cigarette/cig = H.wear_mask
+ if(istype(cig)) //Some species specfic changes can mess this up (plasmamen)
+ cig.light("")
+
+ if(visualsOnly)
+ return
+
+// Botanist
+
+/datum/outfit/job/independent/botanist
+ name = "Independent - Botanist"
+ job_icon = "botanist"
+ jobtype = /datum/job/hydro
+
+ ears = /obj/item/radio/headset/headset_srv
+ uniform = /obj/item/clothing/under/color/green
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/hydro
+ suit = /obj/item/clothing/suit/apron/overalls
+ gloves =/obj/item/clothing/gloves/botanic_leather
+ suit_store = /obj/item/plant_analyzer
+
+ backpack = /obj/item/storage/backpack/botany
+ satchel = /obj/item/storage/backpack/satchel/hyd
+ courierbag = /obj/item/storage/backpack/messenger/hyd
+
+/datum/outfit/job/independent/botanist/pharma
+ name = "Independent - Botanist (Herbalist)"
+
+ ears = /obj/item/radio/headset/headset_med
+ belt = /obj/item/storage/bag/plants
+ suit = /obj/item/clothing/suit/apron/overalls
+ uniform = /obj/item/clothing/under/utility
diff --git a/code/modules/clothing/outfits/factions/inteq.dm b/code/modules/clothing/outfits/factions/inteq.dm
new file mode 100644
index 000000000000..48702c064447
--- /dev/null
+++ b/code/modules/clothing/outfits/factions/inteq.dm
@@ -0,0 +1,231 @@
+/datum/outfit/job/inteq
+ name = "IRMG - Base Outfit"
+ faction_icon = "bg_inteq"
+
+ uniform = /obj/item/clothing/under/syndicate/inteq
+ box = /obj/item/storage/box/survival
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger/inteq
+
+/datum/outfit/job/inteq/post_equip(mob/living/carbon/human/H, visualsOnly)
+ . = ..()
+ if(visualsOnly)
+ return
+ H.faction |= list(FACTION_PLAYER_INTEQ)
+
+///assistants
+
+/datum/outfit/job/inteq/assistant
+ name = "IRMG - Recruit"
+ jobtype = /datum/job/assistant
+ job_icon = "assistant"
+
+ r_pocket = /obj/item/radio
+
+///captains
+
+/datum/outfit/job/inteq/captain
+ name = "IRMG - Vanguard (Naked)"
+ jobtype = /datum/job/captain
+ job_icon = "captain"
+
+ ears = /obj/item/radio/headset/inteq/alt/captain
+ shoes = /obj/item/clothing/shoes/combat
+ r_pocket = /obj/item/assembly/flash/handheld
+ l_pocket = /obj/item/restraints/handcuffs
+ jobtype = /datum/job/captain
+ id = /obj/item/card/id/gold
+
+ backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
+
+/datum/outfit/job/inteq/captain/geared
+ name = "IRMG - Vanguard"
+
+ head = /obj/item/clothing/head/beret/sec/hos/inteq
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
+ mask = /obj/item/clothing/mask/gas/sechailer/inteq
+ belt = /obj/item/storage/belt/security/webbing/inteq
+ suit = /obj/item/clothing/suit/armor/hos/inteq
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
+ gloves = /obj/item/clothing/gloves/combat
+ accessory = null
+
+/datum/outfit/job/inteq/captain/honorable
+ name = "IRMG - Honorable Vanguard"
+
+ head = /obj/item/clothing/head/beret/sec/hos/inteq/honorable
+ uniform = /obj/item/clothing/under/syndicate/inteq/honorable
+ suit = /obj/item/clothing/suit/armor/hos/inteq/honorable
+ gloves = /obj/item/clothing/gloves/combat
+ shoes = /obj/item/clothing/shoes/combat
+ ears = /obj/item/radio/headset/inteq/alt/captain
+ belt = /obj/item/storage/belt/military/assault
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
+
+/datum/outfit/job/inteq/captain/honorable/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ if(visualsOnly)
+ return
+
+ var/obj/item/card/id/W = H.wear_id
+ W.assignment = "Honorable Vanguard"
+ W.update_label()
+ ..()
+
+///Chief Engineer
+
+/datum/outfit/job/inteq/ce
+ name = "IRMG - Artificer Class II"
+ job_icon = "chiefengineer"
+ jobtype = /datum/job/chief_engineer
+
+ ears = /obj/item/radio/headset/inteq
+ uniform = /obj/item/clothing/under/syndicate/inteq/artificer
+ head = /obj/item/clothing/head/hardhat/white
+ mask = /obj/item/clothing/mask/gas/sechailer/inteq
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
+ shoes = /obj/item/clothing/shoes/combat
+ gloves = /obj/item/clothing/gloves/combat
+ belt = /obj/item/storage/belt/utility/full
+
+ id = /obj/item/card/id/silver
+ belt = /obj/item/storage/belt/utility/chief/full
+
+ courierbag = /obj/item/storage/backpack/messenger/inteq
+
+ backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced=1)
+
+///paramedic
+
+/datum/outfit/job/inteq/paramedic
+ name = "IRMG - Corpsman"
+ job_icon = "paramedic"
+ jobtype = /datum/job/paramedic
+
+ uniform = /obj/item/clothing/under/syndicate/inteq/corpsman
+ head = /obj/item/clothing/head/soft/inteq/corpsman
+ suit = /obj/item/clothing/suit/armor/inteq/corpsman
+ shoes = /obj/item/clothing/shoes/combat
+ belt = /obj/item/storage/belt/medical/webbing/paramedic
+ ears = /obj/item/radio/headset/headset_medsec/alt
+
+ suit_store = /obj/item/flashlight/pen
+ backpack_contents = list(/obj/item/roller=1)
+
+/datum/outfit/job/inteq/paramedic/empty
+ name = "IRMG Corpsman (Inteq) (Naked)"
+
+ head = null
+ suit = null
+ suit_store = null
+ belt = null
+
+///Security Officers
+
+/datum/outfit/job/inteq/security
+ name = "IRMG - Enforcer"
+ jobtype = /datum/job/officer
+ job_icon = "securityofficer"
+
+ head = /obj/item/clothing/head/helmet/inteq
+ suit = /obj/item/clothing/suit/armor/vest/alt
+ belt = /obj/item/storage/belt/security/webbing/inteq
+ mask = /obj/item/clothing/mask/gas/sechailer/inteq
+ uniform = /obj/item/clothing/under/syndicate/inteq
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
+ shoes = /obj/item/clothing/shoes/combat
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
+ gloves = /obj/item/clothing/gloves/combat
+
+ backpack = /obj/item/storage/backpack/messenger/inteq
+ satchel = /obj/item/storage/backpack/messenger/inteq
+ courierbag = /obj/item/storage/backpack/messenger/inteq
+
+/datum/outfit/job/inteq/security/beluga
+ name = "IRMG - Enforcer (Beluga)"
+
+ head = /obj/item/clothing/head/beret/sec/inteq
+ accessory = /obj/item/clothing/accessory/waistcoat
+ suit = null
+ belt = null
+ mask = null
+ shoes = /obj/item/clothing/shoes/laceup
+ glasses = null
+ gloves = /obj/item/clothing/gloves/color/evening
+
+ backpack = /obj/item/storage/backpack/messenger/inteq
+ satchel = /obj/item/storage/backpack/messenger/inteq
+ courierbag = /obj/item/storage/backpack/messenger/inteq
+
+/datum/outfit/job/inteq/security/empty
+ name = "IRMG - Enforcer (Naked)"
+ head = null
+ suit = null
+ belt = null
+ mask = null
+ gloves = null
+
+///engineers
+
+/datum/outfit/job/inteq/engineer
+ name = "IRMG - Artificer"
+ job_icon = "stationengineer"
+ jobtype = /datum/job/engineer
+
+ uniform = /obj/item/clothing/under/syndicate/inteq/artificer
+ head = /obj/item/clothing/head/soft/inteq
+ shoes = /obj/item/clothing/shoes/combat
+ belt = /obj/item/storage/belt/utility/full/engi
+ r_pocket = /obj/item/t_scanner
+
+//wardens
+
+/datum/outfit/job/inteq/warden
+ name = "IRMG - Master At Arms"
+ jobtype = /datum/job/warden
+ job_icon = "warden"
+
+ ears = /obj/item/radio/headset/inteq/alt
+ uniform = /obj/item/clothing/under/syndicate/inteq
+ head = /obj/item/clothing/head/beret/sec/hos/inteq
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
+ mask = /obj/item/clothing/mask/gas/sechailer/inteq
+ belt = /obj/item/storage/belt/military/assault
+ suit = /obj/item/clothing/suit/armor/vest/alt
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
+ shoes = /obj/item/clothing/shoes/combat
+ gloves = /obj/item/clothing/gloves/combat
+ suit_store = null
+
+ courierbag = /obj/item/storage/backpack/messenger/inteq
+ backpack_contents = list(/obj/item/melee/classic_baton=1)
+
+// cmo
+
+/datum/outfit/job/inteq/cmo
+ name = "IRMG Honorable Corpsman (Inteq)"
+ jobtype = /datum/job/cmo
+ job_icon = "chiefmedicalofficer"
+
+ belt = /obj/item/storage/belt/medical/webbing/paramedic
+ ears = /obj/item/radio/headset/inteq/captain
+ uniform = /obj/item/clothing/under/syndicate/inteq/corpsman
+ alt_uniform = /obj/item/clothing/under/syndicate/inteq/skirt/corpsman
+ shoes = /obj/item/clothing/shoes/combat
+ suit = /obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt
+ alt_suit = /obj/item/clothing/suit/armor/inteq/corpsman
+ dcoat = /obj/item/clothing/suit/armor/hos/inteq
+ r_pocket = /obj/item/pda/medical
+
+ chameleon_extras = null
+
+/datum/outfit/job/inteq/cmo/empty
+ name = "IRMG Honorable Corpsman (Inteq) (Naked)"
+ belt = null
+ suit = null
+ alt_suit = null
+ suit_store = null
+ dcoat = null
+ r_pocket = null
diff --git a/code/modules/clothing/outfits/factions/minutemen.dm b/code/modules/clothing/outfits/factions/minutemen.dm
new file mode 100644
index 000000000000..0b991268c408
--- /dev/null
+++ b/code/modules/clothing/outfits/factions/minutemen.dm
@@ -0,0 +1,352 @@
+//top outfit of everything Minuteman. Touch at own risk.
+
+/datum/outfit/job/minutemen
+ name = "Minutemen - Base Outfit"
+
+ uniform = /obj/item/clothing/under/rank/security/officer/minutemen
+ alt_uniform = null
+
+ faction_icon = "bg_minutemen"
+
+ backpack = /obj/item/storage/backpack/security/cmm
+ satchel = /obj/item/storage/backpack/satchel/sec/cmm
+ duffelbag = /obj/item/storage/backpack/duffelbag //to-do: bug rye for cmm duffles // rye. rye. give me 20 pound bag of ice
+ satchel = /obj/item/storage/backpack/messenger //and these
+
+ box = /obj/item/storage/box/survival
+
+/datum/outfit/job/minutemen/post_equip(mob/living/carbon/human/H, visualsOnly)
+ . = ..()
+ if(visualsOnly)
+ return
+ H.faction |= list(FACTION_PLAYER_MINUTEMAN)
+
+///assistant
+
+/datum/outfit/job/minutemen/assistant
+ name = "Minutemen - Volunteer"
+ job_icon = "assistant"
+ jobtype = /datum/job/assistant
+
+ r_pocket = /obj/item/radio
+
+///captains
+
+/datum/outfit/job/minutemen/captain
+ name = "Minutemen - Captain"
+ job_icon = "captain"
+ jobtype = /datum/job/captain
+
+ id = /obj/item/card/id/gold
+ gloves = /obj/item/clothing/gloves/color/captain
+
+
+ backpack = /obj/item/storage/backpack/captain
+ satchel = /obj/item/storage/backpack/satchel/cap
+ duffelbag = /obj/item/storage/backpack/duffelbag/captain
+ courierbag = /obj/item/storage/backpack/messenger/com
+
+ accessory = /obj/item/clothing/accessory/medal/gold/captain
+
+ ears = /obj/item/radio/headset/minutemen/alt/captain
+ uniform = /obj/item/clothing/under/rank/command/minutemen
+ alt_uniform = null
+ suit = /obj/item/clothing/suit/toggle/lawyer/minutemen
+ alt_suit = null
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain
+
+ shoes = /obj/item/clothing/shoes/combat
+ head = /obj/item/clothing/head/cowboy/sec/minutemen
+ backpack = /obj/item/storage/backpack
+ backpack_contents = list(/obj/item/storage/box/ids=1,\
+ /obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
+
+/datum/outfit/job/minutemen/captain/general
+ name = "Minutemen - General"
+
+ head = /obj/item/clothing/head/caphat/minutemen
+ ears = /obj/item/radio/headset/minutemen/alt/captain
+ uniform = /obj/item/clothing/under/rank/command/minutemen
+ suit = /obj/item/clothing/suit/armor/vest/capcarapace/minutemen
+ shoes = /obj/item/clothing/shoes/combat
+
+ box = /obj/item/storage/box/survival/engineer/radio
+ backpack = /obj/item/storage/backpack
+ backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/gun/ballistic/revolver/mateba=1)
+
+///chemist
+
+/datum/outfit/job/minutemen/chemist
+ name = "Minutemen - Chemical Scientist"
+ job_icon = "chemist"
+ jobtype = /datum/job/chemist
+
+ glasses = /obj/item/clothing/glasses/science
+ shoes = /obj/item/clothing/shoes/sneakers/white
+ suit = /obj/item/clothing/suit/toggle/labcoat/chemist
+
+ backpack = /obj/item/storage/backpack/chemistry
+ satchel = /obj/item/storage/backpack/satchel/chem
+ duffelbag = /obj/item/storage/backpack/duffelbag/med
+ courierbag = /obj/item/storage/backpack/messenger/chem
+
+ box = /obj/item/storage/box/survival/medical
+ chameleon_extras = /obj/item/gun/syringe
+
+///Chief Engineer
+
+/datum/outfit/job/minutemen/ce
+ name = "Minutemen - Foreman"
+ job_icon = "chiefengineer"
+ jobtype = /datum/job/chief_engineer
+
+ id = /obj/item/card/id/silver
+
+ backpack = /obj/item/storage/backpack/industrial
+ satchel = /obj/item/storage/backpack/satchel/eng
+ duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+ courierbag = /obj/item/storage/backpack/messenger/engi
+
+ box = /obj/item/storage/box/survival/engineer
+
+ chameleon_extras = /obj/item/stamp/ce
+
+
+ ears = /obj/item/radio/headset/minutemen/alt
+ uniform = /obj/item/clothing/under/rank/command/minutemen
+ alt_uniform = null
+ suit = /obj/item/clothing/suit/toggle/lawyer/minutemen
+ alt_suit = null
+ gloves = /obj/item/clothing/gloves/combat
+ belt = /obj/item/storage/belt/utility/full
+ shoes = /obj/item/clothing/shoes/combat
+ head = /obj/item/clothing/head/cowboy/sec/minutemen
+ backpack = /obj/item/storage/backpack
+ backpack_contents = list(
+ /obj/item/melee/classic_baton/telescopic=1,
+ /obj/item/modular_computer/tablet/preset/advanced = 1
+ )
+
+/// Head Of Personnel
+
+/datum/outfit/job/minutemen/head_of_personnel
+ name = "Minutemen - Bridge Officer"
+ job_icon = "headofpersonnel"
+ jobtype = /datum/job/head_of_personnel
+
+ id = /obj/item/card/id/silver
+
+ backpack = /obj/item/storage/backpack/captain
+ satchel = /obj/item/storage/backpack/satchel/cap
+ duffelbag = /obj/item/storage/backpack/duffelbag/captain
+ courierbag = /obj/item/storage/backpack/messenger/com
+
+ chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/head_of_personnel)
+
+ ears = /obj/item/radio/headset/minutemen/alt
+ uniform = /obj/item/clothing/under/rank/command/minutemen
+ alt_uniform = null
+ suit = /obj/item/clothing/suit/toggle/lawyer/minutemen
+ alt_suit = null
+
+ shoes = /obj/item/clothing/shoes/combat
+ head = /obj/item/clothing/head/cowboy/sec/minutemen
+ backpack = /obj/item/storage/backpack
+ backpack_contents = list(/obj/item/storage/box/ids=1,\
+ /obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
+
+/// Medical Doctor
+/datum/outfit/job/minutemen/doctor
+ name = "Minutemen - Field Medic"
+ job_icon = "medicaldoctor"
+ jobtype = /datum/job/doctor
+
+ l_hand = /obj/item/storage/firstaid/medical
+ suit_store = /obj/item/flashlight/pen
+
+ backpack = /obj/item/storage/backpack/medic
+ satchel = /obj/item/storage/backpack/satchel/med
+ duffelbag = /obj/item/storage/backpack/duffelbag/med
+ courierbag = /obj/item/storage/backpack/messenger/med
+ box = /obj/item/storage/box/survival/medical
+
+ chameleon_extras = /obj/item/gun/syringe
+
+ uniform = /obj/item/clothing/under/rank/security/officer/minutemen
+ accessory = /obj/item/clothing/accessory/armband/medblue
+ shoes = /obj/item/clothing/shoes/sneakers/white
+ head = /obj/item/clothing/head/beret/med
+ suit = null
+ suit_store = null
+
+///paramedic
+/datum/outfit/job/minutemen/paramedic
+ name = "Minutemen - BARD Combat Medic"
+ job_icon = "paramedic"
+ jobtype = /datum/job/paramedic
+
+
+ uniform = /obj/item/clothing/under/rank/medical/paramedic/emt
+ head = /obj/item/clothing/head/soft/paramedic
+ suit = /obj/item/clothing/suit/armor/vest
+ shoes = /obj/item/clothing/shoes/sneakers/blue
+ gloves = /obj/item/clothing/gloves/color/latex/nitrile
+ belt = /obj/item/storage/belt/medical/paramedic
+ suit_store = /obj/item/flashlight/pen
+ backpack_contents = list(/obj/item/roller=1)
+
+ backpack = /obj/item/storage/backpack/medic
+ satchel = /obj/item/storage/backpack/satchel/med
+ duffelbag = /obj/item/storage/backpack/duffelbag/med
+ courierbag = /obj/item/storage/backpack/messenger/para
+
+ box = /obj/item/storage/box/survival/medical
+
+///roboticist
+/datum/outfit/job/minutemen/roboticist
+ name = "Minutemen - Mech Technician"
+ job_icon = "roboticist"
+ jobtype = /datum/job/roboticist
+
+ belt = /obj/item/storage/belt/utility/full
+
+ backpack = /obj/item/storage/backpack/science
+ satchel = /obj/item/storage/backpack/satchel/tox
+ courierbag = /obj/item/storage/backpack/messenger/tox
+
+
+ uniform = /obj/item/clothing/under/rank/security/officer/minutemen
+ shoes = /obj/item/clothing/shoes/combat
+ ears = /obj/item/radio/headset/minutemen
+ suit = /obj/item/clothing/suit/toggle/labcoat/science
+ alt_suit = /obj/item/clothing/suit/toggle/suspenders/gray
+
+///scientist
+/datum/outfit/job/minutemen/scientist
+ name = "Minutemen - Scientist"
+ job_icon = "scientist"
+ jobtype = /datum/job/scientist
+
+ uniform = /obj/item/clothing/under/rank/security/officer/minutemen
+ backpack = /obj/item/storage/backpack/security/cmm
+
+ shoes = /obj/item/clothing/shoes/sneakers/white
+ suit = /obj/item/clothing/suit/toggle/labcoat/science
+ alt_suit = /obj/item/clothing/suit/toggle/suspenders/blue
+
+ backpack = /obj/item/storage/backpack/science
+ satchel = /obj/item/storage/backpack/satchel/tox
+ courierbag = /obj/item/storage/backpack/messenger/tox
+
+//security officers
+
+/datum/outfit/job/minutemen/security
+ name = "Minutemen - Minuteman"
+ job_icon = "securityofficer"
+ jobtype = /datum/job/officer
+
+ head = /obj/item/clothing/head/helmet/bulletproof/minutemen
+ mask = /obj/item/clothing/mask/gas/sechailer/minutemen
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof
+ alt_suit = null
+ uniform = /obj/item/clothing/under/rank/security/officer/minutemen
+ alt_uniform = null
+ shoes = /obj/item/clothing/shoes/combat
+ gloves = /obj/item/clothing/gloves/combat
+ ears = /obj/item/radio/headset/alt
+
+ belt = /obj/item/storage/belt/military/minutemen
+
+ l_pocket = /obj/item/flashlight/seclite
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/double
+ box = /obj/item/storage/box/survival/engineer/radio
+ backpack_contents = null
+
+/datum/outfit/job/minutemen/security/armed
+ name = "Minutemen - Minuteman (Armed)"
+
+ suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
+ belt = /obj/item/storage/belt/military/minutemen/p16
+
+/datum/outfit/job/minutemen/security/mech_pilot
+ name = "Minutemen - Mech Pilot"
+
+ suit = /obj/item/clothing/suit/armor/vest/alt
+ gloves = /obj/item/clothing/gloves/tackler/combat/insulated
+ glasses = /obj/item/clothing/glasses/hud/diagnostic
+
+///miners
+
+/datum/outfit/job/minutemen/miner
+ name = "Minutemen - Industrial Miner"
+ job_icon = "shaftminer"
+ jobtype = /datum/job/mining
+
+ l_pocket = /obj/item/reagent_containers/hypospray/medipen/survival
+ uniform = /obj/item/clothing/under/rank/cargo/miner/hazard
+ alt_uniform = null
+ alt_suit = /obj/item/clothing/suit/toggle/hazard
+
+ gloves = /obj/item/clothing/gloves/color/black
+ shoes = /obj/item/clothing/shoes/combat
+ backpack_contents = list(
+ /obj/item/flashlight/seclite=1,
+ /obj/item/stack/marker_beacon/ten=1,
+ /obj/item/weldingtool=1
+ )
+
+///engineers
+
+/datum/outfit/job/minutemen/engineer
+ name = "Minutemen - Mechanic"
+ job_icon = "stationengineer"
+ jobtype = /datum/job/engineer
+
+ belt = /obj/item/storage/belt/utility/full/engi
+ shoes = /obj/item/clothing/shoes/workboots
+ r_pocket = /obj/item/t_scanner
+
+ backpack = /obj/item/storage/backpack/industrial
+ satchel = /obj/item/storage/backpack/satchel/eng
+ duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+ courierbag = /obj/item/storage/backpack/messenger/engi
+
+ uniform = /obj/item/clothing/under/rank/security/officer/minutemen
+ accessory = /obj/item/clothing/accessory/armband/engine
+ head = /obj/item/clothing/head/hardhat/dblue
+ suit = /obj/item/clothing/suit/hazardvest
+
+ box = /obj/item/storage/box/survival/engineer
+ backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
+
+
+///warden
+
+/datum/outfit/job/minutemen/warden
+ name = "Minutemen - Field Commander"
+ job_icon = "warden"
+ jobtype = /datum/job/warden
+
+ glasses = /obj/item/clothing/glasses/sunglasses
+ ears = /obj/item/radio/headset/minutemen/alt
+ uniform = /obj/item/clothing/under/rank/security/officer/minutemen
+ accessory = /obj/item/clothing/accessory/armband
+ head = /obj/item/clothing/head/cowboy/sec/minutemen
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof
+ belt = /obj/item/storage/belt/military/minutemen
+ shoes = /obj/item/clothing/shoes/combat
+
+ l_pocket = /obj/item/flashlight/seclite
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/double
+
+ box = /obj/item/storage/box/survival/engineer/radio
+ backpack = /obj/item/storage/backpack
+ backpack_contents = null
+
+/datum/outfit/job/minutemen/warden/armed
+ name = "Minutemen - Field Commander (Armed)"
+
+ suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
+ 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/clothing/outfits/factions/nanotrasen.dm b/code/modules/clothing/outfits/factions/nanotrasen.dm
new file mode 100644
index 000000000000..28ff486e4dc6
--- /dev/null
+++ b/code/modules/clothing/outfits/factions/nanotrasen.dm
@@ -0,0 +1,547 @@
+/datum/outfit/job/nanotrasen
+ name = "Nanotrasen - Base Outfit"
+ faction_icon = "bg_nanotrasen"
+
+ box = /obj/item/storage/box/survival
+ id = /obj/item/card/id
+
+
+/datum/outfit/job/nanotrasen/post_equip(mob/living/carbon/human/H, visualsOnly)
+ . = ..()
+ if(visualsOnly)
+ return
+ H.faction |= list(FACTION_PLAYER_NANOTRASEN)
+
+// Assistant
+
+/datum/outfit/job/nanotrasen/assistant
+ name = "Nanotrasen - Assistant"
+ jobtype = /datum/job/assistant
+ job_icon = "assistant"
+
+ uniform = /obj/item/clothing/under/color/grey
+ shoes = /obj/item/clothing/shoes/sneakers/black
+ belt = /obj/item/pda
+
+// Captain
+
+/datum/outfit/job/nanotrasen/captain
+ name = "Nanotrasen - Captain"
+ job_icon = "captain"
+ jobtype = /datum/job/captain
+
+ id = /obj/item/card/id/gold
+ belt = /obj/item/pda/captain
+ gloves = /obj/item/clothing/gloves/color/captain/nt
+ ears = /obj/item/radio/headset/nanotrasen/captain
+ uniform = /obj/item/clothing/under/rank/command/captain/nt
+ alt_uniform = /obj/item/clothing/under/rank/command/captain/parade
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain
+ shoes = /obj/item/clothing/shoes/laceup
+ head = /obj/item/clothing/head/caphat/nt
+ backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
+
+ backpack = /obj/item/storage/backpack/captain
+ satchel = /obj/item/storage/backpack/satchel/cap
+ duffelbag = /obj/item/storage/backpack/duffelbag/captain
+ courierbag = /obj/item/storage/backpack/messenger/com
+
+ accessory = /obj/item/clothing/accessory/medal/gold/captain
+
+ chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/captain)
+
+/datum/outfit/job/nanotrasen/captain/lp
+ name = "Nanotrasen - Loss Prevention Lieutenant"
+
+ implants = list(/obj/item/implant/mindshield)
+ ears = /obj/item/radio/headset/nanotrasen/alt/captain
+ id = /obj/item/card/id/lplieu
+ belt = /obj/item/pda/captain
+ gloves = /obj/item/clothing/gloves/color/black
+ uniform = /obj/item/clothing/under/rank/security/head_of_security/alt/lp
+ alt_uniform = /obj/item/clothing/under/rank/security/head_of_security/alt/skirt/lp
+ dcoat = /obj/item/clothing/suit/jacket
+ shoes = /obj/item/clothing/shoes/jackboots
+ head = /obj/item/clothing/head/beret/command
+
+ satchel = /obj/item/storage/backpack/satchel/cap
+ duffelbag = /obj/item/storage/backpack/duffelbag/captain
+ courierbag = /obj/item/storage/backpack/messenger/com
+
+/datum/outfit/job/nanotrasen/captain/centcom
+ name = "Nanotrasen - Captain (Central Command)"
+
+ uniform = /obj/item/clothing/under/rank/centcom/officer
+ gloves = /obj/item/clothing/gloves/combat
+ head = /obj/item/clothing/head/centhat
+
+// Head of Personnel
+
+/datum/outfit/job/nanotrasen/hop
+ name = "Nanotrasen - Head of Personnel"
+ job_icon = "headofpersonnel"
+ jobtype = /datum/job/head_of_personnel
+
+ belt = /obj/item/pda/heads/head_of_personnel
+ id = /obj/item/card/id/silver
+ ears = /obj/item/radio/headset/headset_com
+ uniform = /obj/item/clothing/under/rank/command/head_of_personnel/nt
+ alt_suit = /obj/item/clothing/suit/ianshirt
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain
+ shoes = /obj/item/clothing/shoes/laceup
+ head = /obj/item/clothing/head/hopcap/nt
+ backpack_contents = list(/obj/item/storage/box/ids=1,\
+ /obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
+
+ backpack = /obj/item/storage/backpack/captain
+ satchel = /obj/item/storage/backpack/satchel/cap
+ duffelbag = /obj/item/storage/backpack/duffelbag/captain
+ courierbag = /obj/item/storage/backpack/messenger/com
+
+ chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/head_of_personnel)
+
+// Head of Security
+
+/datum/outfit/job/nanotrasen/hos
+ name = "Nanotrasen - Head of Security"
+ job_icon = "headofsecurity"
+ jobtype = /datum/job/hos
+
+ id = /obj/item/card/id/silver
+ belt = /obj/item/pda/heads/hos
+ ears = /obj/item/radio/headset/nanotrasen/alt
+ uniform = /obj/item/clothing/under/rank/security/head_of_security/nt
+ alt_uniform = null
+ shoes = /obj/item/clothing/shoes/jackboots
+ suit = /obj/item/clothing/suit/armor/hos/trenchcoat
+ alt_suit = /obj/item/clothing/suit/armor/vest/security/hos
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/security
+ gloves = /obj/item/clothing/gloves/color/black
+ head = /obj/item/clothing/head/beret/sec/hos
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ suit_store = null
+ r_pocket = /obj/item/assembly/flash/handheld
+ l_pocket = /obj/item/restraints/handcuffs
+ backpack_contents = list(/obj/item/melee/classic_baton=1)
+
+ backpack = /obj/item/storage/backpack/security
+ satchel = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/duffelbag/sec
+ courierbag = /obj/item/storage/backpack/messenger/sec
+ box = /obj/item/storage/box/survival/security
+
+ implants = list(/obj/item/implant/mindshield)
+
+ chameleon_extras = list(/obj/item/gun/energy/e_gun/hos, /obj/item/stamp/hos)
+
+// Roboticist
+
+/datum/outfit/job/nanotrasen/roboticist
+ name = "Nanotrasen - Mech Technician"
+ job_icon = "roboticist"
+ jobtype = /datum/job/roboticist
+
+ uniform = /obj/item/clothing/under/rank/rnd/roboticist
+ suit = /obj/item/clothing/suit/longcoat/robowhite
+ ears = /obj/item/radio/headset/nanotrasen
+ glasses = /obj/item/clothing/glasses/welding
+
+ backpack_contents = list(/obj/item/weldingtool/hugetank)
+
+// Pilot. idk
+
+/datum/outfit/job/nanotrasen/pilot
+ name = "Nanotrasen - Pilot"
+
+ uniform = /obj/item/clothing/under/rank/security/officer/military
+ suit = /obj/item/clothing/suit/jacket/leather/duster
+ glasses = /obj/item/clothing/glasses/hud/spacecop
+ accessory = /obj/item/clothing/accessory/holster
+ head = /obj/item/clothing/head/beret/command
+
+// Lawyer
+
+/datum/outfit/job/nanotrasen/lawyer
+ name = "Nanotrasen - Lawyer"
+ job_icon = "lawyer"
+ jobtype = /datum/job/lawyer
+
+ ears = /obj/item/radio/headset/headset_srvsec
+ uniform = /obj/item/clothing/under/suit/navy
+ suit = /obj/item/clothing/suit/toggle/lawyer/navy
+ shoes = /obj/item/clothing/shoes/laceup
+ l_hand = /obj/item/storage/briefcase/lawyer
+ l_pocket = /obj/item/laser_pointer
+ r_pocket = /obj/item/clothing/accessory/lawyers_badge
+
+ chameleon_extras = /obj/item/stamp/law
+
+/datum/outfit/job/nanotrasen/lawyer/corporaterepresentative
+ name = "Nanotrasen - Lawyer (Corporate Representative)"
+ job_icon = "nanotrasen"
+
+
+ uniform = /obj/item/clothing/under/rank/command/head_of_personnel/suit
+ suit = null
+ ears = /obj/item/radio/headset/headset_cent
+ l_hand = /obj/item/clipboard
+ r_pocket = /obj/item/pen/fountain
+
+// Security Officer
+
+/datum/outfit/job/nanotrasen/security
+ name = "Nanotrasen - Security Officer"
+ jobtype = /datum/job/officer
+ job_icon = "securityofficer"
+
+ ears = /obj/item/radio/headset/alt
+ uniform = /obj/item/clothing/under/rank/security/officer/nt
+ gloves = /obj/item/clothing/gloves/color/black
+ head = /obj/item/clothing/head/helmet/sec
+ suit = /obj/item/clothing/suit/armor/vest
+ alt_suit = /obj/item/clothing/suit/armor/vest/security/officer
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/security
+ shoes = /obj/item/clothing/shoes/jackboots
+ l_pocket = /obj/item/restraints/handcuffs
+ r_pocket = /obj/item/assembly/flash/handheld
+ backpack_contents = null
+
+ backpack = /obj/item/storage/backpack/security
+ satchel = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/duffelbag/sec
+ courierbag = /obj/item/storage/backpack/messenger/sec
+ box = /obj/item/storage/box/survival/security
+
+ chameleon_extras = list(/obj/item/gun/energy/disabler, /obj/item/clothing/glasses/hud/security/sunglasses, /obj/item/clothing/head/helmet)
+ //The helmet is necessary because /obj/item/clothing/head/helmet/sec is overwritten in the chameleon list by the standard helmet, which has the same name and icon state
+
+/datum/outfit/job/nanotrasen/security/ert
+ name = "Nanotrasen - ERT Officer"
+
+ uniform = /obj/item/clothing/under/rank/security/officer/camo
+ head = null
+ backpack = /obj/item/storage/backpack/ert/security
+ belt = /obj/item/storage/belt/military
+ id = /obj/item/card/id/ert/security
+ r_pocket = /obj/item/kitchen/knife/combat/survival
+ backpack_contents = list(/obj/item/radio, /obj/item/flashlight/seclite)
+
+/datum/outfit/job/nanotrasen/security/ert/engi
+ name = "Nanotrasen - ERT Engineering Officer"
+
+ uniform = /obj/item/clothing/under/rank/security/officer/camo
+ head = null
+ backpack = /obj/item/storage/backpack/ert/engineer
+ belt = /obj/item/storage/belt/utility/full/ert
+ id = /obj/item/card/id/ert/security
+ r_pocket = /obj/item/kitchen/knife/combat/survival
+ backpack_contents = list(/obj/item/radio, /obj/item/flashlight/seclite)
+ accessory = /obj/item/clothing/accessory/armband/engine
+ glasses = /obj/item/clothing/glasses/hud/diagnostic/sunglasses
+
+/datum/outfit/job/nanotrasen/security/ert/med
+ name = "Nanotrasen - ERT Medical Officer"
+
+ uniform = /obj/item/clothing/under/rank/security/officer/camo
+ head = /obj/item/clothing/head/beret/med
+ backpack = /obj/item/storage/backpack/ert/medical
+ belt = /obj/item/storage/belt/medical/webbing/paramedic
+ id = /obj/item/card/id/ert/security
+ r_pocket = /obj/item/kitchen/knife/combat/survival
+ backpack_contents = list(/obj/item/radio, /obj/item/flashlight/seclite)
+ accessory = /obj/item/clothing/accessory/armband/med
+ glasses = /obj/item/clothing/glasses/hud/health/night
+
+/datum/outfit/job/nanotrasen/security/mech_pilot
+ name = "Nanotrasen - Mech Pilot"
+
+ uniform = /obj/item/clothing/under/rank/security/officer/military/eng
+ head = /obj/item/clothing/head/beret/sec/officer
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof
+ backpack_contents = list(/obj/item/radio, /obj/item/flashlight/seclite)
+
+/datum/outfit/job/nanotrasen/security/lp
+ name = "Nanotrasen - LP Security Specialist"
+
+ implants = list(/obj/item/implant/mindshield)
+ ears = /obj/item/radio/headset/nanotrasen/alt/captain
+ id = /obj/item/card/id/lpsec
+ belt = /obj/item/pda/security
+ gloves = /obj/item/clothing/gloves/color/black
+ uniform = /obj/item/clothing/under/rank/security/head_of_security/nt/lp
+ alt_uniform = /obj/item/clothing/under/rank/security/head_of_security/nt/skirt/lp
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/security
+ shoes = /obj/item/clothing/shoes/jackboots
+ head = /obj/item/clothing/head/beret/sec
+
+ satchel = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/duffelbag/sec
+ courierbag = /obj/item/storage/backpack/messenger/sec
+
+// Engineer
+
+/datum/outfit/job/nanotrasen/engineer
+ name = "Nanotrasen - Engineer"
+ job_icon = "stationengineer"
+ jobtype = /datum/job/engineer
+
+ belt = /obj/item/storage/belt/utility/full/engi
+ l_pocket = /obj/item/pda/engineering
+ ears = /obj/item/radio/headset/headset_eng
+ uniform = /obj/item/clothing/under/rank/engineering/engineer/nt
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering
+ shoes = /obj/item/clothing/shoes/workboots
+ head = /obj/item/clothing/head/hardhat
+ r_pocket = /obj/item/t_scanner
+
+ backpack = /obj/item/storage/backpack/industrial
+ satchel = /obj/item/storage/backpack/satchel/eng
+ duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+ courierbag = /obj/item/storage/backpack/messenger/engi
+
+ box = /obj/item/storage/box/survival/engineer
+ backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
+
+/datum/outfit/job/nanotrasen/engineer/lp
+ name = "Nanotrasen - LP Engineering Specialist"
+
+ implants = list(/obj/item/implant/mindshield)
+ ears = /obj/item/radio/headset/nanotrasen/alt/captain
+ id = /obj/item/card/id/lpengie
+ gloves = /obj/item/clothing/gloves/color/yellow
+ uniform = /obj/item/clothing/under/rank/engineering/engineer/nt/lp
+ alt_uniform = /obj/item/clothing/under/rank/engineering/engineer/nt/skirt/lp
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering
+ shoes = /obj/item/clothing/shoes/jackboots
+ head = /obj/item/clothing/head/beret/eng
+
+ satchel = /obj/item/storage/backpack/satchel/eng
+ duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+ courierbag = /obj/item/storage/backpack/messenger/engi
+
+// Warden
+
+/datum/outfit/job/nanotrasen/warden
+ name = "Nanotrasen - Warden"
+ job_icon = "warden"
+ jobtype = /datum/job/warden
+
+ ears = /obj/item/radio/headset/headset_sec/alt
+ uniform = /obj/item/clothing/under/rank/security/warden/nt
+ shoes = /obj/item/clothing/shoes/jackboots
+ suit = /obj/item/clothing/suit/armor/vest/security/warden/alt/nt
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/security
+ gloves = /obj/item/clothing/gloves/color/black
+ head = /obj/item/clothing/head/warden/red
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ r_pocket = /obj/item/assembly/flash/handheld
+ l_pocket = /obj/item/restraints/handcuffs
+ suit_store = null
+ backpack_contents = list(/obj/item/melee/classic_baton)
+
+ backpack = /obj/item/storage/backpack/security
+ satchel = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/duffelbag/sec
+ courierbag = /obj/item/storage/backpack/messenger/sec
+ box = /obj/item/storage/box/survival/security
+
+ chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/combat/compact
+
+// Chief Engineer
+
+/datum/outfit/job/nanotrasen/ce
+ name = "Nanotrasen - Chief Engineer"
+ jobtype = /datum/job/chief_engineer
+ job_icon = "chiefengineer"
+
+ id = /obj/item/card/id/silver
+ belt = /obj/item/storage/belt/utility/chief/full
+ l_pocket = /obj/item/storage/wallet
+ ears = /obj/item/radio/headset/headset_com
+ uniform = /obj/item/clothing/under/rank/engineering/chief_engineer
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering
+ shoes = /obj/item/clothing/shoes/sneakers/brown
+ head = /obj/item/clothing/head/hardhat/white
+ gloves = /obj/item/clothing/gloves/color/black
+ backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced=1)
+
+ backpack = /obj/item/storage/backpack/industrial
+ satchel = /obj/item/storage/backpack/satchel/eng
+ duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+ courierbag = /obj/item/storage/backpack/messenger/engi
+
+ box = /obj/item/storage/box/survival/engineer
+ chameleon_extras = /obj/item/stamp/ce
+
+// Medical Doctor
+
+/datum/outfit/job/nanotrasen/doctor
+ name = "Nanotrasen - Medical Doctor"
+ job_icon = "medicaldoctor"
+ jobtype = /datum/job/doctor
+
+ belt = /obj/item/pda/medical
+ ears = /obj/item/radio/headset/headset_med
+ uniform = /obj/item/clothing/under/rank/medical/doctor
+ shoes = /obj/item/clothing/shoes/sneakers/white
+ suit = /obj/item/clothing/suit/toggle/labcoat
+ alt_suit = /obj/item/clothing/suit/apron/surgical
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical
+
+ backpack = /obj/item/storage/backpack/medic
+ satchel = /obj/item/storage/backpack/satchel/med
+ duffelbag = /obj/item/storage/backpack/duffelbag/med
+ courierbag = /obj/item/storage/backpack/messenger/med
+ box = /obj/item/storage/box/survival/medical
+
+/datum/outfit/job/nanotrasen/doctor/lp
+ name = "Nanotrasen - LP Medical Specialist"
+
+ implants = list(/obj/item/implant/mindshield)
+ ears = /obj/item/radio/headset/nanotrasen/alt/captain
+ id = /obj/item/card/id/lpmed
+ belt = /obj/item/pda/medical
+ gloves = /obj/item/clothing/gloves/color/latex/nitrile
+ uniform = /obj/item/clothing/under/rank/medical/paramedic/lp
+ alt_uniform = /obj/item/clothing/under/rank/medical/paramedic/skirt/lp
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical
+ shoes = /obj/item/clothing/shoes/sneakers/white
+ head = /obj/item/clothing/head/beret/med
+
+ satchel = /obj/item/storage/backpack/satchel/med
+ duffelbag = /obj/item/storage/backpack/duffelbag/med
+ courierbag = /obj/item/storage/backpack/messenger/med
+ box = /obj/item/storage/box/survival/medical
+
+// Cargo Tech
+
+/datum/outfit/job/nanotrasen/cargo_tech
+ name = "Nanotrasen - Cargo Tech"
+ jobtype = /datum/job/cargo_tech
+ job_icon = "cargotechnician"
+
+ belt = /obj/item/pda/cargo
+ ears = /obj/item/radio/headset/headset_cargo
+ uniform = /obj/item/clothing/under/rank/cargo/tech
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo
+ backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1)
+
+// Atmos Tech
+
+/datum/outfit/job/nanotrasen/atmos
+ name = "Nanotrasen - Atmos Tech"
+ jobtype = /datum/job/atmos
+ job_icon = "atmospherictechnician"
+
+ belt = /obj/item/storage/belt/utility/atmostech
+ ears = /obj/item/radio/headset/headset_eng
+ uniform = /obj/item/clothing/under/rank/engineering/atmospheric_technician
+ alt_suit = /obj/item/clothing/suit/hazardvest
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering
+
+ backpack = /obj/item/storage/backpack/industrial
+ satchel = /obj/item/storage/backpack/satchel/eng
+ duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+ courierbag = /obj/item/storage/backpack/messenger/engi
+ box = /obj/item/storage/box/survival/engineer
+ backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
+
+// Scientist
+
+/datum/outfit/job/nanotrasen/scientist
+ name = "Nanotrasen - Scientist"
+ jobtype = /datum/job/scientist
+ job_icon = "scientist"
+
+ ears = /obj/item/radio/headset/headset_sci
+ uniform = /obj/item/clothing/under/rank/rnd/scientist
+ shoes = /obj/item/clothing/shoes/sneakers/white
+ suit = /obj/item/clothing/suit/toggle/labcoat/science
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/science
+
+ backpack = /obj/item/storage/backpack/science
+ satchel = /obj/item/storage/backpack/satchel/tox
+ courierbag = /obj/item/storage/backpack/messenger/tox
+
+// Brig Physician
+
+/datum/outfit/job/nanotrasen/brig_phys
+ name = "Nanotrasen - Brig Physician"
+ jobtype = /datum/job/brig_phys
+ job_icon = "brigphysician"
+
+ ears = /obj/item/radio/headset/headset_medsec/alt
+ uniform = /obj/item/clothing/under/rank/security/brig_phys/nt
+ shoes = /obj/item/clothing/shoes/jackboots
+ glasses = /obj/item/clothing/glasses/hud/health/sunglasses
+ suit = /obj/item/clothing/suit/toggle/labcoat/brig_phys
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/security
+ head = /obj/item/clothing/head/soft/sec/brig_phys
+ implants = list(/obj/item/implant/mindshield)
+
+// Paramedic
+
+/datum/outfit/job/nanotrasen/paramedic
+ name = "Nanotrasen - Paramedic"
+ jobtype = /datum/job/paramedic
+ job_icon = "paramedic"
+
+ ears = /obj/item/radio/headset/headset_med
+ uniform = /obj/item/clothing/under/rank/medical/paramedic
+ head = /obj/item/clothing/head/soft/paramedic
+ shoes = /obj/item/clothing/shoes/sneakers/blue
+ suit = /obj/item/clothing/suit/toggle/labcoat/paramedic
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical/paramedic
+ gloves = /obj/item/clothing/gloves/color/latex/nitrile
+ id = /obj/item/card/id
+ backpack_contents = list(/obj/item/roller=1)
+
+ backpack = /obj/item/storage/backpack/medic
+ satchel = /obj/item/storage/backpack/satchel/med
+ duffelbag = /obj/item/storage/backpack/duffelbag/med
+ courierbag = /obj/item/storage/backpack/messenger/para
+ box = /obj/item/storage/box/survival/medical
+
+ chameleon_extras = /obj/item/gun/syringe
+
+// Quartermaster
+
+/datum/outfit/job/nanotrasen/quartermaster
+ name = "Nanotrasen - Quartermaster"
+ jobtype = /datum/job/qm
+ job_icon = "quartermaster"
+
+ ears = /obj/item/radio/headset/headset_cargo
+ uniform = /obj/item/clothing/under/rank/cargo/qm
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo
+ shoes = /obj/item/clothing/shoes/sneakers/brown
+ glasses = /obj/item/clothing/glasses/sunglasses
+ l_hand = /obj/item/clipboard
+ backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1)
+
+ chameleon_extras = /obj/item/stamp/qm
+
+/datum/outfit/job/nanotrasen/miner
+ name = "Nanotrasen - Miner"
+ jobtype = /datum/job/mining
+ job_icon = "shaftminer"
+
+ ears = /obj/item/radio/headset/headset_cargo/mining
+ shoes = /obj/item/clothing/shoes/workboots/mining
+ gloves = /obj/item/clothing/gloves/explorer
+ uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland
+ suit = /obj/item/clothing/suit/hazardvest
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/miner
+ r_pocket = /obj/item/storage/bag/ore
+ backpack_contents = list(
+ /obj/item/flashlight/seclite=1,\
+ /obj/item/kitchen/knife/combat/survival=1,\
+ /obj/item/stack/marker_beacon/ten=1,\
+ /obj/item/radio/weather_monitor=1)
+
+ backpack = /obj/item/storage/backpack/explorer
+ satchel = /obj/item/storage/backpack/satchel/explorer
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ box = /obj/item/storage/box/survival/mining
+
+ chameleon_extras = /obj/item/gun/energy/kinetic_accelerator
diff --git a/code/modules/clothing/outfits/factions/roumain.dm b/code/modules/clothing/outfits/factions/roumain.dm
new file mode 100644
index 000000000000..4cf4e56005e9
--- /dev/null
+++ b/code/modules/clothing/outfits/factions/roumain.dm
@@ -0,0 +1,92 @@
+/datum/outfit/job/roumain
+ name = "Saint-Roumain Militia - Base Outfit"
+
+ uniform = /obj/item/clothing/under/suit/roumain
+ id = /obj/item/card/id
+ faction_icon = "bg_srm"
+
+ box = null
+
+/datum/outfit/job/roumain/post_equip(mob/living/carbon/human/H, visualsOnly)
+ . = ..()
+ if(visualsOnly)
+ return
+ H.faction |= list(FACTION_PLAYER_ROUMAIN)
+
+// Assistant
+
+/datum/outfit/job/roumain/assistant
+ name = "Saint-Roumain Militia - Shadow"
+ jobtype = /datum/job/assistant
+ job_icon = "assistant"
+
+ uniform = /obj/item/clothing/under/suit/roumain
+ alt_uniform = null
+ shoes = /obj/item/clothing/shoes/workboots/mining
+ suit = /obj/item/clothing/suit/armor/roumain/shadow
+
+ head = /obj/item/clothing/head/cowboy/sec/roumain/shadow
+
+// Captain
+
+/datum/outfit/job/roumain/captain
+ name = "Saint-Roumain Militia - Hunter Montagne"
+ job_icon = "captain"
+ jobtype = /datum/job/captain
+
+ ears = /obj/item/radio/headset/headset_com
+ uniform = /obj/item/clothing/under/suit/roumain
+ shoes = /obj/item/clothing/shoes/workboots/mining
+ suit = /obj/item/clothing/suit/armor/hos/roumain/montagne
+ head = /obj/item/clothing/head/HoS/cowboy/montagne
+ id = /obj/item/card/id/silver
+
+ duffelbag = /obj/item/storage/backpack/cultpack
+ courierbag = /obj/item/storage/backpack/cultpack
+ backpack = /obj/item/storage/backpack/cultpack
+ satchel = /obj/item/storage/backpack/cultpack
+
+ backpack_contents = list(/obj/item/book/manual/srmlore=1,
+ /obj/item/stamp/chap = 1,
+ /obj/item/melee/classic_baton/telescopic=1,
+ )
+ chameleon_extras = null
+
+/datum/outfit/job/roumain/security
+ name = "Saint-Roumain Militia - Hunter"
+ jobtype = /datum/job/officer
+ job_icon = "securityofficer"
+
+ uniform = /obj/item/clothing/under/suit/roumain
+ alt_uniform = null
+ shoes = /obj/item/clothing/shoes/workboots/mining
+ suit = /obj/item/clothing/suit/armor/roumain
+ head = /obj/item/clothing/head/cowboy/sec/roumain
+ gloves = null
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
+
+ backpack_contents = null
+
+// Medical Doctor
+
+/datum/outfit/job/roumain/doctor
+ name = "Saint-Roumain Militia - Hunter Doctor"
+ job_icon = "medicaldoctor"
+ jobtype = /datum/job/doctor
+
+ uniform = /obj/item/clothing/under/suit/roumain
+ alt_uniform = null
+ shoes = /obj/item/clothing/shoes/workboots/mining
+ suit = /obj/item/clothing/suit/toggle/labcoat/roumain_med
+ head = /obj/item/clothing/head/cowboy/sec/roumain/med
+ mask = /obj/item/clothing/mask/gas/plaguedoctor
+ gloves = null
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
diff --git a/code/modules/clothing/outfits/solgov.dm b/code/modules/clothing/outfits/factions/solgov.dm
similarity index 89%
rename from code/modules/clothing/outfits/solgov.dm
rename to code/modules/clothing/outfits/factions/solgov.dm
index f6a4b03324de..33463c498581 100644
--- a/code/modules/clothing/outfits/solgov.dm
+++ b/code/modules/clothing/outfits/factions/solgov.dm
@@ -1,14 +1,18 @@
/datum/outfit/job/solgov
+ name = "SolGov Base Outfit"
+
+ faction_icon = "bg_solgov"
/datum/outfit/job/solgov/post_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
if(visualsOnly)
return
- H.faction |= list("playerSolgov")
+ H.faction |= list(FACTION_PLAYER_SOLGOV)
/datum/outfit/job/solgov/assistant
- name = "Scribe (SolGov)"
+ name = "SolGov - Scribe"
jobtype = /datum/job/assistant
+ job_icon = "scribe"
head = /obj/item/clothing/head/beret/solgov/plain
uniform = /obj/item/clothing/under/solgov/formal
@@ -16,14 +20,14 @@
suit = /obj/item/clothing/suit/solgov
/datum/outfit/job/solgov/bureaucrat
- name = "Bureaucrat (SolGov)"
+ name = "SolGov - Bureaucrat"
jobtype = /datum/job/curator
+ job_icon = "curator"
head = /obj/item/clothing/head/beret/solgov
uniform = /obj/item/clothing/under/solgov/formal
shoes = /obj/item/clothing/shoes/laceup
suit = /obj/item/clothing/suit/solgov/bureaucrat
- belt = /obj/item/pda/curator
l_hand = /obj/item/storage/bag/books
r_pocket = /obj/item/key/displaycase
l_pocket = /obj/item/laser_pointer
@@ -33,11 +37,11 @@
)
/datum/outfit/job/solgov/captain
- name = "Captain (SolGov)"
+ name = "SolGov - Captain"
jobtype = /datum/job/captain
+ job_icon = "solgovrepresentative" // idk
id = /obj/item/card/id/gold
- belt = /obj/item/pda/captain
gloves = /obj/item/clothing/gloves/combat
ears = /obj/item/radio/headset/solgov/alt/captain
uniform = /obj/item/clothing/under/solgov/formal/captain
@@ -56,8 +60,9 @@
chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/captain)
/datum/outfit/job/solgov/sonnensoldner
- name = "Sonnensöldner (SolGov)"
+ name = "SolGov - Sonnensöldner"
jobtype = /datum/job/officer
+ job_icon = "sonnensoldner"
id = /obj/item/card/id/solgov
uniform = /obj/item/clothing/under/solgov
@@ -73,9 +78,9 @@
backpack_contents = list(/obj/item/crowbar/power)
/datum/outfit/job/solgov/representative
- name = "Solarian Representative (SolGov)"
- job_icon = "solgovrepresentative"
+ name = "SolGov - Solarian Representative"
jobtype = /datum/job/solgov
+ job_icon = "solgovrepresentative"
id = /obj/item/card/id/solgov
head = /obj/item/clothing/head/solgov
@@ -89,7 +94,6 @@
shoes = /obj/item/clothing/shoes/laceup
ears = /obj/item/radio/headset/solgov/captain
glasses = /obj/item/clothing/glasses/sunglasses
- belt = /obj/item/pda/solgov
implants = list(/obj/item/implant/mindshield)
@@ -98,11 +102,11 @@
)
/datum/outfit/job/solgov/overseer
- name = "Overseer (SolGov)"
+ name = "SolGov - Overseer"
jobtype = /datum/job/head_of_personnel
+ job_icon = "headofpersonnel"
id = /obj/item/card/id/solgov
- belt = /obj/item/pda/heads/head_of_personnel
ears = /obj/item/radio/headset/solgov/captain
uniform = /obj/item/clothing/under/solgov/formal
head = /obj/item/clothing/head/solgov
@@ -116,10 +120,10 @@
chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/head_of_personnel)
/datum/outfit/job/solgov/doctor
- name = "Medical Doctor (SolGov)"
+ name = "SolGov - Medical Doctor"
jobtype = /datum/job/doctor
+ job_icon = "medicaldoctor"
- belt = /obj/item/pda/medical
ears = /obj/item/radio/headset/headset_med
uniform = /obj/item/clothing/under/solgov/formal
accessory = /obj/item/clothing/accessory/armband/medblue
@@ -135,10 +139,10 @@
box = /obj/item/storage/box/survival/medical
/datum/outfit/job/solgov/miner
- name = "Field Engineer (SolGov)"
+ name = "SolGov - Field Engineer"
jobtype = /datum/job/mining
+ job_icon = "shaftminer"
- belt = /obj/item/pda/shaftminer
ears = /obj/item/radio/headset/headset_cargo/mining
shoes = /obj/item/clothing/shoes/workboots/mining
gloves = /obj/item/clothing/gloves/explorer
@@ -159,8 +163,9 @@
box = /obj/item/storage/box/survival/mining
/datum/outfit/job/solgov/psychologist
- name = "Psychologist (SolGov)"
+ name = "SolGov - Psychologist"
jobtype = /datum/job/psychologist
+ job_icon = "psychologist"
head = /obj/item/clothing/head/fedora/solgov
suit = /obj/item/clothing/suit/solgov/suit
@@ -168,8 +173,6 @@
uniform = /obj/item/clothing/under/solgov/formal
shoes = /obj/item/clothing/shoes/laceup
id = /obj/item/card/id
- belt = /obj/item/pda/medical
- pda_slot = ITEM_SLOT_BELT
l_hand = /obj/item/clipboard
backpack = /obj/item/storage/backpack/medic
@@ -177,8 +180,9 @@
duffelbag = /obj/item/storage/backpack/duffelbag/med
/datum/outfit/job/solgov/patient
- name = "Attentive Care Patient (SolGov)"
+ name = "SolGov - Attentive Care Patient"
jobtype = /datum/job/prisoner
+ job_icon = "assistant" // todo: bug rye for patient icon
id = /obj/item/card/id/patient
uniform = /obj/item/clothing/under/rank/medical/gown
@@ -186,11 +190,11 @@
shoes = /obj/item/clothing/shoes/sandal/slippers
/datum/outfit/job/solgov/engineer
- name = "Ship Engineer (SolGov)"
+ name = "SolGov - Ship Engineer"
jobtype = /datum/job/engineer
+ job_icon = "stationengineer"
belt = /obj/item/storage/belt/utility/full/engi
- l_pocket = /obj/item/pda/engineering
ears = /obj/item/radio/headset/headset_eng
uniform = /obj/item/clothing/under/solgov/formal
accessory = /obj/item/clothing/accessory/armband/engine
@@ -205,15 +209,13 @@
courierbag = /obj/item/storage/backpack/messenger/engi
box = /obj/item/storage/box/survival/engineer
- pda_slot = ITEM_SLOT_LPOCKET
backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
/datum/outfit/job/solgov/quartermaster
- name = "Logistics Deck Officer (SolGov)"
- job_icon = "quartermaster"
+ name = "SolGov - Logistics Deck Officer"
jobtype = /datum/job/qm
+ job_icon = "quartermaster"
- belt = /obj/item/pda/quartermaster
ears = /obj/item/radio/headset/solgov/captain
uniform = /obj/item/clothing/under/solgov/formal
suit = /obj/item/clothing/suit/solgov/overcoat
diff --git a/code/modules/clothing/outfits/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm
similarity index 68%
rename from code/modules/clothing/outfits/syndicate.dm
rename to code/modules/clothing/outfits/factions/syndicate.dm
index fbe35ec5738a..bf78be44fc62 100644
--- a/code/modules/clothing/outfits/syndicate.dm
+++ b/code/modules/clothing/outfits/factions/syndicate.dm
@@ -1,12 +1,14 @@
//top outfit of everything syndicate. Don't change this.
/datum/outfit/job/syndicate
- name = "Syndicate (mostly) Empty"
+ name = "Syndicate - Base Outfit"
- uniform = /obj/item/clothing/under/syndicate
+ uniform = /obj/item/clothing/under/color/black
box = /obj/item/storage/box/survival/syndie
id = /obj/item/card/id/syndicate_command/crew_id
+ faction_icon = "bg_syndicate"
+
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel/sec
duffelbag = /obj/item/storage/backpack/duffelbag/syndie
@@ -28,8 +30,9 @@
//and now, for the Assistants
/datum/outfit/job/syndicate/assistant
- name = "Junior Agent (Assistant)"
+ name = "Syndicate - Junior Agent"
jobtype = /datum/job/assistant
+ job_icon = "assistant"
uniform = /obj/item/clothing/under/syndicate/intern
alt_uniform = null
@@ -41,7 +44,6 @@
id = /obj/item/card/id/syndicate_command/crew_id
r_pocket = /obj/item/radio
- belt = /obj/item/pda
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel/sec
@@ -51,13 +53,13 @@
box = /obj/item/storage/box/survival/syndie
/datum/outfit/job/syndicate/assistant/gorlex
- name = "Junior Agent (Gorlex Marauders)"
+ name = "Syndicate - Junior Agent (Gorlex Marauders)"
uniform = /obj/item/clothing/under/syndicate/gorlex
alt_uniform = /obj/item/clothing/under/syndicate
/datum/outfit/job/syndicate/assistant/gec
- name = "Deckhand (GEC)"
+ name = "Syndicate - Deckhand (GEC)"
uniform = /obj/item/clothing/under/syndicate
suit = /obj/item/clothing/suit/toggle/hazard
@@ -65,7 +67,7 @@
head = /obj/item/clothing/head/safety_helmet
/datum/outfit/job/syndicate/assistant/cybersun
- name = "Junior Agent (Cybersun)"
+ name = "Syndicate - Junior Agent (Cybersun)"
uniform = /obj/item/clothing/under/syndicate/cybersun
shoes = /obj/item/clothing/shoes/jackboots
@@ -73,7 +75,7 @@
head = /obj/item/clothing/head/soft/cybersun
/datum/outfit/job/syndicate/assistant/twink
- name = "Deck Assistant (Twinkleshine)"
+ name = "Syndicate - Deck Assistant (Twinkleshine)"
uniform = /obj/item/clothing/under/syndicate/intern
shoes = /obj/item/clothing/shoes/combat
@@ -98,12 +100,41 @@
assign_codename(H)
+/datum/outfit/job/syndicate/assistant/suns
+ name = "Syndicate - Freshman (SUNS)"
+
+ uniform = /obj/item/clothing/under/syndicate/suns
+ alt_uniform = /obj/item/clothing/under/syndicate/suns/alt
+ suit = /obj/item/clothing/suit/toggle/suns/alt
+ alt_suit = /obj/item/clothing/suit/toggle/suns
+ shoes = /obj/item/clothing/shoes/laceup/suns
+ gloves = null
+ ears = null
+ box = /obj/item/storage/box/survival
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
+
+/datum/outfit/job/syndicate/assistant/suns/halfway
+ name = "Syndicate - Junior (SUNS)"
+
+ uniform = /obj/item/clothing/under/syndicate/suns/uniform2
+ alt_uniform = /obj/item/clothing/under/syndicate/suns/uniform2/alt
+
+/datum/outfit/job/syndicate/assistant/suns/complete
+ name = "Syndicate - Graduate (SUNS)"
+
+ uniform = /obj/item/clothing/under/syndicate/suns/uniform3
+ alt_uniform = /obj/item/clothing/under/syndicate/suns/uniform3
+
//atmos techs
-//Shiptest
/datum/outfit/job/syndicate/atmos
- name = "Atmospheric Technician (Syndicate)"
+ name = "Syndicate - Atmospheric Technician"
jobtype = /datum/job/atmos
+ job_icon = "atmospherictechnician"
belt = /obj/item/storage/belt/utility/atmostech
@@ -113,7 +144,6 @@
dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering
r_pocket = /obj/item/analyzer
- l_pocket = /obj/item/pda/atmos
backpack = /obj/item/storage/backpack/industrial
satchel = /obj/item/storage/backpack/satchel/eng
@@ -126,7 +156,7 @@
backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
/datum/outfit/job/syndicate/atmos/gec
- name = "Atmospheric Technician (GEC)"
+ name = "Syndicate - Atmospheric Technician (GEC)"
uniform = /obj/item/clothing/under/syndicate/gec/atmos_tech
suit = /obj/item/clothing/suit/toggle/hazard
@@ -137,13 +167,13 @@
//bartenders
/datum/outfit/job/syndicate/bartender
- name = "Bartender (Syndicate)"
+ name = "Syndicate - Bartender"
jobtype = /datum/job/bartender
+ job_icon = "bartender"
id = /obj/item/card/id/syndicate_command/crew_id
head = /obj/item/clothing/head/HoS/beret/syndicate
glasses = /obj/item/clothing/glasses/sunglasses/reagent
- belt = /obj/item/pda/bar
uniform = /obj/item/clothing/under/rank/civilian/bartender
alt_uniform = /obj/item/clothing/under/rank/civilian/bartender/purple
alt_suit = /obj/item/clothing/suit/apron/purple_bartender
@@ -162,7 +192,7 @@
/datum/outfit/job/syndicate/bartender/twink
- name = "Bartender (Twinkleshine)"
+ name = "Syndicate - Bartender (Twinkleshine)"
uniform = /obj/item/clothing/under/syndicate/donk
shoes = /obj/item/clothing/shoes/laceup
@@ -186,37 +216,46 @@
//botanist
/datum/outfit/job/syndicate/botanist
- name = "Botanist (Syndicate)"
+ name = "Syndicate - Botanist"
jobtype = /datum/job/hydro
- belt = /obj/item/pda/botanist
+ job_icon = "botanist"
+
suit = /obj/item/clothing/suit/apron
alt_suit = /obj/item/clothing/suit/apron/overalls
gloves =/obj/item/clothing/gloves/botanic_leather
suit_store = /obj/item/plant_analyzer
/datum/outfit/job/syndicate/botanist/suns
- name = "Botanist-Chemist (SUNS)"
+ name = "Syndicate - Botanist-Chemist (SUNS)"
+ uniform = /obj/item/clothing/under/syndicate/suns/sciencejumpsuit
id = /obj/item/card/id/syndicate_command/crew_id
- shoes = /obj/item/clothing/shoes/jackboots
- glasses = /obj/item/clothing/glasses/science
- suit = /obj/item/clothing/suit/toggle/labcoat/chemist
+ shoes = /obj/item/clothing/shoes/sneakers/suns
+ glasses = /obj/item/clothing/glasses/science/suns
+ suit = /obj/item/clothing/suit/hooded/suns
suit_store = null
+ neck = /obj/item/clothing/neck/cloak/suns
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
-//Capitan (Captain)
+//Capitan
/datum/outfit/job/syndicate/captain
- name = "Captain (Syndicate)"
+ name = "Syndicate - Captain"
jobtype = /datum/job/captain
+ job_icon = "captain"
id = /obj/item/card/id/syndicate_command/captain_id
ears = /obj/item/radio/headset/syndicate/alt/captain
- uniform = /obj/item/clothing/under/syndicate/aclf
+ uniform = /obj/item/clothing/under/syndicate/officer
shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/HoS/syndicate
gloves = /obj/item/clothing/gloves/combat
suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
- backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/pda/captain)
+ backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel/sec
@@ -226,13 +265,12 @@
box = /obj/item/storage/box/survival/syndie
/datum/outfit/job/syndicate/captain/aclf
- name = "Captain (ACLF)"
-
+ name = "Syndicate - Captain (ACLF)"
/datum/outfit/job/syndicate/captain/twink
- name = "Captain (Twinkleshine)"
+ name = "Syndicate - Captain (Twinkleshine)"
- uniform = /obj/item/clothing/under/syndicate/aclf
+ uniform = /obj/item/clothing/under/syndicate/officer
gloves = /obj/item/clothing/gloves/combat
shoes = /obj/item/clothing/shoes/combat
ears = /obj/item/radio/headset/syndicate/alt/captain
@@ -246,85 +284,98 @@
implants = list(/obj/item/implant/weapons_auth)
-/datum/outfit/job/syndicate/captain/sbc/post_equip(mob/living/carbon/human/H)
+/datum/outfit/job/syndicate/captain/twink/post_equip(mob/living/carbon/human/H)
. = ..()
assign_codename(H)
/datum/outfit/job/syndicate/captain/gorlex
- name = "Captain (Gorlex Marauders)"
- uniform = /obj/item/clothing/under/syndicate/aclf
+ name = "Syndicate - Captain (Gorlex Marauders)"
+ uniform = /obj/item/clothing/under/syndicate/officer
- head = /obj/item/clothing/head/aclfcap
- suit = /obj/item/clothing/suit/aclf
+ head = /obj/item/clothing/head/gorlexcap
+ suit = /obj/item/clothing/suit/gorlex
/datum/outfit/job/syndicate/captain/cybersun
- name = "Captain (Cybersun)"
+ name = "Syndicate - Captain (Cybersun)"
uniform = /obj/item/clothing/under/syndicate/cybersun/officer
suit = /obj/item/clothing/suit/armor/vest/capcarapace/cybersun
head = /obj/item/clothing/head/HoS/cybersun
gloves = /obj/item/clothing/gloves/combat
+/datum/outfit/job/syndicate/captain/suns
+ name = "Syndicate - Captain (SUNS)"
+
+ uniform = /obj/item/clothing/under/syndicate/suns/captain
+ shoes = /obj/item/clothing/shoes/combat/suns
+ head = /obj/item/clothing/head/suns/captain
+ gloves = /obj/item/clothing/gloves/suns/captain
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/captain
+ mask = /obj/item/clothing/mask/breath/suns
+ neck = /obj/item/clothing/neck/cloak/suns/cap
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
//cargo tech
/datum/outfit/job/syndicate/cargo_tech
- name = "Cargo Tech (Syndicate)"
+ name = "Syndicate - Cargo Tech"
jobtype = /datum/job/cargo_tech
+ job_icon = "cargotechnician"
id = /obj/item/card/id/syndicate_command/crew_id
uniform = /obj/item/clothing/under/syndicate/donk
suit = /obj/item/clothing/suit/hazardvest/donk
- belt = /obj/item/pda/cargo
alt_suit = /obj/item/clothing/suit/hazardvest
l_hand = /obj/item/export_scanner
backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1)
/datum/outfit/job/syndicate/cargo_tech/donk
- name = "Customer Associate (Donk! Co)"
+ name = "Syndicate - Customer Associate (Donk)"
//chemist
/datum/outfit/job/syndicate/chemist
- name = "Chemist (Syndicate)"
+ name = "Syndicate - Chemist"
jobtype = /datum/job/chemist
+ job_icon = "chemist"
- uniform = /obj/item/clothing/under/syndicate/intern
+ uniform = /obj/item/clothing/under/syndicate
id = /obj/item/card/id/syndicate_command/crew_id
- l_pocket =/obj/item/pda/chemist
glasses = /obj/item/clothing/glasses/science
- belt = /obj/item/pda/chemist
shoes = /obj/item/clothing/shoes/sneakers/white
suit = /obj/item/clothing/suit/toggle/labcoat/chemist
box = /obj/item/storage/box/survival/medical
/datum/outfit/job/syndicate/chemist/gec
- name = "Chemist (GEC)"
+ name = "Syndicate - Chemist (GEC)"
uniform = /obj/item/clothing/under/syndicate/intern
suit = /obj/item/clothing/suit/toggle/hazard
head = /obj/item/clothing/head/hardhat
belt = /obj/item/storage/belt/utility/full/engi
id = /obj/item/card/id/syndicate_command/crew_id
- l_pocket =/obj/item/pda/chemist
//Chief Engineer
/datum/outfit/job/syndicate/ce
- name = "Chief Engineer (Syndicate)"
+ name = "Syndicate - Chief Engineer"
jobtype = /datum/job/chief_engineer
+ job_icon = "chiefengineer"
id = /obj/item/card/id/syndicate_command/crew_id
ears = /obj/item/radio/headset/syndicate/alt
glasses = /obj/item/clothing/glasses/sunglasses
belt = /obj/item/storage/belt/utility/chief/full
- l_pocket = /obj/item/pda/heads/ce
uniform = /obj/item/clothing/under/rank/engineering/chief_engineer
shoes = /obj/item/clothing/shoes/sneakers/brown
head = /obj/item/clothing/head/hardhat/white
@@ -341,7 +392,7 @@
/datum/outfit/job/syndicate/ce/gec
- name = "Chief Engineer (GEC)"
+ name = "Syndicate - Chief Engineer (GEC)"
uniform = /obj/item/clothing/under/syndicate/gec/chief_engineer
suit = /obj/item/clothing/suit/toggle/hazard
@@ -352,7 +403,7 @@
gloves = /obj/item/clothing/gloves/combat
/datum/outfit/job/syndicate/ce/gorlex
- name = "Foreman (Gorlex Marauders)"
+ name = "Syndicate - Foreman (Gorlex Marauders)"
ears = /obj/item/radio/headset/syndicate/alt
uniform = /obj/item/clothing/under/syndicate/gorlex
@@ -365,29 +416,48 @@
//Chief Medical Officer
/datum/outfit/job/syndicate/cmo
- name = "Chief Medical Officer (Syndicate)"
+ name = "Syndicate - Medical Director (Cybersun)"
jobtype = /datum/job/cmo
+ job_icon = "chiefmedicalofficer"
- uniform = /obj/item/clothing/under/syndicate
+ uniform = /obj/item/clothing/under/rank/medical/chief_medical_officer/cybersun
ears = /obj/item/radio/headset/syndicate/alt/captain
id = /obj/item/card/id/syndicate_command/captain_id
shoes = /obj/item/clothing/shoes/jackboots
- belt = /obj/item/pda/heads/cmo
l_pocket = /obj/item/pinpointer/crew
- shoes = /obj/item/clothing/shoes/sneakers/brown
- suit = /obj/item/clothing/suit/toggle/labcoat/cmo
+ head = /obj/item/clothing/head/beret/cmo/cybersun
+ suit = /obj/item/clothing/suit/toggle/labcoat/raincoat
l_hand = /obj/item/storage/firstaid/medical
suit_store = /obj/item/flashlight/pen
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
/datum/outfit/job/syndicate/cmo/suns
- name = "Medical Director (SUNS)"
+ name = "Syndicate - Medical Instructor (SUNS)"
+
+ uniform = /obj/item/clothing/under/syndicate/suns/doctorscrubs
+ ears = /obj/item/radio/headset/syndicate/alt/captain
+ id = /obj/item/card/id/syndicate_command/captain_id
+ shoes = /obj/item/clothing/shoes/combat/suns
+ l_pocket = /obj/item/pinpointer/crew
+ suit = /obj/item/clothing/suit/toggle/labcoat/suns/cmo
+ l_hand = /obj/item/storage/firstaid/medical
+ suit_store = /obj/item/flashlight/pen
+ backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
+ gloves = /obj/item/clothing/gloves/color/latex/nitrile/suns
+ glasses = /obj/item/clothing/glasses/hud/health/suns
+ head = /obj/item/clothing/head/suns/cmo
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
//"Head Of Personnel"
/datum/outfit/job/syndicate/head_of_personnel
- name = "Bridge Officer (Syndicate)"
+ name = "Syndicate - Bridge Officer"
jobtype = /datum/job/head_of_personnel
+ job_icon = "headofpersonnel"
ears = /obj/item/radio/headset/syndicate/alt
uniform = /obj/item/clothing/under/syndicate/aclfgrunt
@@ -397,12 +467,11 @@
id = /obj/item/card/id/syndicate_command/crew_id
r_pocket = /obj/item/kitchen/knife/combat/survival
glasses = /obj/item/clothing/glasses/hud/health
- belt = /obj/item/pda/heads/head_of_personnel
backpack_contents = list(/obj/item/storage/box/ids=1,\
/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
/datum/outfit/job/syndicate/head_of_personnel/cybersun
- name = "Intelligence Officer (Cybersun)"
+ name = "Syndicate - Intelligence Officer (Cybersun)"
ears = /obj/item/radio/headset/syndicate/alt
uniform = /obj/item/clothing/under/syndicate/cybersun/officer
@@ -414,18 +483,35 @@
r_pocket = /obj/item/kitchen/knife/combat/survival
glasses = /obj/item/clothing/glasses/sunglasses
+/datum/outfit/job/syndicate/head_of_personnel/suns
+ name = "Syndicate - Academic Staff (SUNS)"
+
+ uniform = /obj/item/clothing/under/syndicate/suns/xo
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/xo
+ shoes = /obj/item/clothing/shoes/combat/suns
+ head = /obj/item/clothing/head/suns
+ gloves = /obj/item/clothing/gloves/suns/xo
+ neck = /obj/item/clothing/neck/cloak/suns/xo
+ r_pocket = null
+ glasses = /obj/item/clothing/glasses/science/suns
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
+
//head of security
/datum/outfit/job/syndicate/hos
- name = "Head Of Security (Syndicate)"
+ name = "Syndicate - Head Of Security"
jobtype = /datum/job/hos
+ job_icon = "headofsecurity"
ears = /obj/item/radio/headset/syndicate/alt
uniform = /obj/item/clothing/under/syndicate/combat
head = /obj/item/clothing/head/HoS/syndicate
suit = /obj/item/clothing/suit/armor/vest/syndie
id = /obj/item/card/id/syndicate_command/crew_id
- belt = /obj/item/pda/heads/hos
shoes = /obj/item/clothing/shoes/jackboots
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
suit_store = /obj/item/gun/energy/e_gun
@@ -434,11 +520,12 @@
backpack_contents = list(/obj/item/melee/baton/loaded=1)
/datum/outfit/job/syndicate/hos/gorlex
- name = "Sergeant (Syndicate)"
+ name = "Syndicate - Sergeant (Gorlex)"
/datum/outfit/job/syndicate/hos/twink
- name = "Lieutenant (Twinkleshine)"
- uniform = /obj/item/clothing/under/syndicate/aclf
+ name = "Syndicate - Lieutenant (Twinkleshine)"
+
+ uniform = /obj/item/clothing/under/syndicate/officer
head = /obj/item/clothing/head/HoS/beret/syndicate
ears = /obj/item/radio/headset/syndicate/alt
mask = /obj/item/clothing/mask/chameleon
@@ -448,7 +535,7 @@
belt = /obj/item/storage/belt/military/assault
shoes = /obj/item/clothing/shoes/combat
suit = /obj/item/clothing/suit/armor/vest
- alt_suit = /obj/item/clothing/suit/aclf
+ alt_suit = /obj/item/clothing/suit/gorlex
id = /obj/item/card/id/syndicate_command/lieutenant
implants = list(/obj/item/implant/weapons_auth)
backpack_contents = list(/obj/item/melee/baton)
@@ -464,34 +551,65 @@
. = ..()
assign_codename(H)
+/datum/outfit/job/syndicate/hos/suns/
+ name = "Syndicate - Senior Peacekeeper (SUNS)"
+ uniform = /obj/item/clothing/under/syndicate/suns/pkuniform
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/hos
+ gloves = /obj/item/clothing/gloves/tackler/dolphin/suns
+ shoes = /obj/item/clothing/shoes/combat/suns
+ head = /obj/item/clothing/head/welding/suns/hos
+ glasses = /obj/item/clothing/glasses/hud/security/suns
+ suit_store = /obj/item/gun/ballistic/automatic/powered/gauss/modelh
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
+
+/datum/outfit/job/syndicate/hos/suns/alt
+ name = "Syndicate - Senior Peacekeeper Alt (SUNS)"
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/ehos
+ head = /obj/item/clothing/head/HoS/syndicate/suns
+
//medical doctors (assorted)
/datum/outfit/job/syndicate/doctor
- name = "Medical Doctor (Syndicate)"
+ name = "Syndicate - Medical Doctor"
jobtype = /datum/job/doctor
+ job_icon = "medicaldoctor"
uniform = /obj/item/clothing/under/syndicate
id = /obj/item/card/id/syndicate_command/crew_id
shoes = /obj/item/clothing/shoes/jackboots
- belt = /obj/item/pda/medical
shoes = /obj/item/clothing/shoes/sneakers/white
- suit = /obj/item/clothing/suit/toggle/labcoat
alt_suit = /obj/item/clothing/suit/apron/surgical
l_hand = /obj/item/storage/firstaid/medical
- suit_store = /obj/item/flashlight/pen
/datum/outfit/job/syndicate/doctor/suns
- name = "Medical Doctor (SUNS)"
+ name = "Syndicate - Medical Doctor (SUNS)"
+
+ uniform = /obj/item/clothing/under/syndicate/suns/doctorscrubs
+ shoes = /obj/item/clothing/shoes/sneakers/suns
+ suit = /obj/item/clothing/suit/toggle/labcoat/suns/doctorlabcoat
+ gloves = /obj/item/clothing/gloves/color/latex/nitrile/suns
+ head = /obj/item/clothing/head/suns/surgery
+ glasses = /obj/item/clothing/glasses/hud/health/suns
+ mask = /obj/item/clothing/mask/surgical/suns
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
/datum/outfit/job/syndicate/doctor/cybersun
- name = "Medical Doctor (Cybersun)"
+ name = "Syndicate - Medical Doctor (Cybersun)"
uniform = /obj/item/clothing/under/syndicate/medic
accessory = /obj/item/clothing/accessory/armband/medblue
shoes = /obj/item/clothing/shoes/jackboots
/datum/outfit/job/syndicate/doctor/gorlex
- name = "Medical Doctor (Gorlex)"
+ name = "Syndicate - Medical Doctor (Gorlex)"
uniform = /obj/item/clothing/under/syndicate/gorlex
glasses = /obj/item/clothing/glasses/hud/health/prescription
@@ -504,9 +622,9 @@
/datum/outfit/job/syndicate/paramedic
- name = "Paramedic (Syndicate)"
+ name = "Syndicate - Paramedic"
jobtype = /datum/job/paramedic
-
+ job_icon = "paramedic"
id = /obj/item/card/id/syndicate_command/crew_id
uniform = /obj/item/clothing/under/syndicate/gorlex
@@ -519,16 +637,15 @@
gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil
belt = /obj/item/storage/belt/medical/paramedic
id = /obj/item/card/id
- l_pocket = /obj/item/pda/medical
suit_store = /obj/item/flashlight/pen
backpack_contents = list(/obj/item/roller=1)
pda_slot = ITEM_SLOT_LPOCKET
/datum/outfit/job/syndicate/paramedic/gorlex
- name = "Paramedic (Gorlex)"
+ name = "Syndicate - Paramedic (Gorlex)"
/datum/outfit/job/syndicate/paramedic/cybersun
- name = "Field Medic (Cybersun Industries)"
+ name = "Syndicate - Field Medic (Cybersun Industries)"
uniform = /obj/item/clothing/under/syndicate/medic
head = /obj/item/clothing/head/soft/cybersun/medical
@@ -536,7 +653,7 @@
suit = /obj/item/clothing/suit/toggle/labcoat/raincoat
/datum/outfit/job/syndicate/paramedic/twink
- name = "Medic (Twinkleshine)"
+ name = "Syndicate - Medic (Twinkleshine)"
gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil
uniform = /obj/item/clothing/under/syndicate/medic
@@ -551,7 +668,6 @@
mask = /obj/item/clothing/mask/chameleon
id = /obj/item/card/id/syndicate_command/crew_id/med
implants = list(/obj/item/implant/weapons_auth)
- backpack_contents = list(/obj/item/pda/brig_phys)
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel/sec
@@ -567,8 +683,9 @@
//psychologist
/datum/outfit/job/syndicate/psychologist
- name = "Psychologist (Syndicate)"
+ name = "Syndicate - Psychologist"
jobtype = /datum/job/psychologist
+ job_icon = "psychologist"
id = /obj/item/card/id/syndicate_command/crew_id
uniform = /obj/item/clothing/under/rank/medical/psychiatrist
@@ -576,17 +693,29 @@
shoes = /obj/item/clothing/shoes/laceup
alt_uniform = null
l_hand = /obj/item/clipboard
- belt = /obj/item/pda/medical
pda_slot = ITEM_SLOT_BELT
/datum/outfit/job/syndicate/psychologist/suns
- name = "Ship Psychologist (SUNS)"
+ name = "Syndicate - Psychologist (SUNS)"
+
+ uniform = /obj/item/clothing/under/syndicate/suns/uniform3
+ alt_uniform = /obj/item/clothing/under/syndicate/suns/uniform3/alt
+ suit = /obj/item/clothing/suit/toggle/suns
+ alt_suit = /obj/item/clothing/suit/toggle/suns/alt
+ shoes = /obj/item/clothing/shoes/laceup/suns
+ accessory = /obj/item/clothing/accessory/waistcoat/suns/poof
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
//patient (prisoner)
/datum/outfit/job/syndicate/patient
- name = "Long Term Patient"
+ name = "Syndicate - Long Term Patient"
jobtype = /datum/job/prisoner
+ job_icon = "assistant"
id = /obj/item/card/id/patient
uniform = /obj/item/clothing/under/rank/medical/gown
@@ -596,8 +725,9 @@
//Quartermaster
/datum/outfit/job/syndicate/quartermaster
- name = "Quartermaster (Syndicate)"
+ name = "Syndicate - Quartermaster"
jobtype = /datum/job/qm
+ job_icon = "quartermaster"
id = /obj/item/card/id/syndicate_command/captain_id
@@ -606,13 +736,12 @@
suit = /obj/item/clothing/suit/hazardvest/donk/qm
ears = /obj/item/radio/headset/syndicate/alt
shoes = /obj/item/clothing/shoes/laceup
- belt = /obj/item/pda/quartermaster
glasses = /obj/item/clothing/glasses/sunglasses
l_hand = /obj/item/clipboard
backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1)
/datum/outfit/job/syndicate/quartermaster/donk
- name = "Manager (Donk! Co.)"
+ name = "Syndicate - Manager (Donk)"
id = /obj/item/card/id/syndicate_command/captain_id
ears = /obj/item/radio/headset/syndicate/alt
@@ -621,12 +750,36 @@
ears = /obj/item/radio/headset/syndicate/alt
shoes = /obj/item/clothing/shoes/laceup
+//scientists
+
+/datum/outfit/job/syndicate/science
+ name = "Syndicate - Scientist"
+ jobtype = /datum/job/scientist
+ job_icon = "scientist"
+
+ suit = /obj/item/clothing/suit/toggle/labcoat/science
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/science
+
+/datum/outfit/job/syndicate/science/suns
+ name = "Syndicate - Scientist (SUNS)"
+//more futureproofing than anything, the Aegis currently uses /datum/outfit/job/syndicate/botanist/suns for a similar role
+ uniform = /obj/item/clothing/under/syndicate/suns/sciencejumpsuit
+ suit = /obj/item/clothing/suit/hooded/suns
+ shoes = /obj/item/clothing/shoes/sneakers/suns
+ glasses = /obj/item/clothing/glasses/science/suns
+ neck = /obj/item/clothing/neck/cloak/suns
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
+
//security officers
/datum/outfit/job/syndicate/security
- name = "Operative (Syndicate)"
+ name = "Syndicate - Operative"
jobtype = /datum/job/officer
-
+ job_icon = "securityofficer"
uniform = /obj/item/clothing/under/syndicate
r_pocket = /obj/item/kitchen/knife/combat/survival
@@ -648,10 +801,10 @@
/datum/outfit/job/syndicate/security/gorlex
- name = "Assault Operative (Gorlex)"
+ name = "Syndicate - Assault Operative (Gorlex)"
/datum/outfit/job/syndicate/security/twink
- name = "Operative (Twinkleshine)"
+ name = "Syndicate - Operative (Twinkleshine)"
uniform = /obj/item/clothing/under/syndicate/combat
ears = /obj/item/radio/headset/syndicate/alt
mask = /obj/item/clothing/mask/chameleon
@@ -676,13 +829,29 @@
. = ..()
assign_codename(H)
+/datum/outfit/job/syndicate/security/suns
+ name = "Syndicate - Peacekeeper (SUNS)"
+ uniform = /obj/item/clothing/under/syndicate/suns/pkuniform
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns
+ alt_suit = /obj/item/clothing/suit/toggle/suns/pkcoat
+ belt = null
+ gloves = /obj/item/clothing/gloves/tackler/dolphin/suns
+ shoes = /obj/item/clothing/shoes/jackboots/suns/long
+ head = /obj/item/clothing/head/welding/suns
+ glasses = /obj/item/clothing/glasses/hud/security/suns
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
+
//Miners
/datum/outfit/job/syndicate/miner
- name = "Miner (Syndicate)"
+ name = "Syndicate - Miner"
jobtype = /datum/job/mining
+ job_icon = "shaftminer"
- belt = /obj/item/pda/shaftminer
ears = /obj/item/radio/headset/headset_cargo/mining
shoes = /obj/item/clothing/shoes/workboots/mining
gloves = /obj/item/clothing/gloves/explorer
@@ -696,14 +865,14 @@
/obj/item/stack/marker_beacon/ten=1)
/datum/outfit/job/syndicate/miner/gorlex
- name = "Wrecker (Gorlex Marauders)"
+ name = "Syndicate - Wrecker (Gorlex Marauders)"
uniform = /obj/item/clothing/under/syndicate/gorlex
shoes = /obj/item/clothing/shoes/workboots
ears = /obj/item/radio/headset/alt
/datum/outfit/job/syndicate/miner/twink
- name = "Miner (Twinkleshine)"
+ name = "Syndicate - Miner (Twinkleshine)"
uniform = /obj/item/clothing/under/syndicate/gorlex
shoes = /obj/item/clothing/shoes/workboots
@@ -728,7 +897,7 @@
assign_codename(H)
/datum/outfit/job/syndicate/miner/cybersun
- name = "Field Agent (Cybersun)"
+ name = "Syndicate - Field Agent (Cybersun)"
id = /obj/item/card/id/syndicate_command/crew_id
ears = /obj/item/radio/headset
@@ -738,7 +907,7 @@
r_pocket = /obj/item/radio
/datum/outfit/job/syndicate/miner/gec
- name = "Shaft Miner (GEC)"
+ name = "Syndicate - Shaft Miner (GEC)"
id = /obj/item/card/id/syndicate_command/crew_id
ears = /obj/item/radio/headset
@@ -754,8 +923,9 @@
//"station" engineers
/datum/outfit/job/syndicate/engineer
- name = "Ship Technician (Syndicate)"
+ name = "Syndicate - Ship Technician"
jobtype = /datum/job/engineer
+ job_icon = "stationengineer"
id = /obj/item/card/id/syndicate_command/crew_id
uniform = /obj/item/clothing/under/syndicate/aclfgrunt
@@ -764,7 +934,6 @@
shoes = /obj/item/clothing/shoes/jackboots
belt = /obj/item/storage/belt/utility/full/engi
- l_pocket = /obj/item/pda/engineering
head = /obj/item/clothing/head/hardhat/dblue
r_pocket = /obj/item/t_scanner
@@ -773,7 +942,7 @@
backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
/datum/outfit/job/syndicate/engineer/gec
- name = "Ship Engineer (GEC)"
+ name = "Syndicate - Ship Engineer (GEC)"
uniform = /obj/item/clothing/under/syndicate/gec
suit = /obj/item/clothing/suit/toggle/hazard
@@ -781,7 +950,7 @@
id = /obj/item/card/id/syndicate_command/crew_id
/datum/outfit/job/syndicate/engineer/gorlex
- name = "Mechanic (Gorlex Marauders)"
+ name = "Syndicate - Mechanic (Gorlex Marauders)"
uniform = /obj/item/clothing/under/syndicate/gorlex
shoes = /obj/item/clothing/shoes/workboots
@@ -789,7 +958,7 @@
glasses = null
/datum/outfit/job/syndicate/engineer/twink
- name = "Ship Engineer (Twinkleshine)"
+ name = "Syndicate - Ship Engineer (Twinkleshine)"
uniform = /obj/item/clothing/under/syndicate/gec
accessory = null
@@ -814,10 +983,26 @@
assign_codename(H)
/datum/outfit/job/syndicate/engineer/cybersun
- name = "Engineer (Cybersun)"
+ name = "Syndicate - Engineer (Cybersun)"
uniform = /obj/item/clothing/under/syndicate/cybersun/research
shoes = /obj/item/clothing/shoes/workboots
r_pocket = /obj/item/radio
head = /obj/item/clothing/head/soft/cybersun
accessory = /obj/item/clothing/accessory/armband/engine
+
+/datum/outfit/job/syndicate/engineer/suns
+ name = "Syndicate - Ship Engineer (SUNS)"
+
+ uniform = /obj/item/clothing/under/syndicate/suns/workerjumpsuit
+ suit = /obj/item/clothing/suit/toggle/suns/workervest
+ gloves = /obj/item/clothing/gloves/suns/yellow
+ shoes = /obj/item/clothing/shoes/jackboots/suns
+ head = /obj/item/clothing/head/safety_helmet/suns
+ accessory = null
+ glasses = null
+
+ backpack = /obj/item/storage/backpack
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/duffelbag
+ courierbag = /obj/item/storage/backpack/messenger
diff --git a/code/modules/clothing/outfits/plasmaman.dm b/code/modules/clothing/outfits/plasmaman.dm
index eb994b528c6b..ba38a4a9240b 100644
--- a/code/modules/clothing/outfits/plasmaman.dm
+++ b/code/modules/clothing/outfits/plasmaman.dm
@@ -212,12 +212,6 @@
mask = /obj/item/clothing/mask/gas/clown_hat
gloves = /obj/item/clothing/gloves/color/plasmaman/clown
-/datum/outfit/plasmaman/lieutenant //WS edit plasmaman customization
- name = "Lt. Plasma"
- head = /obj/item/clothing/head/helmet/space/plasmaman/security/lieutenant
- uniform = /obj/item/clothing/under/plasmaman/lieutenant
- gloves = /obj/item/clothing/gloves/combat
-
/datum/outfit/plasmaman/solgov //WS edit sgr
name = "Plasmasolgov"
head = /obj/item/clothing/head/helmet/space/plasmaman/solgov
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index 82ad3aae38d6..72127bbaf7df 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -5,95 +5,6 @@
var/obj/item/implant/mindshield/L = new/obj/item/implant/mindshield(H)//hmm lets have centcom officials become revs
L.implant(H, null, 1)
-/datum/outfit/centcom/spec_ops
- name = "Special Ops Officer"
-
- uniform = /obj/item/clothing/under/syndicate
- suit = /obj/item/clothing/suit/space/officer
- shoes = /obj/item/clothing/shoes/combat/swat
- gloves = /obj/item/clothing/gloves/tackler/combat/insulated
- glasses = /obj/item/clothing/glasses/thermal/eyepatch
- ears = /obj/item/radio/headset/headset_cent/commander
- mask = /obj/item/clothing/mask/cigarette/cigar/havana
- head = /obj/item/clothing/head/helmet/space/beret
- belt = /obj/item/gun/energy/pulse/pistol/m1911
- r_pocket = /obj/item/lighter
- back = /obj/item/storage/backpack/satchel/leather
- id = /obj/item/card/id/centcom
-
-/datum/outfit/centcom/spec_ops/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- if(visualsOnly)
- return
-
- var/obj/item/card/id/W = H.wear_id
- W.access = get_all_accesses()
- W.access += get_centcom_access("Special Ops Officer")
- W.assignment = "Special Ops Officer"
- W.registered_name = H.real_name
- W.update_label()
-
- var/obj/item/radio/headset/R = H.ears
- R.set_frequency(FREQ_CENTCOM)
- R.freqlock = TRUE
- ..()
-
-/datum/outfit/space
- name = "Standard Space Gear"
-
- uniform = /obj/item/clothing/under/color/grey
- shoes = /obj/item/clothing/shoes/sneakers/black
- suit = /obj/item/clothing/suit/space
- head = /obj/item/clothing/head/helmet/space
- back = /obj/item/tank/jetpack/oxygen
- mask = /obj/item/clothing/mask/breath
-
-/datum/outfit/tournament
- name = "tournament standard red"
-
- uniform = /obj/item/clothing/under/color/red
- shoes = /obj/item/clothing/shoes/sneakers/black
- suit = /obj/item/clothing/suit/armor/vest
- head = /obj/item/clothing/head/helmet/thunderdome
- r_hand = /obj/item/gun/energy/pulse/destroyer
- l_hand = /obj/item/kitchen/knife
- r_pocket = /obj/item/grenade/smokebomb
-
-/datum/outfit/tournament/green
- name = "tournament standard green"
-
- uniform = /obj/item/clothing/under/color/green
-
-/datum/outfit/tournament/gangster
- name = "tournament gangster"
-
- uniform = /obj/item/clothing/under/rank/security/detective
- suit = /obj/item/clothing/suit/det_suit
- glasses = /obj/item/clothing/glasses/thermal/monocle
- head = /obj/item/clothing/head/fedora/det_hat
- r_hand = /obj/item/gun/ballistic
- l_hand = null
- r_pocket = /obj/item/ammo_box/c10mm
-
-/datum/outfit/tournament/janitor
- name = "tournament janitor"
-
- uniform = /obj/item/clothing/under/rank/civilian/janitor
- back = /obj/item/storage/backpack
- suit = null
- head = null
- r_hand = /obj/item/mop
- l_hand = /obj/item/reagent_containers/glass/bucket
- r_pocket = /obj/item/grenade/chem_grenade/cleaner
- l_pocket = /obj/item/grenade/chem_grenade/cleaner
- backpack_contents = list(/obj/item/stack/tile/plasteel=6)
-
-/datum/outfit/tournament/janitor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- if(visualsOnly)
- return
-
- var/obj/item/reagent_containers/glass/bucket/bucket = H.get_item_for_held_index(1)
- bucket.reagents.add_reagent(/datum/reagent/water,70)
-
/datum/outfit/laser_tag
name = "Laser Tag Red"
@@ -149,48 +60,6 @@
W.registered_name = H.real_name
W.update_label()
-/datum/outfit/assassin
- name = "Assassin"
-
- uniform = /obj/item/clothing/under/suit/black
- shoes = /obj/item/clothing/shoes/sneakers/black
- gloves = /obj/item/clothing/gloves/color/black
- ears = /obj/item/radio/headset
- glasses = /obj/item/clothing/glasses/sunglasses
- l_pocket = /obj/item/melee/transforming/energy/sword/saber
- l_hand = /obj/item/storage/secure/briefcase
- id = /obj/item/card/id/syndicate
- belt = /obj/item/pda/heads
-
-/datum/outfit/assassin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- var/obj/item/clothing/under/U = H.w_uniform
- U.attach_accessory(new /obj/item/clothing/accessory/waistcoat(H))
-
- if(visualsOnly)
- return
-
- //Could use a type
- var/obj/item/storage/secure/briefcase/sec_briefcase = H.get_item_for_held_index(1)
- for(var/obj/item/briefcase_item in sec_briefcase)
- qdel(briefcase_item)
- for(var/i = 3 to 0 step -1)
- SEND_SIGNAL(sec_briefcase, COMSIG_TRY_STORAGE_INSERT, new /obj/item/spacecash/bundle/mediumrand, null, TRUE, TRUE)
- SEND_SIGNAL(sec_briefcase, COMSIG_TRY_STORAGE_INSERT, new /obj/item/gun/energy/kinetic_accelerator/crossbow, null, TRUE, TRUE)
- SEND_SIGNAL(sec_briefcase, COMSIG_TRY_STORAGE_INSERT, new /obj/item/gun/ballistic/revolver/mateba, null, TRUE, TRUE)
- SEND_SIGNAL(sec_briefcase, COMSIG_TRY_STORAGE_INSERT, new /obj/item/ammo_box/a357, null, TRUE, TRUE)
- SEND_SIGNAL(sec_briefcase, COMSIG_TRY_STORAGE_INSERT, new /obj/item/grenade/c4/x4, null, TRUE, TRUE)
-
- var/obj/item/pda/heads/pda = H.belt
- pda.owner = H.real_name
- pda.ownjob = "Reaper"
- pda.update_label()
-
- var/obj/item/card/id/syndicate/W = H.wear_id
- W.access = get_all_accesses()
- W.assignment = "Reaper"
- W.registered_name = H.real_name
- W.update_label()
-
/datum/outfit/centcom/commander
name = "CentCom Commander"
@@ -269,27 +138,6 @@
shoes = /obj/item/clothing/shoes/sandal/marisa
head = /obj/item/clothing/head/wizard/marisa
-/datum/outfit/mobster
- name = "Mobster"
-
- uniform = /obj/item/clothing/under/suit/black_really
- head = /obj/item/clothing/head/fedora
- shoes = /obj/item/clothing/shoes/laceup
- gloves = /obj/item/clothing/gloves/color/black
- ears = /obj/item/radio/headset
- glasses = /obj/item/clothing/glasses/sunglasses
- r_hand = /obj/item/gun/ballistic/automatic/smg/thompson/drum
- id = /obj/item/card/id
-
-/datum/outfit/mobster/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- if(visualsOnly)
- return
-
- var/obj/item/card/id/W = H.wear_id
- W.assignment = "Assistant"
- W.registered_name = H.real_name
- W.update_label()
-
/datum/outfit/plasmaman
name = "Plasmaman"
@@ -381,55 +229,3 @@
var/obj/item/card/id/W = H.wear_id
W.registered_name = H.real_name
W.update_label()
-
-/datum/outfit/job/lieutenant
- name = "Lieutenant"
- job_icon = "lieutenant"
- //jobtype = /datum/job/lieutenant
-
- id = /obj/item/card/id/silver
- head = /obj/item/clothing/head/beret/lt
- uniform = /obj/item/clothing/under/rank/command
- alt_uniform = /obj/item/clothing/under/rank/command
- suit = /obj/item/clothing/suit/toggle/lieutenant
- alt_suit = /obj/item/clothing/suit/armor/lieutenant_trenchcoat
- dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain
- gloves = /obj/item/clothing/gloves/combat
- shoes = /obj/item/clothing/shoes/jackboots
- ears = /obj/item/radio/headset/heads/lieutenant/alt
- glasses = /obj/item/clothing/glasses/hud/health/sunglasses
- belt = /obj/item/pda/lieutenant
-
- implants = list(/obj/item/implant/mindshield)
-
- backpack = /obj/item/storage/backpack/security
- satchel = /obj/item/storage/backpack/satchel/sec
- duffelbag = /obj/item/storage/backpack/duffelbag/sec
- courierbag = /obj/item/storage/backpack/messenger/sec
-
- backpack_contents = list(
- /obj/item/gun/energy/e_gun/adv_stopping = 1
- )
-
-/datum/outfit/job/hos/inteq_honorable
- name = "Inteq Honorable vanguard"
- head = /obj/item/clothing/head/beret/sec/hos/inteq/honorable
- uniform = /obj/item/clothing/under/syndicate/inteq/honorable
- suit = /obj/item/clothing/suit/armor/hos/inteq/honorable
- mask = /obj/item/clothing/mask/gas/sechailer/inteq
- gloves = /obj/item/clothing/gloves/combat
- shoes = /obj/item/clothing/shoes/combat
- ears = /obj/item/radio/headset/inteq/alt
- belt = /obj/item/storage/belt/military/assault
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
-
-/datum/outfit/job/hos/inteq_honorable/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- if(visualsOnly)
- return
-
- var/obj/item/card/id/W = H.wear_id
- W.access = get_all_accesses()
- W.assignment = "Honorable Vanguard"
- W.registered_name = H.real_name
- W.update_label()
- ..()
diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm
index 65d19b1cdeb3..1b05de78e96d 100644
--- a/code/modules/clothing/shoes/colour.dm
+++ b/code/modules/clothing/shoes/colour.dm
@@ -1,11 +1,6 @@
/obj/item/clothing/shoes/sneakers
dying_key = DYE_REGISTRY_SNEAKERS
supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | KEPORI_VARIATION
-
-/obj/item/clothing/shoes/sneakers/black
- name = "black shoes"
- icon_state = "black"
- desc = "A pair of black shoes."
custom_price = 50
cold_protection = FEET
@@ -13,6 +8,11 @@
heat_protection = FEET
max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
+/obj/item/clothing/shoes/sneakers/black
+ name = "black shoes"
+ icon_state = "black"
+ desc = "A pair of black shoes."
+
/obj/item/clothing/shoes/sneakers/brown
name = "brown shoes"
desc = "A pair of brown shoes."
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 03abdf1325f8..a738bee8f8ed 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -145,7 +145,7 @@
/obj/item/clothing/shoes/jackboots
name = "jackboots"
- desc = "Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time."
+ desc = "Ankle-high combat boots for combat scenarios or combat situations. All combat, all the time."
icon_state = "jackboots"
item_state = "jackboots"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
@@ -434,30 +434,10 @@
/obj/item/clothing/shoes/cowboy/fancy
name = "bilton wrangler boots"
- desc = "A pair of authentic haute couture boots from Japanifornia. You doubt they have ever been close to cattle."
+ desc = "A pair of authentic haute couture boots. You doubt they have ever been close to cattle."
icon_state = "cowboy_fancy"
permeability_coefficient = 0.08
-/obj/item/clothing/shoes/cowboy/lizard
- name = "lizard skin boots"
- desc = "You can hear a faint hissing from inside the boots; you hope it is just a mournful ghost."
- icon_state = "lizardboots_green"
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 40, "acid" = 0) //lizards like to stay warm
-
-/obj/item/clothing/shoes/cowboy/lizard/masterwork
- name = "\improper Hugs-The-Feet lizard skin boots"
- desc = "A pair of masterfully crafted lizard skin boots. Finally a good application for the sector's most bothersome inhabitants."//:c
- icon_state = "lizardboots_blue"
-
-/obj/effect/spawner/lootdrop/lizardboots
- name = "random lizard boot quality"
- desc = "Which ever gets picked, the lizard race loses"
- icon = 'icons/obj/clothing/shoes.dmi'
- icon_state = "lizardboots_green"
- loot = list(
- /obj/item/clothing/shoes/cowboy/lizard = 7,
- /obj/item/clothing/shoes/cowboy/lizard/masterwork = 1)
-
/obj/item/clothing/shoes/cookflops
desc = "All this talk of antags, greytiding, and griefing... I just wanna grill for god's sake!"
name = "grilling sandals"
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index b4fa1a1282f6..517a51982e7f 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -420,30 +420,71 @@
var/combat_slowdown = 0 //slowdown when in combat mode
var/lightweight = 0 //used for flags when toggling
-//Scarlet Syndie suit
-/obj/item/clothing/head/helmet/space/hardsuit/syndi/scarlet
- name = "scarlet hardsuit helmet"
- desc = "A standardized dual-mode helmet derived from more advanced special operations helmets. It is in EVA mode. Manufactured by Donk Co."
- alt_desc = "A standardized dual-mode helmet derived from more advanced special operations helmets. It is in combat mode. Manufactured by Donk Co."
- icon_state = "hardsuit1-scarlet"
- item_state = "scarlet_helm"
- hardsuit_type = "scarlet"
+//Ramzi Syndie suit
+/obj/item/clothing/head/helmet/space/hardsuit/syndi/ramzi
+ name = "rusted-red hardsuit helmet"
+ desc = "A beat-up standardized dual-mode helmet derived from more advanced special operations helmets, its red rusted into a dirty brown. It is in EVA mode. Manufactured by Ramzi Clique."
+ alt_desc = "A beat-up standardized dual-mode helmet derived from more advanced special operations helmets, its red rusted into a dirty brown. It is in combat mode. Manufactured by Ramzi Clique."
+ icon_state = "hardsuit1-ramzi"
+ item_state = "hardsuit1-ramzi"
+ hardsuit_type = "ramzi"
armor = list("melee" = 35, "bullet" = 25, "laser" = 20,"energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
-/obj/item/clothing/suit/space/hardsuit/syndi/scarlet
- name = "scarlet hardsuit"
- desc = "A standardized dual-mode hardsuit derived from more advanced special operations hardsuits. It is in EVA mode. Manufactured by Donk Co."
- alt_desc = "A standardized dual-mode hardsuit derived from more advanced special operations hardsuits. It is in combat mode. Manufactured by Donk Co."
- icon_state = "hardsuit1-scarlet"
- item_state = "scarlet_hardsuit"
- hardsuit_type = "scarlet"
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/scarlet
+/obj/item/clothing/suit/space/hardsuit/syndi/ramzi
+ name = "rusted-red hardsuit"
+ desc = "A beat-up standardized dual-mode hardsuit derived from more advanced special operations hardsuits, its red rusted into a dirty brown. It is in EVA mode. Manufactured by Ramzi Clique."
+ alt_desc = "A beat-up standardized dual-mode hardsuit derived from more advanced special operations hardsuits, its red rusted into a dirty brown. It is in combat mode. Manufactured by Ramzi Clique."
+ icon_state = "hardsuit1-ramzi"
+ item_state = "hardsuit1-ramzi"
+ hardsuit_type = "ramzi"
+ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/ramzi
lightweight = 1
jetpack = null
armor = list("melee" = 35, "bullet" = 25, "laser" = 20,"energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
combat_slowdown = 0.5
jetpack = null
+//2nd Battlegroup Syndie suit
+/obj/item/clothing/head/helmet/space/hardsuit/syndi/sbg
+ name = "beige-red hardsuit helmet"
+ desc = "A standardized dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by beige. It is in EVA mode. Manufactured by Second Battlegroup."
+ alt_desc = "A standardized dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by beige. It is in combat mode. Manufactured by Second Battlegroup."
+ icon_state = "hardsuit1-sbg"
+ item_state = "hardsuit1-sbg"
+ hardsuit_type = "sbg"
+
+/obj/item/clothing/suit/space/hardsuit/syndi/sbg
+ name = "beige-red hardsuit"
+ desc = "A standardized dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by beige. It is in EVA mode. Manufactured by Second Battlegroup."
+ alt_desc = "A standardized dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by beige. It is in combat mode. Manufactured by the Second Battlegroup."
+ icon_state = "hardsuit1-sbg"
+ item_state = "hardsuit1-sbg"
+ hardsuit_type = "sbg"
+ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/sbg
+ lightweight = 1
+ jetpack = null
+
+//Hardliner Syndie suit
+/obj/item/clothing/head/helmet/space/hardsuit/syndi/hl
+ name = "white-red hardsuit helmet"
+ desc = "An advanced dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by white. It is in EVA mode. Manufactured by Second Battlegroup."
+ alt_desc = "An advanced dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by white. It is in combat mode. Manufactured by Second Battlegroup."
+ icon_state = "hardsuit1-hl"
+ item_state = "hardsuit1-hl"
+ hardsuit_type = "hl"
+
+/obj/item/clothing/suit/space/hardsuit/syndi/hl
+ name = "white-red hardsuit"
+ desc = "An advanced dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by white. It is in EVA mode. Manufactured by Second Battlegroup."
+ alt_desc = "An advanced dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by white. It is in combat mode. Manufactured by the Second Battlegroup."
+ icon_state = "hardsuit1-hl"
+ item_state = "hardsuit1-hl"
+ hardsuit_type = "hl"
+ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/hl
+ lightweight = 1
+ jetpack = null
+
+
//Elite Syndie suit
/obj/item/clothing/head/helmet/space/hardsuit/syndi/elite
name = "elite syndicate hardsuit helmet"
@@ -480,28 +521,6 @@
/obj/item/clothing/suit/space/hardsuit/syndi/elite/debug
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/debug
-//The Owl Hardsuit
-/obj/item/clothing/head/helmet/space/hardsuit/syndi/owl
- name = "owl hardsuit helmet"
- desc = "A dual-mode advanced helmet designed for any crime-fighting situation. It is in travel mode."
- alt_desc = "A dual-mode advanced helmet designed for any crime-fighting situation. It is in combat mode."
- icon_state = "hardsuit0-owl"
- item_state = "s_helmet"
- hardsuit_type = "owl"
- visor_flags_inv = 0
- visor_flags = 0
- on = FALSE
- full_retraction = TRUE
-
-/obj/item/clothing/suit/space/hardsuit/syndi/owl
- name = "owl hardsuit"
- desc = "A dual-mode advanced hardsuit designed for any crime-fighting situation. It is in travel mode."
- alt_desc = "A dual-mode advanced hardsuit designed for any crime-fighting situation. It is in combat mode."
- icon_state = "hardsuit1-owl"
- item_state = "s_suit"
- hardsuit_type = "owl"
- helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/owl
-
//Cybersun Hardsuit
/obj/item/clothing/suit/space/hardsuit/syndi/cybersun
name = "neutron-star combat hardsuit"
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index 9f7afba9fb4b..43dc5a5dd8d0 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -360,9 +360,3 @@
desc = "An envirosuit helmet made for the sanctioned plasmaman."
icon_state = "secmed_envirohelm"
item_state = "secmed_envirohelm"
-
-/obj/item/clothing/head/helmet/space/plasmaman/security/lieutenant //WS edit plasmaman customization
- name = "lieutenants envirosuit helmet"
- desc = "an envirosuit helmet made for the sentinel plasmaman."
- icon_state = "lt_envirohelm"
- item_state = "lt_envirohelm"
diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm
index 4bdafe4f7f41..e5a98c7215e5 100644
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -111,7 +111,6 @@
item_state = "syndicate-black"
allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/tank/internals, /obj/item/storage/firstaid, /obj/item/healthanalyzer, /obj/item/stack/medical)
-
//Black-orange syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/orange
name = "black space helmet"
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index d0eba4833ea5..9c363c11551a 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -46,7 +46,7 @@
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
resistance_flags = FIRE_PROOF | ACID_PROOF
- supports_variations = VOX_VARIATION
+ supports_variations = VOX_VARIATION | DIGITIGRADE_VARIATION_NO_NEW_ICON
/obj/item/clothing/suit/armor/vest/marine/medium
name = "medium tactical armor vest"
@@ -103,7 +103,6 @@
/obj/item/clothing/suit/armor/vest/security/warden
name = "warden's jacket"
desc = "A black armored jacket with silver shoulder designations and '/Warden/' stitched into one of the chest pockets."
-
icon_state = "armor_warden"
item_state = "armor"
body_parts_covered = CHEST|GROIN|ARMS
@@ -144,13 +143,13 @@
resistance_flags = FIRE_PROOF
/obj/item/clothing/suit/armor/vest/capcarapace/syndicate
- name = "syndicate captain's vest"
- desc = "A sinister looking vest of advanced armor worn over a black and red fireproof jacket. The gold collar and shoulders denote that this belongs to a high ranking syndicate officer."
+ name = "Syndicate captain's vest"
+ desc = "A sinister looking vest of advanced armor worn over a black and red fireproof jacket. The gold collar and shoulders denote that this belongs to a high ranking Syndicate officer."
icon_state = "carapace_syndie"
/obj/item/clothing/suit/armor/vest/capcarapace/cybersun
- name = "cybersun captain's haori"
- desc = "An extraordinarily fashionable haori, utilized by cybersun captains. Weaved with armored fabric to protect the user from gunshots."
+ name = "Cybersun captain's haori"
+ desc = "An extraordinarily fashionable haori, utilized by Cybersun captains. Weaved with armored fabric to protect the user from gunshots."
icon_state = "cybersunhaori"
/obj/item/clothing/suit/armor/vest/capcarapace/alt
@@ -161,12 +160,12 @@
/obj/item/clothing/suit/armor/vest/capcarapace/captunic
name = "captain's parade coat"
- desc = "Worn by a Captain to show their class."
+ desc = "Worn by a captain to show their class."
icon_state = "carapace_formal"
item_state = "bio_suit"
/obj/item/clothing/suit/armor/vest/capcarapace/minutemen
- name = "colonial minutemen general coat"
+ name = "Colonial Minutemen general coat"
desc = "A very fancy coat used by generals of the Colonial Minutemen."
icon_state = "carapace_minutemen"
item_state = "carapace_minutemen"
@@ -342,7 +341,7 @@
/obj/item/clothing/suit/armor/hos/inteq/honorable //Basically CC higherup clothing for inteq
name = "honorable vanguard battlecoat"
- desc = "A sleek black coat with snow white fur trims made to order for honorable vanguards of the IRMG, It feels even tougher than the typical battlecoat."
+ desc = "A sleek black coat with snow white fur trims made to order for honorable vanguards of the IRMG. It feels even tougher than the typical battlecoat."
icon_state = "armor_inteq_honorable_battlecoat"
item_state = "inteq_honorable_battlecoat"
armor = list("melee" = 40, "bullet" = 50, "laser" = 50, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90)
@@ -397,12 +396,6 @@
icon_state = "armor_rouma_montagne"
item_state = "rouma_montagne_coat"
-/obj/item/clothing/suit/armor/vest/lieutenant
- name = "lieutenant's armor"
- desc = "An armored vest with a lieutenant's insignia imprinted on it."
- icon_state = "armor_blueshield"
- item_state = "blueshield"
-
/obj/item/clothing/suit/armor/vest/bulletproof/solgov
name = "\improper Sonnensoldner gambison"
desc = "A standard armor vest fielded for SolGov's Sonnensoldners."
@@ -495,7 +488,7 @@
/obj/item/clothing/suit/armor/vest/security/hos
name = "head of security's jacket"
desc = "This piece of clothing was specifically designed for asserting superior authority."
- icon_state = "hosjacket"
+ icon_state = "armor_hosjacket"
body_parts_covered = CHEST|ARMS
/obj/item/clothing/suit/armor/vest/security/brig_phys
diff --git a/code/modules/clothing/suits/hoodies.dm b/code/modules/clothing/suits/hoodies.dm
index 82e4d86bc3d3..1feea7adfd0f 100644
--- a/code/modules/clothing/suits/hoodies.dm
+++ b/code/modules/clothing/suits/hoodies.dm
@@ -74,3 +74,44 @@
desc = "A gray hood for your gray hoodie."
icon_state = "hoodie_gray"
item_state = "hoodie_gray"
+
+/obj/item/clothing/suit/hooded/hoodie/fbp
+ name = "\improper FBP kepori hoodie"
+ desc = "A hoodie themed to look like a kepori in a Full Body Prosthetic. It has a comfy pocket for keeping your hands warm."
+ icon_state = "hoodie_fbp"
+ item_state = "hoodie_fbp"
+ hoodtype = /obj/item/clothing/head/hooded/hood/fbp
+
+/obj/item/clothing/head/hooded/hood/fbp
+ name = "\improper FBP kepori hood"
+ desc = "A hood for your FBP hoodie."
+ icon_state = "hoodie_fbp"
+ item_state = "hoodie_fbp"
+
+/obj/item/clothing/suit/hooded/hoodie/rilena
+ name = "K4L1 hoodie"
+ desc = "A hoodie themed to look like K4L1 from the popular webseries RILENA. It has a comfy pocket for keeping your hands warm."
+ icon_state = "hoodie_rilena"
+ item_state = "hoodie_rilena"
+ hoodtype = /obj/item/clothing/head/hooded/hood/rilena
+
+/obj/item/clothing/suit/hooded/hoodie/rilena/equipped(mob/user, slot)
+ . = ..()
+ if(slot != ITEM_SLOT_OCLOTHING)
+ return
+ var/mob/living/L = user
+ if(HAS_TRAIT(L, TRAIT_FAN_RILENA))
+ SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "hoodie_rilena", /datum/mood_event/rilena_super_fan)
+
+/obj/item/clothing/suit/hooded/hoodie/rilena/dropped(mob/user)
+ . = ..()
+ var/mob/living/L = user
+ if(HAS_TRAIT(L, TRAIT_FAN_RILENA))
+ SEND_SIGNAL(L, COMSIG_CLEAR_MOOD_EVENT, "hoodie_rilena")
+
+/obj/item/clothing/head/hooded/hood/rilena
+ name = "RILENA: LMR K4L1 hood"
+ desc = "A hood for your RILENA themed hoodie."
+ icon_state = "hoodie_rilena"
+ item_state = "hoodie_rilena"
+
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index c9c0edd2def8..12a44cbbd252 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -234,27 +234,6 @@
body_parts_covered = HEAD
flags_inv = HIDEHAIR|HIDEEARS
-//Lieutenant
-/obj/item/clothing/suit/armor/lieutenant_trenchcoat
- name = "lieutenant's trenchcoat"
- desc = "A design taken from a war over 500 years ago. Makes you look like a badass."
- icon_state = "armor_blueshield_trenchcoat"
- item_state = "trenchcoat_blueshield"
- blood_overlay_type = "coat"
- armor = list("melee" = 25, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
- body_parts_covered = CHEST|GROIN|ARMS|HANDS
- cold_protection = CHEST|LEGS|ARMS
- heat_protection = CHEST|LEGS|ARMS
-
-/obj/item/clothing/suit/toggle/lieutenant
- name = "lieutenant's coat"
- desc = "Surplus from some military. You finally have your own coat."
- icon_state = "blueshield_coat"
- item_state = "blueshield_coat"
- allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/ammo_box, /obj/item/ammo_casing,/obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton)
- armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
- body_parts_covered = CHEST|GROIN|ARMS|HANDS
-
//SolGov suits
/obj/item/clothing/suit/solgov
@@ -333,3 +312,4 @@
item_state = "enginseerhood"
body_parts_covered = HEAD
flags_inv = HIDEHAIR|HIDEEARS|HIDEFACE|HIDEFACIALHAIR
+
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index 8a918876dfcd..24836f6f2404 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -8,7 +8,6 @@
allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
togglename = "buttons"
- species_exception = list(/datum/species/golem)
/obj/item/clothing/suit/toggle/labcoat/cmo
name = "chief medical officer's labcoat"
@@ -85,7 +84,6 @@ You're pretty sure this is just a raincoat.
allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
togglename = "buttons"
- species_exception = list(/datum/species/golem)
/obj/item/clothing/suit/longcoat/virologist
name = "virologist longcoat"
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 5bb6923dec73..59b252a9836a 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -686,11 +686,11 @@
item_state = "DutchJacket"
body_parts_covered = ARMS
-/obj/item/clothing/suit/aclf
+/obj/item/clothing/suit/gorlex
name = "\improper 2nd Battlegroup jacket"
- desc = "An armored jacket worn by the Gorlex Marauders 2nd Battlegroup."
+ desc = "An armored jacket worn by the 2nd Battlegroup."
body_parts_covered = CHEST|GROIN|ARMS|HANDS
- icon_state = "aclfjacket"
- item_state = "aclfjacket"
+ icon_state = "gorlexjacket"
+ item_state = "gorlexjacket"
blood_overlay_type = "coat"
armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
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/accessories.dm b/code/modules/clothing/under/accessories.dm
index 5fc4cc67390b..7bb36a9086b4 100644
--- a/code/modules/clothing/under/accessories.dm
+++ b/code/modules/clothing/under/accessories.dm
@@ -464,10 +464,7 @@
name = "detective's shoulder holster"
pocket_storage_component_path = /datum/component/storage/concrete/pockets/holster/detective
-/obj/item/clothing/accessory/holster/lieutenant
- name = "lieutenant's shoulder holster"
- desc = "A modified shoulder holster designed to fit a small egun and power cells."
- pocket_storage_component_path = /datum/component/storage/concrete/pockets/holster/lt
+
/obj/item/clothing/accessory/holster/detective/Initialize()
. = ..()
@@ -523,3 +520,25 @@
name = "solgov waistcoat"
desc = "A standard issue waistcoat in solgov colors."
icon_state = "solgov_waistcoat"
+
+//////////
+//RILENA//
+//////////
+
+/obj/item/clothing/accessory/rilena_pin
+ name = "RILENA: LMR Xader pin"
+ desc = "A pin that shows your love for the webseries RILENA."
+ icon_state = "rilena_pin"
+ above_suit = FALSE
+ minimize_when_attached = TRUE
+ attachment_slot = CHEST
+
+/obj/item/clothing/accessory/rilena_pin/on_uniform_equip(obj/item/clothing/under/U, user)
+ var/mob/living/L = user
+ if(HAS_TRAIT(L, TRAIT_FAN_RILENA))
+ SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "rilena_pin", /datum/mood_event/rilena_fan)
+
+/obj/item/clothing/accessory/rilena_pin/on_uniform_dropped(obj/item/clothing/under/U, user)
+ var/mob/living/L = user
+ if(HAS_TRAIT(L, TRAIT_FAN_RILENA))
+ SEND_SIGNAL(L, COMSIG_CLEAR_MOOD_EVENT, "rilena_pin")
diff --git a/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm b/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm
index 9d1ceda58127..59b83eb7e3e5 100644
--- a/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm
+++ b/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm
@@ -152,15 +152,3 @@
icon_state = "mime_enviroskirt"
item_state = "mime_enviroskirt"
-/obj/item/clothing/under/plasmaman/lieutenant //WS edit plasmaman customization
- name = "lieutenants envirosuit"
- desc = "A navy blue envirosuit with chlorophyll green trimmings."
- icon_state = "lt_envirosuit"
- item_state = "lt_envirosuit"
-
-/obj/item/clothing/under/plasmaman/lieutenant/skirt //WS edit plasmaman customization
- name = "lieutenants enviroskirt"
- desc = "A navy blue envirosuit with chlorophyll green trimmings and a poofy skirt, just as blue to match."
- icon_state = "lt_enviroskirt"
- item_state = "lt_enviroskirt"
-
diff --git a/code/modules/clothing/under/jobs/cargo.dm b/code/modules/clothing/under/jobs/cargo.dm
index 7d1eaa30190d..c5426e63883e 100644
--- a/code/modules/clothing/under/jobs/cargo.dm
+++ b/code/modules/clothing/under/jobs/cargo.dm
@@ -29,7 +29,7 @@
/obj/item/clothing/under/rank/cargo/tech/skirt
name = "cargo technician's jumpskirt"
- desc = "Skiiiiirts! They're comfy and easy to wear"
+ desc = "Skiiiiirts! They're comfy and easy to wear!"
icon_state = "cargo_skirt"
item_state = "lb_suit"
body_parts_covered = CHEST|GROIN|ARMS
diff --git a/code/modules/clothing/under/jobs/command.dm b/code/modules/clothing/under/jobs/command.dm
index 8edb11ba91cc..231c62eb2895 100644
--- a/code/modules/clothing/under/jobs/command.dm
+++ b/code/modules/clothing/under/jobs/command.dm
@@ -111,35 +111,7 @@
body_parts_covered = CHEST|GROIN|ARMS
supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION
-//Lieutenant
-
-/obj/item/clothing/under/rank/command
- desc = "A standard command jumpsuit in the colours of the Lieutenant."
- name = "\improper lieutenant jumpsuit"
- icon_state = "lt"
- can_adjust = FALSE
-
-/obj/item/clothing/under/rank/command/skirt
- desc = "A command jumpskirt in the colours of the Lieutenant."
- name = "\improper lieutenant jumpskirt"
- icon_state = "lt_skirt"
- body_parts_covered = CHEST|GROIN|ARMS
- can_adjust = FALSE
- supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION
-
-/obj/item/clothing/under/rank/command/nt
- desc = "A standard command jumpsuit in the colours of the Lieutenant."
- name = "\improper lieutenant blue jumpsuit"
- icon_state = "lt_nt"
- item_state = "b_suit"
-
-/obj/item/clothing/under/rank/command/nt/skirt
- desc = "A command jumpskirt in the colours of the Lieutenant."
- name = "\improper lieutenant blue jumpskirt"
- icon_state = "lt_nt_skirt"
- body_parts_covered = CHEST|GROIN|ARMS
- supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION
-
+//Minuteman
/obj/item/clothing/under/rank/command/minutemen
name = "colonial minutemen officer uniform"
desc = "A uniform used by officers of the Colonial Minutemen."
diff --git a/code/modules/clothing/under/jobs/medical.dm b/code/modules/clothing/under/jobs/medical.dm
index b50de5f3d17e..7a95273c22f2 100644
--- a/code/modules/clothing/under/jobs/medical.dm
+++ b/code/modules/clothing/under/jobs/medical.dm
@@ -11,6 +11,16 @@
permeability_coefficient = 0.5
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
+/obj/item/clothing/under/rank/medical/chief_medical_officer/cybersun
+ desc = "It's a jumpsuit worn by those with the experience to be a \"Medical Director\" for Cybersun. It provides minor biological protection."
+ name = "medical director's jumpsuit"
+ icon_state = "cybersun_md"
+ item_state = "w_suit"
+ icon = 'icons/obj/clothing/under/syndicate.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/under/syndicate.dmi'
+ can_adjust = FALSE
+ supports_variations = DIGITIGRADE_VARIATION
+
/obj/item/clothing/under/rank/medical/chief_medical_officer/skirt
name = "chief medical officer's jumpskirt"
desc = "It's a jumpskirt worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index 251743a5cdad..de9cb15258e5 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -85,12 +85,12 @@
// Brig Physician //
/obj/item/clothing/under/rank/security/brig_phys
name = "brig physician jumpsuit"
- desc = "A lightly armored jumpsuit worn by Nanotrasen's Asset Protection Medical Corps."
+ desc = "A lightly armored jumpsuit, worn by practitioners entrusted to the care of prisoners around the frontier."
icon_state = "brig_phys"
/obj/item/clothing/under/rank/security/brig_phys/skirt
name = "brig physician jumpskirt"
- desc = "A lightly armored jumpsuit worn by Nanotrasen's Asset Protection Medical Corps."
+ desc = "A lightly armored jumpskirt, worn by practitioners entrusted to the care of prisoners around the frontier."
icon_state = "brig_phys_skirt"
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
@@ -98,13 +98,13 @@
/obj/item/clothing/under/rank/security/brig_phys/nt
name = "security medic's uniform"
- desc = "A lightly armored uniform worn by medics ensuring the health of prisoners."
+ desc = "A lightly armored uniform worn by members of Nanotrasen's Asset Protection Medical Corps."
icon_state = "rbrig_phys"
item_state = "r_suit"
/obj/item/clothing/under/rank/security/brig_phys/nt/skirt
name = "security medic's uniform"
- desc = "A lightly armored uniform, with a skirt, worn by medics ensuring the health of prisoners."
+ desc = "A lightly armored uniform, with a skirt, worn by members of Nanotrasen's Asset Protection Medical Corps."
icon_state = "rbrig_phys_skirt"
body_parts_covered = CHEST|GROIN|ARMS
supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
@@ -129,30 +129,18 @@
/obj/item/clothing/under/rank/security/warden/nt
name = "warden's red security suit"
- desc = "A formal security suit for officers complete with Nanotrasen belt buckle."
+ desc = "A formal security suit for wardens, complete with Nanotrasen belt buckle."
icon_state = "rwarden"
item_state = "r_suit"
/obj/item/clothing/under/rank/security/warden/nt/skirt
name = "warden's red suitskirt"
- desc = "A formal security suitskirt for officers complete with Nanotrasen belt buckle."
+ desc = "A formal security suitskirt for wardens, complete with Nanotrasen belt buckle."
icon_state = "rwarden_skirt"
item_state = "r_suit"
body_parts_covered = CHEST|GROIN|ARMS
supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
-/obj/item/clothing/under/rank/security/head_of_security/nt
- name = "red head of security's jumpsuit"
- icon_state = "rhos"
- item_state = "r_suit"
-
-/obj/item/clothing/under/rank/security/head_of_security/nt/skirt
- name = "head of security's red jumpskirt"
- desc = "A security jumpskirt decorated for those few with the dedication to achieve the position of Head of Security."
- icon_state = "rhos_skirt"
- body_parts_covered = CHEST|GROIN|ARMS
- supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
-
// Head of Security //
/obj/item/clothing/under/rank/security/head_of_security
name = "head of security's jumpsuit"
@@ -186,6 +174,18 @@
body_parts_covered = CHEST|GROIN|ARMS
supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
+/obj/item/clothing/under/rank/security/head_of_security/nt
+ name = "red head of security's jumpsuit"
+ icon_state = "rhos"
+ item_state = "r_suit"
+
+/obj/item/clothing/under/rank/security/head_of_security/nt/skirt
+ name = "head of security's red jumpskirt"
+ desc = "A security jumpskirt decorated for those few with the dedication to achieve the position of Head of Security."
+ icon_state = "rhos_skirt"
+ body_parts_covered = CHEST|GROIN|ARMS
+ supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
+
/obj/item/clothing/under/rank/security/head_of_security/parade
name = "head of security's parade uniform"
desc = "A male head of security's luxury-wear, for special occasions."
@@ -201,7 +201,7 @@
// Prisoner //
/obj/item/clothing/under/rank/prisoner
name = "prison jumpsuit"
- desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
+ desc = "It's standardised prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
icon = 'icons/obj/clothing/under/security.dmi'
icon_state = "prisoner"
item_state = "o_suit"
@@ -212,7 +212,7 @@
/obj/item/clothing/under/rank/prisoner/skirt
name = "prison jumpskirt"
- desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
+ desc = "It's standardised prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
icon_state = "prisoner_skirt"
item_state = "o_suit"
body_parts_covered = CHEST|GROIN|ARMS
@@ -221,12 +221,12 @@
/obj/item/clothing/under/rank/prisoner/protected_custody
name = "protected custody jumpsuit"
- desc = "It's standardised Nanotrasen prisoner-wear worn by those in protected custody. Its suit sensors are stuck in the \"Fully On\" position."
+ desc = "It's standardised prisoner-wear worn by those in protected custody. Its suit sensors are stuck in the \"Fully On\" position."
icon_state = "protected_custody"
/obj/item/clothing/under/rank/prisoner/protected_custody/skirt
name = "protected custody jumpskirt"
- desc = "It's standardised Nanotrasen prisoner-wear worn by those in protected custody. Its suit sensors are stuck in the \"Fully On\" position."
+ desc = "It's standardised prisoner-wear worn by those in protected custody. Its suit sensors are stuck in the \"Fully On\" position."
icon_state = "protected_custody_skirt"
supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
@@ -254,7 +254,7 @@
/obj/item/clothing/under/rank/security/officer/mallcop
name = "NT mall cop uniform"
- desc = "The radio and badge are sewn on, what a crappy knock off. Secway not included."
+ desc = "The radio and badge are sewn on. What a crappy knock off! Secway not included."
icon_state = "mallcop"
can_adjust = FALSE
@@ -293,14 +293,16 @@
/obj/item/clothing/under/rank/security/officer/frontier
name = "\improper Frontiersmen uniform"
- desc = "Worn by members of the Frontiersmen pirate fleet. It's less comfortable than it looks."
+ desc = "Worn by members of the Frontiersmen pirate fleet. It's very uncomfortable to move around in."
icon_state = "frontier"
item_state = "gy_suit"
/obj/item/clothing/under/rank/security/officer/frontier/officer
name = "\improper Frontiersmen officer's uniform"
+ desc = "Worn by officers of the Frontiersmen pirate fleet. It's less comfortable than it looks."
icon_state = "frontier_officer"
/obj/item/clothing/under/rank/security/officer/frontier/admiral
name = "\improper Frontiersmen admiral's uniform"
+ desc = "Worn by admirals of the Frontiersmen pirate fleet. It's the only Frontiersman uniform that isn't mass produced."
icon_state = "frontier_admiral"
diff --git a/code/modules/clothing/under/skirt_dress.dm b/code/modules/clothing/under/skirt_dress.dm
index 64500724d01e..1dabceb6db24 100644
--- a/code/modules/clothing/under/skirt_dress.dm
+++ b/code/modules/clothing/under/skirt_dress.dm
@@ -87,3 +87,10 @@
desc = "A preppy green skirt with a white blouse."
icon_state = "plaid_green"
item_state = "plaid_green"
+
+/obj/item/clothing/under/dress/rilena
+ name = "RILENA: LMR Ri cosplay"
+ desc = "A pretty red dress with big pink ribbons attached. Intended to be worn by Kepori cosplayers, but also fits other species."
+ icon_state = "rilena_dress"
+ item_state = "rilena_dress"
+ supports_variations = KEPORI_VARIATION
diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index e2e972ab70ae..01ed8b5a082a 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -89,13 +89,15 @@
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
-/obj/item/clothing/under/syndicate/aclf
- name = "2nd Battlegroup uniform"
- desc = "A black uniform worn by the officers of the Gorlex Marauders 2nd Battlegroup."
- icon_state = "aclf"
+/obj/item/clothing/under/syndicate/officer
+ 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/discord/tgs_commands.dm b/code/modules/discord/tgs_commands.dm
index e2c92e345459..d79bf07b87e4 100644
--- a/code/modules/discord/tgs_commands.dm
+++ b/code/modules/discord/tgs_commands.dm
@@ -5,13 +5,12 @@
/datum/tgs_chat_command/notify/Run(datum/tgs_chat_user/sender, params)
if(!CONFIG_GET(string/chat_announce_new_game))
- return "Notifcations are currently disabled"
+ return new /datum/tgs_message_content("New round notifications are currently disabled.")
- for(var/member in SSdiscord.notify_members) // If they are in the list, take them out
- if(member == sender.mention)
- SSdiscord.notify_members -= sender.mention
- return "You will no longer be notified when the server restarts"
+ if(sender.mention in SSdiscord.notify_members) // If they are in the list, take them out
+ SSdiscord.notify_members -= sender.mention
+ return new /datum/tgs_message_content("You will no longer be notified when the round ends")
// If we got here, they arent in the list. Chuck 'em in!
SSdiscord.notify_members += sender.mention
- return "You will now be notified when the server restarts"
+ return new /datum/tgs_message_content("You will now be notified when the server restarts")
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 7bf30e86d498..9ca494d431e9 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -954,10 +954,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
if("too_much_tox")
target.throw_alert(alert_type, /atom/movable/screen/alert/too_much_tox, override = TRUE)
if("nutrition")
- if(prob(50))
- target.throw_alert(alert_type, /atom/movable/screen/alert/fat, override = TRUE)
- else
- target.throw_alert(alert_type, /atom/movable/screen/alert/starving, override = TRUE)
+ target.throw_alert(alert_type, /atom/movable/screen/alert/starving, override = TRUE)
if("gravity")
target.throw_alert(alert_type, /atom/movable/screen/alert/weightless, override = TRUE)
if("fire")
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index cd372392b927..08a87b6f9193 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -515,6 +515,13 @@
volume = 30
spillable = TRUE
+/obj/item/reagent_containers/food/drinks/rilenacup
+ name = "RILENA mug"
+ desc = "A mug with RILENA: LMR protagonist Ri's face on it."
+ icon_state = "rilenacup"
+ volume = 30
+ spillable = TRUE
+
//////////////////////////soda_cans//
//These are in their own group to be used as IED's in /obj/item/grenade/ghettobomb.dm
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
index 2baf670d807d..589e986aaeeb 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/food_and_drinks/food/condiment.dm
@@ -323,3 +323,13 @@
icon_state = "oliveoil"
list_reagents = list(/datum/reagent/consumable/cornoil = 50)
+/obj/item/reagent_containers/food/condiment/pack/sugar
+ name = "sugar pack"
+ originalname = "sugar"
+ list_reagents = list(/datum/reagent/consumable/sugar = 5)
+
+/obj/item/reagent_containers/food/condiment/pack/creamer
+ name = "creamer" /// dont laugh you child
+ originalname = "cream"
+ list_reagents = list(/datum/reagent/consumable/cream = 5)
+
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/food_and_drinks/food/ration.dm b/code/modules/food_and_drinks/food/ration.dm
index b74db1f0ccb7..261fe707ed7f 100644
--- a/code/modules/food_and_drinks/food/ration.dm
+++ b/code/modules/food_and_drinks/food/ration.dm
@@ -3,6 +3,7 @@
desc = "standard issue ration"
filling_color = "#664330"
list_reagents = list(/datum/reagent/consumable/nutriment = 4)
+ bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
icon = 'icons/obj/food/ration.dmi'
icon_state = "ration_side"
in_container = TRUE
@@ -55,7 +56,16 @@
..()
else
name = "warm [initial(name)]"
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+ var/cooking_efficiency = 1
+ if(istype(Heater))
+ cooking_efficiency = Heater.efficiency
+ if(length(bonus_reagents))
+ for(var/r_id in bonus_reagents)
+ var/amount = bonus_reagents[r_id] * cooking_efficiency
+ if(ispath(r_id, /datum/reagent/consumable/nutriment))
+ reagents.add_reagent(r_id, amount, tastes)
+ else
+ reagents.add_reagent(r_id, amount)
cooked = TRUE
/obj/item/reagent_containers/food/snacks/ration/examine(mob/user)
diff --git a/code/modules/food_and_drinks/food/snacks/meat.dm b/code/modules/food_and_drinks/food/snacks/meat.dm
index 86323c2e00bc..e4ccbd1c8f90 100644
--- a/code/modules/food_and_drinks/food/snacks/meat.dm
+++ b/code/modules/food_and_drinks/food/snacks/meat.dm
@@ -68,20 +68,6 @@
tastes = list("slime" = 1, "jelly" = 1)
foodtype = MEAT | RAW | TOXIC
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem
- icon_state = "golemmeat"
- desc = "Edible rocks, welcome to the future."
- list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/iron = 3)
- filling_color = "#A9A9A9"
- tastes = list("rock" = 1)
- foodtype = MEAT | RAW | GROSS
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine
- icon_state = "agolemmeat"
- desc = "From the slime pen to the rune to the kitchen, science."
- filling_color = "#66CDAA"
- foodtype = MEAT | RAW | GROSS
-
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard
icon_state = "lizardmeat"
desc = "Delicious dino damage."
diff --git a/code/modules/food_and_drinks/food/snacks_frozen.dm b/code/modules/food_and_drinks/food/snacks_frozen.dm
index 95ef84ae5cb7..dfbed9ba9112 100644
--- a/code/modules/food_and_drinks/food/snacks_frozen.dm
+++ b/code/modules/food_and_drinks/food/snacks_frozen.dm
@@ -262,9 +262,9 @@
bonus_reagents = list(/datum/reagent/consumable/hot_coco = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 3, /datum/reagent/consumable/sugar = 2)
overlay_state = "jumbo"
-/obj/item/reagent_containers/food/snacks/popsicle/nogga_black
- name = "nogga black"
- desc = "A salty licorice icecream recently reintroduced due to all the records of the controversy being lost to time. Those who cannot remember the past are doomed to repeat it."
+/obj/item/reagent_containers/food/snacks/popsicle/licorice
+ name = "licorice icecream"
+ desc = "A salty licorice icecream."
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/sugar = 4)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/sugar = 4)
tastes = list("salty liquorice")
diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm
index 78999078193c..510130ce08be 100644
--- a/code/modules/food_and_drinks/food/snacks_meat.dm
+++ b/code/modules/food_and_drinks/food/snacks_meat.dm
@@ -227,7 +227,7 @@
/obj/item/reagent_containers/food/snacks/sausage/Initialize()
. = ..()
- eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp")
+ eatverb = pick("bite","chew","nibble","gobble","chomp")
/obj/item/reagent_containers/food/snacks/salami
name = "salami"
@@ -430,14 +430,6 @@
tastes = list("tofu" = 3, "metal" = 1)
foodtype = VEGETABLES
-
-/obj/item/reagent_containers/food/snacks/kebab/tail
- name = "lizard-tail kebab"
- desc = "Severed lizard tail on a stick."
- bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
- tastes = list("meat" = 8, "metal" = 4, "scales" = 1)
- foodtype = MEAT // NOT GORE, tastes delicious!
-
/obj/item/reagent_containers/food/snacks/kebab/rat
name = "rat-kebab"
desc = "Not so delicious rat meat, on a stick."
diff --git a/code/modules/food_and_drinks/kitchen_machinery/coffeemaker.dm b/code/modules/food_and_drinks/kitchen_machinery/coffeemaker.dm
new file mode 100644
index 000000000000..7b98be6a16c4
--- /dev/null
+++ b/code/modules/food_and_drinks/kitchen_machinery/coffeemaker.dm
@@ -0,0 +1,689 @@
+#define BEAN_CAPACITY 10 //amount of coffee beans that can fit inside the impressa coffeemaker
+
+/obj/machinery/coffeemaker
+ name = "coffeemaker"
+ desc = "A Modello 3 Coffeemaker that brews coffee and holds it at the perfect temperature of 176 fahrenheit. Made by Piccionaia Home Appliances."
+ icon = 'icons/obj/machines/coffeemaker.dmi'
+ icon_state = "coffeemaker_nopot_nocart"
+ base_icon_state = "coffeemaker"
+ resistance_flags = FIRE_PROOF | ACID_PROOF
+ circuit = /obj/item/circuitboard/machine/coffeemaker
+ var/obj/item/reagent_containers/food/drinks/bottle/coffeepot/coffeepot = null
+ var/brewing = FALSE
+ var/brew_time = 20 SECONDS
+ var/speed = 1
+ /// The coffee cartridge to make coffee from. In the future, coffee grounds are like printer ink.
+ var/obj/item/coffee_cartridge/cartridge = null
+ /// The type path to instantiate for the coffee cartridge the device initially comes with, eg. /obj/item/coffee_cartridge
+ var/initial_cartridge = /obj/item/coffee_cartridge
+ /// The number of cups left
+ var/coffee_cups = 15
+ var/max_coffee_cups = 15
+ /// The amount of sugar packets left
+ var/sugar_packs = 10
+ var/max_sugar_packs = 10
+ /// The amount of sweetener packets left
+ var/sweetener_packs = 10
+ var/max_sweetener_packs = 10
+ /// The amount of creamer packets left
+ var/creamer_packs = 10
+ var/max_creamer_packs = 10
+
+ var/static/radial_examine = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_examine")
+ var/static/radial_brew = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_brew")
+ var/static/radial_eject_pot = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_eject_pot")
+ var/static/radial_eject_cartridge = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_eject_cartridge")
+ var/static/radial_take_cup = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_take_cup")
+ var/static/radial_take_sugar = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_take_sugar")
+ var/static/radial_take_sweetener = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_take_sweetener")
+ var/static/radial_take_creamer = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_take_creamer")
+
+/obj/machinery/coffeemaker/Initialize(mapload)
+ . = ..()
+ if(mapload)
+ coffeepot = new /obj/item/reagent_containers/food/drinks/bottle/coffeepot(src)
+ cartridge = new /obj/item/coffee_cartridge(src)
+
+/obj/machinery/coffeemaker/deconstruct()
+ coffeepot?.forceMove(drop_location())
+ cartridge?.forceMove(drop_location())
+ return ..()
+
+/obj/machinery/coffeemaker/Destroy()
+ QDEL_NULL(coffeepot)
+ QDEL_NULL(cartridge)
+ return ..()
+
+/obj/machinery/coffeemaker/Exited(atom/movable/gone, direction)
+ . = ..()
+ if(gone == coffeepot)
+ coffeepot = null
+ update_appearance(UPDATE_OVERLAYS)
+ if(gone == cartridge)
+ cartridge = null
+ update_appearance(UPDATE_OVERLAYS)
+/obj/machinery/coffeemaker/examine(mob/user)
+ . = ..()
+ if(!in_range(user, src) && !issilicon(user) && !isobserver(user))
+ . += span_warning("You're too far away to examine [src]'s contents and display!")
+ return
+
+ if(brewing)
+ . += span_warning("\The [src] is brewing.")
+ return
+
+ if(panel_open)
+ . += span_notice("[src]'s maintenance hatch is open!")
+ return
+
+ if(coffeepot || cartridge)
+ . += span_notice("\The [src] contains:")
+ if(coffeepot)
+ . += span_notice("- \A [coffeepot].")
+ if(cartridge)
+ . += span_notice("- \A [cartridge].")
+ return
+
+ if(!(machine_stat & (NOPOWER|BROKEN)))
+ . += "[span_notice("The status display reads:")]\n"+\
+ span_notice("- Brewing coffee at [speed*100]% .")
+ if(coffeepot)
+ for(var/datum/reagent/consumable/cawfee as anything in coffeepot.reagents.reagent_list)
+ . += span_notice("- [cawfee.volume] units of coffee in pot.")
+ if(cartridge)
+ if(cartridge.charges < 1)
+ . += span_notice("- grounds cartridge is empty.")
+ else
+ . += span_notice("- grounds cartridge has [cartridge.charges] charges remaining.")
+
+ if (coffee_cups >= 1)
+ . += span_notice("There [coffee_cups == 1 ? "is" : "are"] [coffee_cups] coffee cup[coffee_cups != 1 && "s"] left.")
+ else
+ . += span_notice("There are no cups left.")
+
+ if (sugar_packs >= 1)
+ . += span_notice("There [sugar_packs == 1 ? "is" : "are"] [sugar_packs] packet[sugar_packs != 1 && "s"] of sugar left.")
+ else
+ . += span_notice("There is no sugar left.")
+
+ if (sweetener_packs >= 1)
+ . += span_notice("There [sweetener_packs == 1 ? "is" : "are"] [sweetener_packs] packet[sweetener_packs != 1 && "s"] of sweetener left.")
+ else
+ . += span_notice("There is no sweetener left.")
+
+ if (creamer_packs > 1)
+ . += span_notice("There [creamer_packs == 1 ? "is" : "are"] [creamer_packs] packet[creamer_packs != 1 && "s"] of creamer left.")
+ else
+ . += span_notice("There is no creamer left.")
+
+
+/obj/machinery/coffeemaker/update_overlays()
+ . = ..()
+ . += overlay_checks()
+
+/obj/machinery/coffeemaker/proc/overlay_checks()
+ . = list()
+ if(coffeepot)
+ . += "coffeemaker_pot"
+ if(cartridge)
+ . += "coffeemaker_cartidge"
+ return .
+
+/obj/machinery/coffeemaker/proc/replace_pot(mob/living/user, /obj/item/reagent_containers/food/drinks/bottle/coffeepot)
+ if(!user)
+ return FALSE
+ if(coffeepot)
+ try_put_in_hand(coffeepot, user)
+ balloon_alert(user, "replaced pot")
+ update_appearance(UPDATE_OVERLAYS)
+ return TRUE
+
+/obj/machinery/coffeemaker/proc/replace_cartridge(mob/living/user, obj/item/coffee_cartridge/new_cartridge)
+ if(!user)
+ return FALSE
+ if(cartridge)
+ try_put_in_hand(cartridge, user)
+ if(new_cartridge)
+ cartridge = new_cartridge
+ update_appearance(UPDATE_OVERLAYS)
+ return TRUE
+
+/obj/machinery/coffeemaker/wrench_act(mob/living/user, obj/item/tool)
+ . = ..()
+ default_unfasten_wrench(user, tool)
+ return TOOL_ACT_TOOLTYPE_SUCCESS
+
+/obj/machinery/coffeemaker/attackby(obj/item/attack_item, mob/living/user, params)
+ //You can only screw open empty grinder
+ if(!coffeepot && default_deconstruction_screwdriver(user, icon_state, icon_state, attack_item))
+ return FALSE
+
+ if(default_deconstruction_crowbar(attack_item))
+ return
+
+ if(panel_open) //Can't insert objects when its screwed open
+ return TRUE
+
+ if (istype(attack_item, /obj/item/reagent_containers/food/drinks/bottle/coffeepot) && !(attack_item.item_flags & ABSTRACT) && attack_item.is_open_container())
+ var/obj/item/reagent_containers/food/drinks/bottle/coffeepot/new_pot = attack_item
+ . = TRUE //no afterattack
+ if(!user.transferItemToLoc(new_pot, src))
+ return TRUE
+ replace_pot(user, new_pot)
+ update_appearance(UPDATE_OVERLAYS)
+ return TRUE //no afterattack
+
+ if (istype(attack_item, /obj/item/reagent_containers/glass/coffee_cup) && !(attack_item.item_flags & ABSTRACT) && attack_item.is_open_container())
+ var/obj/item/reagent_containers/glass/coffee_cup/new_cup = attack_item
+ if(new_cup.reagents.total_volume > 0)
+ balloon_alert(user, "the cup must be empty!")
+ return
+ if(coffee_cups >= max_coffee_cups)
+ balloon_alert(user, "the cup holder is full!")
+ return
+ if(!user.transferItemToLoc(attack_item, src))
+ return
+ coffee_cups++
+ update_appearance(UPDATE_OVERLAYS)
+ return TRUE //no afterattack
+
+ if (istype(attack_item, /obj/item/reagent_containers/food/condiment/pack/sugar))
+ var/obj/item/reagent_containers/food/condiment/pack/sugar/new_pack = attack_item
+ if(new_pack.reagents.total_volume < new_pack.reagents.maximum_volume)
+ balloon_alert(user, "the pack must be full!")
+ return
+ if(sugar_packs >= max_sugar_packs)
+ balloon_alert(user, "the sugar compartment is full!")
+ return
+ if(!user.transferItemToLoc(attack_item, src))
+ return
+ sugar_packs++
+ update_appearance(UPDATE_OVERLAYS)
+ return TRUE //no afterattack
+
+ if (istype(attack_item, /obj/item/reagent_containers/food/condiment/pack/creamer))
+ var/obj/item/reagent_containers/food/condiment/pack/creamer/new_pack = attack_item
+ if(new_pack.reagents.total_volume < new_pack.reagents.maximum_volume)
+ balloon_alert(user, "the pack must be full!")
+ return
+ if(creamer_packs >= max_creamer_packs)
+ balloon_alert(user, "the creamer compartment is full!")
+ return
+ if(!user.transferItemToLoc(attack_item, src))
+ return
+ creamer_packs++
+ update_appearance(UPDATE_OVERLAYS)
+ return TRUE //no afterattack
+
+ if (istype(attack_item, /obj/item/reagent_containers/food/condiment/pack/astrotame))
+ var/obj/item/reagent_containers/food/condiment/pack/astrotame/new_pack = attack_item
+ if(new_pack.reagents.total_volume < new_pack.reagents.maximum_volume)
+ balloon_alert(user, "the pack must be full!")
+ return
+ else if(sweetener_packs >= max_sweetener_packs)
+ balloon_alert(user, "the sweetener compartment is full!")
+ return
+ else if(!user.transferItemToLoc(attack_item, src))
+ return
+ sweetener_packs++
+ update_appearance(UPDATE_OVERLAYS)
+ return TRUE //no afterattack
+
+ if (istype(attack_item, /obj/item/coffee_cartridge) && !(attack_item.item_flags & ABSTRACT))
+ var/obj/item/coffee_cartridge/new_cartridge = attack_item
+ if(!user.transferItemToLoc(new_cartridge, src))
+ return
+ replace_cartridge(user, new_cartridge)
+ balloon_alert(user, "added cartridge")
+ update_appearance(UPDATE_OVERLAYS)
+ return TRUE //no afterattack
+
+/obj/machinery/coffeemaker/proc/try_brew()
+ if(!cartridge)
+ balloon_alert(usr, "no coffee cartridge inserted!")
+ return FALSE
+ if(cartridge.charges < 1)
+ balloon_alert(usr, "coffee cartridge empty!")
+ return FALSE
+ if(!coffeepot)
+ balloon_alert(usr, "no coffeepot inside!")
+ return FALSE
+ if(machine_stat & (NOPOWER|BROKEN))
+ balloon_alert(usr, "machine unpowered!")
+ return FALSE
+ if(coffeepot.reagents.total_volume >= coffeepot.reagents.maximum_volume)
+ balloon_alert(usr, "the coffeepot is already full!")
+ return FALSE
+ return TRUE
+
+/obj/machinery/coffeemaker/ui_interact(mob/user) // The microwave Menu //I am reasonably certain that this is not a microwave //I am positively certain that this is not a microwave
+ . = ..()
+
+ if(brewing || panel_open || !anchored || !user.canUseTopic(src, !issilicon(user)))
+ return
+
+ var/list/options = list()
+
+ if(coffeepot)
+ options["Eject Pot"] = radial_eject_pot
+
+ if(cartridge)
+ options["Eject Cartridge"] = radial_eject_cartridge
+
+ options["Brew"] = radial_brew //brew is always available as an option, when the machine is unable to brew the player is told by balloon alerts whats exactly wrong
+
+ if(coffee_cups > 0)
+ options["Take Cup"] = radial_take_cup
+
+ if(sugar_packs > 0)
+ options["Take Sugar"] = radial_take_sugar
+
+ if(sweetener_packs > 0)
+ options["Take Sweetener"] = radial_take_sweetener
+
+ if(creamer_packs > 0)
+ options["Take Creamer"] = radial_take_creamer
+
+ if(isAI(user))
+ if(machine_stat & NOPOWER)
+ return
+ options["Examine"] = radial_examine
+
+ var/choice
+
+ if(length(options) < 1)
+ return
+ if(length(options) == 1)
+ choice = options[1]
+ else
+ choice = show_radial_menu(user, src, options, require_near = !issilicon(user))
+
+ // post choice verification
+ if(brewing || panel_open || !anchored || !user.canUseTopic(src, !issilicon(user)))
+ return
+
+ switch(choice)
+ if("Brew")
+ brew(user)
+ if("Eject Pot")
+ eject_pot(user)
+ if("Eject Cartridge")
+ eject_cartridge(user)
+ if("Examine")
+ examine(user)
+ if("Take Cup")
+ take_cup(user)
+ if("Take Sugar")
+ take_sugar(user)
+ if("Take Sweetener")
+ take_sweetener(user)
+ if("Take Creamer")
+ take_creamer(user)
+
+/obj/machinery/coffeemaker/proc/eject_pot(mob/user)
+ if(coffeepot)
+ replace_pot(user)
+
+/obj/machinery/coffeemaker/proc/eject_cartridge(mob/user)
+ if(cartridge)
+ replace_cartridge(user)
+
+/obj/machinery/coffeemaker/proc/take_cup(mob/user)
+ if(!coffee_cups) //shouldn't happen, but we all know how stuff manages to break
+ balloon_alert(user, "no cups left!")
+ return
+ var/obj/item/reagent_containers/glass/coffee_cup/new_cup = new(get_turf(src))
+ user.put_in_hands(new_cup)
+ coffee_cups--
+ update_appearance(UPDATE_OVERLAYS)
+
+/obj/machinery/coffeemaker/proc/take_sugar(mob/user)
+ if(!sugar_packs)
+ balloon_alert(user, "no sugar left!")
+ return
+ var/obj/item/reagent_containers/food/condiment/pack/sugar/new_pack = new(get_turf(src))
+ user.put_in_hands(new_pack)
+ sugar_packs--
+ update_appearance(UPDATE_OVERLAYS)
+
+/obj/machinery/coffeemaker/proc/take_sweetener(mob/user)
+ if(!sweetener_packs)
+ balloon_alert(user, "no sweetener left!")
+ return
+ var/obj/item/reagent_containers/food/condiment/pack/astrotame/new_pack = new(get_turf(src))
+ user.put_in_hands(new_pack)
+ sweetener_packs--
+ update_appearance(UPDATE_OVERLAYS)
+
+/obj/machinery/coffeemaker/proc/take_creamer(mob/user)
+ if(!creamer_packs)
+ balloon_alert(user, "no creamer left!")
+ return
+ var/obj/item/reagent_containers/food/condiment/pack/creamer/new_pack = new(drop_location())
+ user.put_in_hands(new_pack)
+ creamer_packs--
+ update_appearance(UPDATE_OVERLAYS)
+
+///Updates the smoke state to something else, setting particles if relevant
+/obj/machinery/coffeemaker/proc/toggle_steam()
+ QDEL_NULL(particles)
+ if(brewing)
+ particles.position = list(-6, 0, 0)
+
+/obj/machinery/coffeemaker/proc/operate_for(time, silent = FALSE)
+ brewing = TRUE
+ if(!silent)
+ playsound(src, 'sound/machines/coffeemaker_brew.ogg', 20, vary = TRUE)
+ toggle_steam()
+ use_power(active_power_usage * time * 0.1) // .1 needed here to convert time (in deciseconds) to seconds such that watts * seconds = joules
+ addtimer(CALLBACK(src, PROC_REF(stop_operating)), time / speed)
+
+/obj/machinery/coffeemaker/proc/stop_operating()
+ brewing = FALSE
+ toggle_steam()
+
+/obj/machinery/coffeemaker/proc/brew()
+ power_change()
+ if(!try_brew())
+ return
+ operate_for(brew_time)
+ coffeepot.reagents.add_reagent_list(cartridge.drink_type)
+ cartridge.charges--
+
+//Coffee Cartridges: like toner, but for your coffee!
+/obj/item/coffee_cartridge
+ name = "coffeemaker cartridge- Caffè Generico"
+ desc = "A coffee cartridge manufactured by Piccionaia Coffee, for use with the Modello 3 system."
+ icon = 'icons/obj/machines/coffeemaker.dmi'
+ icon_state = "cartridge_basic"
+ var/charges = 4
+ var/list/drink_type = list(/datum/reagent/consumable/coffee = 120)
+
+/obj/item/coffee_cartridge/examine(mob/user)
+ . = ..()
+ if(charges)
+ . += span_warning("The cartridge has [charges] portions of grounds remaining.")
+ else
+ . += span_warning("The cartridge has no unspent grounds remaining.")
+
+/obj/item/coffee_cartridge/fancy
+ name = "coffeemaker cartridge - Caffè Fantasioso"
+ desc = "A fancy coffee cartridge manufactured by Piccionaia Coffee, for use with the Modello 3 system."
+ icon_state = "cartridge_blend"
+
+//Here's the joke before I get 50 issue reports: they're all the same, and that's intentional
+/obj/item/coffee_cartridge/fancy/Initialize(mapload)
+ . = ..()
+ var/coffee_type = pick("blend", "blue_mountain", "kilimanjaro", "mocha")
+ switch(coffee_type)
+ if("blend")
+ name = "coffeemaker cartridge - Miscela di Piccione"
+ icon_state = "cartridge_blend"
+ if("blue_mountain")
+ name = "coffeemaker cartridge - Montagna Blu"
+ icon_state = "cartridge_blue_mtn"
+ if("kilimanjaro")
+ name = "coffeemaker cartridge - Kilimangiaro"
+ icon_state = "cartridge_kilimanjaro"
+ if("mocha")
+ name = "coffeemaker cartridge - Moka Arabica"
+ icon_state = "cartridge_mocha"
+
+/obj/item/coffee_cartridge/decaf
+ name = "coffeemaker cartridge - Caffè Decaffeinato"
+ desc = "A decaf coffee cartridge manufactured by Piccionaia Coffee, for use with the Modello 3 system."
+ icon_state = "cartridge_decaf"
+
+// no you can't just squeeze the juice bag into a glass!
+/obj/item/coffee_cartridge/bootleg
+ name = "coffeemaker cartridge - Botany Blend"
+ desc = "A jury-rigged coffee cartridge. Should work with a Modello 3 system, though it might void the warranty."
+ icon_state = "cartridge_bootleg"
+
+// blank cartridge for crafting's sake, can be made at the service lathe
+/obj/item/blank_coffee_cartridge
+ name = "blank coffee cartridge"
+ desc = "A blank coffee cartridge, ready to be filled with coffee paste."
+ icon = 'icons/obj/machines/coffeemaker.dmi'
+ icon_state = "cartridge_blank"
+
+//now, how do you store coffee carts? well, in a rack, of course!
+/obj/item/storage/box/coffee_cart_rack
+ name = "coffeemaker cartridge box"
+ desc = "A small rack for storing coffeemaker cartridges."
+ var/cartridge_type = /obj/item/coffee_cartridge
+
+/obj/item/storage/box/coffee_cart_rack/Initialize(mapload)
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_items = 8
+ STR.can_hold = typecacheof(list(/obj/item/coffee_cartridge))
+
+
+/obj/item/storage/box/coffee_cart_rack/PopulateContents()
+ for(var/i in 1 to 4)
+ new cartridge_type(src)
+ new /obj/item/coffee_cartridge/decaf(src)
+ new /obj/item/coffee_cartridge/fancy(src)
+ new /obj/item/coffee_cartridge(src)
+
+/*
+ * impressa coffee maker
+ * its supposed to be a premium line product, so its cargo-only, the board cant be therefore researched
+ */
+
+/obj/machinery/coffeemaker/impressa
+ name = "impressa coffeemaker"
+ desc = "An industry-grade Impressa Modello 5 Coffeemaker of the Piccionaia Home Appliances premium coffeemakers product line. Makes coffee from fresh dried whole beans."
+ icon = 'icons/obj/machines/coffeemaker.dmi'
+ icon_state = "coffeemaker_impressa"
+ circuit = /obj/item/circuitboard/machine/coffeemaker/impressa
+ initial_cartridge = null //no cartridge, just coffee beans
+ brew_time = 15 SECONDS //industrial grade, its faster than the regular one
+ density = TRUE
+ pass_flags = PASSTABLE
+ /// Current amount of coffee beans stored
+ var/coffee_amount = 0
+ /// List of coffee bean objects are stored
+ var/list/coffee = list()
+
+/obj/machinery/coffeemaker/impressa/Initialize(mapload)
+ . = ..()
+ if(mapload)
+ coffeepot = new /obj/item/reagent_containers/food/drinks/bottle/coffeepot(src)
+ cartridge = null
+
+/obj/machinery/coffeemaker/impressa/Destroy()
+ QDEL_NULL(coffeepot)
+ QDEL_NULL(coffee)
+ return ..()
+
+/obj/machinery/coffeemaker/impressa/examine(mob/user)
+ . = ..()
+ if(coffee)
+ . += span_notice("The internal grinder contains [length(coffee)] scoop\s of coffee beans")
+
+/obj/machinery/coffeemaker/impressa/update_overlays()
+ . = ..()
+ . += overlay_checks()
+
+/obj/machinery/coffeemaker/impressa/overlay_checks()
+ . = list()
+ if(coffeepot)
+ if(coffeepot.reagents.total_volume > 0)
+ . += "pot_full"
+ else
+ . += "pot_empty"
+ if(coffee_cups > 0)
+ if(coffee_cups >= max_coffee_cups/3)
+ if(coffee_cups > max_coffee_cups/1.5)
+ . += "cups_3"
+ else
+ . += "cups_2"
+ else
+ . += "cups_1"
+ if(sugar_packs)
+ . += "extras_1"
+ if(creamer_packs)
+ . += "extras_2"
+ if(sweetener_packs)
+ . += "extras_3"
+ if(coffee_amount)
+ if(coffee_amount < 0.7*BEAN_CAPACITY)
+ . += "grinder_half"
+ else
+ . += "grinder_full"
+ return .
+
+/obj/machinery/coffeemaker/impressa/Exited(atom/movable/gone, direction)
+ . = ..()
+ if(gone in coffee)
+ coffee -= gone
+ update_appearance(UPDATE_OVERLAYS)
+
+/obj/machinery/coffeemaker/impressa/try_brew(mob/living/user)
+ if(coffee_amount <= 0)
+ balloon_alert(user, "no coffee beans added!")
+ return FALSE
+ if(!coffeepot)
+ balloon_alert(user, "no coffeepot inside!")
+ return FALSE
+ if(machine_stat & (NOPOWER|BROKEN))
+ balloon_alert(user, "machine unpowered!")
+ return FALSE
+ if(coffeepot.reagents.total_volume >= coffeepot.reagents.maximum_volume)
+ balloon_alert(user, "the coffeepot is already full!")
+ return FALSE
+ return TRUE
+
+/obj/machinery/coffeemaker/impressa/attackby(obj/item/attack_item, mob/living/user, params)
+ //You can only screw open empty grinder
+ if(!coffeepot && default_deconstruction_screwdriver(user, icon_state, icon_state, attack_item))
+ return
+
+ if(default_deconstruction_crowbar(attack_item))
+ return
+
+ if(panel_open) //Can't insert objects when its screwed open
+ return TRUE
+
+ if (istype(attack_item, /obj/item/reagent_containers/food/drinks/bottle/coffeepot) && !(attack_item.item_flags & ABSTRACT) && attack_item.is_open_container())
+ var/obj/item/reagent_containers/food/drinks/bottle/coffeepot/new_pot = attack_item
+ if(!user.transferItemToLoc(new_pot, src))
+ return TRUE
+ replace_pot(user, new_pot)
+ update_appearance(UPDATE_OVERLAYS)
+ return TRUE //no afterattack
+
+ if (istype(attack_item, /obj/item/reagent_containers/glass/coffee_cup) && !(attack_item.item_flags & ABSTRACT) && attack_item.is_open_container())
+ var/obj/item/reagent_containers/glass/coffee_cup/new_cup = attack_item //different type of cup
+ if(new_cup.reagents.total_volume > 0)
+ balloon_alert(user, "the cup must be empty!")
+ return
+ if(coffee_cups >= max_coffee_cups)
+ balloon_alert(user, "the cup holder is full!")
+ return
+ if(!user.transferItemToLoc(attack_item, src))
+ return
+ coffee_cups++
+ update_appearance(UPDATE_OVERLAYS)
+ return TRUE //no afterattack
+
+ if (istype(attack_item, /obj/item/reagent_containers/food/condiment/pack/sugar))
+ var/obj/item/reagent_containers/food/condiment/pack/sugar/new_pack = attack_item
+ if(new_pack.reagents.total_volume < new_pack.reagents.maximum_volume)
+ balloon_alert(user, "the pack must be full!")
+ return
+ if(sugar_packs >= max_sugar_packs)
+ balloon_alert(user, "the sugar compartment is full!")
+ return
+ if(!user.transferItemToLoc(attack_item, src))
+ return
+ sugar_packs++
+ update_appearance(UPDATE_OVERLAYS)
+ return TRUE //no afterattack
+
+ if (istype(attack_item, /obj/item/reagent_containers/food/condiment/pack/creamer))
+ var/obj/item/reagent_containers/food/condiment/pack/creamer/new_pack = attack_item
+ if(new_pack.reagents.total_volume < new_pack.reagents.maximum_volume)
+ balloon_alert(user, "the pack must be full!")
+ return
+ if(creamer_packs >= max_creamer_packs)
+ balloon_alert(user, "the creamer compartment is full!")
+ return
+ if(!user.transferItemToLoc(attack_item, src))
+ return
+ creamer_packs++
+ update_appearance(UPDATE_OVERLAYS)
+ return TRUE //no afterattack
+
+ if (istype(attack_item, /obj/item/reagent_containers/food/condiment/pack/astrotame))
+ var/obj/item/reagent_containers/food/condiment/pack/astrotame/new_pack = attack_item
+ if(new_pack.reagents.total_volume < new_pack.reagents.maximum_volume)
+ balloon_alert(user, "the pack must be full!")
+ return
+ if(sweetener_packs >= max_sweetener_packs)
+ balloon_alert(user, "the sweetener compartment is full!")
+ return
+ if(!user.transferItemToLoc(attack_item, src))
+ return
+ sweetener_packs++
+ update_appearance(UPDATE_OVERLAYS)
+ return TRUE //no afterattack
+
+ if (istype(attack_item, /obj/item/reagent_containers/food/snacks/grown/coffee) && !(attack_item.item_flags & ABSTRACT))
+ if(coffee_amount >= BEAN_CAPACITY)
+ balloon_alert(user, "the coffee container is full!")
+ return
+ var/obj/item/reagent_containers/food/snacks/grown/coffee/new_coffee = attack_item
+ if(!user.transferItemToLoc(new_coffee, src))
+ return
+ coffee += new_coffee
+ coffee_amount++
+ balloon_alert(user, "added coffee")
+
+
+ if (istype(attack_item, /obj/item/storage/box/coffeepack))
+ if(coffee_amount >= BEAN_CAPACITY)
+ balloon_alert(user, "the coffee container is full!")
+ return
+ var/obj/item/storage/box/coffeepack/new_coffee_pack = attack_item
+ for(var/obj/item/reagent_containers/food/snacks/grown/coffee/new_coffee in new_coffee_pack.contents)
+ if(coffee_amount < BEAN_CAPACITY)
+ if(user.transferItemToLoc(new_coffee, src))
+ coffee += new_coffee
+ coffee_amount++
+ new_coffee.forceMove(src)
+ balloon_alert(user, "added coffee")
+ update_appearance(UPDATE_OVERLAYS)
+ else
+ return
+ update_appearance(UPDATE_OVERLAYS)
+ return TRUE //no afterattack
+
+/obj/machinery/coffeemaker/impressa/take_cup(mob/user)
+ if(!coffee_cups) //shouldn't happen, but we all know how stuff manages to break
+ balloon_alert(user, "no cups left!")
+ return
+ balloon_alert_to_viewers("took cup")
+ var/obj/item/reagent_containers/food/drinks/coffee/new_cup = new(get_turf(src))
+ user.put_in_hands(new_cup)
+ coffee_cups--
+ update_appearance(UPDATE_OVERLAYS)
+
+/obj/machinery/coffeemaker/impressa/toggle_steam()
+ QDEL_NULL(particles)
+ if(brewing)
+ particles.position = list(-2, 1, 0)
+
+/obj/machinery/coffeemaker/impressa/brew()
+ power_change()
+ if(!try_brew())
+ return
+ operate_for(brew_time)
+ coffeepot.reagents.add_reagent_list(list(/datum/reagent/consumable/coffee = 120))
+ coffee.Cut(1,2) //remove the first item from the list
+ coffee_amount--
+ update_appearance(UPDATE_OVERLAYS)
+
+#undef BEAN_CAPACITY
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index ca8900c1dda3..fad3c3bc963f 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
@@ -186,7 +186,7 @@
newmeat.name = "[sourcename] [newmeat.name]"
if(istype(newmeat))
newmeat.subjectname = sourcename
- newmeat.reagents.add_reagent (/datum/reagent/consumable/nutriment, sourcenutriment / meat_produced) // Thehehe. Fat guys go first
+ newmeat.reagents.add_reagent (/datum/reagent/consumable/nutriment, sourcenutriment / meat_produced)
if(occupant_volume)
occupant.reagents.trans_to(newmeat, occupant_volume / meat_produced, remove_blacklisted = TRUE)
if(sourcejob)
diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
index 3d759bce3fd2..acd768347327 100644
--- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
@@ -237,6 +237,18 @@
required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/ethanol/irish_cream = 3, /datum/reagent/consumable/ethanol/beer = 2)
required_catalysts = list(/datum/reagent/consumable/ethanol/creme_de_cacao = 1)
+/datum/chemical_reaction/bullet_hell
+ results = list(/datum/reagent/consumable/ethanol/bullethell = 5)
+ required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 5, /datum/reagent/fuel = 2, /datum/reagent/consumable/ethanol/absinthe = 3)
+
+/datum/chemical_reaction/shotinthedark
+ results = list(/datum/reagent/consumable/ethanol/shotinthedark = 10)
+ required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 5, /datum/reagent/consumable/ethanol/tequila = 5, /datum/reagent/gold = 3)
+
+/datum/chemical_reaction/homesick
+ results = list(/datum/reagent/consumable/ethanol/homesick = 15)
+ required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 5, /datum/reagent/consumable/cream = 5, /datum/reagent/consumable/ethanol/creme_de_menthe = 5)
+
////DRINKS THAT REQUIRED IMPROVED SPRITES BELOW:: -Agouri/////
/datum/chemical_reaction/sbiten
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
index 588eb863fbd7..92647559d9cd 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm
@@ -296,8 +296,8 @@
result = /obj/item/reagent_containers/food/snacks/popsicle/jumbo
subcategory = CAT_ICE
-/datum/crafting_recipe/food/nogga_black
- name = "Nogga black"
+/datum/crafting_recipe/food/licorice
+ name = "Licorice icecream"
reqs = list(
/obj/item/popsicle_stick = 1,
/datum/reagent/consumable/blumpkinjuice = 4, //natural source of ammonium chloride
@@ -307,5 +307,5 @@
/datum/reagent/consumable/vanilla = 2,
/datum/reagent/consumable/sugar = 2
)
- result = /obj/item/reagent_containers/food/snacks/popsicle/nogga_black
+ result = /obj/item/reagent_containers/food/snacks/popsicle/licorice
subcategory = CAT_ICE
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
index bd7aec4ed422..72f2046a3b84 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
@@ -29,15 +29,6 @@
result = /obj/item/reagent_containers/food/snacks/kebab/tofu
subcategory = CAT_MEAT
-/datum/crafting_recipe/food/tailkebab
- name = "lizard tail kebab"
- reqs = list(
- /obj/item/stack/rods = 1,
- /obj/item/organ/tail/lizard = 1
- )
- result = /obj/item/reagent_containers/food/snacks/kebab/tail
- subcategory = CAT_MEAT
-
/datum/crafting_recipe/food/fiestaskewer
name = "Fiesta Skewer"
reqs = list(
diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm
deleted file mode 100644
index e6a1c90ede6e..000000000000
--- a/code/modules/holodeck/computer.dm
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
-Map Template Holodeck
-
-Holodeck finds the location of mapped_start_area and loads offline_program in it on LateInitialize. It then loads the programs that have the
-same holodeck_access flag as it (e.g. the station holodeck has the holodeck_access flag STATION_HOLODECK, and it loads all programs with this
-flag). These program templates are then given to Holodeck.js in the form of program_cache and emag_programs. when a user selects a program the
-ui calls load_program() with the id of the selected program.
-load_program() -> map_template/load() on map_template/holodeck.
-
-holodeck map templates:
-1. have an update_blacklist that doesnt allow placing on non holofloors (except for engine floors so you can repair it)
-2. has should_place_on_top = FALSE, so that the baseturfs list doesnt pull a kilostation oom crash
-3. has returns_created = TRUE, so that SSatoms gives the map template a list of spawned atoms
-all the fancy flags and shit are added to holodeck objects in finish_spawn()
-
-Easiest way to add new holodeck programs:
-1. Define new map template datums in code/modules/holodeck/holodeck_map_templates, make sure they have the access flags
-of the holodeck you want them to be able to load, for the onstation holodeck the flag is STATION_HOLODECK.
-2. Create the new map templates in _maps/templates (remember theyre 9x10, and make sure they have area/noop or else it will fuck with linked)
-all turfs in holodeck programs MUST be of type /turf/open/floor/holofloor, OR /turf/open/floor/engine, or they will block future programs!
-
-Note: if youre looking at holodeck code because you want to see how returns_created is handled so that templates return a list of atoms
-created from them: make sure you handle that list correctly! Either copy them by value and delete them or reference it and handle qdel'ing
-and clear when youre done! if you dont i will use :newspaper2: on you
-*/
-
-#define HOLODECK_CD 2 SECONDS
-#define HOLODECK_DMG_CD 5 SECONDS
-
-
-/obj/machinery/computer/holodeck
- name = "holodeck control console"
- desc = "A computer used to control a nearby holodeck."
- icon_screen = "holocontrol"
- idle_power_usage = 10
- active_power_usage = 50
-
- //new vars
- ///what access type this holodeck has, used to specify programs for another holodeck that others cant load.
- var/holodeck_access = STATION_HOLODECK
-
- ///what area type this holodeck loads into. linked turns into the nearest instance of this area
- var/area/mapped_start_area = /area/holodeck/rec_center
-
- ///the currently used map template
- var/datum/map_template/holodeck/template
-
- ///bottom left corner of the loading room, used for placing
- var/turf/bottom_left
-
- ///if TRUE the holodeck is busy spawning another simulation and should immediately stop loading the newest one
- var/spawning_simulation = FALSE
-
- //old vars
-
- ///the area that this holodeck loads templates into, used for power and deleting holo objects that leave it
- var/area/holodeck/linked
-
- ///what program is loaded right now or is about to be loaded
- var/program = "holodeck_offline"
- var/last_program
-
- ///the default program loaded by this holodeck when spawned and when deactivated
- var/offline_program = "holodeck_offline"
-
- ///stores all of the unrestricted holodeck map templates that this computer has access to
- var/list/program_cache
- ///stores all of the restricted holodeck map templates that this computer has access to
- var/list/emag_programs
-
- ///subtypes of this (but not this itself) are loadable programs
- var/program_type = /datum/map_template/holodeck
-
- ///every holo object created by the holodeck goes in here to track it
- var/list/spawned = list()
- var/list/effects = list() //like above, but for holo effects
-
- ///TRUE if the holodeck is using extra power because of a program, FALSE otherwise
- var/active = FALSE
- ///increases the holodeck cooldown if TRUE, causing the holodeck to take longer to allow loading new programs
- var/damaged = FALSE
-
- //creates the timer that determines if another program can be manually loaded
- COOLDOWN_DECLARE(holodeck_cooldown)
-
-/obj/machinery/computer/holodeck/Initialize(mapload)
- ..()
- return INITIALIZE_HINT_LATELOAD
-
-/obj/machinery/computer/holodeck/LateInitialize()//from here linked is populated and the program list is generated. its also set to load the offline program
- linked = GLOB.areas_by_type[mapped_start_area]
-
- var/area/computer_area = get_area(src)
- if(istype(computer_area, /area/holodeck))
- log_mapping("Holodeck computer cannot be in a holodeck, This would cause circular power dependency.")
- qdel(src)
- return
-
- // the following is necessary for power reasons
- if(!linked)
- log_mapping("No matching holodeck area found")
- qdel(src)
- return
- else if (!offline_program)
- stack_trace("Holodeck console created without an offline program")
- qdel(src)
- return
-
- else
- linked.linked = src
- var/area/my_area = get_area(src)
- if(my_area)
- linked.power_usage = my_area.power_usage
- else
- linked.power_usage = list(AREA_USAGE_LEN)
-
- bottom_left = locate(linked.x, linked.y, z)
- COOLDOWN_START(src, holodeck_cooldown, HOLODECK_CD)
- generate_program_list()
- load_program(offline_program,TRUE)
-
-///adds all programs that this holodeck has access to, and separates the restricted and unrestricted ones
-/obj/machinery/computer/holodeck/proc/generate_program_list()
- for(var/typekey in subtypesof(program_type))
- var/datum/map_template/holodeck/program = typekey
- var/list/info_this = list("id" = initial(program.template_id), "name" = initial(program.name))
- if(initial(program.restricted) && (initial(program.access_flags) & holodeck_access))
- LAZYADD(emag_programs, list(info_this))
- else if (initial(program.access_flags) & holodeck_access)
- LAZYADD(program_cache, list(info_this))
-
-/obj/machinery/computer/holodeck/ui_interact(mob/user, datum/tgui/ui)
- ui = SStgui.try_update_ui(user, src, ui)
- if(!ui)
- ui = new(user, src, "Holodeck", name)
- ui.open()
-
-/obj/machinery/computer/holodeck/ui_data(mob/user)
- var/list/data = list()
-
- data["default_programs"] = program_cache
- if(obj_flags & EMAGGED)
- data["emagged"] = TRUE
- data["emag_programs"] = emag_programs
- data["program"] = program
- data["can_toggle_safety"] = issilicon(user) || isAdminGhostAI(user)
- return data
-
-/obj/machinery/computer/holodeck/ui_act(action, params)
- . = ..()
- if(.)
- return
- . = TRUE
- switch(action)
- if("load_program")
- var/program_to_load = params["id"]
-
- var/list/checked = program_cache.Copy()
- if (obj_flags & EMAGGED)
- checked |= emag_programs
- var/valid = FALSE //dont tell security about this
-
- for (var/prog in checked)//checks if program_to_load is any one of the loadable programs, if it isnt then it rejects it
- var/list/check_list = prog
- if (check_list["id"] == program_to_load)
- valid = TRUE
- break
- if (!valid)
- return FALSE
- //load the map_template that program_to_load represents
- if(program_to_load)
- load_program(program_to_load)
- if("safety")
- if((obj_flags & EMAGGED) && program)
- emergency_shutdown()
- nerf(obj_flags & EMAGGED,FALSE)
- obj_flags ^= EMAGGED
- say("Safeties reset. Restarting...")
-
-///this is what makes the holodeck not spawn anything on broken tiles (space and non engine plating / non holofloors)
-/datum/map_template/holodeck/update_blacklist(turf/placement, list/input_blacklist)
- for (var/_turf in get_affected_turfs(placement))
- var/turf/possible_blacklist = _turf
- if (possible_blacklist.holodeck_compatible)
- continue
- input_blacklist[possible_blacklist] = TRUE
-
-///loads the template whose id string it was given ("offline_program" loads datum/map_template/holodeck/offline)
-/obj/machinery/computer/holodeck/proc/load_program(map_id, force = FALSE, add_delay = TRUE)
- if (program == map_id)
- return
-
- if (is_operational)//load_program is called once with a timer (in toggle_power) we dont want this to load anything if its off
- map_id = offline_program
- force = TRUE
-
- if ((!COOLDOWN_FINISHED(src, holodeck_cooldown) && !force) || spawning_simulation)
- say("ERROR. Recalibrating projection apparatus.")
- return
-
- if (add_delay)
- COOLDOWN_START(src, holodeck_cooldown, (damaged ? HOLODECK_CD + HOLODECK_DMG_CD : HOLODECK_CD))
- if (damaged && floorcheck())
- damaged = FALSE
-
- spawning_simulation = TRUE
- active = (map_id != offline_program)
- use_power = active + IDLE_POWER_USE
- program = map_id
-
- //clear the items from the previous program
- for (var/_item in spawned)
- var/obj/holo_item = _item
- derez(holo_item)
-
- for (var/_effect in effects)
- var/obj/effect/holodeck_effect/holo_effect = _effect
- effects -= holo_effect
- holo_effect.deactivate(src)
-
- //makes sure that any time a holoturf is inside a baseturf list (e.g. if someone put a wall over it) its set to the OFFLINE turf
- //so that you cant bring turfs from previous programs into other ones (like putting the plasma burn turf into lounge for example)
- for (var/turf/closed/holo_turf in linked)
- for (var/_baseturf in holo_turf.baseturfs)
- if (ispath(_baseturf, /turf/open/floor/holofloor))
- holo_turf.baseturfs -= _baseturf
- holo_turf.baseturfs += /turf/open/floor/holofloor/plating
-
- template = SSmapping.holodeck_templates[map_id]
- template.load(bottom_left) //this is what actually loads the holodeck simulation into the map
-
- spawned = template.created_atoms //populate the spawned list with the atoms belonging to the holodeck
-
- nerf(!(obj_flags & EMAGGED))
- finish_spawn()
-
-///finalizes objects in the spawned list
-/obj/machinery/computer/holodeck/proc/finish_spawn()
- //this is used for holodeck effects (like spawners). otherwise they dont do shit
- //holo effects are taken out of the spawned list and added to the effects list
- //turfs and overlay objects are taken out of the spawned list
- //objects get resistance flags added to them
- for (var/_atom in spawned)
- var/atom/atoms = _atom
-
- if (isturf(atoms) || istype(atoms, /obj/effect/overlay/vis)) //ssatoms
- spawned -= atoms
- continue
-
- atoms.flags_1 |= HOLOGRAM_1
- RegisterSignal(atoms, COMSIG_PARENT_PREQDELETED, PROC_REF(remove_from_holo_lists))
-
- if (isholoeffect(atoms))//activates holo effects and transfers them from the spawned list into the effects list
- var/obj/effect/holodeck_effect/holo_effect = atoms
- effects += holo_effect
- spawned -= holo_effect
- var/atom/active_effect = holo_effect.activate(src)
- if(istype(active_effect) || islist(active_effect))
- spawned += active_effect // we want mobs or objects spawned via holoeffects to be tracked as objects
- continue
-
- if (isobj(atoms))
- var/obj/holo_object = atoms
- holo_object.resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
-
- if (isstructure(holo_object))
- holo_object.flags_1 |= NODECONSTRUCT_1
- continue
-
- if (ismachinery(holo_object))
- var/obj/machinery/machines = holo_object
- machines.flags_1 |= NODECONSTRUCT_1
- machines.power_change()
-
- if(istype(machines, /obj/machinery/button))
- var/obj/machinery/button/buttons = machines
- buttons.setup_device()
- spawning_simulation = FALSE
-
-///this qdels holoitems that should no longer exist for whatever reason
-/obj/machinery/computer/holodeck/proc/derez(obj/object, silent = TRUE, forced = FALSE)
- if(!object)
- return
-
- spawned -= object
- UnregisterSignal(object, COMSIG_PARENT_PREQDELETED)
- var/turf/target_turf = get_turf(object)
- for(var/c in object) //make sure that things inside of a holoitem are moved outside before destroying it
- var/atom/movable/object_contents = c
- object_contents.forceMove(target_turf)
-
- if(!silent)
- visible_message("[object] fades away! ")
-
- qdel(object)
-
-/obj/machinery/computer/holodeck/proc/remove_from_holo_lists(datum/to_remove, _forced)
- spawned -= to_remove
- UnregisterSignal(to_remove, COMSIG_PARENT_PREQDELETED)
-
-/obj/machinery/computer/holodeck/process()
- if(damaged && prob(10))
- for(var/turf/T in linked)
- if(prob(5))
- do_sparks(2, 1, T)
- return
- . = ..()
- if(!. || program == offline_program)//we dont need to scan the holodeck if the holodeck is offline
- return
-
- if(!floorcheck()) //if any turfs in the floor of the holodeck are broken
- emergency_shutdown()
- damaged = TRUE
- visible_message("The holodeck overloads!")
- for(var/turf/holo_turf in linked)
- if(prob(30))
- do_sparks(2, 1, holo_turf)
- SSexplosions.lowturf += holo_turf
- holo_turf.hotspot_expose(1000,500,1)
-
- if(!(obj_flags & EMAGGED))
- for(var/item in spawned)
- if(!(get_turf(item) in linked))
- derez(item)
- for(var/_effect in effects)
- var/obj/effect/holodeck_effect/holo_effect = _effect
- holo_effect.tick()
- active_power_usage = 50 + spawned.len * 3 + effects.len * 5
-
-/obj/machinery/computer/holodeck/proc/toggle_power(toggleOn = FALSE)
- if(active == toggleOn)
- return
-
- if(toggleOn)
- if(last_program && (last_program != offline_program))
- addtimer(CALLBACK(src, PROC_REF(load_program), last_program, TRUE), 25)
- active = TRUE
- else
- last_program = program
- load_program(offline_program, TRUE)
- active = FALSE
-
-/obj/machinery/computer/holodeck/power_change()
- . = ..()
- INVOKE_ASYNC(src, PROC_REF(toggle_power), !machine_stat)
-
-///shuts down the holodeck and force loads the offline_program
-/obj/machinery/computer/holodeck/proc/emergency_shutdown()
- last_program = program
- active = FALSE
- load_program(offline_program, TRUE)
-
-///returns TRUE if the entire floor of the holodeck is intact, returns FALSE if any are broken
-/obj/machinery/computer/holodeck/proc/floorcheck()
- for(var/turf/holo_floor in linked)
- if(isspaceturf(holo_floor))
- return FALSE
- if(!holo_floor.intact)
- return FALSE
- return TRUE
-
-///changes all weapons in the holodeck to do stamina damage if set
-/obj/machinery/computer/holodeck/proc/nerf(nerf_this, is_loading = TRUE)
- if (!nerf_this && is_loading)
- return
- for(var/obj/item/to_be_nerfed in spawned)
- to_be_nerfed.damtype = nerf_this ? STAMINA : initial(to_be_nerfed.damtype)
- for(var/to_be_nerfed in effects)
- var/obj/effect/holodeck_effect/holo_effect = to_be_nerfed
- holo_effect.safety(nerf_this)
-
-/obj/machinery/computer/holodeck/emag_act(mob/user)
- if(obj_flags & EMAGGED)
- return
- if(!LAZYLEN(emag_programs))
- to_chat(user, "[src] does not seem to have a card swipe port. It must be an inferior model.")
- return
- playsound(src, "sparks", 75, TRUE)
- obj_flags |= EMAGGED
- to_chat(user, "You vastly increase projector power and override the safety and security protocols. ")
- say("Warning. Automatic shutoff and derezzing protocols have been corrupted. Please call Nanotrasen maintenance and do not use the simulator.")
- log_game("[key_name(user)] emagged the Holodeck Control Console")
- nerf(!(obj_flags & EMAGGED),FALSE)
-
-/obj/machinery/computer/holodeck/emp_act(severity)
- . = ..()
- if(. & EMP_PROTECT_SELF)
- return
- emergency_shutdown()
-
-/obj/machinery/computer/holodeck/ex_act(severity, target)
- emergency_shutdown()
- return ..()
-
-/obj/machinery/computer/holodeck/Destroy()
- emergency_shutdown()
- if(linked)
- linked.linked = null
- linked.power_usage = list(AREA_USAGE_LEN)
- return ..()
-
-/obj/machinery/computer/holodeck/blob_act(obj/structure/blob/B)
- emergency_shutdown()
- return ..()
-
-/obj/machinery/computer/holodeck/offstation //second holodeck if you want to add one to a ruin :flushed:
- name = "holodeck control console"
- desc = "A computer used to control a nearby holodeck."
- offline_program = "holodeck_offline"
- holodeck_access = HOLODECK_DEBUG | STATION_HOLODECK
- mapped_start_area = /area/holodeck/rec_center/offstation_one
-
-#undef HOLODECK_CD
-#undef HOLODECK_DMG_CD
diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm
deleted file mode 100644
index 122c852fbc9a..000000000000
--- a/code/modules/holodeck/holo_effect.dm
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- The holodeck activates these shortly after the program loads,
- and deactivates them immediately before changing or disabling the holodeck.
-
- These remove snowflake code for special holodeck functions.
-*/
-/obj/effect/holodeck_effect
- icon = 'icons/hud/screen_gen.dmi'
- icon_state = "x2"
- invisibility = INVISIBILITY_ABSTRACT
-
-/obj/effect/holodeck_effect/proc/activate(obj/machinery/computer/holodeck/HC)
- return
-
-/obj/effect/holodeck_effect/proc/deactivate(obj/machinery/computer/holodeck/HC)
- qdel(src)
- return
-
-// Called by the holodeck computer as long as the program is running
-/obj/effect/holodeck_effect/proc/tick(obj/machinery/computer/holodeck/HC)
- return
-
-/obj/effect/holodeck_effect/proc/safety(active)
- return
-
-
-// Generates a holodeck-tracked card deck
-/obj/effect/holodeck_effect/cards
- icon = 'icons/obj/toy.dmi'
- icon_state = "deck_nanotrasen_full"
- var/obj/item/toy/cards/deck/deck
-
-/obj/effect/holodeck_effect/cards/activate(obj/machinery/computer/holodeck/HC)
- deck = new(loc)
- safety(!(HC.obj_flags & EMAGGED))
- deck.holo = HC
- RegisterSignal(deck, COMSIG_PARENT_QDELETING, PROC_REF(handle_card_delete))
- return deck
-
-/obj/effect/holodeck_effect/cards/proc/handle_card_delete(datum/source)
- SIGNAL_HANDLER
- deck = null
-
-/obj/effect/holodeck_effect/cards/safety(active)
- if(!deck)
- return
- if(active)
- deck.card_hitsound = null
- deck.card_force = 0
- deck.card_throwforce = 0
- deck.card_throw_speed = 3
- deck.card_throw_range = 7
- deck.card_attack_verb = list("attacked")
- else
- deck.card_hitsound = 'sound/weapons/bladeslice.ogg'
- deck.card_force = 5
- deck.card_throwforce = 10
- deck.card_throw_speed = 3
- deck.card_throw_range = 7
- deck.card_attack_verb = list("attacked", "sliced", "diced", "slashed", "cut")
-
-
-/obj/effect/holodeck_effect/sparks/activate(obj/machinery/computer/holodeck/HC)
- var/turf/T = get_turf(src)
- if(T)
- var/datum/effect_system/spark_spread/s = new
- s.set_up(3, 1, T)
- s.start()
- T.set_temperature(5000)
- T.hotspot_expose(50000,50000,1)
-
-
-
-/obj/effect/holodeck_effect/mobspawner
- var/mobtype = /mob/living/simple_animal/hostile/carp/holocarp
- var/mob/our_mob = null
-
-/obj/effect/holodeck_effect/mobspawner/activate(obj/machinery/computer/holodeck/HC)
- if(islist(mobtype))
- mobtype = pick(mobtype)
- our_mob = new mobtype(loc)
- our_mob.flags_1 |= HOLOGRAM_1
-
- // these vars are not really standardized but all would theoretically create stuff on death
- for(var/v in list("butcher_results","corpse","weapon1","weapon2","blood_volume") & our_mob.vars)
- our_mob.vars[v] = null
- RegisterSignal(our_mob, COMSIG_PARENT_QDELETING, PROC_REF(handle_mob_delete))
- return our_mob
-
-/obj/effect/holodeck_effect/mobspawner/deactivate(obj/machinery/computer/holodeck/HC)
- if(our_mob)
- HC.derez(our_mob)
- qdel(src)
-
-/obj/effect/holodeck_effect/mobspawner/proc/handle_mob_delete(datum/source)
- SIGNAL_HANDLER
- our_mob = null
-
-/obj/effect/holodeck_effect/mobspawner/pet
- mobtype = list(
- /mob/living/simple_animal/butterfly, /mob/living/simple_animal/chick/holo,
- /mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/cat/kitten,
- /mob/living/simple_animal/pet/dog/corgi, /mob/living/simple_animal/pet/dog/corgi/puppy,
- /mob/living/simple_animal/pet/dog/pug, /mob/living/simple_animal/pet/fox)
-
-/obj/effect/holodeck_effect/mobspawner/bee
- mobtype = /mob/living/simple_animal/hostile/poison/bees/toxin
-
-/obj/effect/holodeck_effect/mobspawner/monkey
- mobtype = /mob/living/simple_animal/holodeck_monkey
-
-/obj/effect/holodeck_effect/mobspawner/penguin
- mobtype = /mob/living/simple_animal/pet/penguin/emperor
-
-/obj/effect/holodeck_effect/mobspawner/penguin/Initialize()
- if(prob(1))
- mobtype = /mob/living/simple_animal/pet/penguin/emperor/shamebrero
- return ..()
-
-/obj/effect/holodeck_effect/mobspawner/penguin_baby
- mobtype = /mob/living/simple_animal/pet/penguin/baby
diff --git a/code/modules/holodeck/holodeck_map_templates.dm b/code/modules/holodeck/holodeck_map_templates.dm
deleted file mode 100644
index 2f4a790a3366..000000000000
--- a/code/modules/holodeck/holodeck_map_templates.dm
+++ /dev/null
@@ -1,198 +0,0 @@
-/datum/map_template/holodeck
- var/template_id
- var/description
- var/access_flags //bitflags representing what holodeck is allowed to access them
- var/restricted = FALSE
- var/datum/parsed_map/lastparsed
-
- should_place_on_top = FALSE
- returns_created_atoms = TRUE
- keep_cached_map = TRUE
-
- var/obj/machinery/computer/holodeck/linked
-
-/datum/map_template/holodeck/offline
- name = "Holodeck - Offline"
- template_id = "holodeck_offline"
- description = "benis"
- mappath = "_maps/templates/holodeck_offline.dmm"
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/emptycourt
- name = "Holodeck - Empty Court"
- template_id = "holodeck_emptycourt"
- description = "benis"
- mappath = "_maps/templates/holodeck_emptycourt.dmm"
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/dodgeball
- name = "Holodeck - Dodgeball Court"
- template_id = "holodeck_dodgeball"
- description = "benis"
- mappath = "_maps/templates/holodeck_dodgeball.dmm"
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/basketball
- name = "Holodeck - Basketball Court"
- template_id = "holodeck_basketball"
- description = "benis"
- mappath = "_maps/templates/holodeck_basketball.dmm"
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/thunderdome
- name = "Holodeck - Thunderdome Arena"
- template_id = "holodeck_thunderdome"
- description = "benis"
- mappath = "_maps/templates/holodeck_thunderdome.dmm"
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/beach
- name = "Holodeck - Beach"
- template_id = "holodeck_beach"
- description = "benis"
- mappath = "_maps/templates/holodeck_beach.dmm"
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/lounge
- name = "Holodeck - Lounge"
- template_id = "holodeck_lounge"
- description = "benis"
- mappath = "_maps/templates/holodeck_lounge.dmm"
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/petpark
- name = "Holodeck - Pet Park"
- template_id = "holodeck_petpark"
- description = "benis"
- mappath = "_maps/templates/holodeck_petpark.dmm"
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/firingrange
- name = "Holodeck - Firing Range"
- template_id = "holodeck_firingrange"
- description = "benis"
- mappath = "_maps/templates/holodeck_firingrange.dmm"
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/anime_school
- name = "Holodeck - Anime School"
- template_id = "holodeck_animeschool"
- description = "benis"
- mappath = "_maps/templates/holodeck_animeschool.dmm"
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/chapelcourt
- name = "Holodeck - Chapel Courtroom"
- template_id = "holodeck_chapelcourt"
- description = "benis"
- mappath = "_maps/templates/holodeck_chapelcourt.dmm"
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/spacechess
- name = "Holodeck - Space Chess"
- template_id = "holodeck_spacechess"
- description = "benis"
- mappath = "_maps/templates/holodeck_spacechess.dmm"
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/spacecheckers
- name = "Holodeck - Space Checkers"
- template_id = "holodeck_spacecheckers"
- description = "benis"
- mappath = "_maps/templates/holodeck_spacecheckers.dmm"
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/kobayashi
- name = "Holodeck - Kobayashi Maru"
- template_id = "holodeck_kobayashi"
- description = "benis"
- mappath = "_maps/templates/holodeck_kobayashi.dmm"
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/winterwonderland
- name = "Holodeck - Winter Wonderland"
- template_id = "holodeck_winterwonderland"
- description = "benis"
- mappath = "_maps/templates/holodeck_winterwonderland.dmm"
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/photobooth
- name = "Holodeck - Photobooth"
- template_id = "holodeck_photobooth"
- description = "benis"
- mappath = "_maps/templates/holodeck_photobooth.dmm"
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/skatepark
- name = "Holodeck - Skatepark"
- template_id = "holodeck_skatepark"
- description = "benis"
- mappath = "_maps/templates/holodeck_skatepark.dmm"
- access_flags = STATION_HOLODECK
-
-//bad evil no good programs
-
-/datum/map_template/holodeck/medicalsim
- name = "Holodeck - Emergency Medical"
- template_id = "holodeck_medicalsim"
- description = "benis"
- mappath = "_maps/templates/holodeck_medicalsim.dmm"
- restricted = TRUE
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/thunderdome1218
- name = "Holodeck - 1218 AD"
- template_id = "holodeck_thunderdome1218"
- description = "benis"
- mappath = "_maps/templates/holodeck_thunderdome1218.dmm"
- restricted = TRUE
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/burntest
- name = "Holodeck - Atmospheric Burn Test"
- template_id = "holodeck_burntest"
- description = "benis"
- mappath = "_maps/templates/holodeck_burntest.dmm"
- restricted = TRUE
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/wildlifesim
- name = "Holodeck - Wildlife Simulation"
- template_id = "holodeck_wildlifesim"
- description = "benis"
- mappath = "_maps/templates/holodeck_wildlifesim.dmm"
- restricted = TRUE
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/holdoutbunker
- name = "Holodeck - Holdout Bunker"
- template_id = "holodeck_holdoutbunker"
- description = "benis"
- mappath = "_maps/templates/holodeck_holdoutbunker.dmm"
- restricted = TRUE
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/anthophillia
- name = "Holodeck - Anthophillia"
- template_id = "holodeck_anthophillia"
- description = "benis"
- mappath = "_maps/templates/holodeck_anthophillia.dmm"
- restricted = TRUE
- access_flags = STATION_HOLODECK
-
-/datum/map_template/holodeck/refuelingstation
- name = "Holodeck - Refueling Station"
- template_id = "holodeck_refuelingstation"
- description = "benis"
- mappath = "_maps/templates/holodeck_refuelingstation.dmm"
- restricted = TRUE
- access_flags = STATION_HOLODECK
-
-//flag debug holodeck
-
-/datum/map_template/holodeck/gamer
- name = "Holodeck - Gamer"
- template_id = "holodeck_gamer"
- description = "benis"
- mappath = "_maps/templates/holodeck_gamer.dmm"
- access_flags = HOLODECK_DEBUG
diff --git a/code/modules/holodeck/mobs.dm b/code/modules/holodeck/mobs.dm
deleted file mode 100644
index 121989bf1e71..000000000000
--- a/code/modules/holodeck/mobs.dm
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- Mobs
-*/
-
-/mob/living/simple_animal/holodeck_monkey
- name = "monkey"
- desc = "A holographic creature fond of bananas."
- icon = 'icons/mob/monkey.dmi'
- icon_state = "monkey1"
- icon_living = "monkey1"
- icon_dead = "monkey1_dead"
- speak_emote = list("chimpers")
- emote_hear = list("chimpers.")
- emote_see = list("scratches.", "looks around.")
- speak_chance = 1
- turns_per_move = 2
- butcher_results = list()
- response_help_continuous = "pets"
- response_help_simple = "pet"
- response_disarm_continuous = "pushes aside"
- response_disarm_simple = "push aside"
- response_harm_continuous = "kicks"
- response_harm_simple = "kick"
diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm
index b69c05e34653..59e9a46341e6 100644
--- a/code/modules/holodeck/turfs.dm
+++ b/code/modules/holodeck/turfs.dm
@@ -1,6 +1,5 @@
/turf/open/floor/holofloor
icon_state = "floor"
- holodeck_compatible = TRUE
thermal_conductivity = 0
flags_1 = NONE
var/direction = SOUTH
diff --git a/code/modules/jobs/job_exp.dm b/code/modules/jobs/job_exp.dm
index 159c1e1df6aa..9cf57432b4ea 100644
--- a/code/modules/jobs/job_exp.dm
+++ b/code/modules/jobs/job_exp.dm
@@ -45,6 +45,7 @@ GLOBAL_PROTECT(exp_to_update)
return FALSE
if(CONFIG_GET(flag/use_exp_restrictions_admin_bypass) && check_rights_for(src, R_ADMIN))
return FALSE // if admin exemption is enabled, and client is an admin, let them through
+ return TRUE
/client/proc/get_exp_living(pure_numeric = FALSE)
if(!prefs.exp)
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index 206c0746bc85..2bd5c2fd4667 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -67,7 +67,7 @@
if(back_storage)
back_storage.handle_item_insertion(loadout_dumper, TRUE)
else if(!spawnee.put_in_hands(loadout_dumper, TRUE))
- to_chat("Unable to place loadout box.")
+ to_chat(spawnee, "Unable to place loadout box.")
/datum/job/proc/override_latejoin_spawn(mob/living/carbon/human/H) //Return TRUE to force latejoining to not automatically place the person in latejoin shuttle/whatever.
return FALSE
@@ -192,6 +192,8 @@
///The icon this outfit's ID will have when shown on a sechud and ID cards. See [icons\mob\hud.dmi] for a list of icons. Leave null for default.
var/job_icon
+ // the background of the job icon
+ var/faction_icon
var/alt_uniform
@@ -277,6 +279,7 @@
if(H.age)
C.registered_age = H.age
C.job_icon = job_icon
+ C.faction_icon = faction_icon
C.update_label()
for(var/A in SSeconomy.bank_accounts)
var/datum/bank_account/B = A
diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm
index b098e79dadac..42ca9b6de9fc 100644
--- a/code/modules/jobs/job_types/assistant.dm
+++ b/code/modules/jobs/job_types/assistant.dm
@@ -45,153 +45,3 @@ Assistant
uniform = /obj/item/clothing/under/utility/skirt
else
uniform = /obj/item/clothing/under/utility
-
-/datum/outfit/job/assistant/entertainer
- name = "Assistant (Entertainer)"
- r_hand = /obj/item/bikehorn //comedy
-
-/datum/outfit/job/assistant/engineeringspecialist
- name = "Assistant (Engineering Specialist)"
- accessory = /obj/item/clothing/accessory/armband/engine
-
-/datum/outfit/job/assistant/medicalspecialist
- name = "Assistant (Medical Specialist)"
- uniform = /obj/item/clothing/under/color/white
- accessory = /obj/item/clothing/accessory/armband/med
-
-/datum/outfit/job/assistant/sciencespecialist
- name = "Assistant (Science Specialist)"
- uniform = /obj/item/clothing/under/color/white
- accessory = /obj/item/clothing/accessory/armband/science
-
-/datum/outfit/job/assistant/engineeringspecialist
- name = "Assistant (Deckhand)"
- accessory = /obj/item/clothing/accessory/armband/cargo
-
-//Shiptest outfits
-
-/datum/outfit/job/assistant/minutemen
- name = "Volunteer (Minutemen)"
-
- uniform = /obj/item/clothing/under/rank/security/officer/minutemen
- backpack = /obj/item/storage/backpack/security/cmm
-
-/datum/outfit/job/assistant/inteq
- name = "IRMG Recruit (Inteq)"
- uniform = /obj/item/clothing/under/syndicate/inteq
-
-/datum/outfit/job/assistant/intern
- name = "Assistant (Intern)"
- uniform = /obj/item/clothing/under/suit/black
- neck = /obj/item/clothing/neck/tie
- shoes = /obj/item/clothing/shoes/laceup
- r_pocket = /obj/item/pen/fountain
-
-/datum/outfit/job/assistant/receptionist
- name = "Assistant (Receptionist)"
- uniform = /obj/item/clothing/under/suit/beige
- glasses = /obj/item/clothing/glasses/regular/hipster
- shoes = /obj/item/clothing/shoes/laceup
- r_pocket = /obj/item/pen/fourcolor
- l_pocket = /obj/item/clipboard
-
-/datum/outfit/job/assistant/receptionist/pre_equip(mob/living/carbon/human/H)
- ..()
- switch(H.jumpsuit_style)
- if(PREF_SUIT)
- uniform = initial(uniform)
- if(PREF_ALTSUIT)
- uniform = /obj/item/clothing/under/suit/blacktwopiece
- if(PREF_SKIRT)
- uniform = /obj/item/clothing/under/dress/skirt/plaid
- else
- uniform = /obj/item/clothing/under/suit/beige
-
-/datum/outfit/job/assistant/pirate
- name = "Assistant (Pirate)"
-
- uniform = /obj/item/clothing/under/costume/sailor
- shoes = /obj/item/clothing/shoes/jackboots
-
-/datum/outfit/job/assistant/corporate
- name = "Business Associate"
-
- uniform = /obj/item/clothing/under/suit/black
- shoes = /obj/item/clothing/shoes/laceup
- suit = /obj/item/clothing/suit/toggle/lawyer/black
-
-/datum/outfit/job/assistant/independent/crewmatefancy
- name = "Crewmate (Independent)"
-
- uniform = /obj/item/clothing/under/misc/assistantformal
- shoes = /obj/item/clothing/shoes/laceup
- gloves = /obj/item/clothing/gloves/color/white
-
-/datum/outfit/job/assistant/ex_prisoner
- name = "Assistant (Ex-Prisoner)"
-
- glasses = /obj/item/clothing/glasses/sunglasses
- uniform = /obj/item/clothing/under/rank/prisoner
- shoes = /obj/item/clothing/shoes/sneakers/orange
- accessory = /obj/item/clothing/accessory/armband/deputy
-
-/datum/outfit/job/assistant/waiter
- name = "Assistant (Waiter)"
-
- uniform = /obj/item/clothing/under/suit/waiter
- shoes = /obj/item/clothing/shoes/laceup
- ears = /obj/item/radio/headset/headset_srv
- gloves = /obj/item/clothing/gloves/color/white
-
-/datum/outfit/job/assistant/artist
- name = "Assistant (Artist)"
-
- uniform = /obj/item/clothing/under/suit/burgundy
- suit = /obj/item/clothing/suit/toggle/suspenders
- head = /obj/item/clothing/head/beret/black
- shoes = /obj/item/clothing/shoes/laceup
- gloves = /obj/item/clothing/gloves/color/white
- accessory = /obj/item/clothing/neck/scarf/darkblue
-
-/datum/outfit/job/assistant/roumain
- name = "Shadow (Saint-Roumain Militia)"
-
- uniform = /obj/item/clothing/under/suit/roumain
- alt_uniform = null
- shoes = /obj/item/clothing/shoes/workboots/mining
- suit = /obj/item/clothing/suit/armor/roumain/shadow
-
- head = /obj/item/clothing/head/cowboy/sec/roumain/shadow
-
-/datum/outfit/job/assistant/roumain/post_equip(mob/living/carbon/human/H)
- H.faction |= list("roumain")
-
-/datum/outfit/job/assistant/pharma
- name = "Pharmacology Student"
-
- uniform = /obj/item/clothing/under/rank/medical/
- shoes = /obj/item/clothing/shoes/sneakers/white
- accessory = /obj/item/clothing/neck/scarf/orange
- l_pocket = /obj/item/pda/medical
- r_pocket = /obj/item/reagent_containers/pill/floorpill
- belt = /obj/item/reagent_scanner
- backpack_contents = list(/obj/item/book/manual/wiki/chemistry=1)
-
-/datum/outfit/job/assistant/aipirate
- name = "Nodesman"
-
- uniform = /obj/item/clothing/under/utility
- head = /obj/item/clothing/head/soft/black
- shoes = /obj/item/clothing/shoes/combat
- l_pocket = /obj/item/kitchen/knife/combat/survival
- gloves = /obj/item/clothing/gloves/combat
- implants = list(/obj/item/implant/radio)
-
-/datum/outfit/job/assistant/frontiersmen
- name = "Deckhand (frontiersmen)"
-
- uniform = /obj/item/clothing/under/rank/security/officer/frontier
- shoes = /obj/item/clothing/shoes/jackboots
- r_pocket = /obj/item/radio
- head = /obj/item/clothing/head/beret/sec/frontier
- ears = /obj/item/radio/headset/pirate
diff --git a/code/modules/jobs/job_types/atmospheric_technician.dm b/code/modules/jobs/job_types/atmospheric_technician.dm
index f00d87eb6ba4..3dc911b137ac 100644
--- a/code/modules/jobs/job_types/atmospheric_technician.dm
+++ b/code/modules/jobs/job_types/atmospheric_technician.dm
@@ -31,20 +31,3 @@
box = /obj/item/storage/box/survival/engineer
pda_slot = ITEM_SLOT_LPOCKET
backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
-
-/datum/outfit/job/atmos/rig
- name = "Atmospheric Technician (Hardsuit)"
-
- mask = /obj/item/clothing/mask/gas/atmos
- suit = /obj/item/clothing/suit/space/hardsuit/engine/atmos
- suit_store = /obj/item/tank/internals/oxygen
- internals_slot = ITEM_SLOT_SUITSTORE
-
-/datum/outfit/job/atmos/frontiersmen
- name = "Atmospheric Technician (Frontiersmen)"
-
- uniform = /obj/item/clothing/under/rank/security/officer/frontier
- suit = /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos
- head = /obj/item/clothing/head/hardhat
- ears = /obj/item/radio/headset/pirate
- mask = /obj/item/clothing/mask/gas/atmos
diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm
index f704f1c62139..9c5d28e693e8 100644
--- a/code/modules/jobs/job_types/bartender.dm
+++ b/code/modules/jobs/job_types/bartender.dm
@@ -31,16 +31,3 @@
if(H.age < AGE_MINOR)
W.registered_age = AGE_MINOR
to_chat(H, "You're not technically old enough to access or serve alcohol, but your ID has been discreetly modified to display your age as [AGE_MINOR]. Try to keep that a secret! ")
-
-/datum/outfit/job/bartender/pharma
- name = "Mixologist"
-
- backpack_contents = list(/obj/item/storage/box/syringes=1, /obj/item/storage/box/drinkingglasses = 1)
- ears = /obj/item/radio/headset/headset_med
- suit = /obj/item/clothing/suit/toggle/labcoat
- alt_suit = /obj/item/clothing/suit/armor/vest
- l_pocket = /obj/item/pda/bar
- r_pocket = /obj/item/reagent_containers/food/drinks/shaker
- belt = /obj/item/storage/belt
- gloves = /obj/item/clothing/gloves/color/latex/nitrile
- uniform = /obj/item/clothing/under/suit/black
diff --git a/code/modules/jobs/job_types/botanist.dm b/code/modules/jobs/job_types/botanist.dm
index 17820864e57f..130385df95f1 100644
--- a/code/modules/jobs/job_types/botanist.dm
+++ b/code/modules/jobs/job_types/botanist.dm
@@ -26,12 +26,3 @@
backpack = /obj/item/storage/backpack/botany
satchel = /obj/item/storage/backpack/satchel/hyd
courierbag = /obj/item/storage/backpack/messenger/hyd
-
-/datum/outfit/job/botanist/pharma
- name = "Herbalist"
-
- ears = /obj/item/radio/headset/headset_med
- belt = /obj/item/storage/bag/plants
- l_pocket = /obj/item/pda/botanist
- suit = /obj/item/clothing/suit/apron/overalls
- uniform = /obj/item/clothing/under/utility
diff --git a/code/modules/jobs/job_types/brig_physician.dm b/code/modules/jobs/job_types/brig_physician.dm
index d27f2df6b859..124c1ec791df 100644
--- a/code/modules/jobs/job_types/brig_physician.dm
+++ b/code/modules/jobs/job_types/brig_physician.dm
@@ -28,20 +28,3 @@
l_hand = /obj/item/storage/firstaid/regular
head = /obj/item/clothing/head/soft/sec/brig_phys
implants = list(/obj/item/implant/mindshield)
-
-
-/datum/outfit/job/brig_phys/securitymedic
- name = "Brig Physician (Security Medic)"
-
- uniform = /obj/item/clothing/under/rank/security/brig_phys/nt
- suit = /obj/item/clothing/suit/toggle/labcoat/brig_phys
- suit_store = /obj/item/flashlight/pen
- alt_suit = null
-
-/datum/outfit/job/brig_phys/executionsupervisor
- name = "Brig Physician (Execution Supervisor)"
-
- uniform = /obj/item/clothing/under/rank/security/brig_phys/nt
- suit = /obj/item/clothing/suit/toggle/labcoat/brig_phys
- l_pocket = /obj/item/reagent_containers/syringe
- alt_suit = null
diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm
index 78e7eb8dde74..786f9e798e43 100644
--- a/code/modules/jobs/job_types/captain.dm
+++ b/code/modules/jobs/job_types/captain.dm
@@ -41,175 +41,3 @@
accessory = /obj/item/clothing/accessory/medal/gold/captain
chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/captain)
-
-/datum/outfit/job/captain/hardsuit
- name = "Captain (Hardsuit)"
-
- mask = /obj/item/clothing/mask/gas/atmos/captain
- suit = /obj/item/clothing/suit/space/hardsuit/swat/captain
- suit_store = /obj/item/tank/internals/oxygen
-
-/datum/outfit/job/captain/nt
- name = "Captain (Nanotrasen)"
-
- ears = /obj/item/radio/headset/nanotrasen/captain
- uniform = /obj/item/clothing/under/rank/command/captain/nt
- gloves = /obj/item/clothing/gloves/color/captain/nt
- shoes = /obj/item/clothing/shoes/laceup
- head = /obj/item/clothing/head/caphat/nt
-
-/datum/outfit/job/captain/nt/heron
- name = "Captain (Nanotrasen)"
-
- uniform = /obj/item/clothing/under/rank/centcom/officer
- gloves = /obj/item/clothing/gloves/combat
- head = /obj/item/clothing/head/centhat
- suit = /obj/item/clothing/suit/armor/vest/bulletproof
-
-/datum/outfit/job/captain/pirate
- name = "Captain (Pirate)"
-
- ears = /obj/item/radio/headset/pirate/captain
- uniform = /obj/item/clothing/under/costume/pirate
- shoes = /obj/item/clothing/shoes/jackboots
- head = /obj/item/clothing/head/pirate/captain
- suit = /obj/item/clothing/suit/pirate/captain
-
-/datum/outfit/job/captain/corporate
- name = "Captain (Corporate)"
- uniform = /obj/item/clothing/under/suit/navy
- shoes = /obj/item/clothing/shoes/laceup
- glasses = /obj/item/clothing/glasses/sunglasses
- gloves = null
-
-/datum/outfit/job/captain/western
- name = "Captain (Western)"
- alt_uniform = null
- shoes = /obj/item/clothing/shoes/cowboy/white
- head = /obj/item/clothing/head/caphat/cowboy
- glasses = /obj/item/clothing/glasses/sunglasses
- alt_suit = null
-
-/datum/outfit/job/captain/minutemen
- name = "Captain (Colonial Minutemen)"
-
- ears = /obj/item/radio/headset/heads/captain/alt
- uniform = /obj/item/clothing/under/rank/command/minutemen
- alt_uniform = null
- suit = /obj/item/clothing/suit/toggle/lawyer/minutemen
- alt_suit = null
-
- shoes = /obj/item/clothing/shoes/combat
- head = /obj/item/clothing/head/cowboy/sec/minutemen
- backpack = /obj/item/storage/backpack
- backpack_contents = list(/obj/item/storage/box/ids=1,\
- /obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
-
-/datum/outfit/job/captain/minutemen/general
- name = "General (Colonial Minutemen)"
-
- head = /obj/item/clothing/head/caphat/minutemen
- ears = /obj/item/radio/headset/heads/captain
- uniform = /obj/item/clothing/under/rank/command/minutemen
- suit = /obj/item/clothing/suit/armor/vest/capcarapace/minutemen
- shoes = /obj/item/clothing/shoes/combat
-
- box = /obj/item/storage/box/survival/engineer/radio
- backpack = /obj/item/storage/backpack
- backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/gun/ballistic/revolver/mateba=1)
-
-/datum/outfit/job/captain/independent/owner
- name = "Private Ship Owner (Independent)"
-
- id = /obj/item/card/id/gold
- uniform = /obj/item/clothing/under/suit/black
- shoes = /obj/item/clothing/shoes/laceup
- head = null
- belt = null
- gloves = null
- accessory = null
- ears = /obj/item/radio/headset/heads/captain
- box = /obj/item/storage/box/survival
- backpack = /obj/item/storage/backpack
- satchel = /obj/item/storage/backpack/satchel/
- duffelbag = /obj/item/storage/backpack/duffelbag
- courierbag = /obj/item/storage/backpack/messenger
- backpack_contents = list(/obj/item/clothing/accessory/medal/gold/captain=1, /obj/item/spacecash/bundle/c10000=1)
-
-/datum/outfit/job/captain/inteq
- name = "IRMG Vanguard (Inteq)"
-
- ears = /obj/item/radio/headset/inteq/alt/captain
- uniform = /obj/item/clothing/under/syndicate/inteq
- head = /obj/item/clothing/head/beret/sec/hos/inteq
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
- mask = /obj/item/clothing/mask/gas/sechailer/inteq
- belt = /obj/item/storage/belt/security/webbing/inteq
- suit = /obj/item/clothing/suit/armor/hos/inteq
- dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
- shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
- r_pocket = /obj/item/assembly/flash/handheld
- l_pocket = /obj/item/restraints/handcuffs
- accessory = null
-
- courierbag = /obj/item/storage/backpack/messenger/inteq
- backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/pda/captain)
-
-/datum/outfit/job/captain/inteq/naked
- name = "IRMG Vanguard (Inteq) (Naked)"
- head = null
- mask = null
- glasses = null
- belt = null
- suit = null
- gloves = null
- suit_store = null
-
-/datum/outfit/job/captain/aipirate
- name = "Nodesman (Command)"
-
- uniform = /obj/item/clothing/under/utility
- alt_uniform = null
- gloves = /obj/item/clothing/gloves/combat
- suit = /obj/item/clothing/suit/armor/vest/marine/medium
- alt_suit = null
- dcoat = null
- head = /obj/item/clothing/head/soft/black
- shoes = /obj/item/clothing/shoes/combat
- l_pocket = /obj/item/kitchen/knife/combat
- implants = list(/obj/item/implant/radio)
- accessory = null
-
-/datum/outfit/job/captain/frontiersmen
- name = "Captain (Frontiersmen)"
-
- ears = /obj/item/radio/headset/pirate/alt/captain
- uniform = /obj/item/clothing/under/rank/security/officer/frontier/admiral
- head = /obj/item/clothing/head/caphat/frontier/admiral
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
- mask = /obj/item/clothing/mask/gas/sechailer
- suit = /obj/item/clothing/suit/armor/frontier
- shoes = /obj/item/clothing/shoes/cowboy
- gloves = /obj/item/clothing/gloves/combat
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
-
- backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/pda/captain)
-
-/datum/outfit/job/captain/nt/lp_lieutenant
- name = "LP Lieutenant"
-
- implants = list(/obj/item/implant/mindshield)
- ears = /obj/item/radio/headset/nanotrasen/alt/captain
- id = /obj/item/card/id/lplieu
- belt = /obj/item/pda/captain
- gloves = /obj/item/clothing/gloves/color/black
- uniform = /obj/item/clothing/under/rank/security/head_of_security/alt/lp
- alt_uniform = /obj/item/clothing/under/rank/security/head_of_security/alt/skirt/lp
- dcoat = /obj/item/clothing/suit/jacket
- shoes = /obj/item/clothing/shoes/jackboots
- head = /obj/item/clothing/head/beret/command
-
- satchel = /obj/item/storage/backpack/satchel/cap
- duffelbag = /obj/item/storage/backpack/duffelbag/captain
- courierbag = /obj/item/storage/backpack/messenger/com
diff --git a/code/modules/jobs/job_types/cargo_technician.dm b/code/modules/jobs/job_types/cargo_technician.dm
index 22f85ed9f57a..3fa729969013 100644
--- a/code/modules/jobs/job_types/cargo_technician.dm
+++ b/code/modules/jobs/job_types/cargo_technician.dm
@@ -23,27 +23,4 @@
l_hand = /obj/item/export_scanner
backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1)
-//Shiptest outfits
-/datum/outfit/job/cargo_tech/pilot
- name = "Pilot"
-
- uniform = /obj/item/clothing/under/syndicate/camo
- accessory = /obj/item/clothing/accessory/armband/cargo
- suit = /obj/item/clothing/suit/jacket
- shoes = /obj/item/clothing/shoes/jackboots
- gloves = /obj/item/clothing/gloves/fingerless
- glasses = /obj/item/clothing/glasses/sunglasses/big
-
-
-/datum/outfit/job/cargo_tech/frontiersmen
- name = "Cargo Tech (frontiersmen)"
-
- uniform = /obj/item/clothing/under/rank/security/officer/frontier
- suit = /obj/item/clothing/suit/hazardvest
- ears = /obj/item/radio/headset/pirate
- shoes = /obj/item/clothing/shoes/workboots
- head = /obj/item/clothing/head/soft
- backpack_contents = list(
- /obj/item/modular_computer/tablet/preset/cargo = 1,
- )
diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm
index 9dd36c1e201a..870697476794 100644
--- a/code/modules/jobs/job_types/chaplain.dm
+++ b/code/modules/jobs/job_types/chaplain.dm
@@ -124,18 +124,3 @@
satchel = /obj/item/storage/backpack/cultpack
chameleon_extras = /obj/item/stamp/chap
-
-/datum/outfit/job/chaplain/monk
- name = "Chaplain (Monk)"
- suit = /obj/item/clothing/suit/hooded/chaplainsuit/monkhabit
- l_hand = /obj/item/storage/book/bible
-
-/datum/outfit/job/chaplain/imam
- name = "Chaplain (Imam)"
- head = /obj/item/clothing/head/taqiyahwhite
- l_hand = /obj/item/storage/book/bible/koran
-
-/datum/outfit/job/chaplain/rabbi
- name = "Chaplain (Rabbi)"
- head = /obj/item/clothing/head/kippah
- l_hand = /obj/item/storage/book/bible/torah
diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm
index d98181af7324..c93b6d3119a2 100644
--- a/code/modules/jobs/job_types/chemist.dm
+++ b/code/modules/jobs/job_types/chemist.dm
@@ -29,70 +29,3 @@
box = /obj/item/storage/box/survival/medical
chameleon_extras = /obj/item/gun/syringe
-
-//Alt jobs
-
-/datum/outfit/job/chemist/pharmacist
- name = "Chemist (Pharmacist)"
- jobtype = /datum/job/chemist
-
- glasses = null
- alt_uniform = null
-
- backpack_contents = list(/obj/item/clothing/glasses/science=1)
-
-/datum/outfit/job/chemist/pharmacologist
- name = "Chemist (Pharmacologist)"
-
- glasses = null
- alt_uniform = null
- suit = /obj/item/clothing/suit/toggle/labcoat/chemist/side
-
- backpack_contents = list(/obj/item/clothing/glasses/science=1)
-
-/datum/outfit/job/chemist/juniorchemist
- name = "Chemist (Junior Chemist)"
-
- glasses = null
- alt_uniform = null
- suit = null
- alt_suit = null
-
- backpack_contents = list(/obj/item/clothing/glasses/science=1)
-
-/datum/outfit/job/chemist/seniorchemist
- name = "Chemist (Senior Chemist)"
-
- glasses = null
- alt_uniform = null
- shoes = /obj/item/clothing/shoes/laceup
- suit = /obj/item/clothing/suit/toggle/lawyer/orange
- alt_suit = /obj/item/clothing/suit/toggle/labcoat/chemist
- dcoat = null
- l_hand = null
- suit_store = null
- neck = /obj/item/clothing/neck/tie/orange
-
- backpack_contents = list(/obj/item/clothing/glasses/science=1)
-
-//Shiptest
-
-/datum/outfit/job/chemist/pharma
- name = "Pharmacist"
-
- belt = /obj/item/storage/bag/chemistry
- l_pocket =/obj/item/pda/chemist
- r_pocket = /obj/item/storage/pill_bottle
- suit = /obj/item/clothing/suit/longcoat/chemist
- alt_suit = /obj/item/clothing/suit/toggle/labcoat/chemist/side
- dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical
- box = /obj/item/storage/box/survival/medical
- gloves = /obj/item/clothing/gloves/color/latex
- glasses = /obj/item/clothing/glasses/sunglasses
-
-/datum/outfit/job/chemist/minutemen
- name = "Chemical Scientist(minutemen)"
-
- suit = /obj/item/clothing/suit/toggle/labcoat/chemist
- ears = /obj/item/radio/headset/minutemen
-
diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm
index 5b862731db49..b828f2357159 100644
--- a/code/modules/jobs/job_types/chief_engineer.dm
+++ b/code/modules/jobs/job_types/chief_engineer.dm
@@ -45,78 +45,3 @@
box = /obj/item/storage/box/survival/engineer
pda_slot = ITEM_SLOT_LPOCKET
chameleon_extras = /obj/item/stamp/ce
-
-/datum/outfit/job/ce/rig
- name = "Chief Engineer (Hardsuit)"
-
- mask = /obj/item/clothing/mask/breath
- suit = /obj/item/clothing/suit/space/hardsuit/engine/elite
- shoes = /obj/item/clothing/shoes/magboots/advance
- suit_store = /obj/item/tank/internals/oxygen
- glasses = /obj/item/clothing/glasses/meson/engine
- gloves = /obj/item/clothing/gloves/color/yellow
- head = null
- internals_slot = ITEM_SLOT_SUITSTORE
-
-/datum/outfit/job/ce/engineeringcoordinator
- name = "Chief Engineer (Engineering Coordinator)"
-
- belt = null
- uniform = /obj/item/clothing/under/rank/engineering/chief_engineer
- alt_uniform = null
- alt_suit = /obj/item/clothing/suit/hazardvest
- dcoat = null
- shoes = /obj/item/clothing/shoes/laceup
- head = /obj/item/clothing/head/hardhat/white
- gloves = null
- neck = /obj/item/clothing/neck/tie/green
- backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced=1, /obj/item/clothing/gloves/color/black=1)
-
-/datum/outfit/job/ce/inteq
- name = "IRMG Artificer Class II (Inteq)"
-
- ears = /obj/item/radio/headset/inteq
- uniform = /obj/item/clothing/under/syndicate/inteq/artificer
- head = /obj/item/clothing/head/hardhat/white
- mask = /obj/item/clothing/mask/gas/sechailer/inteq
- dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
- shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
- belt = /obj/item/storage/belt/utility/full
-
- courierbag = /obj/item/storage/backpack/messenger/inteq
-
-/datum/outfit/job/ce/nt
- name = "Chief Engineer (NT)"
-
- head = /obj/item/clothing/head/beret/ce
- belt = /obj/item/storage/belt/utility/full
- suit = /obj/item/clothing/suit/hazardvest
-
-/datum/outfit/job/ce/frontiersmen
- name = "Head Carpenter (Frontiersmen)"
-
- ears = /obj/item/radio/headset/pirate
- uniform = /obj/item/clothing/under/rank/security/officer/frontier/officer
- head = /obj/item/clothing/head/hardhat/white
- shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
- belt = /obj/item/storage/belt/utility/full
-
-/datum/outfit/job/ce/minutemen
- name = "Foreman (Colonial Minutemen)"
-
- ears = /obj/item/radio/headset/minutemen/alt
- uniform = /obj/item/clothing/under/rank/command/minutemen
- alt_uniform = null
- suit = /obj/item/clothing/suit/toggle/lawyer/minutemen
- alt_suit = null
- gloves = /obj/item/clothing/gloves/combat
- belt = /obj/item/storage/belt/utility/full
- shoes = /obj/item/clothing/shoes/combat
- head = /obj/item/clothing/head/cowboy/sec/minutemen
- backpack = /obj/item/storage/backpack
- backpack_contents = list(
- /obj/item/melee/classic_baton/telescopic=1,
- /obj/item/modular_computer/tablet/preset/advanced = 1
- )
diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm
index f614aab080a0..d09b9ee6aa50 100644
--- a/code/modules/jobs/job_types/chief_medical_officer.dm
+++ b/code/modules/jobs/job_types/chief_medical_officer.dm
@@ -42,55 +42,3 @@
box = /obj/item/storage/box/survival/medical
chameleon_extras = list(/obj/item/gun/syringe, /obj/item/stamp/cmo)
-
-/datum/outfit/job/cmo/hardsuit
- name = "Chief Medical Officer (Hardsuit)"
-
- mask = /obj/item/clothing/mask/breath/medical
- suit = /obj/item/clothing/suit/space/hardsuit/medical/cmo
- suit_store = /obj/item/tank/internals/oxygen
- r_pocket = /obj/item/flashlight/pen
-
-/datum/outfit/job/cmo/medicaldirector
- name = "Chief Medical Officer (Medical Director)"
-
- alt_uniform = null
- shoes = /obj/item/clothing/shoes/laceup
- suit = /obj/item/clothing/suit/toggle/lawyer/cmo
- alt_suit = /obj/item/clothing/suit/toggle/labcoat/cmo
- neck = /obj/item/clothing/neck/tie/blue
- l_hand = null
- suit_store = null
- backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/storage/firstaid/medical=1, /obj/item/flashlight/pen=1)
-
-/datum/outfit/job/cmo/surgeongeneral
- name = "Chief Medical Officer (Surgeon-General)"
-
- uniform = /obj/item/clothing/under/rank/medical/chief_medical_officer
- alt_uniform = null
- shoes = /obj/item/clothing/shoes/laceup
- suit = /obj/item/clothing/suit/toggle/labcoat/cmo
- alt_suit = null
- l_hand = null
- suit_store = null
- backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/storage/firstaid/medical=1, /obj/item/flashlight/pen=1)
-
-
-/datum/outfit/job/cmo/pharma
- name = "Chief Pharmacist"
-
- glasses = /obj/item/clothing/glasses/science/prescription/fake//chief pharma is this kind of person
- neck = /obj/item/clothing/neck/tie/orange//the Horrible Tie was genuinely too hard to look at
- l_pocket = /obj/item/reagent_containers/glass/filter
- ears = /obj/item/radio/headset/heads/cmo
- uniform = /obj/item/clothing/under/suit/tan
- alt_uniform = /obj/item/clothing/under/rank/medical/doctor/green
- shoes = /obj/item/clothing/shoes/sneakers/brown
- suit = /obj/item/clothing/suit/toggle/suspenders/gray
- suit_store = null
- dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical
- l_hand = /obj/item/reagent_containers/glass/maunamug
- backpack = /obj/item/storage/backpack/chemistry
- satchel = /obj/item/storage/backpack/satchel/chem
- courierbag = /obj/item/storage/backpack/messenger/chem
- backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/storage/bag/chemistry=1)
diff --git a/code/modules/jobs/job_types/cook.dm b/code/modules/jobs/job_types/cook.dm
index d1006a5b154f..1c3d318eeffb 100644
--- a/code/modules/jobs/job_types/cook.dm
+++ b/code/modules/jobs/job_types/cook.dm
@@ -35,23 +35,3 @@
H.equip_to_slot_or_del(I,ITEM_SLOT_BACKPACK)
var/datum/martial_art/cqc/under_siege/justacook = new
justacook.teach(H)
-
-//WS Edit Start - Alt-Job Titles
-/datum/outfit/job/cook/grillmaster
- uniform = /obj/item/clothing/under/rank/civilian/cookjorts
- suit = null
- head = null
- mask = null
- r_hand = /obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy
- l_pocket = /obj/item/stack/sheet/mineral/coal
-//WS Edit End - Alt-Job Titles
-
-//shiptest outfits
-
-/datum/outfit/job/cook/frontiersmen
- name = "Steward (frontiersmen)"
-
- uniform = /obj/item/clothing/under/rank/security/officer/frontier
- ears = /obj/item/radio/headset/pirate
- head = /obj/item/clothing/head/flatcap
- suit = /obj/item/clothing/suit/apron/chef
diff --git a/code/modules/jobs/job_types/curator.dm b/code/modules/jobs/job_types/curator.dm
index d069e3411bbc..3fb642e9e469 100644
--- a/code/modules/jobs/job_types/curator.dm
+++ b/code/modules/jobs/job_types/curator.dm
@@ -36,38 +36,3 @@
return
H.grant_all_languages(TRUE, TRUE, TRUE, LANGUAGE_CURATOR)
-
-/datum/outfit/job/curator/journalist
- name = "Curator (Journalist)"
- uniform = /obj/item/clothing/under/suit/checkered
- head = /obj/item/clothing/head/fedora
- neck = /obj/item/camera
- l_hand = /obj/item/taperecorder
- l_pocket = /obj/item/newspaper
- backpack_contents = list(
- /obj/item/choice_beacon/hero = 1,
- /obj/item/tape = 1
- )
-
-/datum/outfit/job/curator/librarian
- name = "Curator (Librarian)"
- uniform = /obj/item/clothing/under/suit/tan
- neck = /obj/item/clothing/neck/tie/brown
- backpack_contents = list(
- /obj/item/choice_beacon/hero = 1,
- /obj/item/tape = 1,
- /obj/item/paper_bin/bundlenatural = 1,
- /obj/item/pen/fountain = 1
- )
-/datum/outfit/job/curator/dungeonmaster
- name = "Dungeon Master"
- uniform = /obj/item/clothing/under/misc/pj/red
- suit = /obj/item/clothing/suit/nerdshirt
- backpack_contents = list(
- /obj/item/choice_beacon/hero = 1,
- /obj/item/tape = 1,
- /obj/item/storage/pill_bottle/dice = 1,
- /obj/item/toy/cards/deck/cas = 1,
- /obj/item/toy/cards/deck/cas/black = 1,
- /obj/item/hourglass = 1
- )
diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm
index e38e758cf71e..a1071d7d3ce4 100644
--- a/code/modules/jobs/job_types/head_of_personnel.dm
+++ b/code/modules/jobs/job_types/head_of_personnel.dm
@@ -49,78 +49,3 @@
courierbag = /obj/item/storage/backpack/messenger/com
chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/head_of_personnel)
-
-/datum/outfit/job/head_of_personnel/pre_equip(mob/living/carbon/human/H)
- ..()
-
-/datum/outfit/job/head_of_personnel/nt
- name = "First Officer (Nanotrasen)"
- ears = /obj/item/radio/headset/nanotrasen
- uniform = /obj/item/clothing/under/rank/command/head_of_personnel/nt
- alt_uniform = null
- alt_suit = null
- shoes = /obj/item/clothing/shoes/laceup
- head = /obj/item/clothing/head/hopcap/nt
-
-/datum/outfit/job/head_of_personnel/pirate
- name = "First Mate (Pirate)"
- ears = /obj/item/radio/headset/pirate
- uniform = /obj/item/clothing/under/costume/pirate
- shoes = /obj/item/clothing/shoes/jackboots
- head = /obj/item/clothing/head/pirate
- suit = /obj/item/clothing/suit/pirate
-
-/datum/outfit/job/head_of_personnel/western
- name = "First Mate (Western)"
- uniform = /obj/item/clothing/under/rank/security/detective/grey
- alt_uniform = null
- suit = null
- alt_suit = null
- shoes = /obj/item/clothing/shoes/cowboy/black
- accessory = /obj/item/clothing/accessory/waistcoat
- head = /obj/item/clothing/head/HoS/cowboy
-
-/datum/outfit/job/head_of_personnel/minutemen
- name = "Bridge Officer (Colonial Minutemen)"
-
- ears = /obj/item/radio/headset/minutemen/alt
- uniform = /obj/item/clothing/under/rank/command/minutemen
- alt_uniform = null
- suit = /obj/item/clothing/suit/toggle/lawyer/minutemen
- alt_suit = null
-
- shoes = /obj/item/clothing/shoes/combat
- head = /obj/item/clothing/head/cowboy/sec/minutemen
- backpack = /obj/item/storage/backpack
- backpack_contents = list(/obj/item/storage/box/ids=1,\
- /obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
-
-/datum/outfit/job/head_of_personnel/beluga
-
- uniform = /obj/item/clothing/under/rank/command/head_of_personnel
- glasses = /obj/item/clothing/glasses/sunglasses/big
- shoes = /obj/item/clothing/shoes/cowboy/fancy
- head = /obj/item/clothing/head/beret/hop
- backpack_contents = list(/obj/item/storage/box/ids=1,\
- /obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
-
-/datum/outfit/job/head_of_personnel/frontiersmen
- name = "Bridge Officer (frontiersmen)"
-
- ears = /obj/item/radio/headset/pirate/alt
- uniform = /obj/item/clothing/under/rank/security/officer/frontier/officer
- shoes = /obj/item/clothing/shoes/cowboy/black
- head = /obj/item/clothing/head/beret/sec/frontier/officer
- gloves = /obj/item/clothing/gloves/combat
- r_pocket = /obj/item/kitchen/knife/combat/survival
- glasses = /obj/item/clothing/glasses/sunglasses
- suit = /obj/item/clothing/suit/armor/vest/bulletproof/frontier
-
-/datum/outfit/job/head_of_personnel/pilot/heron
- name = "pilot"
-
- uniform = /obj/item/clothing/under/rank/security/officer/military
- suit = /obj/item/clothing/suit/jacket/leather/duster
- glasses = /obj/item/clothing/glasses/hud/spacecop
- accessory = /obj/item/clothing/accessory/holster
- head = /obj/item/clothing/head/beret/lt
diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm
index a122b4249b98..52bdd0b505c9 100644
--- a/code/modules/jobs/job_types/head_of_security.dm
+++ b/code/modules/jobs/job_types/head_of_security.dm
@@ -52,69 +52,3 @@
implants = list(/obj/item/implant/mindshield)
chameleon_extras = list(/obj/item/gun/energy/e_gun/hos, /obj/item/stamp/hos)
-
-/datum/outfit/job/hos/hardsuit
- name = "Head of Security (Hardsuit)"
-
- mask = /obj/item/clothing/mask/gas/sechailer
- suit = /obj/item/clothing/suit/space/hardsuit/security/hos
- suit_store = /obj/item/tank/internals/oxygen
- backpack_contents = list(/obj/item/melee/baton/loaded=1, /obj/item/gun/energy/e_gun=1, /obj/item/ammo_box/magazine/co9mm=1) //WS edit - free lethals
-
-/datum/outfit/job/hos/nanotrasen
- name = "Head of Security (Nanotrasen)"
-
- ears = /obj/item/radio/headset/nanotrasen/alt
- uniform = /obj/item/clothing/under/rank/security/head_of_security/nt
- alt_uniform = null
- head = /obj/item/clothing/head/beret/sec/hos
-
-/datum/outfit/job/hos/frontiersmen
- name = "Master At Arms (frontiersmen)"
-
- ears = /obj/item/radio/headset/syndicate/alt
- uniform = /obj/item/clothing/under/rank/security/officer/frontier/officer
- head = /obj/item/clothing/head/caphat/frontier
- suit = /obj/item/clothing/suit/armor/vest/bulletproof/frontier
- shoes = /obj/item/clothing/shoes/cowboy/black
- gloves = /obj/item/clothing/gloves/combat
- backpack_contents = list(/obj/item/melee/baton/loaded=1)
- suit_store = null
-
-/datum/outfit/job/hos/roumain
- jobtype = /datum/job/hos/roumain
- name = "Hunter Montagne (Saint-Roumain Militia)"
- ears = /obj/item/radio/headset/headset_com
- uniform = /obj/item/clothing/under/suit/roumain
- alt_uniform = null
- shoes = /obj/item/clothing/shoes/workboots/mining
- suit = /obj/item/clothing/suit/armor/hos/roumain/montagne
- alt_suit = null
- dcoat = null
- head = /obj/item/clothing/head/HoS/cowboy/montagne
- gloves = null
- id = /obj/item/card/id/silver
- belt = null
- glasses = null
- suit_store = null
- r_pocket = null
- l_pocket = null
- duffelbag = /obj/item/storage/backpack/cultpack
- courierbag = /obj/item/storage/backpack/cultpack
- backpack = /obj/item/storage/backpack/cultpack
- satchel = /obj/item/storage/backpack/cultpack
- box = null
- implants = null
- chameleon_extras = null
- backpack_contents = list(
- /obj/item/book/manual/srmlore,
- /obj/item/stamp/chap = 1,
- /obj/item/melee/classic_baton/telescopic=1
- )
-
-/datum/outfit/job/hos/roumain/post_equip(mob/living/carbon/human/H)
- H.faction |= list("roumain")
-
-/datum/job/hos/roumain
- outfit = /datum/outfit/job/hos/roumain
- mind_traits = null
diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm
index 6f673a06195d..8293c2bd663b 100644
--- a/code/modules/jobs/job_types/janitor.dm
+++ b/code/modules/jobs/job_types/janitor.dm
@@ -24,7 +24,3 @@
if(GARBAGEDAY in SSevents.holidays)
l_pocket = /obj/item/gun/ballistic/revolver
r_pocket = /obj/item/ammo_box/a357
-
-/datum/outfit/job/janitor/maid
- name = "Maid"
- uniform = /obj/item/clothing/under/rank/civilian/janitor/maid
diff --git a/code/modules/jobs/job_types/lawyer.dm b/code/modules/jobs/job_types/lawyer.dm
index d0777a8af2f8..b43c00caed3e 100644
--- a/code/modules/jobs/job_types/lawyer.dm
+++ b/code/modules/jobs/job_types/lawyer.dm
@@ -27,21 +27,3 @@
r_pocket = /obj/item/clothing/accessory/lawyers_badge
chameleon_extras = /obj/item/stamp/law
-
-/datum/outfit/job/lawyer/corporaterepresentative
- uniform = /obj/item/clothing/under/suit/navy
- suit = /obj/item/clothing/suit/toggle/lawyer/navy
- ears = /obj/item/radio/headset/headset_cent
- neck = /obj/item/clothing/neck/tie/blue
- l_hand = /obj/item/clipboard
- r_pocket = /obj/item/pen/fountain
-
-/datum/outfit/job/lawyer/passenger
- uniform = /obj/item/clothing/under/suit/black
- suit = null
- ears = /obj/item/radio/headset/headset_cent
- neck = null
- glasses = /obj/item/clothing/glasses/sunglasses/big
- l_hand = null
- r_pocket = /obj/item/spacecash/bundle/mediumrand
-
diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm
index f46b1f243582..f1eb3c028696 100644
--- a/code/modules/jobs/job_types/medical_doctor.dm
+++ b/code/modules/jobs/job_types/medical_doctor.dm
@@ -32,125 +32,3 @@
box = /obj/item/storage/box/survival/medical
chameleon_extras = /obj/item/gun/syringe
-
-/datum/outfit/job/doctor/surgeon
- name = "Medical Doctor (Surgeon)"
-
- uniform = /obj/item/clothing/under/rank/medical/doctor/blue
- suit = /obj/item/clothing/suit/apron/surgical
- mask = /obj/item/clothing/mask/surgical
- suit_store = null
-
-/datum/outfit/job/doctor/nurse
- name = "Medical Doctor (Nurse)"
-
- head = /obj/item/clothing/head/nursehat
- suit = null
- suit_store = null
- alt_uniform = /obj/item/clothing/under/rank/medical/doctor/nurse
- accessory = /obj/item/clothing/accessory/armband/medblue
-
-/datum/outfit/job/doctor/juniordoctor
- name = "Medical Doctor (Junior Doctor)"
-
- alt_uniform = null
- shoes = /obj/item/clothing/shoes/sneakers/blue
- suit = null
- alt_suit = null
- l_hand = null
- suit_store = null
-
- backpack_contents = list(/obj/item/storage/firstaid/medical=1, /obj/item/flashlight/pen=1)
-
-/datum/outfit/job/doctor/seniordoctor
- name = "Medical Doctor (Senior Doctor)"
-
- uniform = /obj/item/clothing/under/rank/medical/doctor
- alt_uniform = null
- shoes = /obj/item/clothing/shoes/laceup
- suit = /obj/item/clothing/suit/toggle/lawyer/medical
- alt_suit = /obj/item/clothing/suit/toggle/labcoat
- dcoat = null
- l_hand = null
- suit_store = null
- neck = /obj/item/clothing/neck/tie/blue
-
- backpack_contents = list(/obj/item/storage/firstaid/medical=1, /obj/item/flashlight/pen=1)
-
-/datum/outfit/job/doctor/psychiatrist
- name = "Medical Doctor (Psychiatrist)"
-
- uniform = /obj/item/clothing/under/rank/medical/psychiatrist
- shoes = /obj/item/clothing/shoes/laceup
- suit = null
- alt_suit = null
- l_hand = null
- suit_store = null
-
- backpack_contents = list(/obj/item/clipboard=1, /obj/item/folder/white=1, /obj/item/taperecorder=1)
-
-//Shiptest outfits
-
-/datum/outfit/job/doctor/minutemen
- name = "Field Medic (Colonial Minutemen)"
- uniform = /obj/item/clothing/under/rank/security/officer/minutemen
- accessory = /obj/item/clothing/accessory/armband/medblue
- shoes = /obj/item/clothing/shoes/sneakers/white
- head = /obj/item/clothing/head/beret/med
- suit = null
- suit_store = null
-
-/datum/outfit/job/doctor/pirate
- name = "Ship's Doctor (Pirate)"
-
- uniform = /obj/item/clothing/under/costume/sailor
- shoes = /obj/item/clothing/shoes/jackboots
-
-
-/datum/outfit/job/doctor/roumain
- name = "Hunter Doctor (Saint-Roumain Militia)"
-
- uniform = /obj/item/clothing/under/suit/roumain
- alt_uniform = null
- shoes = /obj/item/clothing/shoes/workboots/mining
- suit = /obj/item/clothing/suit/toggle/labcoat/roumain_med
-
- head = /obj/item/clothing/head/cowboy/sec/roumain/med
- mask = /obj/item/clothing/mask/gas/plaguedoctor
- gloves = null
- backpack = /obj/item/storage/backpack
- satchel = /obj/item/storage/backpack/satchel
- duffelbag = /obj/item/storage/backpack/duffelbag
- courierbag = /obj/item/storage/backpack/messenger
- backpack_contents = list(/obj/item/storage/firstaid/roumain=1)
-
-/datum/outfit/job/doctor/roumain/post_equip(mob/living/carbon/human/H)
- H.faction |= list("roumain")
-
-/datum/outfit/job/doctor/frontiersmen
- name = "Surgeon (frontiersmen)"
-
- uniform = /obj/item/clothing/under/rank/security/officer/frontier
- glasses = /obj/item/clothing/glasses/hud/health/prescription
- ears = /obj/item/radio/headset/pirate
- r_pocket = /obj/item/kitchen/knife/combat/survival
- backpack_contents = list(/obj/item/storage/firstaid/medical,)
-
-/datum/outfit/job/doctor/lp
- name = "LP Medical specialist"
-
- implants = list(/obj/item/implant/mindshield)
- ears = /obj/item/radio/headset/nanotrasen/alt/captain
- id = /obj/item/card/id/lpmed
- belt = /obj/item/pda/medical
- gloves = /obj/item/clothing/gloves/color/latex/nitrile
- uniform = /obj/item/clothing/under/rank/medical/paramedic/lp
- alt_uniform = /obj/item/clothing/under/rank/medical/paramedic/skirt/lp
- dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical
- shoes = /obj/item/clothing/shoes/sneakers/white
- head = /obj/item/clothing/head/beret/med
-
- satchel = /obj/item/storage/backpack/satchel/med
- duffelbag = /obj/item/storage/backpack/duffelbag/med
- courierbag = /obj/item/storage/backpack/messenger/med
- box = /obj/item/storage/box/survival/medical
diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm
index 5ac130370a6c..35d353ac6b52 100644
--- a/code/modules/jobs/job_types/paramedic.dm
+++ b/code/modules/jobs/job_types/paramedic.dm
@@ -37,35 +37,3 @@
box = /obj/item/storage/box/survival/medical
chameleon_extras = /obj/item/gun/syringe
-
-/datum/outfit/job/paramedic/emt
- name = "Paramedic (Emergency Medical Technician)"
-
- uniform = /obj/item/clothing/under/rank/medical/paramedic/emt
-
-//Shiptest outfits
-
-/datum/outfit/job/paramedic/traumateam
- name = "Paramedic (Trauma Team Technician)"
-
- uniform = /obj/item/clothing/under/rank/security/brig_phys
- shoes = /obj/item/clothing/shoes/combat
- backpack = /obj/item/storage/backpack/ert/medical
- belt = /obj/item/storage/belt/medical/webbing/paramedic
-
-/datum/outfit/job/paramedic/inteq
- name = "IRMG Corpsman (Inteq)"
-
- uniform = /obj/item/clothing/under/syndicate/inteq/corpsman
- head = /obj/item/clothing/head/soft/inteq/corpsman
- suit = /obj/item/clothing/suit/armor/inteq/corpsman
- shoes = /obj/item/clothing/shoes/combat
- belt = /obj/item/storage/belt/medical/webbing/paramedic
- ears = /obj/item/radio/headset/headset_medsec/alt
-
-/datum/outfit/job/paramedic/minutemen
- name = "BARD Combat Medic (Minutemen)"
-
- uniform = /obj/item/clothing/under/rank/medical/paramedic/emt
- head = /obj/item/clothing/head/soft/paramedic
- suit = /obj/item/clothing/suit/armor/
diff --git a/code/modules/jobs/job_types/prisoner.dm b/code/modules/jobs/job_types/prisoner.dm
index aca27ae4acbf..4d2d6927d9df 100644
--- a/code/modules/jobs/job_types/prisoner.dm
+++ b/code/modules/jobs/job_types/prisoner.dm
@@ -16,16 +16,3 @@
id = /obj/item/card/id/prisoner
ears = null
belt = null
-
-/datum/outfit/job/prisoner/protectedcustody
- name = "Prisoner (Protected Custody)"
-
- uniform = /obj/item/clothing/under/rank/prisoner/protected_custody
- alt_uniform = /obj/item/clothing/under/rank/prisoner/protected_custody
- alt_suit = null
- shoes = /obj/item/clothing/shoes/sneakers/orange
-
-/datum/outfit/job/prisoner/shotcaller
- name = "Shotcaller"
- l_pocket = /obj/item/kitchen/knife/shiv
-
diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm
index 68380b99fa05..48b810cff6d7 100644
--- a/code/modules/jobs/job_types/quartermaster.dm
+++ b/code/modules/jobs/job_types/quartermaster.dm
@@ -27,21 +27,3 @@
backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1)
chameleon_extras = /obj/item/stamp/qm
-
-/datum/outfit/job/quartermaster/western
- name = "Foreman (Western)"
- uniform = /obj/item/clothing/under/rank/cargo/qm
- suit = /obj/item/clothing/suit/toggle/hazard
- shoes = /obj/item/clothing/shoes/workboots
- glasses = /obj/item/clothing/glasses/sunglasses
- head = /obj/item/clothing/head/cowboy/sec
-
-/datum/outfit/job/quartermaster/requisitionsofficer
- name = "Requisitions Officer"
- suit = /obj/item/clothing/suit/jacket/miljacket
- head = /obj/item/clothing/head/soft/black
-
-/datum/outfit/job/quartermaster/chiefeconomist
- name = "Chief Economist"
- uniform = /obj/item/clothing/under/suit/tan
- neck = /obj/item/clothing/neck/tie/brown
diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm
index 7a91f58996a4..dbe1f02e0198 100644
--- a/code/modules/jobs/job_types/research_director.dm
+++ b/code/modules/jobs/job_types/research_director.dm
@@ -45,12 +45,3 @@
courierbag = /obj/item/storage/backpack/messenger/tox
chameleon_extras = /obj/item/stamp/rd
-
-/datum/outfit/job/rd/rig
- name = "Research Director (Hardsuit)"
-
- l_hand = null
- mask = /obj/item/clothing/mask/breath
- suit = /obj/item/clothing/suit/space/hardsuit/rd
- suit_store = /obj/item/tank/internals/oxygen
- internals_slot = ITEM_SLOT_SUITSTORE
diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm
index d842f57edf37..928b1dfc1a5e 100644
--- a/code/modules/jobs/job_types/roboticist.dm
+++ b/code/modules/jobs/job_types/roboticist.dm
@@ -28,21 +28,3 @@
pda_slot = ITEM_SLOT_LPOCKET
-/datum/outfit/job/roboticist/technician/minutemen
- name = "Mech Technician (Minutemen)"
-
- uniform = /obj/item/clothing/under/rank/security/officer/minutemen
- shoes = /obj/item/clothing/shoes/combat
- ears = /obj/item/radio/headset/minutemen
- suit = /obj/item/clothing/suit/toggle/labcoat/science
-
-/datum/outfit/job/roboticist/heron
- name = "Mech Technician (Nanotrasen)"
-
- uniform = /obj/item/clothing/under/rank/rnd/roboticist
- suit = /obj/item/clothing/suit/longcoat/robowhite
- ears = /obj/item/radio/headset/nanotrasen
- glasses = /obj/item/clothing/glasses/welding
-
- backpack_contents = list(/obj/item/weldingtool/hugetank)
-
diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm
index 78f0407d2604..47ba27ce24b8 100644
--- a/code/modules/jobs/job_types/scientist.dm
+++ b/code/modules/jobs/job_types/scientist.dm
@@ -31,9 +31,3 @@
..()
if(prob(0.4))
neck = /obj/item/clothing/neck/tie/horrible
-
-/datum/outfit/job/scientist/minutemen
- name = "Scientist (Minutemen)"
-
- uniform = /obj/item/clothing/under/rank/security/officer/minutemen
- backpack = /obj/item/storage/backpack/security/cmm
diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm
index 3fe484c56986..4dbe20d2465b 100644
--- a/code/modules/jobs/job_types/security_officer.dm
+++ b/code/modules/jobs/job_types/security_officer.dm
@@ -99,242 +99,3 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S
chameleon_extras = list(/obj/item/gun/energy/disabler, /obj/item/clothing/glasses/hud/security/sunglasses, /obj/item/clothing/head/helmet)
//The helmet is necessary because /obj/item/clothing/head/helmet/sec is overwritten in the chameleon list by the standard helmet, which has the same name and icon state
-
-/datum/outfit/job/security/pirate
- name = "Buccaneer (Pirate)"
-
- uniform = /obj/item/clothing/under/syndicate/camo
- shoes = /obj/item/clothing/shoes/jackboots
- head = /obj/item/clothing/head/bandana
- suit = /obj/item/clothing/suit/armor/vest
-
-/datum/outfit/job/security/corporate
- name = "Corporate Security"
-
- uniform = /obj/item/clothing/under/syndicate/combat
- shoes = /obj/item/clothing/shoes/jackboots
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- head = /obj/item/clothing/head/beret/sec/officer
- suit = /obj/item/clothing/suit/armor/vest/security/officer
-
-/datum/outfit/job/security/western
- name = "Security Detail (Western)"
-
- uniform = /obj/item/clothing/under/rank/security/officer/blueshirt
- alt_uniform = null
- shoes = /obj/item/clothing/shoes/jackboots
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- head = /obj/item/clothing/head/cowboy/sec
-
-/datum/outfit/job/security/minutemen
- name = "Minuteman (Colonial Minutemen)"
-
- head = /obj/item/clothing/head/helmet/bulletproof/minutemen
- mask = /obj/item/clothing/mask/gas/sechailer/minutemen
- suit = /obj/item/clothing/suit/armor/vest/bulletproof
- uniform = /obj/item/clothing/under/rank/security/officer/minutemen
- shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
-
- belt = /obj/item/storage/belt/military/minutemen
-
- l_pocket = /obj/item/flashlight/seclite
- r_pocket = /obj/item/tank/internals/emergency_oxygen/double
-
- backpack = /obj/item/storage/backpack/security/cmm
- box = /obj/item/storage/box/survival/engineer/radio
- backpack_contents = null
-
-/datum/outfit/job/security/minutemen/naked
- name = "Minuteman (Colonial Minutemen) (Naked)"
-
- head = null
- suit = null
- mask = null
- shoes = null
- gloves = null
- ears = null
-
- belt = null
-
- l_pocket = null
- r_pocket = null
-
-/datum/outfit/job/security/minutemen/armed
- name = "Minuteman (Colonial Minutemen) (Armed)"
-
- suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
- belt = /obj/item/storage/belt/military/minutemen/loaded
-
-/datum/outfit/job/security/minutemen/mechpilot
- name = "Mech Pilot (Colonial Minutemen)"
-
- suit = /obj/item/clothing/suit/armor/vest/alt
- gloves = /obj/item/clothing/gloves/tackler/combat/insulated
- glasses = /obj/item/clothing/glasses/hud/diagnostic
-
- backpack_contents = list(/obj/item/melee/classic_baton=1, /obj/item/restraints/handcuffs=1)
-
-/datum/outfit/job/security/inteq
- name = "IRMG Enforcer (Inteq)"
-
- head = /obj/item/clothing/head/helmet/inteq
- suit = /obj/item/clothing/suit/armor/vest/alt
- belt = /obj/item/storage/belt/security/webbing/inteq
- mask = /obj/item/clothing/mask/gas/sechailer/inteq
- uniform = /obj/item/clothing/under/syndicate/inteq
- dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
- shoes = /obj/item/clothing/shoes/combat
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
- gloves = /obj/item/clothing/gloves/combat
-
- backpack = /obj/item/storage/backpack/messenger/inteq
- satchel = /obj/item/storage/backpack/messenger/inteq
- courierbag = /obj/item/storage/backpack/messenger/inteq
- backpack_contents = list(/obj/item/pda/security)
-
-/datum/outfit/job/security/inteq/beluga
- name = "IRMG Enforcer (Beluga)"
-
- head = /obj/item/clothing/head/beret/sec/inteq
- suit = null
- belt = null
- mask = null
- uniform = /obj/item/clothing/under/syndicate/inteq
- dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
- shoes = /obj/item/clothing/shoes/sneakers/black
- glasses = null
- gloves = /obj/item/clothing/gloves/color/evening
-
- backpack = /obj/item/storage/backpack/messenger/inteq
- satchel = /obj/item/storage/backpack/messenger/inteq
- courierbag = /obj/item/storage/backpack/messenger/inteq
- backpack_contents = list(/obj/item/pda/security)
-
-/datum/outfit/job/security/inteq/naked
- name = "IRMG Enforcer (Inteq) (Naked)"
- head = null
- suit = null
- belt = null
- mask = null
- gloves = null
-
-/datum/outfit/job/security/nanotrasen
- name = "Security Officer (Nanotrasen)"
-
- uniform = /obj/item/clothing/under/rank/security/officer/nt
- alt_uniform = null
- backpack_contents = list(/obj/item/radio, /obj/item/flashlight/seclite)
-
-/datum/outfit/job/security/nanotrasen/ert
- name = "ERT Officer (Nanotrasen)"
-
- uniform = /obj/item/clothing/under/rank/security/officer/camo
- head = null
- backpack = /obj/item/storage/backpack/ert/security
- belt = /obj/item/storage/belt/military
- id = /obj/item/card/id/ert/security
- r_pocket = /obj/item/kitchen/knife/combat/survival
- backpack_contents = list(/obj/item/radio, /obj/item/flashlight/seclite)
-
-/datum/outfit/job/security/nanotrasen/ert/engi
- name = "ERT Engineering Officer (Nanotrasen)"
-
- uniform = /obj/item/clothing/under/rank/security/officer/camo
- head = null
- backpack = /obj/item/storage/backpack/ert/engineer
- belt = /obj/item/storage/belt/utility/full/ert
- id = /obj/item/card/id/ert/security
- r_pocket = /obj/item/kitchen/knife/combat/survival
- backpack_contents = list(/obj/item/radio, /obj/item/flashlight/seclite)
- accessory = /obj/item/clothing/accessory/armband/engine
- glasses = /obj/item/clothing/glasses/hud/diagnostic/sunglasses
-
-/datum/outfit/job/security/nanotrasen/ert/med
- name = "ERT Medical Officer (Nanotrasen)"
-
- uniform = /obj/item/clothing/under/rank/security/officer/camo
- head = /obj/item/clothing/head/beret/med
- backpack = /obj/item/storage/backpack/ert/medical
- belt = /obj/item/storage/belt/medical/webbing/paramedic
- id = /obj/item/card/id/ert/security
- r_pocket = /obj/item/kitchen/knife/combat/survival
- backpack_contents = list(/obj/item/radio, /obj/item/flashlight/seclite)
- accessory = /obj/item/clothing/accessory/armband/med
- glasses = /obj/item/clothing/glasses/hud/health/night
-
-/datum/outfit/job/security/nanotrasen/mech_pilot
- name = "Mech Pilot (Nanotrasen)"
-
- uniform = /obj/item/clothing/under/rank/security/officer/military/eng
- head = /obj/item/clothing/head/beret/sec/officer
- suit = /obj/item/clothing/suit/armor/vest/bulletproof
- backpack_contents = list(/obj/item/radio, /obj/item/flashlight/seclite)
-
-/datum/outfit/job/security/roumain
- name = "Hunter (Saint-Roumain Militia)"
-
- uniform = /obj/item/clothing/under/suit/roumain
- alt_uniform = null
- shoes = /obj/item/clothing/shoes/workboots/mining
- suit = /obj/item/clothing/suit/armor/roumain
-
- head = /obj/item/clothing/head/cowboy/sec/roumain
- gloves = null
- backpack = /obj/item/storage/backpack
- satchel = /obj/item/storage/backpack/satchel
- duffelbag = /obj/item/storage/backpack/duffelbag
- courierbag = /obj/item/storage/backpack/messenger
- backpack_contents = null
-
-/datum/outfit/job/security/roumain/post_equip(mob/living/carbon/human/H)
- H.faction |= list("roumain")
-
-/datum/outfit/job/security/aipirate
- name = "Nodesman (Security)"
-
- uniform = /obj/item/clothing/under/utility
- head = /obj/item/clothing/head/soft/black
- shoes = /obj/item/clothing/shoes/combat
- l_pocket = /obj/item/kitchen/knife/combat
-
- backpack_contents = list(/obj/item/melee/baton/loaded=1)
-
- implants = list(/obj/item/implant/radio)
-
-
-/datum/outfit/job/security/Frontiersmen
- name = "Buccaneer (Frontiersmen)"
-
- head = /obj/item/clothing/head/beret/sec/frontier
- mask = /obj/item/clothing/mask/gas/sechailer/minutemen
- suit = null
- uniform = /obj/item/clothing/under/rank/security/officer/frontier
- shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
- ears = /obj/item/radio/headset/pirate/alt
-
- belt = /obj/item/storage/belt/security/webbing
-
- l_pocket = /obj/item/flashlight/seclite
- r_pocket = /obj/item/tank/internals/emergency_oxygen/double
-
-/datum/outfit/job/security/lp
- name = "LP Security Specialist"
-
- implants = list(/obj/item/implant/mindshield)
- ears = /obj/item/radio/headset/nanotrasen/alt/captain
- id = /obj/item/card/id/lpsec
- belt = /obj/item/pda/security
- gloves = /obj/item/clothing/gloves/color/black
- uniform = /obj/item/clothing/under/rank/security/head_of_security/nt/skirt/lp
- alt_uniform = /obj/item/clothing/under/rank/security/head_of_security/nt/lp
- dcoat = /obj/item/clothing/suit/hooded/wintercoat/security
- shoes = /obj/item/clothing/shoes/jackboots
- head = /obj/item/clothing/head/beret/sec
-
- satchel = /obj/item/storage/backpack/satchel/sec
- duffelbag = /obj/item/storage/backpack/duffelbag/sec
- courierbag = /obj/item/storage/backpack/messenger/sec
-
-//Shiptest outfits end
diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm
index 6a3f13da7c78..2cf67b9bbf70 100644
--- a/code/modules/jobs/job_types/shaft_miner.dm
+++ b/code/modules/jobs/job_types/shaft_miner.dm
@@ -27,7 +27,8 @@
backpack_contents = list(
/obj/item/flashlight/seclite=1,\
/obj/item/kitchen/knife/combat/survival=1,\
- /obj/item/stack/marker_beacon/ten=1)
+ /obj/item/stack/marker_beacon/ten=1,\
+ /obj/item/radio/weather_monitor=1)
backpack = /obj/item/storage/backpack/explorer
satchel = /obj/item/storage/backpack/satchel/explorer
@@ -35,103 +36,3 @@
box = /obj/item/storage/box/survival/mining
chameleon_extras = /obj/item/gun/energy/kinetic_accelerator
-
-/datum/outfit/job/miner/classic
- uniform = /obj/item/clothing/under/rank/cargo/miner
- gloves = /obj/item/clothing/gloves/color/black
- shoes = /obj/item/clothing/shoes/workboots
-
-/datum/outfit/job/miner/equipped
- name = "Shaft Miner (Equipment)"
- suit = /obj/item/clothing/suit/hooded/explorer
- mask = /obj/item/clothing/mask/gas/explorer
- glasses = /obj/item/clothing/glasses/meson
- suit_store = /obj/item/tank/internals/oxygen
- internals_slot = ITEM_SLOT_SUITSTORE
- backpack_contents = list(
- /obj/item/flashlight/seclite=1,\
- /obj/item/kitchen/knife/combat/survival=1,
- /obj/item/mining_scanner=1,
- /obj/item/stack/marker_beacon/ten=1)
- belt = /obj/item/gun/energy/kinetic_accelerator
-
-/datum/outfit/job/miner/equipped/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
- if(visualsOnly)
- return
- if(istype(H.wear_suit, /obj/item/clothing/suit/hooded))
- var/obj/item/clothing/suit/hooded/S = H.wear_suit
- S.ToggleHood()
-
-/datum/outfit/job/miner/equipped/hardsuit
- name = "Shaft Miner (Equipment + Hardsuit)"
- suit = /obj/item/clothing/suit/space/hardsuit/mining
- mask = /obj/item/clothing/mask/breath
-
-//Shiptest Outfits
-
-/datum/outfit/job/miner/hazard
- name = "Asteroid Miner (Hazard)"
- uniform = /obj/item/clothing/under/rank/cargo/miner/hazard
- alt_uniform = null
- alt_suit = /obj/item/clothing/suit/toggle/hazard
-
-/datum/outfit/job/miner/scientist
- name = "Minerologist"
-
- belt = /obj/item/pda/toxins
- uniform = /obj/item/clothing/under/rank/cargo/miner/hazard
- alt_uniform = /obj/item/clothing/under/rank/rnd/roboticist
- suit = /obj/item/clothing/suit/toggle/labcoat/science
- alt_suit = /obj/item/clothing/suit/toggle/hazard
- dcoat = /obj/item/clothing/suit/hooded/wintercoat/science
-
- backpack = /obj/item/storage/backpack/science
- satchel = /obj/item/storage/backpack/satchel/tox
- courierbag = /obj/item/storage/backpack/messenger/tox
-
-/datum/outfit/job/miner/old
- name = "Shaft Miner (Legacy)"
- suit = /obj/item/clothing/suit/hooded/explorer/old
- mask = /obj/item/clothing/mask/gas/explorer/old
- glasses = /obj/item/clothing/glasses/meson
- suit_store = /obj/item/tank/internals/oxygen
- gloves = /obj/item/clothing/gloves/explorer/old
- uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland/old
- internals_slot = ITEM_SLOT_SUITSTORE
- backpack_contents = list(
- /obj/item/flashlight/seclite=1,\
- /obj/item/kitchen/knife/combat/survival=1,
- /obj/item/mining_scanner=1,
- /obj/item/reagent_containers/hypospray/medipen/survival,
- /obj/item/reagent_containers/hypospray/medipen/survival,\
- /obj/item/stack/marker_beacon/ten=1)
- belt = /obj/item/gun/energy/kinetic_accelerator/old
-
-/datum/outfit/job/miner/righand
- name = "Righand"
- backpack_contents = list(
- /obj/item/flashlight/seclite=1,
- /obj/item/kitchen/knife/combat/survival=1,
- /obj/item/mining_scanner=1,
- /obj/item/wrench=1
- )
-
-/datum/outfit/job/miner/seniorminer
- backpack_contents = list(
- /obj/item/flashlight/seclite=1,
- /obj/item/kitchen/knife/combat/survival=1,
- /obj/item/stack/marker_beacon/ten=1,
- /obj/item/borg/upgrade/modkit/aoe=1
- )
-
-/datum/outfit/job/miner/hazard/minutemen
- name = "Industrial Miner (Minutemen)"
- gloves = /obj/item/clothing/gloves/color/black
- shoes = /obj/item/clothing/shoes/combat
- backpack_contents = list(
- /obj/item/flashlight/seclite=1,
- /obj/item/stack/marker_beacon/ten=1,
- /obj/item/weldingtool=1
- )
-
diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm
index a347965d9323..767684db2ec2 100644
--- a/code/modules/jobs/job_types/station_engineer.dm
+++ b/code/modules/jobs/job_types/station_engineer.dm
@@ -12,7 +12,7 @@
display_order = JOB_DISPLAY_ORDER_STATION_ENGINEER
/datum/outfit/job/engineer
- name = "Mechanic"
+ name = "Engineer"
job_icon = "stationengineer"
jobtype = /datum/job/engineer
@@ -34,116 +34,3 @@
box = /obj/item/storage/box/survival/engineer
pda_slot = ITEM_SLOT_LPOCKET
backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
-
-/datum/outfit/job/engineer/gloved
- name = "Mechanic (Gloves)"
- gloves = /obj/item/clothing/gloves/color/yellow
-
-/datum/outfit/job/engineer/gloved/rig
- name = "Mechanic (Space suit)"
- mask = /obj/item/clothing/mask/breath
- suit = /obj/item/clothing/suit/space/engineer
- head = /obj/item/clothing/head/helmet/space/light/engineer
- suit_store = /obj/item/tank/internals/oxygen
- head = null
- internals_slot = ITEM_SLOT_SUITSTORE
-
-/datum/outfit/job/engineer/nt
- name = "Engineer (Nanotrasen)"
- uniform = /obj/item/clothing/under/rank/engineering/engineer/nt
- head = /obj/item/clothing/head/hardhat
-
-/datum/outfit/job/engineer/minutemen
- name = "Mechanic (Colonial Minutemen)"
-
- uniform = /obj/item/clothing/under/rank/security/officer/minutemen
- accessory = /obj/item/clothing/accessory/armband/engine
- head = /obj/item/clothing/head/hardhat/dblue
- suit = /obj/item/clothing/suit/hazardvest
-
-/datum/outfit/job/engineer/inteq
- name = "IRMG Artificer (Inteq)"
-
- uniform = /obj/item/clothing/under/syndicate/inteq/artificer
- head = /obj/item/clothing/head/soft/inteq
- shoes = /obj/item/clothing/shoes/combat
-
-/datum/outfit/job/engineer/pirate
- name = "Ship's Engineer (Pirate)"
-
- uniform = /obj/item/clothing/under/costume/sailor
- head = /obj/item/clothing/head/bandana
- shoes = /obj/item/clothing/shoes/jackboots
-
-/datum/outfit/job/engineer/hazard
- name = "Ship's Engineer (Hazard)"
-
- uniform = /obj/item/clothing/under/rank/engineering/engineer/hazard
- alt_uniform = null
- head = /obj/item/clothing/head/hardhat
- suit = /obj/item/clothing/suit/toggle/hazard
- alt_suit = /obj/item/clothing/suit/hazardvest
-
-/datum/outfit/job/engineer/independent/ship_engineer
- name = "Ship Engineer (Independent)"
-
- belt = /obj/item/storage/belt/utility/full/engi
- uniform = /obj/item/clothing/under/rank/security/officer/military/eng
- suit = /obj/item/clothing/suit/toggle/hazard
- shoes = /obj/item/clothing/shoes/workboots
-
- head = null
- backpack = /obj/item/storage/backpack
- satchel = /obj/item/storage/backpack/satchel
- duffelbag = /obj/item/storage/backpack/duffelbag
- courierbag = /obj/item/storage/backpack/messenger
- l_pocket = /obj/item/radio
- r_pocket = /obj/item/analyzer
- glasses = /obj/item/clothing/glasses/welding
-
-/datum/outfit/job/engineer/independent/ship_engineer/salvage
- belt = null
- r_pocket = null
- glasses = null
-
-/datum/outfit/job/engineer/aipirate
- name = "Nodesman (Engineer)"
-
- uniform = /obj/item/clothing/under/utility
- head = /obj/item/clothing/head/soft/black
- shoes = /obj/item/clothing/shoes/combat
- r_pocket = /obj/item/kitchen/knife/combat/survival
- gloves = /obj/item/clothing/gloves/combat
-
- implants = list(/obj/item/implant/radio)
-
-/datum/outfit/job/engineer/independent/frontiersmen
- name = "Carpenter (frontiersmen)"
-
- belt = /obj/item/storage/belt/utility/full/engi
- uniform = /obj/item/clothing/under/rank/security/officer/frontier
- suit = /obj/item/clothing/suit/toggle/industrial
- shoes = /obj/item/clothing/shoes/workboots
- glasses = /obj/item/clothing/glasses/welding
- head = /obj/item/clothing/head/helmet/space/pirate/bandana
-
- l_pocket = /obj/item/radio
- r_pocket = /obj/item/analyzer
-
-/datum/outfit/job/engineer/lp
- name = "LP Engineering Specialist"
-
- implants = list(/obj/item/implant/mindshield)
- ears = /obj/item/radio/headset/nanotrasen/alt/captain
- id = /obj/item/card/id/lpengie
- belt = /obj/item/pda/engineering
- gloves = /obj/item/clothing/gloves/color/yellow
- uniform = /obj/item/clothing/under/rank/engineering/engineer/nt/lp
- alt_uniform = /obj/item/clothing/under/rank/engineering/engineer/nt/skirt/lp
- dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering
- shoes = /obj/item/clothing/shoes/jackboots
- head = /obj/item/clothing/head/beret/eng
-
- satchel = /obj/item/storage/backpack/satchel/eng
- duffelbag = /obj/item/storage/backpack/duffelbag/engineering
- courierbag = /obj/item/storage/backpack/messenger/engi
diff --git a/code/modules/jobs/job_types/virologist.dm b/code/modules/jobs/job_types/virologist.dm
index ac0a3986634d..2a3bd87d5ba2 100644
--- a/code/modules/jobs/job_types/virologist.dm
+++ b/code/modules/jobs/job_types/virologist.dm
@@ -30,10 +30,3 @@
duffelbag = /obj/item/storage/backpack/duffelbag/med
courierbag = /obj/item/storage/backpack/messenger/viro
box = /obj/item/storage/box/survival/medical
-
-/datum/outfit/job/virologist/pathologist
- name = "Virologist (Pathologist)"
-
- alt_uniform = null
- shoes = /obj/item/clothing/shoes/laceup
- neck = /obj/item/clothing/neck/tie/green
diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm
index f16d6119d147..4feaed96faf1 100644
--- a/code/modules/jobs/job_types/warden.dm
+++ b/code/modules/jobs/job_types/warden.dm
@@ -48,64 +48,3 @@
implants = list(/obj/item/implant/mindshield)
chameleon_extras = /obj/item/gun/ballistic/shotgun/automatic/combat/compact
-
-/datum/outfit/job/warden/chiefmastersergeant
- name = "Chief Master Sergeant"
- r_pocket = /obj/item/gun/ballistic/automatic/pistol/solgov
- l_pocket = /obj/item/ammo_box/magazine/pistol556mm
- chameleon_extras = null
-
-/datum/outfit/job/warden/minutemen
- name = "Field Commander (Colonial Minutemen)"
-
- glasses = /obj/item/clothing/glasses/sunglasses
- ears = /obj/item/radio/headset/minutemen/alt
- uniform = /obj/item/clothing/under/rank/security/officer/minutemen
- accessory = /obj/item/clothing/accessory/armband
- head = /obj/item/clothing/head/cowboy/sec/minutemen
- suit = /obj/item/clothing/suit/armor/vest/bulletproof
- belt = /obj/item/storage/belt/military/minutemen
- shoes = /obj/item/clothing/shoes/combat
-
- l_pocket = /obj/item/flashlight/seclite
- r_pocket = /obj/item/tank/internals/emergency_oxygen/double
-
- box = /obj/item/storage/box/survival/engineer/radio
- backpack = /obj/item/storage/backpack
- backpack_contents = null
-
-/datum/outfit/job/warden/minutemen/armed
- name = "Field Commander (Colonial Minutemen) (Armed)"
-
- suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
- belt = /obj/item/storage/belt/military/minutemen/loaded
-
- 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)
-
-/datum/outfit/job/warden/inteq
- name = "Master At Arms (Inteq)"
-
- ears = /obj/item/radio/headset/inteq/alt
- uniform = /obj/item/clothing/under/syndicate/inteq
- head = /obj/item/clothing/head/beret/sec/hos/inteq
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
- mask = /obj/item/clothing/mask/gas/sechailer/inteq
- belt = /obj/item/storage/belt/military/assault
- suit = /obj/item/clothing/suit/armor/vest/alt
- dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
- shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
- suit_store = null
-
- courierbag = /obj/item/storage/backpack/messenger/inteq
- backpack_contents = list(/obj/item/melee/classic_baton=1, /obj/item/pda/warden)
-
-/datum/outfit/job/warden/nanotrasen
- name = "Warden (Nanotrasen)"
-
- ears = /obj/item/radio/headset/nanotrasen/alt
- head = /obj/item/clothing/head/warden/red
- uniform = /obj/item/clothing/under/rank/security/warden/nt
- suit = /obj/item/clothing/suit/armor/vest/security/warden/alt/nt
- alt_uniform = null
- alt_suit = null
diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm
index d1b930174490..6484b22963ba 100644
--- a/code/modules/jobs/jobs.dm
+++ b/code/modules/jobs/jobs.dm
@@ -97,7 +97,7 @@ GLOBAL_LIST_INIT(exp_jobsmap, list(
GLOBAL_LIST_INIT(exp_specialmap, list(
EXP_TYPE_LIVING = list(), // all living mobs
EXP_TYPE_ANTAG = list(),
- EXP_TYPE_SPECIAL = list("Lifebringer","Ash Walker","Exile","Servant Golem","Free Golem","Hermit","Translocated Vet","Escaped Prisoner","Hotel Staff","SuperFriend","Space Syndicate","Ancient Crew","Space Doctor","Space Bartender","Beach Bum","Skeleton","Zombie","Space Bar Patron","Lavaland Syndicate","Ghost Role"), // Ghost roles
+ EXP_TYPE_SPECIAL = list("Lifebringer","Ash Walker","Exile","Hermit","Translocated Vet","Escaped Prisoner","Hotel Staff","SuperFriend","Space Syndicate","Ancient Crew","Space Doctor","Space Bartender","Beach Bum","Skeleton","Zombie","Space Bar Patron","Lavaland Syndicate","Ghost Role"), // Ghost roles
EXP_TYPE_GHOST = list() // dead people, observers
))
diff --git a/code/modules/language/language_holder.dm b/code/modules/language/language_holder.dm
index 61570535cbbf..7b51b433adde 100644
--- a/code/modules/language/language_holder.dm
+++ b/code/modules/language/language_holder.dm
@@ -341,28 +341,6 @@ Key procs
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/draconic = list(LANGUAGE_ATOM))
-/datum/language_holder/golem
- understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/terrum = list(LANGUAGE_ATOM))
- spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/terrum = list(LANGUAGE_ATOM))
-
-/datum/language_holder/golem/bone
- understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/terrum = list(LANGUAGE_ATOM),
- /datum/language/calcic = list(LANGUAGE_ATOM))
- spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/terrum = list(LANGUAGE_ATOM),
- /datum/language/calcic = list(LANGUAGE_ATOM))
-
-/datum/language_holder/golem/runic
- understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/terrum = list(LANGUAGE_ATOM),
- /datum/language/narsie = list(LANGUAGE_ATOM))
- spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/terrum = list(LANGUAGE_ATOM),
- /datum/language/narsie = list(LANGUAGE_ATOM))
-
/datum/language_holder/fly
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
/datum/language/buzzwords = list(LANGUAGE_ATOM))
diff --git a/code/modules/language/terrum.dm b/code/modules/language/terrum.dm
deleted file mode 100644
index 04f1ad740821..000000000000
--- a/code/modules/language/terrum.dm
+++ /dev/null
@@ -1,19 +0,0 @@
-/datum/language/terrum
- name = "Terrum"
- desc = "The language of the golems. Sounds similar to old-earth Hebrew."
- speech_verb = "rumbles"
- ask_verb = "questions"
- exclaim_verb = "tremors"
- sing_verb = "yodels"
- flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD //WS Edit- Language icon hiding
- key = "g"
- space_chance = 40
- syllables = list(
- "sha", "vu", "nah", "ha", "yom", "ma", "cha", "ar", "et", "mol", "lua",
- "ch", "na", "sh", "ni", "yah", "bes", "ol", "hish", "ev", "la", "ot", "la",
- "khe", "tza", "chak", "hak", "hin", "hok", "lir", "tov", "yef", "yfe",
- "cho", "ar", "kas", "kal", "ra", "lom", "im", "'", "'", "'", "'", "bok",
- "erev", "shlo", "lo", "ta", "im", "yom"
- )
- icon_state = "golem"
- default_priority = 90
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index c8265205cac5..71de02b3ca1c 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -341,7 +341,6 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
dat += "NTGanda(tm) Universal Printing Module "
dat += "What would you like to print?\[Bible\] \[Poster\] (Return to main menu) Accessing Forbidden Lore Vault v 1.3 "
@@ -524,12 +523,6 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
cooldown = world.time + PRINTER_COOLDOWN
else
say("Printer currently unavailable, please wait a moment.")
- if(href_list["printposter"])
- if(cooldown < world.time)
- new /obj/item/poster/random_official(src.loc)
- cooldown = world.time + PRINTER_COOLDOWN
- else
- say("Printer currently unavailable, please wait a moment.")
add_fingerprint(usr)
updateUsrDialog()
diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm
index b3f5b1078b20..fe66d3a99836 100644
--- a/code/modules/mapping/map_template.dm
+++ b/code/modules/mapping/map_template.dm
@@ -7,7 +7,11 @@
var/datum/parsed_map/cached_map
var/keep_cached_map = FALSE
- ///if true, turfs loaded from this template are placed on top of the turfs already there, defaults to TRUE
+ /// Defaults to TRUE.
+ /// If TRUE, the baseturfs of the new turfs (ignoring baseturf_bottom and space) are added
+ /// to the top of the pre-existing baseturf lists, in accordance with the behavior of PlaceOnTop.
+ /// If FALSE, the old turfs are replaced entirely, including their baseturfs.
+ /// Note that FALSE-case behavior is altered from the original implementation, which ignored baseturfs entirely; it was intended for holodecks, which have been removed.
var/should_place_on_top = TRUE
///if true, creates a list of all atoms created by this template loading, defaults to FALSE
diff --git a/code/modules/mapping/reader.dm b/code/modules/mapping/reader.dm
index 9e12fb7d4ce7..3a8e2706d6b6 100644
--- a/code/modules/mapping/reader.dm
+++ b/code/modules/mapping/reader.dm
@@ -494,14 +494,15 @@ GLOBAL_LIST_EMPTY(map_model_default)
if(members_attributes[index] != default_list)
world.preloader_setup(members_attributes[index], members[index])
+ var/turf/new_turf_type = members[index]
// Note: we make the assertion that the last path WILL be a turf. if it isn't, this will fail.
var/old_virtual_z = crds.virtual_z
if(placeOnTop)
- instance = crds.PlaceOnTop(null, members[index], CHANGETURF_DEFER_CHANGE | (no_changeturf ? CHANGETURF_SKIP : NONE))
+ instance = crds.PlaceOnTop(null, new_turf_type, CHANGETURF_DEFER_CHANGE | (no_changeturf ? CHANGETURF_SKIP : NONE))
else if(!no_changeturf)
- instance = crds.ChangeTurf(members[index], null, CHANGETURF_DEFER_CHANGE)
+ instance = crds.ChangeTurf(new_turf_type, initial(new_turf_type.baseturfs), CHANGETURF_DEFER_CHANGE)
else
- instance = create_turf(members[index], crds , old_virtual_z)//first preloader pass
+ instance = create_turf(new_turf_type, crds , old_virtual_z)//first preloader pass
var/turf/new_turf = instance
new_turf.virtual_z = old_virtual_z //UNDER NO CIRCUMSTANCES LOOSE THIS VARIABLE
diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm
index 8cf62d92abd4..debdb2e2ea02 100644
--- a/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/code/modules/mining/equipment/kinetic_crusher.dm
@@ -64,11 +64,16 @@
/obj/item/kinetic_crusher/attackby(obj/item/I, mob/living/user)
if(I.tool_behaviour == TOOL_CROWBAR)
if(LAZYLEN(trophies))
- to_chat(user, "You remove [src]'s trophies. ")
- I.play_tool_sound(src)
- for(var/t in trophies)
- var/obj/item/crusher_trophy/T = t
- T.remove_from(src, user)
+ var/list/choose_options = list()
+ for(var/obj/item/crusher_trophy/T in trophies)
+ choose_options += list(T.name = image(icon = T.icon, icon_state = T.icon_state))
+ var/picked_option = show_radial_menu(user, src, choose_options, radius = 38, require_near = TRUE)
+ if(picked_option)
+ to_chat(user, "You remove [picked_option]. ")
+ I.play_tool_sound(src)
+ for(var/obj/item/crusher_trophy/T in trophies)
+ if(T.name == picked_option)
+ T.remove_from(src, user)
else
to_chat(user, "There are no trophies on [src]. ")
else if(istype(I, /obj/item/crusher_trophy))
diff --git a/code/modules/mining/equipment/miningradio.dm b/code/modules/mining/equipment/miningradio.dm
new file mode 100644
index 000000000000..a0bef397d8ca
--- /dev/null
+++ b/code/modules/mining/equipment/miningradio.dm
@@ -0,0 +1,23 @@
+/// Portable mining radio purchasable by miners
+/obj/item/radio/weather_monitor
+ icon = 'icons/obj/miningradio.dmi'
+ name = "mining weather radio"
+ icon_state = "miningradio"
+ desc = "A weather radio designed for use in inhospitable environments. Gives audible warnings when storms approach."
+ luminosity = 1
+ light_power = 1
+ light_range = 1.6
+
+/obj/item/radio/weather_monitor/update_overlays()
+ . = ..()
+ . += emissive_appearance(icon, "small_emissive", src, alpha = src.alpha)
+
+/obj/item/radio/weather_monitor/Initialize(mapload)
+ . = ..()
+ AddComponent( \
+ /datum/component/weather_announcer, \
+ state_normal = "weatherwarning", \
+ state_warning = "urgentwarning", \
+ state_danger = "direwarning", \
+ )
+ set_frequency(FREQ_COMMON)
diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm
index bf0877262923..87736c3438e4 100644
--- a/code/modules/mining/equipment/regenerative_core.dm
+++ b/code/modules/mining/equipment/regenerative_core.dm
@@ -62,7 +62,12 @@
if(inert)
to_chat(owner, "[src] breaks down as it tries to activate. ")
else
- owner.revive(full_heal = TRUE, admin_revive = FALSE)
+ owner.adjustBruteLoss(-100) //previously heal proc
+ owner.adjustFireLoss(-100)
+ owner.adjustOxyLoss(-50)
+ owner.adjustToxLoss(-50)
+ if(owner.dna.species.id != SPECIES_IPC)
+ owner.adjustCloneLoss(10) //dont abuse it or take cloneloss (organic only)
qdel(src)
/obj/item/organ/regenerative_core/on_life()
diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm
index 9c989b986a33..2af4c1b5ce4f 100644
--- a/code/modules/mining/equipment/wormhole_jaunter.dm
+++ b/code/modules/mining/equipment/wormhole_jaunter.dm
@@ -1,7 +1,7 @@
/**********************Jaunter**********************/
/obj/item/wormhole_jaunter
name = "wormhole jaunter"
- desc = "A single use device harnessing outdated wormhole technology, Nanotrasen has since turned its eyes to bluespace for more accurate teleportation. The wormholes it creates are unpleasant to travel through, to say the least.\nThanks to modifications provided by the Free Golems, this jaunter can be worn on the belt to provide protection from chasms."
+ desc = "A single use device harnessing outdated wormhole technology, Nanotrasen has since turned its eyes to bluespace for more accurate teleportation. The wormholes it creates are unpleasant to travel through, to say the least.\nThis jaunter has been modified to fit on your belt, providing you protection from chasms."
icon = 'icons/obj/mining.dmi'
icon_state = "Jaunter"
item_state = "electronic"
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/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index a291811d5e83..fe446513c521 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -1385,7 +1385,7 @@
switch(random)
if(1)
- to_chat(user, "Your appearance morphs to that of a very small humanoid ash dragon! You get to look like a freak without the cool abilities. ")
+ to_chat(user, "Your appearance morphs to that of a very small humanoid ash dragon! You get to look like a dragon without the cool abilities. ")
H.dna.features = list("mcolor" = "A02720", "tail_lizard" = "Dark Tiger", "tail_human" = "None", "face_markings" = "None", "horns" = "Curled", "ears" = "None", "wings" = "None", "frills" = "None", "spines" = "Long", "body_markings" = "Dark Tiger Body", "legs" = "Digitigrade Legs")
H.eye_color = "fee5a3"
H.set_species(/datum/species/lizard)
diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm
index 10f43aad4580..bbc84ec7ee68 100644
--- a/code/modules/mining/machine_processing.dm
+++ b/code/modules/mining/machine_processing.dm
@@ -253,7 +253,7 @@
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
materials.use_materials(alloy.materials, amount)
- generate_mineral(alloy.build_path)
+ generate_mineral(alloy.build_path, amount)
/obj/machinery/mineral/processing_unit/proc/can_smelt(datum/design/D)
if(D.make_reagents.len)
@@ -271,8 +271,8 @@
return build_amount
-/obj/machinery/mineral/processing_unit/proc/generate_mineral(P)
- var/O = new P(src)
+/obj/machinery/mineral/processing_unit/proc/generate_mineral(P, amount)
+ var/O = new P(src, amount)
unload_mineral(O)
/obj/machinery/mineral/processing_unit/on_deconstruction()
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index 03a6a9fb39a1..ba2a1c6984a4 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -127,79 +127,10 @@
/obj/item/stack/sheet/rglass = 1,
/obj/item/vending_refill/mining_equipment = 1)
-/obj/item/circuitboard/machine/vending/mining_equipment/golem
- name = "golem equipment vendor (Machine Board)"
- build_path = /obj/machinery/vending/mining_equipment/golem
-
/obj/item/vending_refill/mining_equipment
machine_name = "mining equipment vendor"
icon_state = "mining-refill"
-/obj/item/vending_refill/mining_equipment_golem
- machine_name = "golem equipment vendor"
- icon_state = "mining-refill"
-
-
-/obj/machinery/vending/mining_equipment/golem
- name = "golem equipment vendor"
- desc = "An modified equipment vendor which appears to be a prototype of the current mining equipment vendor. Ore Redemption Points can be spent here to purchase rough-and-tumble goods."
- circuit = /obj/item/circuitboard/machine/vending/mining_equipment
- refill_canister = /obj/item/vending_refill/mining_equipment_golem
- products = list( //if you add something to this, please, for the love of god, sort it by price/type. use tabs and not spaces.
- /obj/item/stack/marker_beacon/thirty = 6,
- /obj/item/reagent_containers/food/drinks/bottle/whiskey = 3,
- /obj/item/storage/box/gum/bubblegum = 5,
- /obj/item/clothing/mask/cigarette/cigar/havana = 3,
- /obj/item/soap/nanotrasen = 1,
- /obj/item/hivelordstabilizer = 6,
- /obj/item/fulton_core = 1,
- /obj/item/survivalcapsule = 3,
- /obj/item/storage/belt/mining = 3,
- /obj/item/card/mining_point_card = 5,
- /obj/item/reagent_containers/hypospray/medipen/survival = 6,
- /obj/item/storage/firstaid/brute = 3,
- /obj/item/storage/box/minertracker = 5,
- /obj/item/wormhole_jaunter = 3,
- /obj/item/kinetic_crusher = 1,
- /obj/item/gun/energy/kinetic_accelerator = 3,
- /obj/item/mining_scanner = 5,
- /obj/item/t_scanner/adv_mining_scanner = 2,
- /obj/item/resonator = 3,
- /obj/item/extraction_pack = 3,
- /obj/item/lazarus_injector = 1,
- /obj/item/pickaxe/silver = 3,
- /obj/item/storage/backpack/duffelbag/mining_conscript = 3,
- /obj/item/tank/jetpack/suit = 3,
- /obj/item/spacecash/bundle/c1000 = 5,
- /obj/item/clothing/suit/space/hardsuit/mining/independent = 3,
- /obj/item/resonator/upgraded = 1,
- /obj/item/clothing/shoes/bhop = 3,
- /obj/item/survivalcapsule/luxury = 3,
- /mob/living/simple_animal/hostile/mining_drone = 3,
- /obj/item/mine_bot_upgrade = 3,
- /obj/item/mine_bot_upgrade/health = 3,
- /obj/item/borg/upgrade/modkit/cooldown/minebot = 3,
- /obj/item/slimepotion/slime/sentience/mining = 1,
- /obj/item/borg/upgrade/modkit/minebot_passthrough = 3,
- /obj/item/borg/upgrade/modkit/tracer = 3,
- /obj/item/borg/upgrade/modkit/tracer/adjustable = 3,
- /obj/item/borg/upgrade/modkit/chassis_mod = 3,
- /obj/item/borg/upgrade/modkit/range = 3,
- /obj/item/borg/upgrade/modkit/damage = 3,
- /obj/item/borg/upgrade/modkit/cooldown = 3,
- /obj/item/borg/upgrade/modkit/aoe/mobs = 2,
- // golem extra things
- /obj/item/card/id/mining = 5,
- /obj/item/clothing/glasses/science = 5,
- /obj/item/reagent_containers/food/snacks/monkeycube = 5,
- /obj/item/storage/belt/utility = 3,
- /obj/item/bedsheet/rd/royal_cape = 3,
- /obj/item/slime_extract/grey = 1,
- /obj/item/borg/upgrade/modkit/trigger_guard = 4,
- /obj/item/storage/box/rndboards = 1
-
- )
-
/**********************Mining Equipment Voucher**********************/
/obj/item/mining_voucher
diff --git a/code/modules/mob/dead/new_player/ship_select.dm b/code/modules/mob/dead/new_player/ship_select.dm
index 0ace7574101a..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()
@@ -112,6 +119,8 @@
.["ships"] = list()
.["shipSpawnAllowed"] = SSovermap.player_ship_spawn_allowed()
.["purchaseBanned"] = is_banned_from(user.ckey, "Ship Purchasing")
+ // if the player has a client which is not eligible for playtime restriction (for admin + player DB flag playtime exemption), they "auto meet" playtime requirements
+ .["autoMeet"] = user.client && !user.client.is_playtime_restriction_eligible()
.["playMin"] = user.client ? user.client.get_exp_living(TRUE) : 0
for(var/datum/overmap/ship/controlled/S as anything in SSovermap.controlled_ships)
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/ipc.dm b/code/modules/mob/dead/new_player/sprite_accessories/ipc.dm
index b25cd222115a..20f2fe732d31 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/ipc.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/ipc.dm
@@ -170,6 +170,10 @@
name = "Color Test"
icon_state = "tv"
+/datum/sprite_accessory/ipc_screens/badapple
+ name = "Old Animation"
+ icon_state = "bad_apple"
+
// Start antennas
/datum/sprite_accessory/ipc_antennas
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/dead/new_player/sprite_accessories/underwear/underwear_torso.dm b/code/modules/mob/dead/new_player/sprite_accessories/underwear/underwear_torso.dm
index c71feb42c6de..187bd4ce569e 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/underwear/underwear_torso.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/underwear/underwear_torso.dm
@@ -112,6 +112,11 @@
icon_state = "tank_fire"
use_static = TRUE
+/datum/sprite_accessory/undershirt/rilena
+ name = "T-Shirt (RILENA)"
+ icon_state = "rilena"
+ use_static = TRUE
+
// Pride shirts
/datum/sprite_accessory/undershirt/tank_les
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index df9b5c22704d..9b50d1827724 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -391,6 +391,14 @@
if(M == src && check_self_for_injuries())
return
+ if(M.zone_selected == BODY_ZONE_PRECISE_MOUTH)
+ var/obj/item/clothing/mask/cigarette/theircig = wear_mask
+ var/obj/item/clothing/mask/cigarette/ourcig = M.wear_mask
+ if(istype(ourcig) && istype(theircig))
+ if(ourcig.lit && !theircig.lit)
+ theircig.light(span_notice("[M] leans towards [src], lighting [p_their()] [theircig.name] with [M.p_their()] own."))
+ return
+
if(body_position == LYING_DOWN)
if(buckled)
to_chat(M, "You need to unbuckle [src] first to do that! ")
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index 7d06c9e1f827..a7dc41b307c4 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -15,7 +15,7 @@
var/silent = 0 ///Can't talk. Value goes down every life proc. NOTE TO FUTURE CODERS: DO NOT INITIALIZE NUMERICAL VARS AS NULL OR I WILL MURDER YOU.
var/dreaming = 0 ///How many dream images we have left to send
- var/obj/item/handcuffed = null///Whether or not the mob is handcuffed
+ var/obj/item/handcuffed = null ///Whether or not the mob is handcuffed
var/obj/item/legcuffed = null ///Same as handcuffs but for legs. Bear traps use this.
var/disgust = 0
diff --git a/code/modules/mob/living/carbon/human/consistent_human.dm b/code/modules/mob/living/carbon/human/consistent_human.dm
index c35d8a71759e..cecfe74b7cc8 100644
--- a/code/modules/mob/living/carbon/human/consistent_human.dm
+++ b/code/modules/mob/living/carbon/human/consistent_human.dm
@@ -3,36 +3,40 @@
return //No randomisation
/mob/living/carbon/human/dummy/consistent/proc/seeded_randomization(seed = 0)
- gender = list(MALE, FEMALE)[seed % 2 + 1]
- skin_tone = GLOB.skin_tones[seed % length(GLOB.skin_tones) + 1]
- hairstyle = GLOB.hairstyles_list[seed % length(GLOB.hairstyles_list) + 1]
- hair_color = color_natural_from_seed(seed)
- eye_color = short_color_from_seed(seed)
+ seed = md5(seed)
- // Mutant randomizing, doesn't affect the mob appearance unless it's the specific mutant.
- dna.features["mcolor"] = short_color_from_seed(seed * 2)
- dna.features["mcolor2"] = short_color_from_seed(seed * 3)
- //AAAAAAAAAAAAAAAAAAAAAAAAAA
- dna.features["ethcolor"] = GLOB.color_list_ethereal[GLOB.color_list_ethereal[seed % length(GLOB.color_list_ethereal) + 1]]
- dna.features["tail_lizard"] = GLOB.tails_list_lizard[seed % length(GLOB.tails_list_lizard) + 1]
- dna.features["face_markings"] = GLOB.face_markings_list[seed % length(GLOB.face_markings_list) + 1]
- dna.features["horns"] = GLOB.horns_list[seed % length(GLOB.horns_list) + 1]
- dna.features["frills"] = GLOB.frills_list[seed % length(GLOB.frills_list) + 1]
- dna.features["spines"] = GLOB.spines_list[seed % length(GLOB.spines_list) + 1]
- dna.features["body_markings"] = GLOB.body_markings_list[seed % length(GLOB.body_markings_list) + 1]
- dna.features["moth_wings"] = GLOB.moth_wings_list[seed % length(GLOB.moth_wings_list) + 1]
- dna.features["moth_fluff"] = GLOB.moth_fluff_list[seed % length(GLOB.moth_fluff_list) + 1]
- dna.features["spider_legs"] = GLOB.spider_legs_list[seed % length(GLOB.spider_legs_list) + 1]
- dna.features["spider_spinneret"] = GLOB.spider_spinneret_list[seed % length(GLOB.spider_spinneret_list) + 1]
- dna.features["squid_face"] = GLOB.squid_face_list[seed % length(GLOB.squid_face_list) + 1]
- dna.features["kepori_feathers"] = GLOB.kepori_feathers_list[seed % length(GLOB.kepori_feathers_list) + 1]
- dna.features["kepori_body_feathers"] = GLOB.kepori_body_feathers_list[seed % length(GLOB.kepori_body_feathers_list) + 1]
- dna.features["vox_head_quills"] = GLOB.vox_head_quills_list[seed % length(GLOB.vox_head_quills_list) + 1]
- dna.features["vox_neck_quills"] = GLOB.vox_neck_quills_list[seed % length(GLOB.vox_neck_quills_list) + 1]
- dna.features["elzu_horns"] = GLOB.elzu_horns_list[seed % length(GLOB.elzu_horns_list) + 1]
- dna.features["tail_elzu"] = GLOB.tails_list_elzu[seed % length(GLOB.tails_list_elzu) + 1]
- dna.features["ipc_chassis"] = GLOB.ipc_chassis_list[seed % length(GLOB.ipc_chassis_list) + 1]
- dna.features["ipc_screen"] = GLOB.ipc_screens_list[seed % length(GLOB.ipc_screens_list) + 1]
+ gender = list(MALE, FEMALE)[hex2num(copytext(seed, 1, 2)) % 2 + 1]
+ skin_tone = GLOB.skin_tones[hex2num(copytext(seed, 2, 3)) % length(GLOB.skin_tones) + 1]
- update_body()
- update_hair()
+ hairstyle = GLOB.hairstyles_list[hex2num(copytext(seed, 1, 3)) % length(GLOB.hairstyles_list) + 1]
+ facial_hairstyle = GLOB.facial_hairstyles_list[hex2num(copytext(seed, 3, 6)) % length(GLOB.facial_hairstyles_list) + 1]
+
+ hair_color = color_natural_from_seed(copytext(seed, 1, 6))
+ facial_hair_color = hair_color
+ eye_color = color_from_seed(copytext(seed, 3, 9))
+
+ dna.features["mcolor"] = color_from_seed(copytext(seed, 1, 9))
+ dna.features["mcolor2"] = color_from_seed(copytext(seed, 2, 10))
+ dna.features["ethcolor"] = color_from_seed(copytext(seed, 3, 11))
+
+ dna.features["tail_lizard"] = GLOB.tails_list_lizard[hex2num(copytext(seed, 2, 3)) % length(GLOB.tails_list_lizard) + 1]
+ dna.features["face_markings"] = GLOB.face_markings_list[hex2num(copytext(seed, 3, 4)) % length(GLOB.face_markings_list) + 1]
+ dna.features["horns"] = GLOB.horns_list[hex2num(copytext(seed, 4, 5)) % length(GLOB.horns_list) + 1]
+ dna.features["frills"] = GLOB.frills_list[hex2num(copytext(seed, 5, 6)) % length(GLOB.frills_list) + 1]
+ dna.features["spines"] = GLOB.spines_list[hex2num(copytext(seed, 6, 7)) % length(GLOB.spines_list) + 1]
+ dna.features["body_markings"] = GLOB.body_markings_list[hex2num(copytext(seed, 7, 8)) % length(GLOB.body_markings_list) + 1]
+ dna.features["moth_wings"] = GLOB.moth_wings_list[hex2num(copytext(seed, 8, 9)) % length(GLOB.moth_wings_list) + 1]
+ dna.features["moth_fluff"] = GLOB.moth_fluff_list[hex2num(copytext(seed, 9, 10)) % length(GLOB.moth_fluff_list) + 1]
+ dna.features["spider_legs"] = GLOB.spider_legs_list[hex2num(copytext(seed, 10, 11)) % length(GLOB.spider_legs_list) + 1]
+ dna.features["spider_spinneret"] = GLOB.spider_spinneret_list[hex2num(copytext(seed, 11, 12)) % length(GLOB.spider_spinneret_list) + 1]
+ dna.features["kepori_feathers"] = GLOB.kepori_feathers_list[hex2num(copytext(seed, 12, 13)) % length(GLOB.kepori_feathers_list) + 1]
+ dna.features["kepori_body_feathers"] = GLOB.kepori_body_feathers_list[hex2num(copytext(seed, 13, 14)) % length(GLOB.kepori_body_feathers_list) + 1]
+ dna.features["vox_head_quills"] = GLOB.vox_head_quills_list[hex2num(copytext(seed, 14, 15)) % length(GLOB.vox_head_quills_list) + 1]
+ dna.features["vox_neck_quills"] = GLOB.vox_neck_quills_list[hex2num(copytext(seed, 15, 16)) % length(GLOB.vox_neck_quills_list) + 1]
+ dna.features["elzu_horns"] = GLOB.elzu_horns_list[hex2num(copytext(seed, 16, 17)) % length(GLOB.elzu_horns_list) + 1]
+ dna.features["tail_elzu"] = GLOB.tails_list_elzu[hex2num(copytext(seed, 17, 18)) % length(GLOB.tails_list_elzu) + 1]
+ dna.features["ipc_chassis"] = GLOB.ipc_chassis_list[hex2num(copytext(seed, 18, 19)) % length(GLOB.ipc_chassis_list) + 1]
+ dna.features["ipc_screen"] = GLOB.ipc_screens_list[hex2num(copytext(seed, 19, 20)) % length(GLOB.ipc_screens_list) + 1]
+
+ var/species_id = GLOB.roundstart_races[hex2num(copytext(seed, 3, 4)) % length(GLOB.roundstart_races) + 1]
+ set_species(GLOB.species_list[species_id])
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index a260f164829f..ceda44284f46 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -232,11 +232,6 @@
if(nutrition < NUTRITION_LEVEL_STARVING - 50)
msg += "[t_He] [t_is] severely malnourished.\n"
- else if(nutrition >= NUTRITION_LEVEL_FAT)
- if(user.nutrition < NUTRITION_LEVEL_STARVING - 50)
- msg += "[t_He] [t_is] plump and delicious looking - Like a fat little piggy. A tasty piggy.\n"
- else
- msg += "[t_He] [t_is] quite chubby.\n"
switch(disgust)
if(DISGUST_LEVEL_GROSS to DISGUST_LEVEL_VERYGROSS)
msg += "[t_He] look[p_s()] a bit grossed out.\n"
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 8c72925e7c96..4bfe35b47060 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 [] [], []Successfully added comment. ")
return
@@ -646,7 +646,7 @@
return threatcount
-//Used for new human mobs created by cloning/goleming/podding
+//Used for new human mobs created by cloning/podding
/mob/living/carbon/human/proc/set_cloned_appearance()
if(gender == MALE)
facial_hairstyle = "Full Beard"
@@ -1336,83 +1336,6 @@
/mob/living/carbon/human/species/fly
race = /datum/species/fly
-/mob/living/carbon/human/species/golem
- race = /datum/species/golem
-
-/mob/living/carbon/human/species/golem/random
- race = /datum/species/golem/random
-
-/mob/living/carbon/human/species/golem/adamantine
- race = /datum/species/golem/adamantine
-
-/mob/living/carbon/human/species/golem/plasma
- race = /datum/species/golem/plasma
-
-/mob/living/carbon/human/species/golem/diamond
- race = /datum/species/golem/diamond
-
-/mob/living/carbon/human/species/golem/gold
- race = /datum/species/golem/gold
-
-/mob/living/carbon/human/species/golem/silver
- race = /datum/species/golem/silver
-
-/mob/living/carbon/human/species/golem/plasteel
- race = /datum/species/golem/plasteel
-
-/mob/living/carbon/human/species/golem/titanium
- race = /datum/species/golem/titanium
-
-/mob/living/carbon/human/species/golem/plastitanium
- race = /datum/species/golem/plastitanium
-
-/mob/living/carbon/human/species/golem/alien_alloy
- race = /datum/species/golem/alloy
-
-/mob/living/carbon/human/species/golem/wood
- race = /datum/species/golem/wood
-
-/mob/living/carbon/human/species/golem/uranium
- race = /datum/species/golem/uranium
-
-/mob/living/carbon/human/species/golem/sand
- race = /datum/species/golem/sand
-
-/mob/living/carbon/human/species/golem/glass
- race = /datum/species/golem/glass
-
-/mob/living/carbon/human/species/golem/bluespace
- race = /datum/species/golem/bluespace
-
-/mob/living/carbon/human/species/golem/bananium
- race = /datum/species/golem/bananium
-
-/mob/living/carbon/human/species/golem/blood_cult
- race = /datum/species/golem/runic
-
-/mob/living/carbon/human/species/golem/cloth
- race = /datum/species/golem/cloth
-
-/mob/living/carbon/human/species/golem/plastic
- race = /datum/species/golem/plastic
-
-/mob/living/carbon/human/species/golem/bronze
- race = /datum/species/golem/bronze
-
-/mob/living/carbon/human/species/golem/cardboard
- race = /datum/species/golem/cardboard
-
-/mob/living/carbon/human/species/golem/leather
- race = /datum/species/golem/leather
-
-/mob/living/carbon/human/species/golem/bone
- race = /datum/species/golem/bone
-
-/mob/living/carbon/human/species/golem/durathread
- race = /datum/species/golem/durathread
-
-/mob/living/carbon/human/species/golem/snow
- race = /datum/species/golem/snow
/mob/living/carbon/human/species/jelly
race = /datum/species/jelly
@@ -1452,6 +1375,9 @@
/mob/living/carbon/human/species/snail
race = /datum/species/snail
+/mob/living/carbon/human/species/vox
+ race = /datum/species/vox
+
/mob/living/carbon/human/species/kepori
race = /datum/species/kepori
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 1444b71d9c51..123ecf6d4fba 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -695,15 +695,8 @@
return
if(src == M)
- if(has_status_effect(STATUS_EFFECT_CHOKINGSTRAND))
- to_chat(src, "You attempt to remove the durathread strand from around your neck. ")
- if(do_after(src, 35, null, src))
- to_chat(src, "You succesfuly remove the durathread strand. ")
- remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND)
- return
check_self_for_injuries()
-
else
if(wear_suit)
wear_suit.add_fingerprint(M)
@@ -712,7 +705,6 @@
..()
-
/mob/living/carbon/human/check_self_for_injuries()
if(stat >= UNCONSCIOUS)
return
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index eab67e22a6be..bbe40388435a 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -66,9 +66,9 @@ GLOBAL_LIST_EMPTY(roundstart_races)
var/disliked_food = GROSS
///Bitfield for food types that the species absolutely hates, giving them even more disgust than disliked food. Meat is "toxic" to moths, for example.
var/toxic_food = TOXIC
- ///Inventory slots the race can't equip stuff to. Golems cannot wear jumpsuits, for example.
+ ///Inventory slots the race can't equip stuff to.
var/list/no_equip = list()
- /// Allows the species to equip items that normally require a jumpsuit without having one equipped. Used by golems.
+ /// Allows the species to equip items that normally require a jumpsuit without having one equipped.
var/nojumpsuit = FALSE
///What languages this species can understand and say. Use a [language holder datum][/datum/language_holder] in this var.
var/species_language_holder = /datum/language_holder
@@ -1350,22 +1350,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(HAS_TRAIT(src, TRAIT_NOHUNGER))
return //hunger is for BABIES
- //The fucking TRAIT_FAT mutation is the dumbest shit ever. It makes the code so difficult to work with
- if(HAS_TRAIT_FROM(H, TRAIT_FAT, OBESITY))//I share your pain, past coder.
- if(H.overeatduration < 100)
- to_chat(H, "You feel fit again! ")
- REMOVE_TRAIT(H, TRAIT_FAT, OBESITY)
- H.remove_movespeed_modifier(/datum/movespeed_modifier/obesity)
- H.update_inv_w_uniform()
- H.update_inv_wear_suit()
- else
- if(H.overeatduration >= 100)
- to_chat(H, "You suddenly feel blubbery! ")
- ADD_TRAIT(H, TRAIT_FAT, OBESITY)
- H.add_movespeed_modifier(/datum/movespeed_modifier/obesity)
- H.update_inv_w_uniform()
- H.update_inv_wear_suit()
-
// nutrition decrease and satiety
if (H.nutrition > 0 && H.stat != DEAD && !HAS_TRAIT(H, TRAIT_NOHUNGER))
// THEY HUNGER
@@ -1397,9 +1381,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.overeatduration -= 2 //doubled the unfat rate
//metabolism change
- if(H.nutrition > NUTRITION_LEVEL_FAT)
- H.metabolism_efficiency = 1
- else if(H.nutrition > NUTRITION_LEVEL_FED && H.satiety > 80)
+ if(H.nutrition > NUTRITION_LEVEL_FED && H.satiety > 80)
if(H.metabolism_efficiency != 1.25 && !HAS_TRAIT(H, TRAIT_NOHUNGER))
to_chat(H, "You feel vigorous. ")
H.metabolism_efficiency = 1.25
@@ -1426,9 +1408,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.remove_movespeed_modifier(/datum/movespeed_modifier/hunger)
switch(H.nutrition)
- if(NUTRITION_LEVEL_FULL to INFINITY)
- H.throw_alert("nutrition", /atom/movable/screen/alert/fat)
- if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_FULL)
+ if(NUTRITION_LEVEL_HUNGRY to INFINITY)
H.clear_alert("nutrition")
if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_HUNGRY)
H.throw_alert("nutrition", /atom/movable/screen/alert/hungry)
diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm
deleted file mode 100644
index 380d91aebbe6..000000000000
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ /dev/null
@@ -1,1113 +0,0 @@
-/datum/species/golem
- // Animated beings of stone. They have increased defenses, and do not need to breathe. They're also slow as fuuuck.
- name = "\improper Golem"
- id = "iron golem"
- species_traits = list(NOBLOOD,MUTCOLORS,NO_UNDERWEAR)
- inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOFIRE,TRAIT_CHUNKYFINGERS,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER)
- inherent_biotypes = MOB_HUMANOID|MOB_MINERAL
- mutant_organs = list(/obj/item/organ/adamantine_resonator)
- mutanttongue = /obj/item/organ/tongue/golem_base
- speedmod = 2
- armor = 55
- siemens_coeff = 0
- punchdamagelow = 5
- punchdamagehigh = 14
- punchstunthreshold = 11 //about 40% chance to stun
- no_equip = list(ITEM_SLOT_MASK, ITEM_SLOT_OCLOTHING, ITEM_SLOT_GLOVES, ITEM_SLOT_FEET, ITEM_SLOT_ICLOTHING, ITEM_SLOT_SUITSTORE)
- nojumpsuit = 1
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC
- sexes = FALSE
- damage_overlay_type = ""
- meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem
- species_language_holder = /datum/language_holder/golem
- // To prevent golem subtypes from overwhelming the odds when random species
- // changes, only the Random Golem type can be chosen
-
- species_chest = /obj/item/bodypart/chest/golem
- species_head = /obj/item/bodypart/head/golem
- species_l_arm = /obj/item/bodypart/l_arm/golem
- species_r_arm = /obj/item/bodypart/r_arm/golem
- species_l_leg = /obj/item/bodypart/leg/left/golem
- species_r_leg = /obj/item/bodypart/leg/right/golem
-
- fixed_mut_color = "aaa"
- var/info_text = "As an Iron Golem , you don't have any special traits."
- var/random_eligible = TRUE //If false, the golem subtype can't be made through golem mutation toxin
-
- var/prefix = "Iron"
- var/list/special_names = list("Tarkus")
- var/human_surname_chance = 3
- var/special_name_chance = 5
- var/owner //dobby is a free golem
-
-/datum/species/golem/random_name(gender,unique,lastname)
- var/golem_surname = pick(GLOB.golem_names)
- // 3% chance that our golem has a human surname, because
- // cultural contamination
- if(prob(human_surname_chance))
- golem_surname = pick(GLOB.last_names)
- else if(special_names && special_names.len && prob(special_name_chance))
- golem_surname = pick(special_names)
-
- var/golem_name = "[prefix] [golem_surname]"
- return golem_name
-
-/datum/species/golem/random
- name = "Random Golem"
- id = "random golem"
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN
- var/static/list/random_golem_types
-
-/datum/species/golem/random/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- ..()
- if(!random_golem_types)
- random_golem_types = subtypesof(/datum/species/golem) - type
- for(var/V in random_golem_types)
- var/datum/species/golem/G = V
- if(!initial(G.random_eligible))
- random_golem_types -= G
- var/datum/species/golem/golem_type = pick(random_golem_types)
- var/mob/living/carbon/human/H = C
- H.set_species(golem_type)
- to_chat(H, "[initial(golem_type.info_text)]")
-
-/datum/species/golem/adamantine
- name = "Adamantine Golem"
- id = "adamantine golem"
- meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine
- mutant_organs = list(/obj/item/organ/adamantine_resonator, /obj/item/organ/vocal_cords/adamantine)
- fixed_mut_color = "4ed"
- info_text = "As an Adamantine Golem , you possess special vocal cords allowing you to \"resonate\" messages to all golems. Your unique mineral makeup makes you immune to most types of magic."
- prefix = "Adamantine"
- special_names = null
-
-/datum/species/golem/adamantine/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- ..()
- ADD_TRAIT(C, TRAIT_ANTIMAGIC, SPECIES_TRAIT)
-
-/datum/species/golem/adamantine/on_species_loss(mob/living/carbon/C)
- REMOVE_TRAIT(C, TRAIT_ANTIMAGIC, SPECIES_TRAIT)
- ..()
-
-//The suicide bombers of golemkind
-/datum/species/golem/plasma
- name = "Plasma Golem"
- id = "plasma golem"
- fixed_mut_color = "a3d"
- meat = /obj/item/stack/ore/plasma
- //Can burn and takes damage from heat
- inherent_traits = list(TRAIT_NOBREATH, TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_CHUNKYFINGERS,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER) //no RESISTHEAT, NOFIRE
- info_text = "As a Plasma Golem , you burn easily. Be careful, if you get hot enough while burning, you'll blow up!"
- heatmod = 0 //fine until they blow up
- prefix = "Plasma"
- special_names = list("Flood","Fire","Bar","Man")
- var/boom_warning = FALSE
- var/datum/action/innate/ignite/ignite
-
-/datum/species/golem/plasma/spec_life(mob/living/carbon/human/H)
- if(H.bodytemperature > 750)
- if(!boom_warning && H.on_fire)
- to_chat(H, "You feel like you could blow up at any moment! ")
- boom_warning = TRUE
- else
- if(boom_warning)
- to_chat(H, "You feel more stable. ")
- boom_warning = FALSE
-
- if(H.bodytemperature > 850 && H.on_fire && prob(25))
- explosion(get_turf(H),1,2,4,flame_range = 5)
- if(H)
- H.gib()
- if(H.fire_stacks < 2) //flammable
- H.adjust_fire_stacks(1)
- ..()
-
-/datum/species/golem/plasma/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- ..()
- if(ishuman(C))
- ignite = new
- ignite.Grant(C)
-
-/datum/species/golem/plasma/on_species_loss(mob/living/carbon/C)
- if(ignite)
- ignite.Remove(C)
- ..()
-
-/datum/action/innate/ignite
- name = "Ignite"
- desc = "Set yourself aflame, bringing yourself closer to exploding!"
- check_flags = AB_CHECK_CONSCIOUS
- button_icon_state = "sacredflame"
-
-/datum/action/innate/ignite/Activate()
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- if(H.fire_stacks)
- to_chat(owner, "You ignite yourself! ")
- else
- to_chat(owner, "You try to ignite yourself, but fail! ")
- H.IgniteMob() //firestacks are already there passively
-
-//Harder to hurt
-/datum/species/golem/diamond
- name = "Diamond Golem"
- id = "diamond golem"
- fixed_mut_color = "0ff"
- armor = 70 //up from 55
- meat = /obj/item/stack/ore/diamond
- info_text = "As a Diamond Golem , you are more resistant than the average golem."
- prefix = "Diamond"
- special_names = list("Back","Grill")
-
-//Faster but softer and less armoured
-/datum/species/golem/gold
- name = "Gold Golem"
- id = "gold golem"
- fixed_mut_color = "cc0"
- speedmod = 1
- armor = 25 //down from 55
- meat = /obj/item/stack/ore/gold
- info_text = "As a Gold Golem , you are faster but less resistant than the average golem."
- prefix = "Golden"
- special_names = list("Boy")
-
-//Heavier, thus higher chance of stunning when punching
-/datum/species/golem/silver
- name = "Silver Golem"
- id = "silver golem"
- fixed_mut_color = "ddd"
- punchstunthreshold = 9 //60% chance, from 40%
- meat = /obj/item/stack/ore/silver
- info_text = "As a Silver Golem , your attacks have a higher chance of stunning. Being made of silver, your body is immune to most types of magic."
- prefix = "Silver"
- special_names = list("Surfer", "Chariot", "Lining")
-
-/datum/species/golem/silver/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- ..()
- ADD_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
-
-/datum/species/golem/silver/on_species_loss(mob/living/carbon/C)
- REMOVE_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
- ..()
-
-//Harder to stun, deals more damage, massively slowpokes, but gravproof and obstructive. Basically, The Wall.
-/datum/species/golem/plasteel
- name = "Plasteel Golem"
- id = "plasteel golem"
- fixed_mut_color = "bbb"
- stunmod = 0.4
- punchdamagelow = 12
- punchdamagehigh = 21
- punchstunthreshold = 18 //still 40% stun chance
- speedmod = 4 //pretty fucking slow
- meat = /obj/item/stack/ore/iron
- info_text = "As a Plasteel Golem , you are slower, but harder to stun, and hit very hard when punching. You also magnetically attach to surfaces and so don't float without gravity and cannot have positions swapped with other beings."
- attack_verb = "smash"
- attack_sound = 'sound/effects/meteorimpact.ogg' //hits pretty hard
- prefix = "Plasteel"
- special_names = null
-
-/datum/species/golem/plasteel/negates_gravity(mob/living/carbon/human/H)
- return TRUE
-
-/datum/species/golem/plasteel/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- ..()
- ADD_TRAIT(C, TRAIT_NOMOBSWAP, SPECIES_TRAIT) //THE WALL THE WALL THE WALL
-
-/datum/species/golem/plasteel/on_species_loss(mob/living/carbon/C)
- REMOVE_TRAIT(C, TRAIT_NOMOBSWAP, SPECIES_TRAIT) //NOTHING ON ERF CAN MAKE IT FALL
- ..()
-
-//Immune to ash storms
-/datum/species/golem/titanium
- name = "Titanium Golem"
- id = "titanium golem"
- fixed_mut_color = "fff"
- meat = /obj/item/stack/ore/titanium
- info_text = "As a Titanium Golem , you are immune to ash storms, and slightly more resistant to burn damage."
- burnmod = 0.9
- prefix = "Titanium"
- special_names = list("Dioxide")
-
-/datum/species/golem/titanium/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- . = ..()
- C.weather_immunities |= "ash"
-
-/datum/species/golem/titanium/on_species_loss(mob/living/carbon/C)
- . = ..()
- C.weather_immunities -= "ash"
-
-//Immune to ash storms and lava
-/datum/species/golem/plastitanium
- name = "Plastitanium Golem"
- id = "plastitanium golem"
- fixed_mut_color = "888"
- meat = /obj/item/stack/ore/titanium
- info_text = "As a Plastitanium Golem , you are immune to both ash storms and lava, and slightly more resistant to burn damage."
- burnmod = 0.8
- prefix = "Plastitanium"
- special_names = null
-
-/datum/species/golem/plastitanium/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- . = ..()
- C.weather_immunities |= "lava"
- C.weather_immunities |= "ash"
-
-/datum/species/golem/plastitanium/on_species_loss(mob/living/carbon/C)
- . = ..()
- C.weather_immunities -= "ash"
- C.weather_immunities -= "lava"
-
-//Fast and regenerates... but can only speak like an abductor
-/datum/species/golem/alloy
- name = "Alien Alloy Golem"
- id = "alloy golem"
- fixed_mut_color = "333"
- meat = /obj/item/stack/sheet/mineral/abductor
- mutanttongue = /obj/item/organ/tongue/abductor
- speedmod = 1 //faster
- info_text = "As an Alloy Golem , you are made of advanced alien materials: you are faster and regenerate over time. You are, however, only able to be heard by other alloy golems."
- prefix = "Alien"
- special_names = list("Outsider", "Technology", "Watcher", "Stranger") //ominous and unknown
-
- species_chest = /obj/item/bodypart/chest/golem/alloy
- species_head = /obj/item/bodypart/head/golem/alloy
- species_l_arm = /obj/item/bodypart/l_arm/golem/alloy
- species_r_arm = /obj/item/bodypart/r_arm/golem/alloy
- species_l_leg = /obj/item/bodypart/leg/left/golem/alloy
- species_r_leg = /obj/item/bodypart/leg/right/golem/alloy
-
-//Regenerates because self-repairing super-advanced alien tech
-/datum/species/golem/alloy/spec_life(mob/living/carbon/human/H)
- if(H.stat == DEAD)
- return
- H.heal_overall_damage(2,2, 0, BODYTYPE_ORGANIC)
- H.adjustToxLoss(-2)
- H.adjustOxyLoss(-2)
-
-//Since this will usually be created from a collaboration between podpeople and free golems, wood golems are a mix between the two races
-/datum/species/golem/wood
- name = "Wood Golem"
- id = "wood golem"
- fixed_mut_color = "9E704B"
- meat = /obj/item/stack/sheet/mineral/wood
- //Can burn and take damage from heat
- inherent_traits = list(TRAIT_NOBREATH, TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_CHUNKYFINGERS,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER)
- armor = 30
- burnmod = 1.25
- heatmod = 1.5
- info_text = "As a Wooden Golem , you have plant-like traits: you take damage from extreme temperatures, can be set on fire, and have lower armor than a normal golem. You regenerate when in the light and wither in the darkness."
- prefix = "Wooden"
- special_names = list("Bark", "Willow", "Catalpa", "Woody", "Oak", "Sap", "Twig", "Branch", "Maple", "Birch", "Elm", "Basswood", "Cottonwood", "Larch", "Aspen", "Ash", "Beech", "Buckeye", "Cedar", "Chestnut", "Cypress", "Fir", "Hawthorn", "Hazel", "Hickory", "Ironwood", "Juniper", "Leaf", "Mangrove", "Palm", "Pawpaw", "Pine", "Poplar", "Redwood", "Redbud", "Sassafras", "Spruce", "Sumac", "Trunk", "Walnut", "Yew")
- human_surname_chance = 0
- special_name_chance = 100
- inherent_factions = list("plants", "vines")
-
-/datum/species/golem/wood/spec_life(mob/living/carbon/human/H)
- if(H.stat == DEAD)
- return
- var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing
- if(isturf(H.loc)) //else, there's considered to be no light
- var/turf/T = H.loc
- light_amount = min(1,T.get_lumcount()) - 0.5
- H.adjust_nutrition(light_amount * 10)
- if(H.nutrition > NUTRITION_LEVEL_ALMOST_FULL)
- H.set_nutrition(NUTRITION_LEVEL_ALMOST_FULL)
- if(light_amount > 0.2) //if there's enough light, heal
- H.heal_overall_damage(1,1,0, BODYPART_ORGANIC)
- H.adjustToxLoss(-1)
- H.adjustOxyLoss(-1)
-
- if(H.nutrition < NUTRITION_LEVEL_STARVING + 50)
- H.take_overall_damage(2,0)
-
-/datum/species/golem/wood/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
- if(chem.type == /datum/reagent/toxin/plantbgone)
- H.adjustToxLoss(3)
- H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM)
- return TRUE
- return ..()
-
-//Radioactive
-/datum/species/golem/uranium
- name = "Uranium Golem"
- id = "uranium golem"
- fixed_mut_color = "7f0"
- meat = /obj/item/stack/ore/uranium
- info_text = "As an Uranium Golem , you emit radiation pulses every once in a while. It won't harm fellow golems, but organic lifeforms will be affected."
-
- var/last_event = 0
- var/active = null
- prefix = "Uranium"
- special_names = list("Oxide", "Rod", "Meltdown", "235")
-
-/datum/species/golem/uranium/spec_life(mob/living/carbon/human/H)
- if(!active)
- if(world.time > last_event+30)
- active = 1
- radiation_pulse(H, 50)
- last_event = world.time
- active = null
- ..()
-
-//Immune to physical bullets and resistant to brute, but very vulnerable to burn damage. Dusts on death.
-/datum/species/golem/sand
- name = "Sand Golem"
- id = "sand golem"
- fixed_mut_color = "ffdc8f"
- meat = /obj/item/stack/ore/glass //this is sand
- armor = 0
- burnmod = 3 //melts easily
- brutemod = 0.25
- info_text = "As a Sand Golem , you are immune to physical bullets and take very little brute damage, but are extremely vulnerable to burn damage and energy weapons. You will also turn to sand when dying, preventing any form of recovery."
- attack_sound = 'sound/effects/shovel_dig.ogg'
- prefix = "Sand"
- special_names = list("Castle", "Bag", "Dune", "Worm", "Storm")
-
-/datum/species/golem/sand/spec_death(gibbed, mob/living/carbon/human/H)
- H.visible_message("[H] turns into a pile of sand! ")
- for(var/obj/item/W in H)
- H.dropItemToGround(W)
- for(var/i=1, i <= rand(3,5), i++)
- new /obj/item/stack/ore/glass(get_turf(H))
- qdel(H)
-
-/datum/species/golem/sand/bullet_act(obj/projectile/P, mob/living/carbon/human/H)
- if(!(P.original == H && P.firer == H))
- if(P.flag == "bullet" || P.flag == "bomb")
- playsound(H, 'sound/effects/shovel_dig.ogg', 70, TRUE)
- H.visible_message("The [P.name] sinks harmlessly in [H]'s sandy body! ", \
- "The [P.name] sinks harmlessly in [H]'s sandy body! ")
- return BULLET_ACT_BLOCK
- return ..()
-
-//Reflects lasers and resistant to burn damage, but very vulnerable to brute damage. Shatters on death.
-/datum/species/golem/glass
- name = "Glass Golem"
- id = "glass golem"
- fixed_mut_color = "5a96b4aa" //transparent body
- meat = /obj/item/shard
- armor = 0
- brutemod = 3 //very fragile
- burnmod = 0.25
- info_text = "As a Glass Golem , you reflect lasers and energy weapons, and are very resistant to burn damage. However, you are extremely vulnerable to brute damage. On death, you'll shatter beyond any hope of recovery."
- attack_sound = 'sound/effects/glassbr2.ogg'
- prefix = "Glass"
- special_names = list("Lens", "Prism", "Fiber", "Bead")
-
-/datum/species/golem/glass/spec_death(gibbed, mob/living/carbon/human/H)
- playsound(H, "shatter", 70, TRUE)
- H.visible_message("[H] shatters! ")
- for(var/obj/item/W in H)
- H.dropItemToGround(W)
- for(var/i=1, i <= rand(3,5), i++)
- new /obj/item/shard(get_turf(H))
- qdel(H)
-
-/datum/species/golem/glass/bullet_act(obj/projectile/P, mob/living/carbon/human/H)
- if(!(P.original == H && P.firer == H)) //self-shots don't reflect
- if(P.flag == "laser" || P.flag == "energy")
- H.visible_message("The [P.name] gets reflected by [H]'s glass skin! ", \
- "The [P.name] gets reflected by [H]'s glass skin! ")
- if(P.starting)
- var/new_x = P.starting.x + pick(0, 0, 0, 0, 0, -1, 1, -2, 2)
- var/new_y = P.starting.y + pick(0, 0, 0, 0, 0, -1, 1, -2, 2)
- // redirect the projectile
- P.firer = H
- P.preparePixelProjectile(locate(clamp(new_x, 1, world.maxx), clamp(new_y, 1, world.maxy), H.z), H)
- return BULLET_ACT_FORCE_PIERCE
- return ..()
-
-//Teleports when hit or when it wants to
-/datum/species/golem/bluespace
- name = "Bluespace Golem"
- id = "bluespace golem"
- fixed_mut_color = "33f"
- meat = /obj/item/stack/ore/bluespace_crystal
- info_text = "As a Bluespace Golem , you are spatially unstable: You will teleport when hit, and you can teleport manually at a long distance."
- attack_verb = "bluespace punch"
- attack_sound = 'sound/effects/phasein.ogg'
- prefix = "Bluespace"
- special_names = list("Crystal", "Polycrystal")
-
- var/datum/action/innate/unstable_teleport/unstable_teleport
- var/teleport_cooldown = 100
- var/last_teleport = 0
-
-/datum/species/golem/bluespace/proc/reactive_teleport(mob/living/carbon/human/H)
- H.visible_message("[H] teleports! ", "You destabilize and teleport! ")
- new /obj/effect/particle_effect/sparks(get_turf(H))
- playsound(get_turf(H), "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- do_teleport(H, get_turf(H), 6, asoundin = 'sound/weapons/emitter2.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)
- last_teleport = world.time
-
-/datum/species/golem/bluespace/spec_hitby(atom/movable/AM, mob/living/carbon/human/H)
- ..()
- var/obj/item/I
- if(istype(AM, /obj/item))
- I = AM
- if(I.thrownby == WEAKREF(H)) //No throwing stuff at yourself to trigger the teleport
- return 0
- else
- reactive_teleport(H)
-
-/datum/species/golem/bluespace/spec_attack_hand(mob/living/carbon/human/M, mob/living/carbon/human/H, datum/martial_art/attacker_style)
- ..()
- if(world.time > last_teleport + teleport_cooldown && M != H && M.a_intent != INTENT_HELP)
- reactive_teleport(H)
-
-/datum/species/golem/bluespace/spec_attacked_by(obj/item/I, mob/living/user, obj/item/bodypart/affecting, intent, mob/living/carbon/human/H)
- ..()
- if(world.time > last_teleport + teleport_cooldown && user != H)
- reactive_teleport(H)
-
-/datum/species/golem/bluespace/on_hit(obj/projectile/P, mob/living/carbon/human/H)
- ..()
- if(world.time > last_teleport + teleport_cooldown)
- reactive_teleport(H)
-
-/datum/species/golem/bluespace/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- ..()
- if(ishuman(C))
- unstable_teleport = new
- unstable_teleport.Grant(C)
- last_teleport = world.time
-
-/datum/species/golem/bluespace/on_species_loss(mob/living/carbon/C)
- if(unstable_teleport)
- unstable_teleport.Remove(C)
- ..()
-
-/datum/action/innate/unstable_teleport
- name = "Unstable Teleport"
- check_flags = AB_CHECK_CONSCIOUS
- button_icon_state = "jaunt"
- icon_icon = 'icons/mob/actions/actions_spells.dmi'
- var/cooldown = 150
- var/last_teleport = 0
-
-/datum/action/innate/unstable_teleport/IsAvailable()
- if(..())
- if(world.time > last_teleport + cooldown)
- return 1
- return 0
-
-/datum/action/innate/unstable_teleport/Activate()
- var/mob/living/carbon/human/H = owner
- H.visible_message("[H] starts vibrating! ", "You start charging your bluespace core... ")
- playsound(get_turf(H), 'sound/weapons/flash.ogg', 25, TRUE)
- addtimer(CALLBACK(src, PROC_REF(teleport), H), 15)
-
-/datum/action/innate/unstable_teleport/proc/teleport(mob/living/carbon/human/H)
- H.visible_message("[H] disappears in a shower of sparks! ", "You teleport! ")
- var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread
- spark_system.set_up(10, 0, src)
- spark_system.attach(H)
- spark_system.start()
- do_teleport(H, get_turf(H), 12, asoundin = 'sound/weapons/emitter2.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)
- last_teleport = world.time
- UpdateButtonIcon() //action icon looks unavailable
- //action icon looks available again
- addtimer(CALLBACK(src, PROC_REF(UpdateButtonIcon)), cooldown + 5)
-
-
-//honk
-/datum/species/golem/bananium
- name = "Bananium Golem"
- id = "bananium golem"
- fixed_mut_color = "ff0"
- punchdamagelow = 0
- punchdamagehigh = 1
- punchstunthreshold = 2 //Harmless and can't stun
- meat = /obj/item/stack/ore/bananium
- info_text = "As a Bananium Golem , you are made for pranking. Your body emits natural honks, and you can barely even hurt people when punching them. Your skin also bleeds banana peels when damaged."
- attack_verb = "honk"
- attack_sound = 'sound/items/airhorn2.ogg'
- prefix = "Bananium"
- special_names = null
- mutanttongue = /obj/item/organ/tongue/golem_honk
-
- species_chest = /obj/item/bodypart/chest/golem/bananium
- species_head = /obj/item/bodypart/head/golem/bananium
- species_l_arm = /obj/item/bodypart/l_arm/golem/bananium
- species_r_arm = /obj/item/bodypart/r_arm/golem/bananium
- species_l_leg = /obj/item/bodypart/leg/left/golem/bananium
- species_r_leg = /obj/item/bodypart/leg/right/golem/bananium
-
- var/last_honk = 0
- var/honkooldown = 0
- var/last_banana = 0
- var/banana_cooldown = 100
- var/active = null
-
-/datum/species/golem/bananium/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- ..()
- last_banana = world.time
- last_honk = world.time
- RegisterSignal(C, COMSIG_MOB_SAY, PROC_REF(handle_speech))
-
-/datum/species/golem/bananium/on_species_loss(mob/living/carbon/C)
- . = ..()
- UnregisterSignal(C, COMSIG_MOB_SAY)
-
-/datum/species/golem/bananium/random_name(gender,unique,lastname)
- var/clown_name = pick(GLOB.clown_names)
- var/golem_name = "[uppertext(clown_name)]"
- return golem_name
-
-/datum/species/golem/bananium/spec_attack_hand(mob/living/carbon/human/M, mob/living/carbon/human/H, datum/martial_art/attacker_style)
- ..()
- if(world.time > last_banana + banana_cooldown && M != H && M.a_intent != INTENT_HELP)
- new/obj/item/grown/bananapeel/specialpeel(get_turf(H))
- last_banana = world.time
-
-/datum/species/golem/bananium/spec_attacked_by(obj/item/I, mob/living/user, obj/item/bodypart/affecting, intent, mob/living/carbon/human/H)
- ..()
- if(world.time > last_banana + banana_cooldown && user != H)
- new/obj/item/grown/bananapeel/specialpeel(get_turf(H))
- last_banana = world.time
-
-/datum/species/golem/bananium/on_hit(obj/projectile/P, mob/living/carbon/human/H)
- ..()
- if(world.time > last_banana + banana_cooldown)
- new/obj/item/grown/bananapeel/specialpeel(get_turf(H))
- last_banana = world.time
-
-/datum/species/golem/bananium/spec_hitby(atom/movable/AM, mob/living/carbon/human/H)
- ..()
- var/obj/item/I
- if(istype(AM, /obj/item))
- I = AM
- if(I.thrownby == WEAKREF(H)) //No throwing stuff at yourself to make bananas
- return 0
- else
- new/obj/item/grown/bananapeel/specialpeel(get_turf(H))
- last_banana = world.time
-
-/datum/species/golem/bananium/spec_life(mob/living/carbon/human/H)
- if(!active)
- if(world.time > last_honk + honkooldown)
- active = 1
- playsound(get_turf(H), 'sound/items/bikehorn.ogg', 50, TRUE)
- last_honk = world.time
- honkooldown = rand(20, 80)
- active = null
- ..()
-
-/datum/species/golem/bananium/spec_death(gibbed, mob/living/carbon/human/H)
- playsound(get_turf(H), 'sound/misc/sadtrombone.ogg', 70, FALSE)
-
-/datum/species/golem/bananium/proc/handle_speech(datum/source, list/speech_args)
- speech_args[SPEECH_SPANS] |= SPAN_CLOWN
-
-/datum/species/golem/runic
- name = "Runic Golem"
- id = "cult_golem"
- sexes = FALSE
- info_text = "As a Runic Golem , you possess eldritch powers granted by the Elder Goddess Nar'Sie."
- species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYESPRITES) //no mutcolors
- inherent_traits = list(TRAIT_NOFLASH,TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOFIRE,TRAIT_CHUNKYFINGERS,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER)
- inherent_biotypes = MOB_HUMANOID|MOB_MINERAL
- prefix = "Runic"
- special_names = null
- inherent_factions = list("cult")
- species_language_holder = /datum/language_holder/golem/runic
- random_eligible = FALSE //Zesko claims runic golems break the game
-
- var/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/golem/phase_shift
- var/obj/effect/proc_holder/spell/pointed/abyssal_gaze/abyssal_gaze
- var/obj/effect/proc_holder/spell/pointed/dominate/dominate
-
- species_chest = /obj/item/bodypart/chest/golem/cult
- species_head = /obj/item/bodypart/head/golem/cult
- species_l_arm = /obj/item/bodypart/l_arm/golem/cult
- species_r_arm = /obj/item/bodypart/r_arm/golem/cult
- species_l_leg = /obj/item/bodypart/leg/left/golem/cult
- species_r_leg = /obj/item/bodypart/leg/right/golem/cult
-
-/datum/species/golem/runic/random_name(gender,unique,lastname)
- var/edgy_first_name = pick("Razor","Blood","Dark","Evil","Cold","Pale","Black","Silent","Chaos","Deadly","Coldsteel")
- var/edgy_last_name = pick("Edge","Night","Death","Razor","Blade","Steel","Calamity","Twilight","Shadow","Nightmare") //dammit Razor Razor
- var/golem_name = "[edgy_first_name] [edgy_last_name]"
- return golem_name
-
-/datum/species/golem/runic/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- . = ..()
- phase_shift = new
- phase_shift.charge_counter = 0
- C.AddSpell(phase_shift)
- abyssal_gaze = new
- abyssal_gaze.charge_counter = 0
- C.AddSpell(abyssal_gaze)
- dominate = new
- dominate.charge_counter = 0
- C.AddSpell(dominate)
-
-/datum/species/golem/runic/on_species_loss(mob/living/carbon/C)
- . = ..()
- if(phase_shift)
- C.RemoveSpell(phase_shift)
- if(abyssal_gaze)
- C.RemoveSpell(abyssal_gaze)
- if(dominate)
- C.RemoveSpell(dominate)
-
-/datum/species/golem/runic/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
- if(chem.type == /datum/reagent/water/holywater)
- H.adjustFireLoss(4)
- H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM)
-
- if(chem.type == /datum/reagent/fuel/unholywater)
- H.adjustBruteLoss(-4)
- H.adjustFireLoss(-4)
- H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM)
- return ..()
-
-/datum/species/golem/cloth
- name = "Cloth Golem"
- id = "cloth golem"
- sexes = FALSE
- info_text = "As a Cloth Golem , you are able to reform yourself after death, provided your remains aren't burned or destroyed. You are, of course, very flammable. \
- Being made of cloth, your body is magic resistant and faster than that of other golems, but weaker and less resilient."
- species_traits = list(NOBLOOD,NO_UNDERWEAR) //no mutcolors, and can burn
- inherent_traits = list(TRAIT_RESISTCOLD,TRAIT_NOBREATH,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER,TRAIT_CHUNKYFINGERS)
- inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID
- armor = 15 //feels no pain, but not too resistant
- burnmod = 2 // don't get burned
- speedmod = 1 // not as heavy as stone
- punchdamagelow = 4
- punchstunthreshold = 7
- punchdamagehigh = 8 // not as heavy as stone
- prefix = "Cloth"
- special_names = null
-
- species_chest = /obj/item/bodypart/chest/golem/cloth
- species_head = /obj/item/bodypart/head/golem/cloth
- species_l_arm = /obj/item/bodypart/l_arm/golem/cloth
- species_r_arm = /obj/item/bodypart/r_arm/golem/cloth
- species_l_leg = /obj/item/bodypart/leg/left/golem/cloth
- species_r_leg = /obj/item/bodypart/leg/right/golem/cloth
-
-/datum/species/golem/cloth/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- ..()
- ADD_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
-
-/datum/species/golem/cloth/on_species_loss(mob/living/carbon/C)
- REMOVE_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
- ..()
-
-/datum/species/golem/cloth/random_name(gender,unique,lastname)
- var/pharaoh_name = pick("Neferkare", "Hudjefa", "Khufu", "Mentuhotep", "Ahmose", "Amenhotep", "Thutmose", "Hatshepsut", "Tutankhamun", "Ramses", "Seti", \
- "Merenptah", "Djer", "Semerkhet", "Nynetjer", "Khafre", "Pepi", "Intef", "Ay") //yes, Ay was an actual pharaoh
- var/golem_name = "[pharaoh_name] \Roman[rand(1,99)]"
- return golem_name
-
-/datum/species/golem/cloth/spec_life(mob/living/carbon/human/H)
- if(H.fire_stacks < 1)
- H.adjust_fire_stacks(1) //always prone to burning
- ..()
-
-/datum/species/golem/cloth/spec_death(gibbed, mob/living/carbon/human/H)
- if(gibbed)
- return
- if(H.on_fire)
- H.visible_message("[H] burns into ash! ")
- H.dust(just_ash = TRUE)
- return
-
- H.visible_message("[H] falls apart into a pile of bandages! ")
- new /obj/structure/cloth_pile(get_turf(H), H)
- ..()
-
-/obj/structure/cloth_pile
- name = "pile of bandages"
- desc = "It emits a strange aura, as if there was still life within it..."
- max_integrity = 50
- armor = list("melee" = 90, "bullet" = 90, "laser" = 25, "energy" = 80, "bomb" = 50, "bio" = 100, "fire" = -50, "acid" = -50)
- icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "pile_bandages"
- resistance_flags = FLAMMABLE
-
- var/revive_time = 900
- var/mob/living/carbon/human/cloth_golem
-
-/obj/structure/cloth_pile/Initialize(mapload, mob/living/carbon/human/H)
- . = ..()
- if(!QDELETED(H) && is_species(H, /datum/species/golem/cloth))
- H.unequip_everything()
- H.forceMove(src)
- cloth_golem = H
- to_chat(cloth_golem, "You start gathering your life energy, preparing to rise again... ")
- addtimer(CALLBACK(src, PROC_REF(revive)), revive_time)
- else
- return INITIALIZE_HINT_QDEL
-
-/obj/structure/cloth_pile/Destroy()
- if(cloth_golem)
- QDEL_NULL(cloth_golem)
- return ..()
-
-/obj/structure/cloth_pile/burn()
- visible_message("[src] burns into ash! ")
- new /obj/effect/decal/cleanable/ash(get_turf(src))
- ..()
-
-/obj/structure/cloth_pile/proc/revive(full_heal = FALSE, admin_revive = FALSE)
- if(QDELETED(src) || QDELETED(cloth_golem)) //QDELETED also checks for null, so if no cloth golem is set this won't runtime
- return
- if(cloth_golem.hellbound)
- QDEL_NULL(cloth_golem)
- return
-
- invisibility = INVISIBILITY_MAXIMUM //disappear before the animation
- new /obj/effect/temp_visual/mummy_animation(get_turf(src))
- if(cloth_golem.revive(full_heal = TRUE, admin_revive = TRUE))
- cloth_golem.grab_ghost()
- sleep(20)
- cloth_golem.forceMove(get_turf(src))
- cloth_golem.visible_message("[src] rises and reforms into [cloth_golem]! ","You reform into yourself! ")
- cloth_golem = null
- qdel(src)
-
-/obj/structure/cloth_pile/attackby(obj/item/P, mob/living/carbon/human/user, params)
- . = ..()
-
- if(resistance_flags & ON_FIRE)
- return
-
- if(P.get_temperature())
- visible_message("[src] bursts into flames! ")
- fire_act()
-
-/datum/species/golem/plastic
- name = "Plastic Golem"
- id = "plastic golem"
- prefix = "Plastic"
- special_names = list("Sheet", "Bag", "Bottle")
- fixed_mut_color = "fffa"
- info_text = "As a Plastic Golem , you are capable of ventcrawling and passing through plastic flaps as long as you are naked."
-
-/datum/species/golem/plastic/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- . = ..()
- C.ventcrawler = VENTCRAWLER_NUDE
-
-/datum/species/golem/plastic/on_species_loss(mob/living/carbon/C)
- . = ..()
- C.ventcrawler = initial(C.ventcrawler)
-
-/datum/species/golem/bronze
- name = "Bronze Golem"
- id = "bronze golem"
- prefix = "Bronze"
- special_names = list("Bell")
- fixed_mut_color = "cd7f32"
- info_text = "As a Bronze Golem , you are very resistant to loud noises, and make loud noises if something hard hits you, however this ability does hurt your hearing."
- special_step_sounds = list('sound/machines/clockcult/integration_cog_install.ogg', 'sound/magic/clockwork/fellowship_armory.ogg')
- mutantears = /obj/item/organ/ears/bronze
- var/last_gong_time = 0
- var/gong_cooldown = 150
-
-/datum/species/golem/bronze/bullet_act(obj/projectile/P, mob/living/carbon/human/H)
- if(!(world.time > last_gong_time + gong_cooldown))
- return ..()
- if(P.flag == "bullet" || P.flag == "bomb")
- gong(H)
- return ..()
-
-/datum/species/golem/bronze/spec_hitby(atom/movable/AM, mob/living/carbon/human/H)
- ..()
- if(world.time > last_gong_time + gong_cooldown)
- gong(H)
-
-/datum/species/golem/bronze/spec_attack_hand(mob/living/carbon/human/M, mob/living/carbon/human/H, datum/martial_art/attacker_style)
- ..()
- if(world.time > last_gong_time + gong_cooldown && M.a_intent != INTENT_HELP)
- gong(H)
-
-/datum/species/golem/bronze/spec_attacked_by(obj/item/I, mob/living/user, obj/item/bodypart/affecting, intent, mob/living/carbon/human/H)
- ..()
- if(world.time > last_gong_time + gong_cooldown)
- gong(H)
-
-/datum/species/golem/bronze/on_hit(obj/projectile/P, mob/living/carbon/human/H)
- ..()
- if(world.time > last_gong_time + gong_cooldown)
- gong(H)
-
-/datum/species/golem/bronze/proc/gong(mob/living/carbon/human/H)
- last_gong_time = world.time
- for(var/mob/living/M in get_hearers_in_view(7,H))
- if(M.stat == DEAD) //F
- return
- if(M == H)
- H.show_message("You cringe with pain as your body rings around you! ", MSG_AUDIBLE)
- H.playsound_local(H, 'sound/effects/gong.ogg', 100, TRUE)
- H.soundbang_act(2, 0, 100, 1)
- H.jitteriness += 7
- var/distance = max(0,get_dist(get_turf(H),get_turf(M)))
- switch(distance)
- if(0 to 1)
- M.show_message("GONG! ", MSG_AUDIBLE)
- M.playsound_local(H, 'sound/effects/gong.ogg', 100, TRUE)
- M.soundbang_act(1, 0, 30, 3)
- M.confused += 10
- M.jitteriness += 4
- SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "gonged", /datum/mood_event/loud_gong)
- if(2 to 3)
- M.show_message("GONG! ", MSG_AUDIBLE)
- M.playsound_local(H, 'sound/effects/gong.ogg', 75, TRUE)
- M.soundbang_act(1, 0, 15, 2)
- M.jitteriness += 3
- SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "gonged", /datum/mood_event/loud_gong)
- else
- M.show_message("GONG! ", MSG_AUDIBLE)
- M.playsound_local(H, 'sound/effects/gong.ogg', 50, TRUE)
-
-
-/datum/species/golem/cardboard //Faster but weaker, can also make new shells on its own
- name = "Cardboard Golem"
- id = "cardboard golem"
- prefix = "Cardboard"
- special_names = list("Box")
- info_text = "As a Cardboard Golem , you aren't very strong, but you are a bit quicker and can easily create more brethren by using cardboard on yourself."
- species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYESPRITES)
- inherent_traits = list(TRAIT_NOBREATH, TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_CHUNKYFINGERS,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER, TRAIT_NOFLASH)
- attack_verb = "whips"
- attack_sound = 'sound/weapons/whip.ogg'
- miss_sound = 'sound/weapons/etherealmiss.ogg'
- fixed_mut_color = null
- armor = 25
- burnmod = 1.25
- heatmod = 2
- speedmod = 1.5
- punchdamagelow = 4
- punchstunthreshold = 7
- punchdamagehigh = 8
- var/last_creation = 0
- var/brother_creation_cooldown = 300
-
- species_chest = /obj/item/bodypart/chest/golem/cardboard
- species_head = /obj/item/bodypart/head/golem/cardboard
- species_l_arm = /obj/item/bodypart/l_arm/golem/cardboard
- species_r_arm = /obj/item/bodypart/r_arm/golem/cardboard
- species_l_leg = /obj/item/bodypart/leg/left/golem/cardboard
- species_r_leg = /obj/item/bodypart/leg/right/golem/cardboard
-
-/datum/species/golem/cardboard/spec_attacked_by(obj/item/I, mob/living/user, obj/item/bodypart/affecting, intent, mob/living/carbon/human/H)
- . = ..()
- if(user != H)
- return FALSE //forced reproduction is rape.
- if(istype(I, /obj/item/stack/sheet/cardboard))
- var/obj/item/stack/sheet/cardboard/C = I
- if(last_creation + brother_creation_cooldown > world.time) //no cheesing dork
- return
- if(C.amount < 10)
- to_chat(H, "You do not have enough cardboard! ")
- return FALSE
- to_chat(H, "You attempt to create a new cardboard brother. ")
- if(do_after(user, 30, target = user))
- if(last_creation + brother_creation_cooldown > world.time) //no cheesing dork
- return
- if(!C.use(10))
- to_chat(H, "You do not have enough cardboard! ")
- return FALSE
- to_chat(H, "You create a new cardboard golem shell. ")
- create_brother(H.loc)
-
-/datum/species/golem/cardboard/proc/create_brother(location)
- new /obj/effect/mob_spawn/human/golem/servant(location, /datum/species/golem/cardboard, owner)
- last_creation = world.time
-
-/datum/species/golem/leather
- name = "Leather Golem"
- id = "leather golem"
- special_names = list("Face", "Man", "Belt") //Ah dude 4 strength 4 stam leather belt AHHH
- inherent_traits = list(TRAIT_NOBREATH, TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_CHUNKYFINGERS,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER, TRAIT_STRONG_GRABBER)
- prefix = "Leather"
- fixed_mut_color = "624a2e"
- info_text = "As a Leather Golem , you are flammable, but you can grab things with incredible ease, allowing all your grabs to start at a strong level."
- grab_sound = 'sound/weapons/whipgrab.ogg'
- attack_sound = 'sound/weapons/whip.ogg'
-
-/datum/species/golem/durathread
- name = "Durathread Golem"
- id = "durathread golem"
- prefix = "Durathread"
- special_names = list("Boll","Weave")
- species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYESPRITES)
- fixed_mut_color = null
- inherent_traits = list(TRAIT_NOBREATH, TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_CHUNKYFINGERS,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER, TRAIT_NOFLASH)
- info_text = "As a Durathread Golem , your strikes will cause those your targets to start choking, but your woven body won't withstand fire as well."
-
- species_head = /obj/item/bodypart/head/golem/durathread
- species_l_arm = /obj/item/bodypart/l_arm/golem/durathread
- species_r_arm = /obj/item/bodypart/r_arm/golem/durathread
- species_l_leg = /obj/item/bodypart/leg/left/golem/durathread
- species_r_leg = /obj/item/bodypart/leg/right/golem/durathread
-
-/datum/species/golem/durathread/spec_unarmedattacked(mob/living/carbon/human/user, mob/living/carbon/human/target)
- . = ..()
- target.apply_status_effect(STATUS_EFFECT_CHOKINGSTRAND)
-
-/datum/species/golem/bone
- name = "Bone Golem"
- id = "bone golem"
- prefix = "Bone"
- special_names = list("Head", "Broth", "Fracture", "Rattler", "Appetit")
- liked_food = GROSS | MEAT | RAW
- toxic_food = null
- species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYESPRITES)
- inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID
- mutanttongue = /obj/item/organ/tongue/bone
- sexes = FALSE
- fixed_mut_color = null
- inherent_traits = list(TRAIT_NOFLASH,TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOFIRE,TRAIT_CHUNKYFINGERS,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER,TRAIT_FAKEDEATH)
- species_language_holder = /datum/language_holder/golem/bone
- info_text = "As a Bone Golem , You have a powerful spell that lets you chill your enemies with fear, and milk heals you! Just make sure to watch our for bone-hurting juice."
- var/datum/action/innate/bonechill/bonechill
-
- species_chest = /obj/item/bodypart/chest/golem/bone
- species_head = /obj/item/bodypart/head/golem/bone
- species_l_arm = /obj/item/bodypart/l_arm/golem/bone
- species_r_arm = /obj/item/bodypart/r_arm/golem/bone
- species_l_leg = /obj/item/bodypart/leg/left/golem/bone
- species_r_leg = /obj/item/bodypart/leg/right/golem/bone
-
-/datum/species/golem/bone/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- ..()
- if(ishuman(C))
- bonechill = new
- bonechill.Grant(C)
-
-/datum/species/golem/bone/on_species_loss(mob/living/carbon/C)
- if(bonechill)
- bonechill.Remove(C)
- ..()
-
-/datum/species/golem/bone/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
- if(chem.type == /datum/reagent/consumable/milk)
- if(chem.volume > 10)
- H.reagents.remove_reagent(chem.type, chem.volume - 10)
- to_chat(H, "The excess milk is dripping off your bones! ")
- H.heal_bodypart_damage(1.5,0, 0)
- H.reagents.remove_reagent(chem.type, chem.metabolization_rate)
- return TRUE
- if(chem.type == /datum/reagent/toxin/bonehurtingjuice)
- H.adjustStaminaLoss(7.5, 0)
- H.adjustBruteLoss(0.5, 0)
- if(prob(20))
- switch(rand(1, 3))
- if(1)
- H.say(pick("oof.", "ouch.", "my bones.", "oof ouch.", "oof ouch my bones."), forced = /datum/reagent/toxin/bonehurtingjuice)
- if(2)
- H.manual_emote(pick("oofs silently.", "looks like their bones hurt.", "grimaces, as though their bones hurt."))
- if(3)
- to_chat(H, "Your bones hurt! ")
- if(chem.overdosed)
- if(prob(4) && iscarbon(H)) //big oof
- var/selected_part = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) //God help you if the same limb gets picked twice quickly.
- var/obj/item/bodypart/bp = H.get_bodypart(selected_part) //We're so sorry skeletons, you're so misunderstood
- if(bp)
- playsound(H, get_sfx("desceration"), 50, TRUE, -1) //You just want to socialize
- H.visible_message("[H] rattles loudly and flails around!! ", "Your bones hurt so much that your missing muscles spasm!! ")
- H.say("OOF!!", forced=/datum/reagent/toxin/bonehurtingjuice)
- bp.receive_damage(200, 0, 0) //But I don't think we should
- else
- to_chat(H, "Your missing arm aches from wherever you left it. ")
- H.emote("sigh")
- H.reagents.remove_reagent(chem.type, chem.metabolization_rate)
- return TRUE
-
- return ..()
-
-/datum/action/innate/bonechill
- name = "Bone Chill"
- desc = "Rattle your bones and strike fear into your enemies!"
- check_flags = AB_CHECK_CONSCIOUS
- icon_icon = 'icons/mob/actions/actions_spells.dmi'
- button_icon_state = "bonechill"
- var/cooldown = 600
- var/last_use
- var/snas_chance = 3
-
-/datum/action/innate/bonechill/Activate()
- if(world.time < last_use + cooldown)
- to_chat("You aren't ready yet to rattle your bones again! ")
- return
- owner.visible_message("[owner] rattles [owner.p_their()] bones harrowingly. ", "You rattle your bones ")
- last_use = world.time
- if(prob(snas_chance))
- playsound(get_turf(owner),'sound/magic/RATTLEMEBONES2.ogg', 100)
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- var/mutable_appearance/badtime = mutable_appearance('icons/mob/human_parts.dmi', "b_golem_eyes", -FIRE_LAYER-0.5)
- badtime.appearance_flags = RESET_COLOR
- H.overlays_standing[FIRE_LAYER+0.5] = badtime
- H.apply_overlay(FIRE_LAYER+0.5)
- addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living/carbon, remove_overlay), FIRE_LAYER+0.5), 25)
- else
- playsound(get_turf(owner),'sound/magic/RATTLEMEBONES.ogg', 100)
- for(var/mob/living/L in orange(7, get_turf(owner)))
- if((L.mob_biotypes & MOB_UNDEAD) || isgolem(L) || HAS_TRAIT(L, TRAIT_RESISTCOLD))
- return //Do not affect our brothers
-
- to_chat(L, "A spine-chilling sound chills you to the bone! ")
- L.apply_status_effect(/datum/status_effect/bonechill)
- SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "spooked", /datum/mood_event/spooked)
-
-/datum/species/golem/snow
- name = "Snow Golem"
- id = "snow golem"
- fixed_mut_color = "null" //custom sprites
- armor = 45 //down from 55
- burnmod = 3 //melts easily
- info_text = "As a Snow Golem , you are extremely vulnerable to burn damage, but you can generate snowballs and shoot cryokinetic beams. You will also turn to snow when dying, preventing any form of recovery."
- prefix = "Snow"
- special_names = list("Flake", "Blizzard", "Storm")
- species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYESPRITES) //no mutcolors, no eye sprites
- inherent_traits = list(TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOGUNS,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER)
-
- var/obj/effect/proc_holder/spell/targeted/conjure_item/snowball/ball
- var/obj/effect/proc_holder/spell/aimed/cryo/cryo
-
- species_chest = /obj/item/bodypart/chest/golem/snow
- species_head = /obj/item/bodypart/head/golem/snow
- species_l_arm = /obj/item/bodypart/l_arm/golem/snow
- species_r_arm = /obj/item/bodypart/r_arm/golem/snow
- species_l_leg = /obj/item/bodypart/leg/left/golem/snow
- species_r_leg = /obj/item/bodypart/leg/right/golem/snow
-
-/datum/species/golem/snow/spec_death(gibbed, mob/living/carbon/human/H)
- H.visible_message("[H] turns into a pile of snow! ")
- for(var/obj/item/W in H)
- H.dropItemToGround(W)
- for(var/i=1, i <= rand(3,5), i++)
- new /obj/item/stack/sheet/mineral/snow(get_turf(H))
- new /obj/item/reagent_containers/food/snacks/grown/carrot(get_turf(H))
- qdel(H)
-
-/datum/species/golem/snow/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- . = ..()
- C.weather_immunities |= "snow"
- ball = new
- ball.charge_counter = 0
- C.AddSpell(ball)
- cryo = new
- cryo.charge_counter = 0
- C.AddSpell(cryo)
-
-/datum/species/golem/snow/on_species_loss(mob/living/carbon/C)
- . = ..()
- C.weather_immunities -= "snow"
- if(ball)
- C.RemoveSpell(ball)
- if(cryo)
- C.RemoveSpell(cryo)
-
-/obj/effect/proc_holder/spell/targeted/conjure_item/snowball
- name = "Snowball"
- desc = "Concentrates cryokinetic forces to create snowballs, useful for throwing at people."
- item_type = /obj/item/toy/snowball
- charge_max = 15
- action_icon = 'icons/obj/toy.dmi'
- action_icon_state = "snowball"
diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
index 888f0c74235f..ec9afd777f2c 100644
--- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
@@ -166,9 +166,6 @@
if("Clown")
O = new /datum/outfit/plasmaman/clown
- if("Lieutenant") //WS edit plasmaman customization
- O = new /datum/outfit/plasmaman/lieutenant //WS edit plasmaman customization
-
if("SolGov Representative") //WS edit sgr
O = new /datum/outfit/plasmaman/solgov
diff --git a/code/modules/mob/living/carbon/human/species_types/spider.dm b/code/modules/mob/living/carbon/human/species_types/spider.dm
index f7ae4f6bef10..e93ef5baaead 100644
--- a/code/modules/mob/living/carbon/human/species_types/spider.dm
+++ b/code/modules/mob/living/carbon/human/species_types/spider.dm
@@ -228,18 +228,3 @@ GLOBAL_LIST_INIT(spider_last, world.file2list("strings/names/spider_last.txt"))
A.forceMove(C)
H.visible_message("[H] wraps [A] into a cocoon! ")
return
-
-/datum/reagent/mutationtoxin/arachnid
- name = "Arachnid Mutation Toxin"
- description = "A glowing toxin."
- color = "#5EFF3B" //RGB: 94, 255, 59
- race = /datum/species/spider
- process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
- taste_description = "silk"
-
-/datum/chemical_reaction/mutationtoxin/arachnid
- results = list(/datum/reagent/mutationtoxin/arachnid = 1)
- required_reagents = list(
- /datum/reagent/mutationtoxin/unstable = 1,
- /datum/reagent/toxin/heparin = 10
- )
diff --git a/code/modules/mob/living/carbon/human/species_types/vox.dm b/code/modules/mob/living/carbon/human/species_types/vox.dm
index e1a0107bc0ad..1f3a00e8641b 100644
--- a/code/modules/mob/living/carbon/human/species_types/vox.dm
+++ b/code/modules/mob/living/carbon/human/species_types/vox.dm
@@ -118,6 +118,7 @@
/datum/action/innate/tail_hold
name = "Tail Hold"
desc = "Store an item in your tail's grip."
+ button_icon_state = "tail_hold"
var/obj/item/held_item
var/mutable_appearance/held_item_overlay
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index d7d6754b0e5d..a0e409c2053d 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -571,7 +571,7 @@ There are several things that need to be remembered:
remove_overlay(LEGCUFF_LAYER)
clear_alert("legcuffed")
if(legcuffed)
- overlays_standing[LEGCUFF_LAYER] = mutable_appearance('icons/mob/mob.dmi', "legcuff1", -LEGCUFF_LAYER)
+ overlays_standing[LEGCUFF_LAYER] = mutable_appearance('icons/mob/mob.dmi', legcuffed.icon_state, -LEGCUFF_LAYER)
apply_overlay(LEGCUFF_LAYER)
throw_alert("legcuffed", /atom/movable/screen/alert/restrained/legcuffed, new_master = src.legcuffed)
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/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index be79cf7184ab..405cda36580c 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -67,7 +67,7 @@
var/can_receive = TRUE
var/obj/item/card/id/access_card = null
var/chassis = "repairbot"
- var/list/possible_chassis = list("cat" = TRUE, "mouse" = TRUE, "monkey" = TRUE, "corgi" = FALSE, "fox" = FALSE, "repairbot" = TRUE, "rabbit" = TRUE, "bat" = FALSE, "butterfly" = FALSE, "hawk" = FALSE, "lizard" = FALSE, "duffel" = TRUE, "snake" = FALSE) //assoc value is whether it can be picked up.
+ var/list/possible_chassis = list("bat" = TRUE, "butterfly" = TRUE, "carp" = TRUE, "cat" = TRUE, "corgi" = TRUE, "corgi_puppy" = TRUE, "crow" = TRUE, "duffel" = TRUE, "fox" = TRUE, "frog" = TRUE, "hawk" = TRUE, "lizard" = TRUE, "monkey" = TRUE, "mothroach" = TRUE, "mouse" = TRUE, "rabbit" = TRUE, "repairbot" = TRUE, "snake" = TRUE, "spider" = TRUE) //assoc value is whether it can be picked up.
var/emitterhealth = 20
var/emittermaxhealth = 20
diff --git a/code/modules/mob/living/silicon/pai/pai_shell.dm b/code/modules/mob/living/silicon/pai/pai_shell.dm
index ca65a416691c..31a807b319b2 100644
--- a/code/modules/mob/living/silicon/pai/pai_shell.dm
+++ b/code/modules/mob/living/silicon/pai/pai_shell.dm
@@ -72,11 +72,18 @@
holoform = FALSE
set_resting(resting)
+
+//Sets a new holochassis skin based on a pAI's choice
+
/mob/living/silicon/pai/proc/choose_chassis()
- if(!isturf(loc) && loc != card)
- to_chat(src, "You can not change your holochassis composite while not on the ground or in your card! ")
- return FALSE
- var/choice = input(src, "What would you like to use for your holochassis composite?") as null|anything in sortList(possible_chassis)
+ var/list/skins = list()
+ for(var/holochassis_option in possible_chassis)
+ var/image/item_image = image(icon = src.icon, icon_state = holochassis_option)
+ skins += list("[holochassis_option]" = item_image)
+ sortList(skins)
+
+ var/atom/anchor = get_atom_on_turf(src)
+ var/choice = show_radial_menu(src, anchor, skins, custom_check = CALLBACK(src, PROC_REF(check_menu), anchor), radius = 40, require_near = TRUE)
if(!choice)
return FALSE
chassis = choice
@@ -85,6 +92,18 @@
update_resting()
to_chat(src, "You switch your holochassis projection composite to [chassis]. ")
+//Checks if we are allowed to interact with a radial menu
+
+/mob/living/silicon/pai/proc/check_menu(atom/anchor)
+ if(incapacitated())
+ return FALSE
+ if(get_turf(src) != get_turf(anchor))
+ return FALSE
+ if(!isturf(loc) && loc != card)
+ to_chat(src, "You can not change your holochassis composite while not on the ground or in your card! ")
+ return FALSE
+ return TRUE
+
/mob/living/silicon/pai/update_resting()
. = ..()
if(resting)
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index a099c05488fa..08e41f3bee44 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -29,7 +29,7 @@ GLOBAL_LIST_INIT(pai_faces, list(
"laugh",
"lenny",
"loss",
- "michevious",
+ "mischievous",
"missingno",
"mistake",
"moth",
@@ -53,6 +53,60 @@ GLOBAL_LIST_INIT(pai_faces, list(
"woozy",
))
+// I AM A FAKE AND A FRAUD
+// in order to get radials to work, the below list utilizes an entirely new .dmi that combines the base pAI card sprite along with the two overlays.
+// if you want to add a pAI screen in future, you will need to use one of the two bases I included in aicardsradial.dmi in addition to adding the
+// screen sprite in aicards.dmi
+// I pray to god someone more talented than me can fix this hack in future
+
+GLOBAL_LIST_INIT(pai_faces_icons, list(
+ ":>" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-:>"),
+ "=_=" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-=_="),
+ "angry" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-angry"),
+ "ashamed" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-ashamed"),
+ "bookworm" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-bookworm"),
+ "boykisser" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-boykisser"),
+ "cat" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-cat"),
+ "clueless" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-clueless"),
+ "concerned" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-concerned"),
+ "dread" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-dread"),
+ "estatic" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-estatic"),
+ "exclaim" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-exclaim"),
+ "eye" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-eye"),
+ "eyewall" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-eyewall"),
+ "face" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-face"),
+ "fangs" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-fangs"),
+ "flushed" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-flushed"),
+ "foureyes" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-foureyes"),
+ "greenjary" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-greenjary"),
+ "happy" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-happy"),
+ "heart" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-heart"),
+ "laugh" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-laugh"),
+ "lenny" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-lenny"),
+ "loss" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-loss"),
+ "mischievous" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-mischievous"),
+ "missingno" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-missingno"),
+ "mistake" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-mistake"),
+ "moth" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-moth"),
+ "moyai" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-moyai"),
+ "neko" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-neko"),
+ "null" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-null"),
+ "o.o" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-o.o"),
+ "off" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-off"),
+ "pleading" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-pleading"),
+ "question" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-question"),
+ "sadcat" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-sadcat"),
+ "smug" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-smug"),
+ "snek" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-snek"),
+ "spiral" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-spiral"),
+ "sunglasses" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-sunglasses"),
+ "syndisnake" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-syndisnake"), //what if cybersun was right all along actually
+ "twoeyes" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-twoeyes"),
+ "T_T" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-T_T"),
+ "what" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-what"),
+ "wink" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-wink"),
+ "woozy" = image(icon = 'icons/obj/aicardsradial.dmi', icon_state = "pai-woozy"),
+ ))
/mob/living/silicon/pai/var/list/available_software = list( //WS -- idk what to do about removing code so i'm just putting this note here to say, removes messanger and manifest, thet get it for free now
//Nightvision
@@ -204,7 +258,8 @@ GLOBAL_LIST_INIT(pai_faces, list(
radio.attack_self(src)
if("image") // Set pAI card display face
- var/new_emotion = input("Select your new display image.", "Display Image", "null") in sortList(GLOB.pai_faces)
+ var/atom/anchor = get_atom_on_turf(src)
+ var/new_emotion = show_radial_menu(usr, anchor, GLOB.pai_faces_icons, radius = 40, require_near = TRUE)
card.set_emotion(new_emotion)
if("news")
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
index 04ff8f5f54de..daac95f38ba4 100644
--- a/code/modules/mob/living/simple_animal/corpse.dm
+++ b/code/modules/mob/living/simple_animal/corpse.dm
@@ -46,6 +46,25 @@
r_pocket = /obj/item/tank/internals/emergency_oxygen
id = /obj/item/card/id/syndicate
+/obj/effect/mob_spawn/human/corpse/syndicateramzi
+ name = "Ramzi's Clique Commando"
+ id_job = "Cutthroat"
+ hairstyle = "Bald"
+ facial_hairstyle = "Shaved"
+ outfit = /datum/outfit/syndicateramzicorpse
+
+/datum/outfit/syndicateramzicorpse
+ name = "Ramzi's Clique Commando Corpse"
+ uniform = /obj/item/clothing/under/syndicate/gorlex
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
+ shoes = /obj/item/clothing/shoes/combat
+ gloves = /obj/item/clothing/gloves/tackler/combat/insulated
+ ears = /obj/item/radio/headset
+ mask = /obj/item/clothing/mask/gas/syndicate
+ back = /obj/item/tank/jetpack/oxygen
+ r_pocket = /obj/item/tank/internals/emergency_oxygen
+ id = /obj/item/card/id/syndicate
+
/obj/effect/mob_spawn/human/corpse/syndicatestormtrooper
name = "Syndicate Stormtrooper"
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index caf465140231..d43d744e2800 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -90,7 +90,7 @@
icon_state = "combatbear"
icon_living = "combatbear"
icon_dead = "combatbear_dead"
- faction = list("frontiersman")
+ faction = list(FACTION_ANTAG_FRONTIERSMEN)
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/bear = 5, /obj/item/clothing/head/bearpelt = 1, /obj/item/bear_armor = 1)
melee_damage_lower = 25
melee_damage_upper = 35
@@ -141,7 +141,7 @@
icon_living = "butterbear"
icon_dead = "butterbear_dead"
desc = "I can't believe its not a bear!"
- faction = list("neutral", "frontiersmen")
+ faction = list("neutral", FACTION_ANTAG_FRONTIERSMEN)
obj_damage = 11
melee_damage_lower = 1
melee_damage_upper = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/frontiersman.dm b/code/modules/mob/living/simple_animal/hostile/frontiersman.dm
index feeecdb5b43d..1a71ed52da78 100644
--- a/code/modules/mob/living/simple_animal/hostile/frontiersman.dm
+++ b/code/modules/mob/living/simple_animal/hostile/frontiersman.dm
@@ -23,7 +23,7 @@
/obj/item/kitchen/knife)
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 15
- faction = list("frontiersman")
+ faction = list(FACTION_ANTAG_FRONTIERSMEN)
status_flags = CANPUSH
del_on_death = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index d6b7c68bd958..bd09f06f3521 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -132,8 +132,6 @@ Difficulty: Very Hard
if(H.mind)
if(istype(H.mind.martial_art, /datum/martial_art/the_sleeping_carp))
. = TRUE
- if (is_species(H, /datum/species/golem/sand))
- . = TRUE
/mob/living/simple_animal/hostile/megafauna/colossus/proc/alternating_dir_shots()
ranged_cooldown = world.time + 40
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
index 1fa691b85de7..c078196749fc 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
@@ -328,7 +328,7 @@
for(var/mob/living/L in loc)
if((!QDELETED(spawner) && spawner.faction_check_mob(L)) || L.stat == DEAD)
continue
- visible_message("[src] grabs hold of [L]! ")
+ visible_message("[src] wraps a mass of tentacles around [L]! ")
on_hit(L)
latched = TRUE
if(!latched)
@@ -337,10 +337,11 @@
deltimer(timerid)
timerid = addtimer(CALLBACK(src, PROC_REF(retract)), 10, TIMER_STOPPABLE)
-/obj/effect/temp_visual/goliath_tentacle/proc/on_hit(mob/living/L)
- L.Stun(100)
- L.adjustBruteLoss(rand(10,15))
-
+/obj/effect/temp_visual/goliath_tentacle/proc/on_hit(mob/living/target)
+ target.apply_damage(rand(20,30), BRUTE, pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
+ if(iscarbon(target))
+ var/obj/item/restraints/legcuffs/beartrap/goliath/B = new /obj/item/restraints/legcuffs/beartrap/goliath(get_turf(target))
+ B.on_entered(src, target)
/obj/effect/temp_visual/goliath_tentacle/proc/retract()
icon_state = "marker"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
index bdc4124ed929..087c538a8c3e 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
@@ -413,12 +413,12 @@
"Miner" = 44,
"Waldo" = 3,
"Ashwalker" = 7,
- "Soldier" = 3,
+ "Soldier" = 5,
"Oldminer" = 8,
"Kobold" = 5,
- "Golem" = 6,
- "SRM" = 10,
- pick("Shadow", "YeOlde", "Operative", "Cultist") = 4
+ "SRM" = 6,
+ "Operative" = 5,
+ pick("Shadow", "YeOlde") = 4
)
)
switch(type)
@@ -796,119 +796,6 @@
r_pocket = /obj/item/kitchen/knife/combat/bone
if(prob(30))
l_pocket = /obj/item/kitchen/knife/combat/bone
- if("Golem")
- mob_species = pickweight(list(
- /datum/species/golem/adamantine = 5,
- /datum/species/golem/plasma = 10,
- /datum/species/golem/diamond = 10,
- /datum/species/golem/gold = 10,
- /datum/species/golem/silver = 10,
- /datum/species/golem/plasteel = 10,
- /datum/species/golem/titanium = 10,
- /datum/species/golem/plastitanium = 10
- )
- )
- if(prob(70))
- back = /obj/item/storage/backpack
- backpack_contents = list()
- if(prob(75))
- backpack_contents += pickweight(list(
- /obj/item/slime_extract/grey = 1,
- /obj/item/slime_scanner = 1,
- /obj/item/resonator/upgraded = 1,
- /obj/item/gps = 1,
- /obj/item/fulton_core = 2,
- /obj/item/extraction_pack = 3,
- /obj/item/stack/sheet/mineral/plasma/twenty = 3,
- /obj/item/stack/marker_beacon/ten = 3,
- /obj/item/mining_scanner = 2,
- /obj/item/extinguisher/mini = 3,
- /obj/item/flashlight/seclite=3,
- /obj/item/research_notes/loot/medium = 3,
- /obj/item/stack/sheet/metal/fifty = 3,
- /obj/item/research_notes/loot/big = 1
- )
- )
- if(prob(75))
- backpack_contents += pickweight(list(
- /obj/item/slime_extract/grey = 1,
- /obj/item/slime_scanner = 1,
- /obj/item/resonator/upgraded = 1,
- /obj/item/gps = 1,
- /obj/item/fulton_core = 2,
- /obj/item/extraction_pack = 3,
- /obj/item/stack/sheet/mineral/plasma/twenty = 3,
- /obj/item/stack/marker_beacon/ten = 3,
- /obj/item/mining_scanner = 2,
- /obj/item/extinguisher/mini = 3,
- /obj/item/flashlight/seclite=3,
- /obj/item/research_notes/loot/medium = 3,
- /obj/item/stack/sheet/metal/fifty = 3,
- /obj/item/research_notes/loot/big = 1
- )
- )
- if(prob(75))
- backpack_contents += pickweight(list(
- /obj/item/slime_extract/grey = 1,
- /obj/item/slime_scanner = 1,
- /obj/item/resonator/upgraded = 1,
- /obj/item/gps = 1,
- /obj/item/fulton_core = 2,
- /obj/item/extraction_pack = 3,
- /obj/item/stack/sheet/mineral/plasma/twenty = 3,
- /obj/item/stack/marker_beacon/ten = 3,
- /obj/item/mining_scanner = 2,
- /obj/item/extinguisher/mini = 3,
- /obj/item/flashlight/seclite=3,
- /obj/item/research_notes/loot/medium = 3,
- /obj/item/stack/sheet/metal/fifty = 3,
- /obj/item/research_notes/loot/big = 1
- )
- )
- if(prob(3))
- backpack_contents += list(
- /obj/item/storage/box/rndboards
- )
- if(prob(20))
- backpack_contents += pickweight(list(
- /obj/item/storage/box/stockparts/basic = 4,
- /obj/item/storage/box/stockparts/t2 = 3,
- /obj/item/storage/box/stockparts/t3 = 2,
- /obj/item/storage/box/stockparts/deluxe = 1
- )
- )
- if(prob(30))
- glasses = pickweight(list(
- /obj/item/clothing/glasses/meson = 2,
- /obj/item/clothing/glasses/hud/health = 2,
- /obj/item/clothing/glasses/hud/diagnostic =2,
- /obj/item/clothing/glasses/science = 2,
- /obj/item/clothing/glasses/welding = 2,
- /obj/item/clothing/glasses/night = 1
- )
- )
- if(prob(10))
- belt = pickweight(list(
- /obj/item/storage/belt/mining/vendor,
- /obj/item/storage/belt/utility/full
- )
- )
- if(prob(50))
- neck = /obj/item/bedsheet/rd/royal_cape
- if(prob(10))
- l_pocket = pickweight(list(
- /obj/item/crowbar/power,
- /obj/item/screwdriver/power,
- /obj/item/weldingtool/experimental
- )
- )
- if(prob(10))
- r_pocket = pickweight(list(
- /obj/item/crowbar/power,
- /obj/item/screwdriver/power,
- /obj/item/weldingtool/experimental
- )
- )
if("YeOlde")
mob_gender = FEMALE
uniform = /obj/item/clothing/under/costume/maid
@@ -922,10 +809,12 @@
mask = /obj/item/clothing/mask/breath
if("Operative")
id_job = "Operative"
- if(prob(15))
+ if(prob(40))
+ outfit = /datum/outfit/syndicatecommandocorpse
+ else if(prob(5))
outfit = /datum/outfit/syndicatestormtroopercorpse
else
- outfit = /datum/outfit/syndicatecommandocorpse
+ outfit = /datum/outfit/syndicateramzicorpse
if("Waldo")//WE FINALLY FOUND HIM
name = "Waldo"
uniform = /obj/item/clothing/under/pants/jeans
@@ -996,7 +885,6 @@
)
if("Shadow")
mob_species = /datum/species/shadow
- r_pocket = /obj/item/reagent_containers/pill/shadowtoxin
neck = /obj/item/clothing/accessory/medal/plasma/nobel_science
uniform = /obj/item/clothing/under/color/black
shoes = /obj/item/clothing/shoes/sneakers/black
@@ -1004,20 +892,6 @@
glasses = /obj/item/clothing/glasses/blindfold
back = /obj/item/tank/internals/oxygen
mask = /obj/item/clothing/mask/breath
- if("Cultist")
- uniform = /obj/item/clothing/under/costume/roman
- suit = /obj/item/clothing/suit/hooded/cultrobes
- suit_store = /obj/item/tome
- r_pocket = /obj/item/restraints/legcuffs/bola/cult
- l_pocket = /obj/item/melee/cultblade/dagger
- glasses = /obj/item/clothing/glasses/hud/health/night/cultblind
- back = /obj/item/storage/backpack/cultpack
- backpack_contents = list(
- /obj/item/reagent_containers/glass/beaker/unholywater = 1,
- /obj/item/cult_shift = 1,
- /obj/item/flashlight/flare/culttorch = 1,
- /obj/item/stack/sheet/runed_metal = 15
- )
if("SRM")
uniform = /obj/item/clothing/under/suit/roumain
shoes = /obj/item/clothing/shoes/workboots/mining
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
index 72b6b25187ba..b98d14128e12 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
@@ -40,7 +40,7 @@
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 15
- faction = list(ROLE_SYNDICATE)
+ faction = list(FACTION_ANTAG_SYNDICATE)
check_friendly_fire = 1
status_flags = CANPUSH
del_on_death = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/zombie.dm b/code/modules/mob/living/simple_animal/hostile/zombie.dm
index 37be0db7f16c..6f1db7aaf996 100644
--- a/code/modules/mob/living/simple_animal/hostile/zombie.dm
+++ b/code/modules/mob/living/simple_animal/hostile/zombie.dm
@@ -58,17 +58,6 @@
corpse.forceMove(drop_location())
corpse.create()
-/mob/living/simple_animal/hostile/zombie/leatherman
- name = "Leatherman"
- desc = "Fuck you!"
- icon = 'icons/mob/simple_human.dmi'
- icon_state = "zombie_leather"
- icon_living = "zombie_leather"
- maxHealth = 60
- health = 60
- melee_damage_lower = 11
- melee_damage_upper = 11
-
/mob/living/simple_animal/hostile/zombie/kudzu
name = "shambling bramble"
desc = "A shambling mass of vibrant vines and rotting flesh. "
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/modular_computers/computers/item/laptop_presets.dm b/code/modules/modular_computers/computers/item/laptop_presets.dm
index 6bc2919bea3b..a774799ada4c 100644
--- a/code/modules/modular_computers/computers/item/laptop_presets.dm
+++ b/code/modules/modular_computers/computers/item/laptop_presets.dm
@@ -20,3 +20,15 @@
/obj/item/modular_computer/laptop/preset/civilian/install_programs()
var/obj/item/computer_hardware/hard_drive/hard_drive = all_components[MC_HDD]
hard_drive.store_file(new/datum/computer_file/program/chatclient())
+
+/obj/item/modular_computer/laptop/preset/civilian/rilena
+ name = "RILENA:LMR laptop"
+ desc = "A laptop themed around the popular combination webcomic and video game series RILENA."
+ icon_state = "laptop-closed_rilena"
+ icon_state_powered = "laptop_rilena"
+ icon_state_unpowered = "laptop-off_rilena"
+ icon_state_closed = "laptop-closed_rilena"
+
+/obj/item/modular_computer/laptop/preset/civilian/rilena/install_programs()
+ //var/obj/item/computer_hardware/hard_drive/hard_drive = all_components[MC_HDD]
+ //hard_drive.store_file(new/datum/computer_file/program/rilena()) //temporarily disabling this so it doesn't ruin anything
diff --git a/code/modules/modular_computers/file_system/programs/rilena.dm b/code/modules/modular_computers/file_system/programs/rilena.dm
new file mode 100644
index 000000000000..bf234dfa3f22
--- /dev/null
+++ b/code/modules/modular_computers/file_system/programs/rilena.dm
@@ -0,0 +1,13 @@
+/datum/computer_file/program/rilena
+ filename = "rilena"
+ filedesc = "RILENA:LMR Part 1"
+ program_icon_state = "holocontrol"
+ extended_desc = "The first entry in the popular RILENA webseries games. Not counting the countless fan prequels."
+ usage_flags = PROGRAM_LAPTOP
+ requires_ntnet = TRUE
+ available_on_ntnet = FALSE //don't let people download for now, since it doesn't do anything
+ program_icon = "gamepad"
+ size = 8
+ tgui_id = "NtosRilena"
+
+//insert stuff here, empty for now
diff --git a/code/modules/movespeed/modifiers/mobs.dm b/code/modules/movespeed/modifiers/mobs.dm
index 8263b3c7dcf4..c1ec7fb45078 100644
--- a/code/modules/movespeed/modifiers/mobs.dm
+++ b/code/modules/movespeed/modifiers/mobs.dm
@@ -1,6 +1,3 @@
-/datum/movespeed_modifier/obesity
- multiplicative_slowdown = 1.5
-
/datum/movespeed_modifier/monkey_reagent_speedmod
variable = TRUE
diff --git a/code/modules/overmap/_overmap_datum.dm b/code/modules/overmap/_overmap_datum.dm
index 076188f6ec58..5244f2850188 100644
--- a/code/modules/overmap/_overmap_datum.dm
+++ b/code/modules/overmap/_overmap_datum.dm
@@ -222,7 +222,7 @@
if(!istype(dock_target))
CRASH("Overmap datum [src] tried to dock to an invalid overmap datum.")
if(docked_to)
- CRASH("Overmap datum [src] tried to dock to [docked_to] when it is already docked to another overmap datum.")
+ CRASH("Overmap datum [src] tried to dock to [dock_target] when it is already docked to another overmap datum ([docked_to])!.")
if(docking || current_docking_ticket)
return "Already docking!"
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] [planet_name] [name] [name] The screen of the [src] flickers! ")
+/**
+ * EMP Interaction
+ */
+/obj/machinery/fax/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
+ allow_exotic_faxes = !allow_exotic_faxes
+ visible_message("[src] [allow_exotic_faxes ? "starts beeping" : "stops beeping"] ominously[allow_exotic_faxes ? "..." : "."]")
+
+/**
+ * Unanchor/anchor
+ */
+
/obj/machinery/fax/wrench_act(mob/living/user, obj/item/tool)
. = ..()
default_unfasten_wrench(user, tool)
@@ -161,27 +195,6 @@
return
return ..()
-// Checks if the card has access to switch "legal" faxes of administrators.
-/obj/machinery/fax/proc/access_additional_faxes_check(mob/living/user)
- if(isAdminObserver(user))
- return TRUE
-
- var/obj/item/card/id/used_card = user.get_idcard(TRUE)
- if(used_card)
- // We check if it makes sense to check access at all.
- if(!access_additional_faxes_required || !used_card.access)
- return FALSE
-
- for(var/requested_access in access_additional_faxes_required)
- if(requested_access in used_card.access)
- return TRUE
- return FALSE
-
-// Switches access to the "legal" administrator's fax list. Access to the "illegal" is switched by hacking.
-/obj/machinery/fax/proc/access_additional_faxes_toggle()
- access_additional_faxes = !access_additional_faxes
- say("Bluespace channel communication [access_additional_faxes ? "opened" : "closed"].")
-
/**
* Attempts to clean out a jammed machine using a passed item.
* Returns true if successful.
@@ -237,12 +250,6 @@
ui.open()
ui.set_autoupdate(TRUE)
-/obj/machinery/fax/ui_static_data(mob/user)
- var/list/data = list()
- data["additional_faxes_list"] = GLOB.additional_faxes_list
- data["frontier_faxes_list"] = GLOB.frontier_faxes_list
- return data
-
/obj/machinery/fax/ui_data(mob/user)
var/list/data = list()
//Record a list of all existing faxes.
@@ -264,12 +271,11 @@
data["fax_id"] = fax_id
data["fax_name"] = fax_name
data["visible"] = visible_to_network
- data["access_additional_faxes"] = access_additional_faxes
- data["сan_switch_access"] = access_additional_faxes_check(user)
// In this case, we don't care if the fax is hacked or in the syndicate's network. The main thing is to check the visibility of other faxes.
data["frontier_network"] = (frontier_network || (obj_flags & EMAGGED))
data["has_paper"] = !!loaded_item_ref?.resolve()
data["fax_history"] = fax_history
+ data["special_faxes"] = special_networks
return data
/obj/machinery/fax/ui_act(action, list/params)
@@ -287,8 +293,6 @@
loaded_item_ref = null
update_icon()
return TRUE
- if("access_additional_faxes_toggle")
- access_additional_faxes_toggle()
if("send")
var/obj/item/loaded = loaded_item_ref?.resolve()
if(!loaded)
@@ -299,17 +303,31 @@
loaded_item_ref = null
update_icon()
return TRUE
- if("send_to_additional_fax")
- var/obj/item/loaded = loaded_item_ref?.resolve()
- if(!loaded)
+ if("send_special")
+ var/obj/item/paper/fax_paper = loaded_item_ref?.resolve()
+ if(!fax_paper)
+ return
+ if(!istype(fax_paper))
+ to_chat(usr, icon2html(src.icon, usr) + "ERROR: Failed to send fax. ")
return
- if(istype(loaded, /obj/item/paper))
- if(send_to_additional_faxes(loaded, usr, params["name"], params["color"]))
- loaded_item_ref = null
- update_icon()
- return TRUE
- else
- say("The destination fax blocks the reception of this item.")
+
+ fax_paper.request_state = TRUE
+ fax_paper.loc = null
+
+ INVOKE_ASYNC(src, PROC_REF(animate_object_travel), fax_paper, "fax_receive", find_overlay_state(fax_paper, "send"))
+ history_add("Send", params["name"])
+
+ GLOB.requests.fax_request(usr.client, "sent a fax message from [fax_name]/[fax_id] to [params["name"]]", fax_paper)
+ to_chat(GLOB.admins, "[icon2html(src.icon, GLOB.admins)]FAX REQUEST: [ADMIN_FULLMONTY(usr)]:sent a fax message from [fax_name]/[fax_id][ADMIN_FLW(src)] to [html_encode(params["name"])] [ADMIN_SHOW_PAPER(fax_paper)]")
+ log_fax(fax_paper, params["id"], params["name"])
+ loaded_item_ref = null
+
+ for(var/obj/machinery/fax/fax as anything in GLOB.fax_machines)
+ if(fax.admin_fax_id == params["id"])
+ fax.receive(fax_paper, fax_name)
+ break
+ update_appearance()
+
if("history_clear")
history_clear()
return TRUE
@@ -349,40 +367,12 @@
balloon_alert(usr, "destination port jammed")
playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, -9)
return FALSE
- fax.receive(loaded, fax_name)
- playback_sending(loaded, fax.fax_name)
+ fax.receive(loaded, fax_name, important = admin_fax_id)
+ history_add("Send", fax.fax_name)
+ INVOKE_ASYNC(src, PROC_REF(animate_object_travel), loaded, "fax_receive", find_overlay_state(loaded, "send"))
return TRUE
return FALSE
-/**
- * The procedure for sending a item to virtual admins fax machine.
- *
- * This procedure is similar to the send procedure except that it sends the item to
- * a "virtual" fax to a special administrator list.
- * Arguments:
- * * loaded - The item to be sent.
- * * sender - Reference to the sender's substance.
- * * receiver_name - The recipient's fax name, which will be displayed in the administrator's list.
- * * receiver_color - The color the receiver_name will be colored in.
- */
-/obj/machinery/fax/proc/send_to_additional_faxes(obj/item/loaded, mob/sender, receiver_name, receiver_color)
- GLOB.fax_manager.receive_request(sender, src, receiver_name, loaded, receiver_color)
- playback_sending(loaded, receiver_name)
- log_fax(loaded, "ADDITIONAL", receiver_name)
- return TRUE
-
-/**
- * The procedure for playing the animation.
- *
- * Procedure called to add to the history of sending messages, playing the sending animation.
- * Arguments:
- * * loaded - Sending item to determine the animation..
- * * receiver_name - Recipient's name to be added to the message history.
- */
-/obj/machinery/fax/proc/playback_sending(obj/item/loaded, receiver_name)
- history_add("Send", receiver_name)
- INVOKE_ASYNC(src, PROC_REF(animate_object_travel), loaded, "fax_receive", find_overlay_state(loaded, "send"))
-
/**
* Procedure for accepting papers from another fax machine.
*
@@ -391,7 +381,7 @@
* * loaded - The object to be printed.
* * sender_name - The sender's name, which will be displayed in the message and recorded in the history of operations.
*/
-/obj/machinery/fax/proc/receive(obj/item/loaded, sender_name)
+/obj/machinery/fax/proc/receive(obj/item/loaded, sender_name, important = FALSE)
playsound(src, 'sound/items/poster_being_created.ogg', 20, FALSE)
INVOKE_ASYNC(src, PROC_REF(animate_object_travel), loaded, "fax_receive", find_overlay_state(loaded, "receive"))
say("Received correspondence from [sender_name].")
@@ -504,3 +494,45 @@
do_sparks(5, TRUE, src)
var/check_range = TRUE
return electrocute_mob(user, get_area(src), src, 0.7, check_range)
+
+/obj/machinery/fax/frontiersmen
+ frontier_network = TRUE
+ visible_to_network = FALSE
+
+/obj/machinery/fax/admin
+ name = "Central Command Fax Machine"
+ fax_name = "Nanotrasen Central Command"
+ radio_channel = RADIO_CHANNEL_CENTCOM
+ visible_to_network = FALSE
+ admin_fax_id = "nanotrasen"
+
+/obj/machinery/fax/admin/solgov
+ name = "SolGov Frontier Affairs Fax Machine"
+ fax_name = "Solarian Confederation Frontier Affairs"
+ admin_fax_id = "solgov"
+
+/obj/machinery/fax/admin/syndicate
+ name = "Syndicate Coordination Fax Machine"
+ fax_name = "Syndicate Coordination Center"
+ admin_fax_id = "syndicate"
+
+/obj/machinery/fax/admin/inteq
+ name = "IRMG Fax Machine"
+ fax_name = "IRMG Mothership"
+ admin_fax_id = "inteq"
+
+/obj/machinery/fax/admin/minutemen
+ name = "CLIP HiComm Fax Machine"
+ fax_name = "Colonial League Leadership"
+ admin_fax_id = "minutemen"
+
+/obj/machinery/fax/admin/roumain
+ name = "Huntsman Council Fax Machine"
+ fax_name = "Saint-Roumain Council of Huntsmen"
+ admin_fax_id = "roumain"
+
+/obj/machinery/fax/admin/frontiersmen
+ name = "old fax machine"
+ fax_name = "Frontiersmen Communications Quartermaster"
+ admin_fax_id = "frontiersmen"
+ frontier_network = TRUE
diff --git a/code/modules/paperwork/fax_manager.dm b/code/modules/paperwork/fax_manager.dm
deleted file mode 100644
index bde646712b96..000000000000
--- a/code/modules/paperwork/fax_manager.dm
+++ /dev/null
@@ -1,154 +0,0 @@
-GLOBAL_DATUM_INIT(fax_manager, /datum/fax_manager, new)
-
-/**
- * Fax Request Manager
- *
- * In its functionality it is similar to the usual Request Manager, but respectively for faxes.
- * This manager allows you to send faxes on behalf of certain virtual faxes to all existing faxes,
- * as well as receive faxes in their name from the players.
- */
-/datum/fax_manager
- /// A list that contains faxes from players and other related information. You can view the filling of its fields in the procedure receive_request.
- var/list/requests = list()
-
-/datum/fax_manager/Destroy(force, ...)
- QDEL_LIST(requests)
- return ..()
-
-/datum/fax_manager/ui_interact(mob/user, datum/tgui/ui = null)
- ui = SStgui.try_update_ui(user, src, ui)
- if(!ui)
- ui = new(user, src, "FaxManager")
- ui.open()
- ui.set_autoupdate(TRUE)
-
-/datum/fax_manager/ui_state(mob/user)
- return GLOB.admin_state
-
-/datum/fax_manager/ui_static_data(mob/user)
- var/list/data = list()
- //Record additional faxes on a separate list
- data["additional_faxes"] = GLOB.additional_faxes_list + GLOB.frontier_faxes_list
- return data
-
-/datum/fax_manager/ui_data(mob/user)
- var/list/data = list()
- //Record a list of all existing faxes.
- for(var/obj/machinery/fax/fax as anything in GLOB.fax_machines)
- var/list/fax_data = list()
- fax_data["fax_name"] = fax.fax_name
- fax_data["fax_id"] = fax.fax_id
- fax_data["frontier_network"] = fax.frontier_network
- data["faxes"] += list(fax_data)
- for(var/list/requested in requests)
- var/list/request = list()
- request["id_message"] = requested["id_message"]
- request["time"] = requested["time"]
- var/mob/sender = requested["sender"]
- request["sender_name"] = sender.name
- request["sender_fax_id"] = requested["sender_fax_id"]
- request["sender_fax_name"] = requested["sender_fax_name"]
- request["receiver_fax_name"] = requested["receiver_fax_name"]
- data["requests"] += list(request)
- return data
-
-/datum/fax_manager/ui_act(action, list/params)
- . = ..()
- if(.)
- return
- var/datum/admins/admin_datum = GLOB.admin_datums[usr.ckey]
-
- switch(action)
- if("send")
- for(var/obj/machinery/fax/fax as anything in GLOB.fax_machines)
- if(fax.fax_id == params["fax_id"])
- var/obj/item/paper/paper = new()
- paper.add_raw_text(params["message"])
- paper.update_appearance()
- fax.receive(paper, params["fax_name"])
- return TRUE
- if("flw_fax")
- for(var/obj/machinery/fax/fax as anything in GLOB.fax_machines)
- if(fax.fax_id == params["fax_id"])
- admin_datum.admin_follow(fax)
- return TRUE
- if("read_message")
- var/list/request = get_request(params["id_message"])
- var/obj/item/paper/request/paper = request["paper"]
- paper.ui_interact(usr)
- return TRUE
- if("flw")
- var/list/request = get_request(params["id_message"])
- admin_datum.admin_follow(request["sender"])
- return TRUE
- if("pp")
- var/list/request = get_request(params["id_message"])
- usr.client.holder.show_player_panel(request["sender"])
- return TRUE
- if("vv")
- var/list/request = get_request(params["id_message"])
- usr.client.debug_variables(request["sender"])
- return TRUE
- if("sm")
- var/list/request = get_request(params["id_message"])
- usr.client.cmd_admin_subtle_message(request["sender"])
- return TRUE
- if("logs")
- var/list/request = get_request(params["id_message"])
- if(!ismob(request["sender"]))
- to_chat(usr, "This can only be used on instances of type /mob.")
- return TRUE
- show_individual_logging_panel(request["sender"], null, null)
- return TRUE
- if("smite")
- var/list/request = get_request(params["id_message"])
- if(!check_rights(R_FUN))
- to_chat(usr, "Insufficient permissions to smite, you require +FUN")
- return TRUE
- var/mob/living/carbon/human/H = request["sender"]
- if (!H || !istype(H))
- to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
- return TRUE
- usr.client.smite(H)
- return TRUE
-
-/datum/fax_manager/proc/get_request(id_message)
- for(var/list/request in requests)
- if(request["id_message"] == id_message)
- return request
-
-/datum/fax_manager/proc/receive_request(mob/sender, obj/machinery/fax/sender_fax, receiver_fax_name, obj/item/paper/paper, receiver_color)
- var/list/request = list()
- var/obj/item/paper/request/message = new()
- request["id_message"] = requests.len
- request["time"] = gameTimestamp()
- request["sender"] = sender
- request["sender_fax_id"] = sender_fax.fax_id
- request["sender_fax_name"] = sender_fax.fax_name
- request["receiver_fax_name"] = receiver_fax_name
- message.copy_properties(paper)
- request["paper"] = message
- requests += list(request)
- var/msg = "\"[sanitize(receiver_fax_name)]\" fax received a message from \"[sanitize(sender_fax.fax_name)]\" fax SENT BY [ADMIN_FULLMONTY(sender)] (Open Fax Manager )[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/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index e6b09920de63..d17e12264706 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -41,20 +41,6 @@
var/last_projectile_params
-/obj/machinery/power/emitter/welded/Initialize()
- welded = TRUE
- return ..()
-
-/obj/machinery/power/emitter/ctf
- name = "Energy Cannon"
- active = TRUE
- active_power_usage = FALSE
- idle_power_usage = FALSE
- locked = TRUE
- req_access_txt = "100"
- welded = TRUE
- use_power = FALSE
-
/obj/machinery/power/emitter/Initialize()
. = ..()
RefreshParts()
@@ -371,6 +357,26 @@
if(user)
user.visible_message("[user.name] emags [src]. ", "You short out the lock. ")
+/obj/machinery/power/emitter/ctf
+ name = "Energy Cannon"
+ active = TRUE
+ active_power_usage = FALSE
+ idle_power_usage = FALSE
+ locked = TRUE
+ req_access_txt = "100"
+ welded = TRUE
+ use_power = FALSE
+
+/obj/machinery/power/emitter/welded/Initialize()
+ welded = TRUE
+ return ..()
+
+/obj/machinery/power/emitter/welded/upgraded/Initialize()
+ . = ..()
+ component_parts = list()
+ component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null)
+ component_parts += new /obj/item/stock_parts/manipulator/femto(null)
+ RefreshParts()
/obj/machinery/power/emitter/prototype
name = "Prototype Emitter"
diff --git a/code/modules/projectiles/ammunition/energy/special.dm b/code/modules/projectiles/ammunition/energy/special.dm
index e7e465e69cfa..d64195150e0a 100644
--- a/code/modules/projectiles/ammunition/energy/special.dm
+++ b/code/modules/projectiles/ammunition/energy/special.dm
@@ -84,3 +84,10 @@
projectile_type = /obj/projectile/beam/shrink
select_name = "shrink ray"
e_cost = 2000
+
+/obj/item/ammo_casing/energy/buster
+ projectile_type = /obj/projectile/energy/buster
+ select_name = "T4L1 buster replica"
+ e_cost = 100 //should have a lot of energy
+ fire_sound = 'sound/effects/empulse.ogg'
+ delay = 3 SECONDS
diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm
index cc92a758eba0..0c25c8a2282e 100644
--- a/code/modules/projectiles/boxes_magazines/external/pistol.dm
+++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm
@@ -28,7 +28,7 @@
/obj/item/ammo_box/magazine/m10mm/rubber
name = "pistol magazine (10mm rubber)"
desc = "An 8-round handgun magazine for the stechkin pistol. These rubber rounds trade lethality for a heavy impact which can incapacitate targets. Performs even worse against armor."
- icon_state = "9x19pR"
+ icon_state = "9x19p"
ammo_type = /obj/item/ammo_casing/c10mm/rubber
/obj/item/ammo_box/magazine/m45
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 2a053adb3098..9c68085f79aa 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -68,6 +68,7 @@
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+ var/list/attachment_options = list() //This.. works for now.. gun refactor soon
var/obj/item/firing_pin/pin = /obj/item/firing_pin //standard firing pin for most guns
var/can_flashlight = FALSE //if a flashlight can be added or removed if it already has one.
@@ -537,17 +538,22 @@
if(!has_safety)
return
- if(src == !user.get_active_held_item())
+ if(src != user.get_active_held_item())
return
- playsound(user, 'sound/weapons/gun/general/selector.ogg', 100, TRUE)
+ if(isliving(user) && in_range(src, user))
+ toggle_safety(user)
+
+/obj/item/gun/proc/toggle_safety(mob/user, silent=FALSE)
safety = !safety
- user.visible_message(
- span_notice("[user] turns the safety on [src] [safety ? "ON " : "OFF "]."),
- span_notice("You turn the safety on [src] [safety ? "ON " : "OFF "]."),
- vision_distance = COMBAT_MESSAGE_RANGE
- )
+ if(!silent)
+ playsound(user, 'sound/weapons/gun/general/selector.ogg', 100, TRUE)
+ user.visible_message(
+ span_notice("[user] turns the safety on [src] [safety ? "ON " : "OFF "]."),
+ span_notice("You turn the safety on [src] [safety ? "ON " : "OFF "]."),
+ )
+
update_appearance()
@@ -557,33 +563,26 @@
return
if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
return
- if((can_flashlight && gun_light) && (can_bayonet && bayonet)) //give them a choice instead of removing both
- var/list/possible_items = list(gun_light, bayonet)
- var/obj/item/item_to_remove = input(user, "Select an attachment to remove", "Attachment Removal") as null|obj in sortNames(possible_items)
- if(!item_to_remove || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
- return
- return remove_gun_attachment(user, I, item_to_remove)
-
- else if(gun_light && can_flashlight) //if it has a gun_light and can_flashlight is false, the flashlight is permanently attached.
+ attachment_options = list()
+ get_gun_attachments()
+ if(LAZYLEN(attachment_options) == 1)
+ remove_gun_attachments(user, I, attachment_options[1])
+ else if (LAZYLEN(attachment_options))
+ var/picked_option = show_radial_menu(user, src, attachment_options, radius = 38, require_near = TRUE)
+ remove_gun_attachments(user, I, picked_option)
+
+/obj/item/gun/proc/get_gun_attachments()
+ if(can_flashlight && gun_light)
+ attachment_options += list("Light" = image(icon = gun_light.icon, icon_state = gun_light.icon_state))
+ if(can_bayonet && bayonet)
+ attachment_options += list("Knife" = image(icon = bayonet.icon, icon_state = bayonet.icon_state))
+
+/obj/item/gun/proc/remove_gun_attachments(mob/living/user, obj/item/I, picked_option)
+ if(picked_option == "Light")
return remove_gun_attachment(user, I, gun_light, "unscrewed")
-
- else if(bayonet && can_bayonet) //if it has a bayonet, and the bayonet can be removed
+ else if(picked_option == "Knife")
return remove_gun_attachment(user, I, bayonet, "unfix")
- /*WS Edit - Fixes Pin Removal
- else if(pin && user.is_holding(src))
- user.visible_message("[user] attempts to remove [pin] from [src] with [I]. ",
- "You attempt to remove [pin] from [src]. (It will take [DisplayTimeText(FIRING_PIN_REMOVAL_DELAY)].) ", null, 3)
- if(I.use_tool(src, user, FIRING_PIN_REMOVAL_DELAY, volume = 50))
- if(!pin) //check to see if the pin is still there, or we can spam messages by clicking multiple times during the tool delay
- return
- user.visible_message("[pin] is pried out of [src] by [user], destroying the pin in the process. ",
- "You pry [pin] out with [I], destroying the pin in the process. ", null, 3)
- QDEL_NULL(pin)
- return TRUE
- WS End */
-
-
/obj/item/gun/welder_act(mob/living/user, obj/item/I)
. = ..()
if(.)
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index da13be546a7f..db7d03afc0b0 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -101,6 +101,7 @@
return
if (!magazine)
magazine = new mag_type(src, init_spawn_with_ammo)
+ magazine = new mag_type(src)
chamber_round()
update_appearance()
diff --git a/code/modules/projectiles/guns/ballistic/assault.dm b/code/modules/projectiles/guns/ballistic/assault.dm
index 66f6699321c2..ab54f3dd247c 100644
--- a/code/modules/projectiles/guns/ballistic/assault.dm
+++ b/code/modules/projectiles/guns/ballistic/assault.dm
@@ -255,9 +255,10 @@
return ..()
/obj/item/gun/ballistic/automatic/assault/e40/attackby(obj/item/attack_obj, mob/user, params)
- if(istype(attack_obj, /obj/item/stock_parts/cell/gun) || istype(attack_obj, /obj/item/screwdriver))
- secondary.attack_self()
+ if(istype(attack_obj, /obj/item/stock_parts/cell/gun))
secondary.attackby(attack_obj, user, params)
+ if(istype(attack_obj, /obj/item/screwdriver))
+ secondary.screwdriver_act(user, attack_obj,)
else
..()
@@ -303,6 +304,12 @@
update_icon()
return
+
+
+/obj/item/gun/ballistic/automatic/assault/e40/toggle_safety(mob/user, silent=FALSE)
+ . = ..()
+ secondary.toggle_safety(user, silent=TRUE)
+
//laser
/obj/item/gun/energy/laser/e40_laser_secondary
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index c4e6ea56f650..9fdf1227c642 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -176,6 +176,7 @@
special_mags = TRUE
semi_auto = TRUE
internal_magazine = FALSE
+ casing_ejector = TRUE
tac_reloads = TRUE
pickup_sound = 'sound/items/handling/rifle_pickup.ogg'
manufacturer = MANUFACTURER_SCARBOROUGH
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/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 7ba4a57bc057..229d49c4a8c6 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -128,27 +128,29 @@
to_chat(user, "You cannot seem to get \the [src] out of your hands! ")
return FALSE
-/obj/item/gun/energy/proc/eject_cell(mob/user, obj/item/stock_parts/cell/gun/tac_load = null)
- playsound(src, load_sound, sound_volume, load_sound_vary)
- cell.forceMove(drop_location())
- var/obj/item/stock_parts/cell/gun/old_cell = cell
- /*if(insert_cell(user, tac_load))
- to_chat(user, "You perform a tactical reload on \the [src]. ")
- else
- to_chat(user, "You dropped the old cell, but the new one doesn't fit. How embarassing. ")*/
- cell = null
- user.put_in_hands(old_cell)
- old_cell.update_appearance()
- to_chat(user, "You pull the cell out of \the [src]. ")
- update_appearance()
+/obj/item/gun/energy/proc/eject_cell(mob/user, obj/item/I)
+ to_chat(user, "You begin unscrewing and pulling out the cell... ")
+ if(I.use_tool(src, user, unscrewing_time, volume=100))
+ to_chat(user, "You remove the power cell. ")
+ playsound(src, load_sound, sound_volume, load_sound_vary)
+ cell.forceMove(drop_location())
+ var/obj/item/stock_parts/cell/gun/old_cell = cell
+ cell = null
+ user.put_in_hands(old_cell)
+ old_cell.update_appearance()
+ to_chat(user, "You pull the cell out of \the [src]. ")
+ update_appearance()
-/obj/item/gun/energy/screwdriver_act(mob/living/user, obj/item/I)
- if(cell && !internal_cell && !bayonet && (!gun_light || !can_flashlight))
- to_chat(user, "You begin unscrewing and pulling out the cell... ")
- if(I.use_tool(src, user, unscrewing_time, volume=100))
- to_chat(user, "You remove the power cell. ")
- eject_cell(user)
- return ..()
+/obj/item/gun/energy/get_gun_attachments()
+ if(cell && !internal_cell)
+ attachment_options += list("Cell" = image(icon = cell.icon, icon_state = cell.icon_state))
+ ..()
+
+/obj/item/gun/energy/remove_gun_attachments(mob/living/user, obj/item/I, picked_option)
+ if(picked_option == "Cell")
+ eject_cell(user, I)
+ return TRUE
+ ..()
/obj/item/gun/energy/can_shoot(visuals)
if(safety && !visuals)
@@ -226,8 +228,6 @@
. = ..()
if(!automatic_charge_overlays || QDELETED(src))
return
- if(cell)
- . += "[icon_state]_cell"
// Every time I see code this "flexible", a kitten fucking dies //it got worse
//todo: refactor this a bit to allow showing of charge on a gun's cell
var/overlay_icon_state = "[icon_state]_charge"
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index 8a829153fcfd..5f39d407d749 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -49,11 +49,17 @@
/obj/item/gun/energy/kinetic_accelerator/crowbar_act(mob/living/user, obj/item/I)
. = TRUE
- if(modkits.len)
- to_chat(user, "You pry the modifications out. ")
- I.play_tool_sound(src, 100)
+ if(LAZYLEN(modkits))
+ var/list/choose_options = list()
for(var/obj/item/borg/upgrade/modkit/M in modkits)
- M.uninstall(src)
+ choose_options += list(M.name = image(icon = M.icon, icon_state = M.icon_state))
+ var/picked_option = show_radial_menu(user, src, choose_options, radius = 38, require_near = TRUE)
+ if(picked_option)
+ to_chat(user, "You remove [picked_option]. ")
+ I.play_tool_sound(src, 100)
+ for(var/obj/item/borg/upgrade/modkit/M in modkits)
+ if(M.name == picked_option)
+ M.uninstall(src)
else
to_chat(user, "There are no modifications currently installed. ")
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 5b16a06a0ef5..5a01abfdc0f1 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -404,3 +404,11 @@
/obj/item/gun/energy/tesla_cannon/ComponentInitialize()
. = ..()
AddComponent(/datum/component/automatic_fire, 0.1 SECONDS)
+
+/obj/item/gun/energy/buster
+ name = "replica buster cannon"
+ icon_state = "buster"
+ item_state = "buster"
+ desc = "A replica of T4L1's buster cannon from the popular webseries RILENA. Fires a harmless energy pellet at the target."
+ ammo_type = list(/obj/item/ammo_casing/energy/buster)
+ weapon_weight = WEAPON_LIGHT
diff --git a/code/modules/projectiles/projectile/energy/misc.dm b/code/modules/projectiles/projectile/energy/misc.dm
index 79ee634a3e66..81fed69d516a 100644
--- a/code/modules/projectiles/projectile/energy/misc.dm
+++ b/code/modules/projectiles/projectile/energy/misc.dm
@@ -17,3 +17,9 @@
damage_type = TOX
paralyze = 100
range = 7
+
+/obj/projectile/energy/buster
+ name = "buster blast"
+ icon_state = "pulse1"
+ damage = 0
+ damage_type = BURN
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index 0e6b166ff810..123afbcf387c 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -2455,3 +2455,47 @@ All effects don't start immediately, but rather get worse over time; the rate is
M.clockcultslurring = min(M.clockcultslurring + 3, 3)
M.stuttering = min(M.stuttering + 3, 3)
..()
+
+/datum/reagent/consumable/ethanol/shotinthedark
+ name = "Shot in the Dark"
+ description = "A coconut elixir with a golden tinge."
+ color = "#bbebff"
+ boozepwr = 40
+ quality = DRINK_VERYGOOD
+ taste_description = "an incoming bullet"
+ glass_icon_state = "shotinthedark"
+ glass_name = "Shot in the Dark"
+ glass_desc = "A specially made drink from the popular webseries RILENA: LMR. Contains traces of gold from the real bullet inside."
+
+/datum/reagent/consumable/ethanol/bullethell
+ name = "Bullet Hell"
+ description = "An incredibly potent combination drink and fire hazard, typically served in a brass shell casing. May spontaneously combust."
+ color = "#c33206"
+ boozepwr = 80
+ quality = DRINK_VERYGOOD
+ taste_description = "being shot in the head several times and then set on fire"
+ glass_icon_state = "bullethell"
+ glass_name = "Bullet Hell"
+ glass_desc = "A specially made drink from the popular webseries RILENA: LMR. Served in an oversized brass shell casing, since glass would probably melt from how intense it is."
+ accelerant_quality = 20
+
+/datum/reagent/consumable/ethanol/bullethell/on_mob_life(mob/living/carbon/M) //rarely sets you on fire
+ if (prob(5))
+ M.adjust_fire_stacks(1)
+ M.IgniteMob()
+ ..()
+
+/datum/reagent/consumable/ethanol/homesick
+ name = "Homesick"
+ description = "A soft, creamy drink that tastes like home, and hurts just as much."
+ color = "#a9c6e5"
+ boozepwr = 10
+ quality = DRINK_GOOD
+ taste_description = "home, in a way that hurts"
+ glass_icon_state = "homesick"
+ glass_name = "Homesick"
+ glass_desc = "A specially made drink from the popular webseries RILENA: LMR. Ri's mother's favorite drink."
+
+/datum/reagent/consumable/ethanol/homesick/on_mob_metabolize(mob/living/M)
+ var/drink_message = pick("You think of what you've left behind...", "You think of the people who miss you...", "You think of where you're from...")
+ to_chat(M, "[drink_message] ")
diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
index 88ce3870e575..f781313bf582 100644
--- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
@@ -434,7 +434,7 @@ WS End*/
SEND_SIGNAL(carbies, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
if(HAS_TRAIT_FROM(M, TRAIT_HUSK, "burn") && carbies.getFireLoss() < THRESHOLD_UNHUSK && (carbies.reagents.get_reagent_amount(/datum/reagent/medicine/c2/instabitaluri) + reac_volume >= 100))
carbies.cure_husk("burn")
- carbies.visible_message("A rubbery liquid coats [carbies]'s burns. [carbies] looks a lot healthier!") //we're avoiding using the phrases "burnt flesh" and "burnt skin" here because carbies could be a skeleton or a golem or something
+ carbies.visible_message("A rubbery liquid coats [carbies]'s burns. [carbies] looks a lot healthier!") //we're avoiding using the phrases "burnt flesh" and "burnt skin" here because carbies could be a skeleton or something
..()
return TRUE
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 9915ca9c4d24..d727cbfd0fa6 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -505,229 +505,6 @@
..()
return
-#define MUT_MSG_IMMEDIATE 1
-#define MUT_MSG_EXTENDED 2
-#define MUT_MSG_ABOUT2TURN 3
-
-/datum/reagent/mutationtoxin
- name = "Stable Mutation Toxin"
- description = "A humanizing toxin."
- color = "#5EFF3B" //RGB: 94, 255, 59
- metabolization_rate = 0.2 //metabolizes to prevent micro-dosage
- taste_description = "slime"
- var/race = /datum/species/human
- var/list/mutationtexts = list( "You don't feel very well." = MUT_MSG_IMMEDIATE,
- "Your skin feels a bit abnormal." = MUT_MSG_IMMEDIATE,
- "Your limbs begin to take on a different shape." = MUT_MSG_EXTENDED,
- "Your appendages begin morphing." = MUT_MSG_EXTENDED,
- "You feel as though you're about to change at any moment!" = MUT_MSG_ABOUT2TURN)
- var/cycles_to_turn = 20 //the current_cycle threshold / iterations needed before one can transform
- process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
-
-/datum/reagent/mutationtoxin/on_mob_life(mob/living/carbon/human/H)
- . = TRUE
- if(!istype(H))
- return
- if(!(H.dna?.species) || !(H.mob_biotypes & MOB_ORGANIC))
- return
- var/datum/species/mutation = pick(race) //I honestly feel extremely uncomfortable. I do not like the fact that this works.
- var/current_species = H.dna.species.type
- if(mutation && mutation != current_species)
- H.set_species(mutation)
- else
- to_chat(H, "The pain vanishes suddenly. You feel no different. ")
- H.reagents.del_reagent(type)
-
- if(prob(10))
- var/list/pick_ur_fav = list()
- var/filter = NONE
- if(current_cycle <= (cycles_to_turn*0.3))
- filter = MUT_MSG_IMMEDIATE
- else if(current_cycle <= (cycles_to_turn*0.8))
- filter = MUT_MSG_EXTENDED
- else
- filter = MUT_MSG_ABOUT2TURN
-
- for(var/i in mutationtexts)
- if(mutationtexts[i] == filter)
- pick_ur_fav += i
- to_chat(H, "[pick(pick_ur_fav)] ")
-
- if(current_cycle >= cycles_to_turn)
- var/datum/species/species_type = race
- H.set_species(species_type)
- H.reagents.del_reagent(type)
- to_chat(H, "You've become \a [lowertext(initial(species_type.name))]! ")
- ..()
-
-/datum/reagent/mutationtoxin/classic //The one from plasma on green slimes
- name = "Mutation Toxin"
- description = "A corruptive toxin."
- color = "#13BC5E" // rgb: 19, 188, 94
- race = /datum/species/jelly/slime
- process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
-
-/datum/reagent/mutationtoxin/unstable
- name = "Unstable Mutation Toxin"
- description = "A mostly safe mutation toxin."
- color = "#13BC5E" // rgb: 19, 188, 94
- race = list(/datum/species/jelly/slime,
- /datum/species/human,
- /datum/species/lizard,
- /datum/species/fly,
- /datum/species/moth,
- /datum/species/pod,
- /datum/species/jelly,
- /datum/species/abductor
- )
- process_flags = ORGANIC | SYNTHETIC
-
-/datum/reagent/mutationtoxin/lizard
- name = "Sarathi Mutation Toxin"
- description = "A lizarding toxin."
- color = "#5EFF3B" //RGB: 94, 255, 59
- race = /datum/species/lizard
- process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
- taste_description = "dragon's breath but not as cool"
-
-/datum/reagent/mutationtoxin/fly
- name = "Fly Mutation Toxin"
- description = "An insectifying toxin."
- color = "#5EFF3B" //RGB: 94, 255, 59
- race = /datum/species/fly
- process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
- taste_description = "trash"
-
-/datum/reagent/mutationtoxin/moth
- name = "Moth Mutation Toxin"
- description = "A glowing toxin."
- color = "#5EFF3B" //RGB: 94, 255, 59
- race = /datum/species/moth
- process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
- taste_description = "clothing"
-
-/datum/reagent/mutationtoxin/pod
- name = "Podperson Mutation Toxin"
- description = "A vegetalizing toxin."
- color = "#5EFF3B" //RGB: 94, 255, 59
- race = /datum/species/pod
- process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
- taste_description = "flowers"
-
-/datum/reagent/mutationtoxin/jelly
- name = "Imperfect Mutation Toxin"
- description = "A jellyfying toxin."
- color = "#5EFF3B" //RGB: 94, 255, 59
- race = /datum/species/jelly
- process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
- taste_description = "grandma's gelatin"
-
-/datum/reagent/mutationtoxin/jelly/on_mob_life(mob/living/carbon/human/H)
- if(isjellyperson(H))
- to_chat(H, "Your jelly shifts and morphs, turning you into another subspecies! ")
- var/species_type = pick(subtypesof(/datum/species/jelly))
- H.set_species(species_type)
- H.reagents.del_reagent(type)
- return TRUE
- if(current_cycle >= cycles_to_turn) //overwrite since we want subtypes of jelly
- var/datum/species/species_type = pick(subtypesof(race))
- H.set_species(species_type)
- H.reagents.del_reagent(type)
- to_chat(H, "You've become \a [initial(species_type.name)]! ")
- return TRUE
- return ..()
-
-/datum/reagent/mutationtoxin/golem
- name = "Golem Mutation Toxin"
- description = "A crystal toxin."
- color = "#5EFF3B" //RGB: 94, 255, 59
- race = /datum/species/golem/random
- process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
- taste_description = "rocks"
-
-/datum/reagent/mutationtoxin/abductor
- name = "Abductor Mutation Toxin"
- description = "An alien toxin."
- color = "#5EFF3B" //RGB: 94, 255, 59
- race = /datum/species/abductor
- process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
- taste_description = "something out of this world... no, universe!"
-
-/datum/reagent/mutationtoxin/android
- name = "Android Mutation Toxin"
- description = "A robotic toxin."
- color = "#5EFF3B" //RGB: 94, 255, 59
- race = /datum/species/android
- process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
- taste_description = "circuitry and steel"
-
-/datum/reagent/mutationtoxin/ipc
- name = "IPC Mutation Toxin"
- description = "An integrated positronic toxin."
- color = "#5EFF3B" //RGB: 94, 255, 59
- race = /datum/species/ipc
- process_flags = ORGANIC | SYNTHETIC
-
-/datum/reagent/mutationtoxin/kepi //crying
- name = "Kepori Mutation Toxin"
- description = "A feathery toxin."
- race = /datum/species/kepori
- process_flags = ORGANIC | SYNTHETIC
- taste_description = "a familiar white meat"
-
-//BLACKLISTED RACES
-/datum/reagent/mutationtoxin/skeleton
- name = "Skeleton Mutation Toxin"
- description = "A scary toxin."
- color = "#5EFF3B" //RGB: 94, 255, 59
- race = /datum/species/skeleton
- process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
- taste_description = "milk... and lots of it"
-
-/datum/reagent/mutationtoxin/zombie
- name = "Zombie Mutation Toxin"
- description = "An undead toxin."
- color = "#5EFF3B" //RGB: 94, 255, 59
- race = /datum/species/zombie //Not the infectious kind. The days of xenobio zombie outbreaks are long past.
- process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
- taste_description = "brai...nothing in particular"
-
-/datum/reagent/mutationtoxin/goofzombie
- name = "Krokodil Zombie Mutation Toxin"
- description = "An undead toxin... kinda..."
- color = "#5EFF3B" //RGB: 94, 255, 59
- race = /datum/species/human/krokodil_addict //Not the infectious kind. The days of xenobio zombie outbreaks are long past.
- process_flags = ORGANIC | SYNTHETIC
-
-/datum/reagent/mutationtoxin/ash
- name = "Ash Mutation Toxin"
- description = "An ashen toxin."
- color = "#5EFF3B" //RGB: 94, 255, 59
- race = /datum/species/lizard/ashwalker
- process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
- taste_description = "savagery"
-
-//DANGEROUS RACES
-/datum/reagent/mutationtoxin/shadow
- name = "Shadow Mutation Toxin"
- description = "A dark toxin."
- color = "#5EFF3B" //RGB: 94, 255, 59
- race = /datum/species/shadow
- process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
- taste_description = "the night"
-
-/datum/reagent/mutationtoxin/plasma
- name = "Plasma Mutation Toxin"
- description = "A plasma-based toxin."
- color = "#5EFF3B" //RGB: 94, 255, 59
- race = /datum/species/plasmaman
- process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
- taste_description = "plasma"
-
-#undef MUT_MSG_IMMEDIATE
-#undef MUT_MSG_EXTENDED
-#undef MUT_MSG_ABOUT2TURN
-
/datum/reagent/mulligan
name = "Mulligan Toxin"
description = "This toxin will rapidly change the DNA of human beings. Commonly used by Syndicate spies and assassins in need of an emergency ID change."
@@ -2773,14 +2550,6 @@
if(prob(min(current_cycle/4, 10)))
M.adjustOrganLoss(ORGAN_SLOT_STOMACH,3*REM)
-/datum/reagent/mutationtoxin/kobold
- name = "Kobold Mutation Toxin"
- description = "An ashen toxin. Something about this seems lesser."
- color = "#5EFF3B" //RGB: 94, 255, 59
- race = /datum/species/lizard/ashwalker/kobold
- process_flags = ORGANIC | SYNTHETIC //WS Edit - IPCs
- taste_description = "short savagery"
-
/datum/reagent/polar_bear_fur //used for icewine crafting
name = "Polar Bear Fur"
description = "Fur obtained from griding up a polar bears hide"
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index 6af26706b9f8..d95bd68759c7 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -179,11 +179,6 @@
toxpwr = 0
taste_description = "mint"
-/datum/reagent/toxin/minttoxin/on_mob_life(mob/living/carbon/M)
- if(HAS_TRAIT(M, TRAIT_FAT))
- M.inflate_gib()
- return ..()
-
/datum/reagent/toxin/carpotoxin
name = "Carpotoxin"
description = "A deadly neurotoxin produced by the dreaded spess carp."
diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm
index d50605dcd7f6..10cd8ffc72eb 100644
--- a/code/modules/reagents/chemistry/recipes/others.dm
+++ b/code/modules/reagents/chemistry/recipes/others.dm
@@ -149,12 +149,6 @@
required_reagents = list(/datum/reagent/ammonia = 2, /datum/reagent/nitrogen = 1, /datum/reagent/oxygen = 2)
required_temp = 525
-//Technically a mutation toxin
-/datum/chemical_reaction/mulligan
- results = list(/datum/reagent/mulligan = 1)
- required_reagents = list(/datum/reagent/mutationtoxin/jelly = 1, /datum/reagent/toxin/mutagen = 1)
-
-
////////////////////////////////// VIROLOGY //////////////////////////////////////////
/datum/chemical_reaction/virus_food
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index 07753cea4a15..97290d54213f 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -44,13 +44,13 @@
//Green
/datum/chemical_reaction/slime/slimemutate
- results = list(/datum/reagent/mutationtoxin/jelly = 1)
+ results = list(/datum/reagent/consumable/berryjuice = 1) // Removal of mutation toxins. This used to be jellyperson toxin, but is now just jelly.
required_reagents = list(/datum/reagent/toxin/plasma = 1)
required_other = TRUE
required_container = /obj/item/slime_extract/green
/datum/chemical_reaction/slime/unstabletoxin
- results = list(/datum/reagent/mutationtoxin/unstable = 1)
+ results = list(/datum/reagent/toxin/mutagen = 1) // Removal of mutation toxins. This used to be unstable toxin, but is now unstable mutagen.
required_reagents = list(/datum/reagent/uranium/radium = 1)
required_other = TRUE
required_container = /obj/item/slime_extract/green
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index dca353500b42..d63debc16e41 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -110,7 +110,7 @@
amount_per_transfer_from_this = possible_transfer_amounts[i+1]
else
amount_per_transfer_from_this = possible_transfer_amounts[1]
- balloon_alert(user, "Transferring [amount_per_transfer_from_this]u")
+ balloon_alert(user, "transferring [amount_per_transfer_from_this]u")
return
/obj/item/reagent_containers/attack(mob/M, mob/user, def_zone)
@@ -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)
@@ -268,7 +270,7 @@
return
var/fill_name = fill_icon_state? fill_icon_state : icon_state
- var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "[fill_name][fill_icon_thresholds[1]]")
+ var/mutable_appearance/filling = mutable_appearance(fill_icon, "[fill_name][fill_icon_thresholds[1]]")
var/percent = round((reagents.total_volume / volume) * 100)
for(var/i in 1 to fill_icon_thresholds.len)
diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm
index a7a43f4b7109..d72389224fd9 100644
--- a/code/modules/reagents/reagent_containers/blood_pack.dm
+++ b/code/modules/reagents/reagent_containers/blood_pack.dm
@@ -38,7 +38,7 @@
/obj/item/reagent_containers/blood/random/Initialize()
icon_state = "bloodpack"
- blood_type = pick("A+", "A-", "B+", "B-", "O+", "O-", "L", "S")
+ blood_type = pick("A+", "A-", "B+", "B-", "O+", "O-", "L")
return ..()
/obj/item/reagent_containers/blood/APlus
@@ -68,9 +68,6 @@
/obj/item/reagent_containers/blood/synthetic
blood_type = "Coolant"
-/obj/item/reagent_containers/blood/squid
- blood_type = "S"
-
/obj/item/reagent_containers/blood/universal
blood_type = "U"
diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm
index 8ec8cd674642..3710a25f3aab 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/bottle.dm
@@ -439,3 +439,39 @@
/obj/item/reagent_containers/glass/bottle/morphine/sleeper
cap_on = FALSE
+
+//types of syrups
+
+/obj/item/reagent_containers/food/drinks/bottle/syrup_bottle/caramel
+ name = "bottle of caramel syrup"
+ desc = "A pump bottle containing caramalized sugar, also known as caramel. Do not lick."
+ list_reagents = list(/datum/reagent/consumable/caramel = 50)
+
+/obj/item/reagent_containers/food/drinks/bottle/syrup_bottle/liqueur
+ name = "bottle of coffee liqueur syrup"
+ desc = "A pump bottle containing mexican coffee-flavoured liqueur syrup. In production since 1936, HONK."
+ list_reagents = list(/datum/reagent/consumable/ethanol/kahlua = 50)
+
+//Coffeepots: for reference, a standard cup is 30u, to allow 20u for sugar/sweetener/milk/creamer
+/obj/item/reagent_containers/food/drinks/bottle/coffeepot
+ icon = 'icons/obj/food/containers.dmi'
+ name = "coffeepot"
+ desc = "A large pot for dispensing that ambrosia of corporate life known to mortals only as coffee. Contains 4 standard cups."
+ volume = 120
+ icon_state = "coffeepot"
+ fill_icon_state = "coffeepot"
+ fill_icon_thresholds = list(0, 1, 30, 60, 100)
+
+/obj/item/reagent_containers/glass/coffee_cup
+ name = "coffee cup"
+ desc = "A heat-formed plastic coffee cup. Can theoretically be used for other hot drinks, if you're feeling adventurous."
+ icon = 'icons/obj/machines/coffeemaker.dmi'
+ icon_state = "coffee_cup_e"
+ base_icon_state = "coffee_cup"
+ possible_transfer_amounts = list(10)
+ volume = 30
+ spillable = TRUE
+
+/obj/item/reagent_containers/glass/coffee_cup/update_icon_state()
+ icon_state = reagents.total_volume ? base_icon_state : "[base_icon_state]_e"
+ return ..()
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 187935fa0b25..58476c423275 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -182,14 +182,6 @@
icon_state = "pill22"
rename_with_volume = TRUE
-///////////////////////////////////////// this pill is used only in a legion mob drop
-/obj/item/reagent_containers/pill/shadowtoxin
- name = "black pill"
- desc = "I wouldn't eat this if I were you."
- icon_state = "pill9"
- color = "#454545"
- list_reagents = list(/datum/reagent/mutationtoxin/shadow = 5)
-
///////////////////////////////////////// Psychologist inventory pills
/obj/item/reagent_containers/pill/happinesspsych
name = "mood stabilizer pill"
diff --git a/code/modules/requests/request.dm b/code/modules/requests/request.dm
new file mode 100644
index 000000000000..0ac37f63187e
--- /dev/null
+++ b/code/modules/requests/request.dm
@@ -0,0 +1,37 @@
+/**
+ * # Request
+ *
+ * A representation of an in-game request, such as a prayer.
+ */
+/datum/request
+ /// Unique ID of the request
+ var/id
+ /// Atomic ID for increment unique request IDs
+ var/static/atomic_id = 0
+ /// The type of request
+ var/req_type
+ /// The owner of the request, the player who created it
+ var/client/owner
+ /// The ckey of the owner, used for re-binding variables on login
+ var/owner_ckey
+ /// The name of the owner, in format /, assigned at time of request creation
+ var/owner_name
+ /// The message associated with the request
+ var/message
+ /// Just any information, which you can to send with request. For example paper datum.
+ var/additional_information
+ /// When the request was created
+ var/timestamp
+
+/datum/request/New(client/requestee, type, request, additional_info)
+ if (!requestee)
+ qdel(src)
+ return
+ id = ++atomic_id
+ owner = requestee
+ owner_ckey = owner.ckey
+ req_type = type
+ message = request
+ timestamp = world.time
+ additional_information = additional_info
+ owner_name = key_name(requestee, FALSE)
diff --git a/code/modules/requests/requests_manager.dm b/code/modules/requests/requests_manager.dm
new file mode 100644
index 000000000000..e33da846d4de
--- /dev/null
+++ b/code/modules/requests/requests_manager.dm
@@ -0,0 +1,249 @@
+/// Requests from prayers
+#define REQUEST_PRAYER "request_prayer"
+/// Requests for Centcom
+#define REQUEST_CENTCOM "request_centcom"
+/// Requests for the Syndicate
+#define REQUEST_SYNDICATE "request_syndicate"
+/// Requests for the nuke code
+#define REQUEST_NUKE "request_nuke"
+/// Requests somebody from fax
+#define REQUEST_FAX "request_fax"
+
+GLOBAL_DATUM_INIT(requests, /datum/request_manager, new)
+
+/**
+ * # Request Manager
+ *
+ * Handles all player requests (prayers, centcom requests, syndicate requests)
+ * that occur in the duration of a round.
+ */
+/datum/request_manager
+ /// Associative list of ckey -> list of requests
+ var/list/requests = list()
+ /// List where requests can be accessed by ID
+ var/list/requests_by_id = list()
+
+/datum/request_manager/Destroy(force, ...)
+ QDEL_LIST(requests)
+ return ..()
+
+/**
+ * Used in the new client pipeline to catch when clients are reconnecting and need to have their
+ * reference re-assigned to the 'owner' variable of any requests
+ *
+ * Arguments:
+ * * C - The client who is logging in
+ */
+/datum/request_manager/proc/client_login(client/C)
+ if (!requests[C.ckey])
+ return
+ for (var/datum/request/request as anything in requests[C.ckey])
+ request.owner = C
+
+/**
+ * Used in the destroy client pipeline to catch when clients are disconnecting and need to have their
+ * reference nulled on the 'owner' variable of any requests
+ *
+ * Arguments:
+ * * C - The client who is logging out
+ */
+/datum/request_manager/proc/client_logout(client/C)
+ if (!requests[C.ckey])
+ return
+ for (var/datum/request/request as anything in requests[C.ckey])
+ request.owner = null
+
+/**
+ * Creates a request for a prayer, and notifies admins who have the sound notifications enabled when appropriate
+ *
+ * Arguments:
+ * * C - The client who is praying
+ * * message - The prayer
+ * * is_chaplain - Boolean operator describing if the prayer is from a chaplain
+ */
+/datum/request_manager/proc/pray(client/C, message, is_chaplain)
+ request_for_client(C, REQUEST_PRAYER, message)
+ for(var/client/admin in GLOB.admins)
+ if(is_chaplain && admin.prefs.chat_toggles & CHAT_PRAYER && admin.prefs.toggles & SOUND_PRAYERS)
+ SEND_SOUND(admin, sound('sound/effects/pray.ogg'))
+
+/**
+ * Creates a request for a Centcom message
+ *
+ * Arguments:
+ * * C - The client who is sending the request
+ * * message - The message
+ */
+/datum/request_manager/proc/message_centcom(client/C, message)
+ request_for_client(C, REQUEST_CENTCOM, message)
+
+/**
+ * Creates a request for a Syndicate message
+ *
+ * Arguments:
+ * * C - The client who is sending the request
+ * * message - The message
+ */
+/datum/request_manager/proc/message_syndicate(client/C, message)
+ request_for_client(C, REQUEST_SYNDICATE, message)
+
+/**
+ * Creates a request for the nuclear self destruct codes
+ *
+ * Arguments:
+ * * C - The client who is sending the request
+ * * message - The message
+ */
+/datum/request_manager/proc/nuke_request(client/C, message)
+ request_for_client(C, REQUEST_NUKE, message)
+
+/**
+ * Creates a request for fax answer
+ *
+ * Arguments:
+ * * requester - The client who is sending the request
+ * * message - Paper with text.. some stamps.. and another things.
+ */
+/datum/request_manager/proc/fax_request(client/requester, message, additional_info)
+ request_for_client(requester, REQUEST_FAX, message, additional_info)
+
+/**
+ * Creates a request and registers the request with all necessary internal tracking lists
+ *
+ * Arguments:
+ * * C - The client who is sending the request
+ * * type - The type of request, see defines
+ * * message - The message
+ */
+/datum/request_manager/proc/request_for_client(client/C, type, message, additional_info)
+ var/datum/request/request = new(C, type, message, additional_info)
+ if (!requests[C.ckey])
+ requests[C.ckey] = list()
+ requests[C.ckey] += request
+ requests_by_id.len++
+ requests_by_id[request.id] = request
+
+/datum/request_manager/ui_interact(mob/user, datum/tgui/ui = null)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if (!ui)
+ ui = new(user, src, "RequestManager")
+ ui.open()
+
+/datum/request_manager/ui_state(mob/user)
+ return GLOB.admin_state
+
+/datum/request_manager/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ if (..())
+ return
+
+ // Only admins should be sending actions
+ if (!check_rights(R_ADMIN))
+ to_chat(usr, "You do not have permission to do this, you require +ADMIN")
+ return
+
+ // Get the request this relates to
+ var/id = params["id"] != null ? text2num(params["id"]) : null
+ if (!id)
+ to_chat(usr, "Failed to find a request ID in your action, please report this")
+ CRASH("Received an action without a request ID, this shouldn't happen!")
+ var/datum/request/request = !id ? null : requests_by_id[id]
+ var/datum/admins/admin_datum = GLOB.admin_datums[usr.ckey]
+
+ switch(action)
+ if ("pp")
+ var/mob/M = request.owner?.mob
+ usr.client.holder.show_player_panel(M)
+ return TRUE
+ if ("vv")
+ var/mob/M = request.owner?.mob
+ usr.client.debug_variables(M)
+ return TRUE
+ if ("sm")
+ var/mob/M = request.owner?.mob
+ usr.client.cmd_admin_subtle_message(M)
+ return TRUE
+ if ("flw")
+ var/mob/M = request.owner?.mob
+ admin_datum.admin_follow(M)
+ return TRUE
+ if ("tp")
+ if(!SSticker.HasRoundStarted())
+ to_chat(usr,"The game hasn't started yet!")
+ return TRUE
+ var/mob/M = request.owner?.mob
+ if(!ismob(M))
+ var/datum/mind/D = M
+ if(!istype(D))
+ to_chat(usr, "This can only be used on instances of type /mob and /mind")
+ return TRUE
+ else
+ D.traitor_panel()
+ return TRUE
+ else
+ usr.client.holder.show_traitor_panel(M)
+ return TRUE
+ if ("logs")
+ var/mob/M = request.owner?.mob
+ if(!ismob(M))
+ to_chat(usr, "This can only be used on instances of type /mob.")
+ return TRUE
+ show_individual_logging_panel(M, null, null)
+ return TRUE
+ if ("smite")
+ if(!check_rights(R_FUN))
+ to_chat(usr, "Insufficient permissions to smite, you require +FUN")
+ return TRUE
+ var/mob/living/carbon/human/H = request.owner?.mob
+ if (!H || !istype(H))
+ to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
+ return TRUE
+ usr.client.smite(H)
+ return TRUE
+ if ("rply")
+ if (request.req_type == REQUEST_PRAYER)
+ to_chat(usr, "Cannot reply to a prayer")
+ return TRUE
+ var/mob/M = request.owner?.mob
+ usr.client.admin_headset_message(M, request.req_type == REQUEST_SYNDICATE ? RADIO_CHANNEL_SYNDICATE : RADIO_CHANNEL_CENTCOM)
+ return TRUE
+ if ("setcode")
+ if (request.req_type != REQUEST_NUKE)
+ to_chat(usr, "You cannot set the nuke code for a non-nuke-code-request request!")
+ return TRUE
+ var/code = random_nukecode()
+ for(var/obj/machinery/nuclearbomb/selfdestruct/SD in GLOB.nuke_list)
+ SD.r_code = code
+ message_admins("[key_name_admin(usr)] has set the self-destruct code to \"[code]\".")
+ return TRUE
+ if ("show")
+ if(request.req_type != REQUEST_FAX)
+ to_chat(usr, "Request doesn't have a paper to read.")
+ return TRUE
+ var/obj/item/paper/request_message = request.additional_information
+ request_message.ui_interact(usr)
+ return TRUE
+
+/datum/request_manager/ui_data(mob/user)
+ . = list(
+ "requests" = list()
+ )
+ for (var/ckey in requests)
+ for (var/datum/request/request as anything in requests[ckey])
+ var/list/data = list(
+ "id" = request.id,
+ "req_type" = request.req_type,
+ "owner" = request.owner ? "[REF(request.owner)]" : null,
+ "owner_ckey" = request.owner_ckey,
+ "owner_name" = request.owner_name,
+ "message" = request.message,
+ "additional_info" = request.additional_information,
+ "timestamp" = request.timestamp,
+ "timestamp_str" = station_time_timestamp(wtime = request.timestamp)
+ )
+ .["requests"] += list(data)
+
+#undef REQUEST_PRAYER
+#undef REQUEST_CENTCOM
+#undef REQUEST_SYNDICATE
+#undef REQUEST_NUKE
+#undef REQUEST_FAX
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index ab96a25edcf0..d80da00dec6e 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -165,3 +165,11 @@ other types of metals and chemistry for reagents).
. = ..()
blueprints[1] = new /datum/design/cmm_ripley_upgrade()
blueprints[2] = new /datum/design/cmm_durand_upgrade()
+
+/obj/item/disk/design_disk/ammo_c9mm
+ name = "Design Disk - 9mm Ammo"
+ desc = "A design disk containing the pattern for a refill box of standard 9mm ammo, used in Commander pistols."
+
+/obj/item/disk/design_disk/ammo_c9mm/Initialize()
+ . = ..()
+ blueprints[1] = new /datum/design/c9mmautolathe()
diff --git a/code/modules/research/designs/limbgrower_designs.dm b/code/modules/research/designs/limbgrower_designs.dm
index 16bf2a9241cb..1f13dcd3b3b4 100644
--- a/code/modules/research/designs/limbgrower_designs.dm
+++ b/code/modules/research/designs/limbgrower_designs.dm
@@ -8,7 +8,7 @@
build_type = LIMBGROWER
reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
build_path = /obj/item/bodypart/l_arm
- category = list("initial",SPECIES_HUMAN,SPECIES_LIZARD,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ETHEREAL,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_GOLEM,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL)
+ category = list("initial",SPECIES_HUMAN,SPECIES_LIZARD,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ETHEREAL,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL)
/datum/design/rightarm
name = "Right Arm"
@@ -16,7 +16,7 @@
build_type = LIMBGROWER
reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
build_path = /obj/item/bodypart/r_arm
- category = list("initial",SPECIES_HUMAN,SPECIES_LIZARD,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ETHEREAL,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_GOLEM,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL)
+ category = list("initial",SPECIES_HUMAN,SPECIES_LIZARD,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ETHEREAL,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL)
/datum/design/leftleg
name = "Left Leg"
@@ -24,7 +24,7 @@
build_type = LIMBGROWER
reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
build_path = /obj/item/bodypart/leg/left
- category = list("initial",SPECIES_HUMAN,SPECIES_LIZARD,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ETHEREAL,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_GOLEM,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL)
+ category = list("initial",SPECIES_HUMAN,SPECIES_LIZARD,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ETHEREAL,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL)
/datum/design/rightleg
name = "Right Leg"
@@ -32,7 +32,7 @@
build_type = LIMBGROWER
reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
build_path = /obj/item/bodypart/leg/right
- category = list("initial",SPECIES_HUMAN,SPECIES_LIZARD,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ETHEREAL,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_GOLEM,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL)
+ category = list("initial",SPECIES_HUMAN,SPECIES_LIZARD,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ETHEREAL,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL)
/datum/design/digitigrade/leftleg
name = "Digitigrade Left Leg"
@@ -319,38 +319,6 @@
build_path = /obj/item/organ/stomach/fly
category = list("initial",SPECIES_FLYPERSON)
-/datum/design/golem_tongue
- name = "Golem Tongue"
- id = "golemtongue"
- build_type = LIMBGROWER
- reagents_list = list(/datum/reagent/medicine/synthflesh = 10)
- build_path = /obj/item/organ/tongue/golem_base
- category = list("initial",SPECIES_GOLEM)
-
-/datum/design/golem_vocal_chords
- name = "Adamantine Vocal Chords"
- id = "golemvocalchords"
- build_type = LIMBGROWER
- reagents_list = list(/datum/reagent/medicine/synthflesh = 20)
- build_path = /obj/item/organ/vocal_cords/adamantine
- category = list("initial",SPECIES_GOLEM)
-
-/datum/design/golem_resonator
- name = "Adamantine Resonator"
- id = "golemresonator"
- build_type = LIMBGROWER
- reagents_list = list(/datum/reagent/medicine/synthflesh = 20)
- build_path = /obj/item/organ/adamantine_resonator
- category = list("initial",SPECIES_GOLEM)
-
-/datum/design/golem_vocal_chords
- name = "Adamantine Vocal Chords"
- id = "golemvocalchords"
- build_type = LIMBGROWER
- reagents_list = list(/datum/reagent/medicine/synthflesh = 20)
- build_path = /obj/item/organ/vocal_cords/adamantine
- category = list("initial",SPECIES_GOLEM)
-
/datum/design/skeleton_tongue
name = "Skeleton... Tongue?"
id = "skeletontongue"
@@ -453,8 +421,6 @@
race = "Abductor"
if(SPECIES_FLYPERSON)
race = "Flyperson"
- if(SPECIES_GOLEM)
- race = "Golem"
if(SPECIES_POD)
race = "Phytosian"
if(SPECIES_SKELETON)
@@ -497,16 +463,6 @@
id = "limbdesign_fly"
build_path = /obj/item/disk/design_disk/limbs/fly
-/obj/item/disk/design_disk/limbs/golem
- name = "Golem Limb Design Disk"
- species = SPECIES_GOLEM
-
-/datum/design/limb_disk/golem
- name = "Golem Limb Design Disk"
- desc = "Contains designs for golem bodyparts and organs for the limbgrower."
- id = "limbdesign_golem"
- build_path = /obj/item/disk/design_disk/limbs/golem
-
/obj/item/disk/design_disk/limbs/pod
name = "Phytosian Limb Design Disk"
species = SPECIES_POD
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index a38d1a24c7c6..0ed2e97f39b9 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -583,15 +583,6 @@
build_path = /obj/item/circuitboard/machine/paystand
category = list ("Misc. Machinery")
-
-/datum/design/board/fat_sucker
- name = "Machine Design (Lipid Extractor)"
- desc = "The circuit board for a lipid extractor."
- id = "fat_sucker"
- build_path = /obj/item/circuitboard/machine/fat_sucker
- category = list ("Misc. Machinery")
- departmental_flags = DEPARTMENTAL_FLAG_SERVICE | DEPARTMENTAL_FLAG_MEDICAL
-
/datum/design/board/stasis
name = "Machine Design (Lifeform Stasis Unit)"
desc = "The circuit board for a stasis unit."
diff --git a/code/modules/research/designs/mining_designs.dm b/code/modules/research/designs/mining_designs.dm
index cf4ba7b9fa41..2cddc5043c3f 100644
--- a/code/modules/research/designs/mining_designs.dm
+++ b/code/modules/research/designs/mining_designs.dm
@@ -120,3 +120,13 @@
build_path = /obj/item/borg/upgrade/modkit/aoe/turfs
category = list("Mining Designs", "Cyborg Upgrade Modules")
departmental_flags = DEPARTMENTAL_FLAG_CARGO
+
+/datum/design/weather_monitor
+ name = "Weather Radio"
+ desc = "A weather radio designed for use in inhospitable environments. Gives audible warnings when storms approach."
+ id = "weatherradio"
+ build_type = PROTOLATHE
+ materials = list(/datum/material/iron=75, /datum/material/glass=25)
+ build_path = /obj/item/radio/weather_monitor
+ category = list("Mining Designs")
+ departmental_flags = DEPARTMENTAL_FLAG_CARGO
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 4d28452521af..2ac4359e2bf8 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -787,3 +787,11 @@
build_path = /obj/item/gun/ballistic/rifle/boltaction
category = list("Weapons")
departmental_flags = DEPARTMENTAL_FLAG_BALLISTICS
+
+/datum/design/c9mmautolathe
+ name = "Ammo Box (9mm)"
+ id = "c9mmautolathe"
+ build_type = AUTOLATHE
+ materials = list(/datum/material/iron = 15000)
+ build_path = /obj/item/ammo_box/c9mm
+ category = list("Imported")
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index f714f65f154d..9016d60515e7 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -322,7 +322,7 @@
ejectItem(TRUE)
else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("[src]'s chemical chamber has sprung a leak! ")
- chosenchem = pick(/datum/reagent/mutationtoxin/classic,/datum/reagent/nanomachines,/datum/reagent/toxin/acid)
+ chosenchem = pick(/datum/reagent/nanomachines,/datum/reagent/toxin/acid)
var/datum/reagents/R = new/datum/reagents(50)
R.my_atom = src
R.add_reagent(chosenchem , 50)
diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm
index 7c46ac61d784..7551590a7a69 100644
--- a/code/modules/research/rdmachines.dm
+++ b/code/modules/research/rdmachines.dm
@@ -55,6 +55,7 @@
var/obj/machinery/rnd/server/server = multi.buffer
linked_techweb = server.stored_research
visible_message("Linked to [server]!")
+ return TRUE
if(is_refillable() && O.is_drainable())
return FALSE //inserting reagents into the machine
if(Insert_Item(O, user))
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 02f51a1af9db..79009ed1fdf6 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -94,9 +94,9 @@
/datum/techweb_node/xenoorgan_biotech
id = "xenoorgan_bio"
display_name = "Xeno-organ Biology"
- description = "Phytosians, Golems, even Skeletons... We finally understand the less well known species enough to replicate their anatomy."
+ description = "Phytosians, even Skeletons... We finally understand the less well known species enough to replicate their anatomy."
prereq_ids = list("adv_biotech")
- design_ids = list("limbdesign_abductor", "limbdesign_fly", "limbdesign_golem", "limbdesign_pod", "limbdesign_skeleton", "limbdesign_snail")
+ design_ids = list("limbdesign_abductor", "limbdesign_fly", "limbdesign_pod", "limbdesign_skeleton", "limbdesign_snail")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -119,7 +119,7 @@
display_name = "Biological Processing"
description = "From slimes to kitchens."
prereq_ids = list("biotech")
- design_ids = list("smartfridge", "gibber", "deepfryer", "monkey_recycler", "processor", "gibber", "microwave", "reagentgrinder", "dish_drive", "fat_sucker")
+ design_ids = list("smartfridge", "gibber", "deepfryer", "monkey_recycler", "processor", "gibber", "microwave", "reagentgrinder", "dish_drive")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -559,7 +559,7 @@
display_name = "Mining Technology"
description = "Better than Efficiency V."
prereq_ids = list("engineering", "basic_plasma")
- design_ids = list("drill", "superresonator", "triggermod", "damagemod", "cooldownmod", "rangemod", "ore_redemption", "mining_equipment_vendor", "cargoexpress", "plasmacutter", "mecha_kineticgun")//e a r l y g a m e)
+ design_ids = list("drill", "superresonator", "triggermod", "damagemod", "cooldownmod", "rangemod", "ore_redemption", "mining_equipment_vendor", "cargoexpress", "plasmacutter", "mecha_kineticgun", "weatherradio")//e a r l y g a m e)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
diff --git a/code/modules/research/xenobiology/crossbreeding/charged.dm b/code/modules/research/xenobiology/crossbreeding/charged.dm
index d44f1bd4ad8b..501ff548e08f 100644
--- a/code/modules/research/xenobiology/crossbreeding/charged.dm
+++ b/code/modules/research/xenobiology/crossbreeding/charged.dm
@@ -258,12 +258,7 @@ Charged extracts:
/obj/item/slimecross/charged/adamantine
colour = "adamantine"
- effect_desc = "Creates a completed golem shell."
-
-/obj/item/slimecross/charged/adamantine/do_effect(mob/user)
- user.visible_message("[src] produces a fully formed golem shell! ")
- new /obj/effect/mob_spawn/human/golem/servant(get_turf(src), /datum/species/golem/adamantine, user)
- ..()
+ effect_desc = "Does nothing. Sorry :)"
/obj/item/slimecross/charged/rainbow
colour = "rainbow"
diff --git a/code/modules/research/xenobiology/crossbreeding/chilling.dm b/code/modules/research/xenobiology/crossbreeding/chilling.dm
index 085f8486ac32..89fa16cca7f5 100644
--- a/code/modules/research/xenobiology/crossbreeding/chilling.dm
+++ b/code/modules/research/xenobiology/crossbreeding/chilling.dm
@@ -290,14 +290,7 @@ Chilling extracts:
/obj/item/slimecross/chilling/black
colour = "black"
- effect_desc = "Transforsms the user into a random type of golem."
-
-/obj/item/slimecross/chilling/black/do_effect(mob/user)
- if(ishuman(user))
- user.visible_message("[src] crystallizes along [user]'s skin, turning into metallic scales! ")
- var/mob/living/carbon/human/H = user
- H.set_species(/datum/species/golem/random)
- ..()
+ effect_desc = "Does nothing. :)"
/obj/item/slimecross/chilling/lightpink
colour = "light pink"
diff --git a/code/modules/research/xenobiology/crossbreeding/industrial.dm b/code/modules/research/xenobiology/crossbreeding/industrial.dm
index 6eead050c385..da9387883f0c 100644
--- a/code/modules/research/xenobiology/crossbreeding/industrial.dm
+++ b/code/modules/research/xenobiology/crossbreeding/industrial.dm
@@ -188,12 +188,6 @@ Industrial extracts:
plasmarequired = 3
itempath = /obj/item/storage/fancy/heart_box
-/obj/item/slimecross/industrial/adamantine
- colour = "adamantine"
- effect_desc = "Produces sheets of adamantine."
- plasmarequired = 10
- itempath = /obj/item/stack/sheet/mineral/adamantine
-
/obj/item/slimecross/industrial/rainbow
colour = "rainbow"
effect_desc = "Produces random slime extracts."
diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm
index 8e71efc3177d..7cb7f8677408 100644
--- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm
+++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm
@@ -265,8 +265,6 @@ Regenerative extracts:
target.visible_message("The [target] suddenly changes color! ")
var/mob/living/simple_animal/slime/S = target
S.random_colour()
- if(isjellyperson(target))
- target.reagents.add_reagent(/datum/reagent/mutationtoxin/jelly,5)
organ_loss += 17
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 939c14589586..113f130562de 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -497,14 +497,6 @@
addtimer(CALLBACK(src, PROC_REF(reset_armor), species), 1200)
return 450
- if(SLIME_ACTIVATE_MAJOR)
- to_chat(user, "You feel your body rapidly crystallizing... ")
- if(do_after(user, 120, target = user))
- to_chat(user, "You feel solid. ")
- user.set_species(pick(/datum/species/golem/adamantine))
- return
- to_chat(user, "You stop feeding [src], and your body returns to its slimelike state. ")
-
/obj/item/slime_extract/adamantine/proc/reset_armor(datum/species/jelly/luminescent/species)
if(istype(species))
species.armor -= 25
diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm
index bf583bcd2157..1115224a6733 100644
--- a/code/modules/ruins/lavaland_ruin_code.dm
+++ b/code/modules/ruins/lavaland_ruin_code.dm
@@ -26,86 +26,6 @@
/obj/item/seeds/sunflower/moonflower = 8
)
-//Free Golems
-
-/obj/item/disk/design_disk/golem_shell
- name = "Golem Creation Disk"
- desc = "A gift from the Liberator."
- illustration = "poyo"
- max_blueprints = 1
-
-/obj/item/disk/design_disk/golem_shell/Initialize()
- . = ..()
- var/datum/design/golem_shell/G = new
- blueprints[1] = G
-
-/datum/design/golem_shell
- name = "Golem Shell Construction"
- desc = "Allows for the construction of a Golem Shell."
- id = "golem"
- build_type = AUTOLATHE
- materials = list(/datum/material/iron = 40000)
- build_path = /obj/item/golem_shell
- category = list("Imported")
-
-/obj/item/golem_shell
- name = "incomplete free golem shell"
- icon = 'icons/obj/wizard.dmi'
- icon_state = "construct"
- desc = "The incomplete body of a golem. Add ten sheets of any mineral to finish."
- var/shell_type = /obj/effect/mob_spawn/human/golem
- var/has_owner = FALSE //if the resulting golem obeys someone
- w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/golem_shell/attackby(obj/item/I, mob/user, params)
- ..()
- var/static/list/golem_shell_species_types = list(
- /obj/item/stack/sheet/metal = /datum/species/golem,
- /obj/item/stack/sheet/glass = /datum/species/golem/glass,
- /obj/item/stack/sheet/plasteel = /datum/species/golem/plasteel,
- /obj/item/stack/sheet/mineral/sandstone = /datum/species/golem/sand,
- /obj/item/stack/sheet/mineral/plasma = /datum/species/golem/plasma,
- /obj/item/stack/sheet/mineral/diamond = /datum/species/golem/diamond,
- /obj/item/stack/sheet/mineral/gold = /datum/species/golem/gold,
- /obj/item/stack/sheet/mineral/silver = /datum/species/golem/silver,
- /obj/item/stack/sheet/mineral/uranium = /datum/species/golem/uranium,
- /obj/item/stack/sheet/mineral/bananium = /datum/species/golem/bananium,
- /obj/item/stack/sheet/mineral/titanium = /datum/species/golem/titanium,
- /obj/item/stack/sheet/mineral/plastitanium = /datum/species/golem/plastitanium,
- /obj/item/stack/sheet/mineral/abductor = /datum/species/golem/alloy,
- /obj/item/stack/sheet/mineral/wood = /datum/species/golem/wood,
- /obj/item/stack/sheet/bluespace_crystal = /datum/species/golem/bluespace,
- /obj/item/stack/sheet/runed_metal = /datum/species/golem/runic,
- /obj/item/stack/medical/gauze = /datum/species/golem/cloth,
- /obj/item/stack/sheet/cotton/cloth = /datum/species/golem/cloth,
- /obj/item/stack/sheet/mineral/adamantine = /datum/species/golem/adamantine,
- /obj/item/stack/sheet/plastic = /datum/species/golem/plastic,
- /obj/item/stack/tile/bronze = /datum/species/golem/bronze,
- /obj/item/stack/sheet/cardboard = /datum/species/golem/cardboard,
- /obj/item/stack/sheet/leather = /datum/species/golem/leather,
- /obj/item/stack/sheet/bone = /datum/species/golem/bone,
- /obj/item/stack/sheet/durathread = /datum/species/golem/durathread,
- /obj/item/stack/sheet/cotton/durathread = /datum/species/golem/durathread,
- /obj/item/stack/sheet/mineral/snow = /datum/species/golem/snow)
-
- if(istype(I, /obj/item/stack))
- var/obj/item/stack/O = I
- var/species = golem_shell_species_types[O.merge_type]
- if(species)
- if(O.use(10))
- to_chat(user, "You finish up the golem shell with ten sheets of [O]. ")
- new shell_type(get_turf(src), species, user)
- qdel(src)
- else
- to_chat(user, "You need at least ten sheets to finish a golem! ")
- else
- to_chat(user, "You can't build a golem out of this kind of material! ")
-
-//made with xenobiology, the golem obeys its creator
-/obj/item/golem_shell/servant
- name = "incomplete servant golem shell"
- shell_type = /obj/effect/mob_spawn/human/golem/servant
-
///Syndicate Listening Post
/obj/effect/mob_spawn/human/lavaland_syndicate
diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
index fbdf03eff183..7b5bd27a8ada 100644
--- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm
+++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
@@ -76,27 +76,6 @@
user.put_in_hands(critical_fail)
qdel(src)
-/obj/effect/gluttony //Gluttony's wall: Used in the Gluttony ruin. Only lets the overweight through.
- name = "gluttony's wall"
- desc = "Only those who truly indulge may pass."
- anchored = TRUE
- density = TRUE
- icon_state = "blob"
- icon = 'icons/mob/blob.dmi'
- color = rgb(145, 150, 0)
-
-/obj/effect/gluttony/CanAllowThrough(atom/movable/mover, border_dir)//So bullets will fly over and stuff.
- . = ..()
- if(ishuman(mover))
- var/mob/living/carbon/human/H = mover
- if(H.nutrition >= NUTRITION_LEVEL_FAT)
- H.visible_message("[H] pushes through [src]! ", "You've seen and eaten worse than this. ")
- return TRUE
- else
- to_chat(H, "You're repulsed by even looking at [src]. Only a pig could force themselves to go through it. ")
- if(istype(mover, /mob/living/simple_animal/hostile/morph))
- return TRUE
-
/obj/structure/mirror/magic/pride //Pride's mirror: Used in the Pride ruin.
name = "pride's mirror"
desc = "Pride cometh before the..."
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index f706bc87a491..8bfe1f7e9bd8 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -598,7 +598,7 @@
all_shuttle_areas += M.shuttle_areas
for(var/turf/oldT as anything in old_turfs)
- if(!(oldT?.loc in all_shuttle_areas))
+ if(!oldT || !(oldT.loc in all_shuttle_areas))
continue
var/area/old_area = oldT.loc
for(var/obj/docking_port/mobile/bottom_shuttle in all_towed_shuttles)
diff --git a/code/modules/shuttle/shuttle_rotate.dm b/code/modules/shuttle/shuttle_rotate.dm
index 4cb5d0c65268..d0b4b49a92f6 100644
--- a/code/modules/shuttle/shuttle_rotate.dm
+++ b/code/modules/shuttle/shuttle_rotate.dm
@@ -46,7 +46,6 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
/************************************Structure rotate procs************************************/
-//WS Edit Begin - Smartwire Revert Do not TG MARG this
/obj/structure/cable/shuttleRotate(rotation, params)
params &= ~ROTATE_DIR
. = ..()
@@ -61,7 +60,6 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
d1 = d2
d2 = temp
update_appearance()
-//WS Edit End - Smartwire Revert Do not TG MARG this
//Fixes dpdir on shuttle rotation
/obj/structure/disposalpipe/shuttleRotate(rotation, params)
diff --git a/code/modules/spells/spell_types/construct_spells.dm b/code/modules/spells/spell_types/construct_spells.dm
index 5f6403ca3cdd..61c05c4170fe 100644
--- a/code/modules/spells/spell_types/construct_spells.dm
+++ b/code/modules/spells/spell_types/construct_spells.dm
@@ -291,11 +291,6 @@
return FALSE
return TRUE
-/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/golem
- charge_max = 800
- jaunt_in_type = /obj/effect/temp_visual/dir_setting/cult/phase
- jaunt_out_type = /obj/effect/temp_visual/dir_setting/cult/phase/out
-
/obj/effect/proc_holder/spell/targeted/projectile/dumbfire/juggernaut
name = "Gauntlet Echo"
desc = "Channels energy into your gauntlet - firing its essence forward in a slow moving, yet devastating, attack."
diff --git a/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
index ad71810adcd3..045c052a7c41 100644
--- a/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
@@ -216,288 +216,3 @@
/obj/item/bodypart/leg/right/skeleton
limb_id = "skeleton"
should_draw_greyscale = FALSE
-
-///MUSHROOM
-/obj/item/bodypart/head/mushroom
- limb_id = "mush"
- is_dimorphic = FALSE
-
-/obj/item/bodypart/chest/mushroom
- limb_id = "mush"
- is_dimorphic = FALSE
-
-/obj/item/bodypart/l_arm/mushroom
- limb_id = "mush"
-
-/obj/item/bodypart/r_arm/mushroom
- limb_id = "mush"
-
-/obj/item/bodypart/leg/left/mushroom
- limb_id = "mush"
-
-/obj/item/bodypart/leg/right/mushroom
- limb_id = "mush"
-
-///GOLEMS (i hate xenobio)
-/obj/item/bodypart/head/golem
- limb_id = "golem"
- is_dimorphic = FALSE
-
-/obj/item/bodypart/chest/golem
- limb_id = "golem"
- is_dimorphic = FALSE
-
-/obj/item/bodypart/l_arm/golem
- limb_id = "golem"
-
-/obj/item/bodypart/r_arm/golem
- limb_id = "golem"
-
-/obj/item/bodypart/leg/left/golem
- limb_id = "golem"
-
-/obj/item/bodypart/leg/right/golem
- limb_id = "golem"
-
-///
-/obj/item/bodypart/head/golem/alloy
- limb_id = "a_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/chest/golem/alloy
- limb_id = "a_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/l_arm/golem/alloy
- limb_id = "a_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/r_arm/golem/alloy
- limb_id = "a_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/left/golem/alloy
- limb_id = "a_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/right/golem/alloy
- limb_id = "a_golem"
- should_draw_greyscale = FALSE
-
-///
-/obj/item/bodypart/head/golem/bananium
- limb_id = "ba_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/chest/golem/bananium
- limb_id = "ba_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/l_arm/golem/bananium
- limb_id = "ba_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/r_arm/golem/bananium
- limb_id = "ba_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/left/golem/bananium
- limb_id = "ba_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/right/golem/bananium
- limb_id = "ba_golem"
- should_draw_greyscale = FALSE
-
-///
-/obj/item/bodypart/head/golem/cult
- limb_id = "cultgolem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/chest/golem/cult
- limb_id = "cultgolem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/l_arm/golem/cult
- limb_id = "cultgolem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/r_arm/golem/cult
- limb_id = "cultgolem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/left/golem/cult
- limb_id = "cultgolem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/right/golem/cult
- limb_id = "cultgolem"
- should_draw_greyscale = FALSE
-
-///
-/obj/item/bodypart/head/golem/clock
- limb_id = "clockgolem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/chest/golem/clock
- limb_id = "clockgolem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/l_arm/golem/clock
- limb_id = "clockgolem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/r_arm/golem/clock
- limb_id = "clockgolem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/left/golem/clock
- limb_id = "clockgolem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/right/golem/clock
- limb_id = "clockgolem"
- should_draw_greyscale = FALSE
-
-///
-/obj/item/bodypart/head/golem/cloth
- limb_id = "clothgolem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/chest/golem/cloth
- limb_id = "clothgolem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/l_arm/golem/cloth
- limb_id = "clothgolem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/r_arm/golem/cloth
- limb_id = "clothgolem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/left/golem/cloth
- limb_id = "clothgolem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/right/golem/cloth
- limb_id = "clothgolem"
- should_draw_greyscale = FALSE
-
-///
-/obj/item/bodypart/head/golem/cardboard
- limb_id = "c_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/chest/golem/cardboard
- limb_id = "c_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/l_arm/golem/cardboard
- limb_id = "c_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/r_arm/golem/cardboard
- limb_id = "c_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/left/golem/cardboard
- limb_id = "c_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/right/golem/cardboard
- limb_id = "c_golem"
- should_draw_greyscale = FALSE
-
-///
-/obj/item/bodypart/head/golem/durathread
- limb_id = "d_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/chest/golem/durathread
- limb_id = "d_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/l_arm/golem/durathread
- limb_id = "d_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/r_arm/golem/durathread
- limb_id = "d_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/left/golem/durathread
- limb_id = "d_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/right/golem/durathread
- limb_id = "d_golem"
- should_draw_greyscale = FALSE
-
-///
-/obj/item/bodypart/head/golem/bone
- limb_id = "b_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/chest/golem/bone
- limb_id = "b_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/l_arm/golem/bone
- limb_id = "b_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/r_arm/golem/bone
- limb_id = "b_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/left/golem/bone
- limb_id = "b_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/right/golem/bone
- limb_id = "b_golem"
- should_draw_greyscale = FALSE
-
-///
-/obj/item/bodypart/head/golem/snow
- limb_id = "sn_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/chest/golem/snow
- limb_id = "sn_golem"
- is_dimorphic = FALSE
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/l_arm/golem/snow
- limb_id = "sn_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/r_arm/golem/snow
- limb_id = "sn_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/left/golem/snow
- limb_id = "sn_golem"
- should_draw_greyscale = FALSE
-
-/obj/item/bodypart/leg/right/golem/snow
- limb_id = "sn_golem"
- should_draw_greyscale = FALSE
diff --git a/code/modules/surgery/experimental_dissection.dm b/code/modules/surgery/experimental_dissection.dm
index 7cf752ddf998..48f423a12512 100644
--- a/code/modules/surgery/experimental_dissection.dm
+++ b/code/modules/surgery/experimental_dissection.dm
@@ -60,7 +60,7 @@
if(H?.dna?.species)
if(isabductor(H))
cost = (BASE_HUMAN_REWARD*24)
- else if(isgolem(H) || iszombie(H) || isshadow(H) || isandroid(H))
+ else if(iszombie(H) || isshadow(H) || isandroid(H))
cost = (BASE_HUMAN_REWARD*20)
else if(isjellyperson(H) || ispodperson(H) || isalien(H))
cost = (BASE_HUMAN_REWARD*14)
diff --git a/code/modules/surgery/healing.dm b/code/modules/surgery/healing.dm
index 956768c09aa4..8d3eecb3ead3 100644
--- a/code/modules/surgery/healing.dm
+++ b/code/modules/surgery/healing.dm
@@ -65,11 +65,11 @@
var/urhealedamt_burn = burnhealing
if(missinghpbonus)
if(target.stat != DEAD)
- urhealedamt_brute += round((target.getBruteLoss()/ missinghpbonus),0.1)
- urhealedamt_burn += round((target.getFireLoss()/ missinghpbonus),0.1)
+ urhealedamt_brute += brutehealing ? round((target.getBruteLoss()/ missinghpbonus),0.1) : 0
+ urhealedamt_burn += burnhealing ? round((target.getFireLoss()/ missinghpbonus),0.1) : 0
else //less healing bonus for the dead since they're expected to have lots of damage to begin with (to make TW into defib not TOO simple)
- urhealedamt_brute += round((target.getBruteLoss()/ (missinghpbonus*5)),0.1)
- urhealedamt_burn += round((target.getFireLoss()/ (missinghpbonus*5)),0.1)
+ urhealedamt_brute += brutehealing ? round((target.getBruteLoss()/ (missinghpbonus*5)),0.1) : 0
+ urhealedamt_burn += burnhealing ? round((target.getFireLoss()/ (missinghpbonus*5)),0.1) : 0
if(!get_location_accessible(target, target_zone))
urhealedamt_brute *= 0.55
urhealedamt_burn *= 0.55
diff --git a/code/modules/surgery/lipoplasty.dm b/code/modules/surgery/lipoplasty.dm
deleted file mode 100644
index be7d824e0b1f..000000000000
--- a/code/modules/surgery/lipoplasty.dm
+++ /dev/null
@@ -1,69 +0,0 @@
-/datum/surgery/lipoplasty
- name = "Lipoplasty"
- steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/cut_fat, /datum/surgery_step/remove_fat, /datum/surgery_step/close)
- possible_locs = list(BODY_ZONE_CHEST)
-
-/datum/surgery/lipoplasty/can_start(mob/user, mob/living/carbon/target)
- if(HAS_TRAIT(target, TRAIT_FAT) && target.nutrition >= NUTRITION_LEVEL_WELL_FED)
- return 1
- return 0
-
-
-//cut fat
-/datum/surgery_step/cut_fat
- name = "cut excess fat"
- implements = list(
- TOOL_SAW = 100,
- /obj/item/hatchet = 40,
- /obj/item/kitchen/knife/butcher = 33)
- time = 64
-
-/datum/surgery_step/cut_fat/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to cut away [target]'s excess fat. ", "You begin to cut away [target]'s excess fat... ")
- display_results(user, target, "You begin to cut away [target]'s excess fat... ",
- "[user] begins to cut away [target]'s excess fat. ",
- "[user] begins to cut [target]'s [target_zone] with [tool]. ")
-
-/datum/surgery_step/cut_fat/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results)
- display_results(user, target, "You cut [target]'s excess fat loose. ",
- "[user] cuts [target]'s excess fat loose! ",
- "[user] finishes the cut on [target]'s [target_zone]. ")
- return 1
-
-//remove fat
-/datum/surgery_step/remove_fat
- name = "remove loose fat"
- implements = list(
- TOOL_RETRACTOR = 100,
- TOOL_WIRECUTTER = 40)
- time = 32
- experience_given = 0 //scales with fat removed
-
-/datum/surgery_step/remove_fat/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- display_results(user, target, "You begin to extract [target]'s loose fat... ",
- "[user] begins to extract [target]'s loose fat! ",
- "[user] begins to extract something from [target]'s [target_zone]. ")
-
-/datum/surgery_step/remove_fat/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
- display_results(user, target, "You extract [target]'s fat. ",
- "[user] extracts [target]'s fat! ",
- "[user] extracts [target]'s fat! ")
- target.overeatduration = 0 //patient is unfatted
- var/removednutriment = target.nutrition
- target.set_nutrition(NUTRITION_LEVEL_WELL_FED)
- removednutriment -= NUTRITION_LEVEL_WELL_FED //whatever was removed goes into the meat
- experience_given = (round(removednutriment/(MEDICAL_SKILL_EASY*5)))
- var/mob/living/carbon/human/H = target
- var/typeofmeat = /obj/item/reagent_containers/food/snacks/meat/slab/human
-
- if(H.dna && H.dna.species)
- typeofmeat = H.dna.species.meat
-
- var/obj/item/reagent_containers/food/snacks/meat/slab/human/newmeat = new typeofmeat
- newmeat.name = "fatty meat"
- newmeat.desc = "Extremely fatty tissue taken from a patient."
- newmeat.subjectname = H.real_name
- newmeat.subjectjob = H.job
- newmeat.reagents.add_reagent (/datum/reagent/consumable/nutriment, (removednutriment / 15)) //To balance with nutriment_factor of nutriment
- newmeat.forceMove(target.loc)
- return ..()
diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm
index 4f22083377ae..f1eb39b84162 100644
--- a/code/modules/surgery/organs/ears.dm
+++ b/code/modules/surgery/organs/ears.dm
@@ -186,12 +186,6 @@
ear_owner.dna.species.mutant_bodyparts -= "ears"
ear_owner.update_body()
-/obj/item/organ/ears/bronze
- name = "tin ears"
- desc = "The robust ears of a bronze golem. "
- damage_multiplier = 0.1 //STRONK
- bang_protect = 1 //Fear me weaklings.
-
/obj/item/organ/ears/cybernetic
name = "cybernetic ears"
icon_state = "ears-c"
diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index 40920cc5d21a..4469410f9b58 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -21,7 +21,6 @@
/datum/language/moffic,
/datum/language/sylvan,
/datum/language/shadowtongue,
- /datum/language/terrum,
/datum/language/ratvar
))
@@ -45,15 +44,6 @@
/obj/item/organ/tongue/could_speak_language(language)
return is_type_in_typecache(language, languages_possible)
-//Say_mod-Only Tongues
-/obj/item/organ/tongue/golem_base
- name = "golem tongue"
- say_mod = "rumbles"
-
-/obj/item/organ/tongue/golem_honk
- name = "bananium tongue"
- say_mod = "honks"
-
/obj/item/organ/tongue/toma
name = "mutated tongue"
say_mod = "mumbles"
@@ -108,7 +98,6 @@
/datum/language/moffic,
/datum/language/sylvan,
/datum/language/shadowtongue,
- /datum/language/terrum,
/datum/language/buzzwords,
/datum/language/ratvar
))
@@ -245,7 +234,6 @@
/datum/language/moffic,
/datum/language/sylvan,
/datum/language/shadowtongue,
- /datum/language/terrum,
/datum/language/calcic,
/datum/language/ratvar
))
@@ -328,7 +316,6 @@
/datum/language/moffic,
/datum/language/sylvan,
/datum/language/shadowtongue,
- /datum/language/terrum,
/datum/language/ratvar,
))
@@ -353,7 +340,6 @@
/datum/language/moffic,
/datum/language/sylvan,
/datum/language/shadowtongue,
- /datum/language/terrum,
/datum/language/ratvar,
/datum/language/slime
))
@@ -378,7 +364,6 @@
/datum/language/moffic,
/datum/language/sylvan,
/datum/language/shadowtongue,
- /datum/language/terrum,
/datum/language/buzzwords
))
@@ -420,7 +405,6 @@
/datum/language/moffic,
/datum/language/sylvan,
/datum/language/shadowtongue,
- /datum/language/terrum,
/datum/language/teceti_unified
))
@@ -444,7 +428,6 @@
/datum/language/moffic,
/datum/language/sylvan,
/datum/language/shadowtongue,
- /datum/language/terrum,
/datum/language/vox_pidgin
))
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index 1a0f1ea60f3d..63b6d5c0bfa0 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -22,38 +22,6 @@
/obj/item/organ/vocal_cords/proc/handle_speech(message) //actually say the message
owner.say(message, spans = spans, sanitize = FALSE)
-/obj/item/organ/adamantine_resonator
- name = "adamantine resonator"
- desc = "Fragments of adamantine exist in all golems, stemming from their origins as purely magical constructs. These are used to \"hear\" messages from their leaders."
- zone = BODY_ZONE_HEAD
- slot = ORGAN_SLOT_ADAMANTINE_RESONATOR
- icon_state = "adamantine_resonator"
-
-/obj/item/organ/vocal_cords/adamantine
- name = "adamantine vocal cords"
- desc = "When adamantine resonates, it causes all nearby pieces of adamantine to resonate as well. Adamantine golems use this to broadcast messages to nearby golems."
- actions_types = list(/datum/action/item_action/organ_action/use/adamantine_vocal_cords)
- icon_state = "adamantine_cords"
-
-/datum/action/item_action/organ_action/use/adamantine_vocal_cords/Trigger()
- if(!IsAvailable())
- return
- var/message = input(owner, "Resonate a message to all nearby golems.", "Resonate")
- if(QDELETED(src) || QDELETED(owner) || !message)
- return
- owner.say(".x[message]")
-
-/obj/item/organ/vocal_cords/adamantine/handle_speech(message)
- var/msg = "[owner.real_name] resonates, \"[message]\" [usr] begins to collapse [src]. ", "You begin to collapse [src]. ")
+ if(!do_after(usr, 3 SECONDS, target = src))
+ return FALSE
+ usr.visible_message("[usr] collapses [src]. ", "You collapse [src]. ")
+ var/obj/vehicle/ridden/wheelchair/wheelchair_folded = new foldabletype(get_turf(src))
+ usr.put_in_hands(wheelchair_folded)
+ qdel(src)
+
+/obj/item/wheelchair/attack_self(mob/user) //Deploys wheelchair on in-hand use
+ deploy_wheelchair(user, user.loc)
+
+/obj/item/wheelchair/proc/deploy_wheelchair(mob/user, atom/location)
+ usr.visible_message("[usr] begins to unfold [src]. ", "You begin to unfold [src]. ")
+ if(!do_after(usr, 3 SECONDS, target = src))
+ return FALSE
+ usr.visible_message("[usr] deploys [src]. ", "You deploy [src]. ")
+ var/obj/vehicle/ridden/wheelchair/wheelchair_unfolded = new unfolded_type(location)
+ wheelchair_unfolded.add_fingerprint(user)
+ qdel(src)
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index a774f048f443..9c4f7c376425 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -319,7 +319,7 @@
name = "JaniDrobe"
desc = "A self cleaning vending machine capable of dispensing clothing for janitors."
icon_state = "janidrobe"
- product_ads = "Come and get your janitorial clothing, now endorsed by lizard janitors everywhere!"
+ product_ads = "Come and get your janitorial clothing, now endorsed by janitors everywhere!"
vend_reply = "Thank you for using the JaniDrobe!"
products = list(/obj/item/clothing/under/rank/civilian/janitor = 2,
/obj/item/cartridge/janitor = 2,
@@ -410,8 +410,7 @@
/obj/item/clothing/accessory/armband/med = 4,
/obj/item/clothing/head/beanie/rasta = 1)
contraband = list(/obj/item/toy/plush/plushvar = 1,
- /obj/item/toy/plush/narplush = 1,
- /obj/item/clothing/head/medievaljewhat = 3)
+ /obj/item/toy/plush/narplush = 1)
premium = list(/obj/item/clothing/suit/chaplainsuit/bishoprobe = 1,
/obj/item/clothing/head/bishopmitre = 1)
refill_canister = /obj/item/vending_refill/wardrobe/chap_wardrobe
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/dependencies.sh b/dependencies.sh
index 84ba6b96feab..ee382484a0f2 100755
--- a/dependencies.sh
+++ b/dependencies.sh
@@ -8,7 +8,7 @@ export BYOND_MAJOR=514
export BYOND_MINOR=1588
#rust version
-export RUST_VERSION=1.67.0
+export RUST_VERSION=1.67.1
#rust_g git tag
export RUST_G_VERSION=3.0.0
@@ -21,7 +21,7 @@ export NODE_VERSION_PRECISE=16.13.0
export SPACEMAN_DMM_VERSION=suite-1.7.1
# Python version for mapmerge and other tools
-export PYTHON_VERSION=3.7.9
+export PYTHON_VERSION=3.9.0
#auxmos repository
export AUXMOS_REPO=https://github.com/shiptest-ss13/auxmos
diff --git a/html/changelogs/AutoChangeLog-pr-2685.yml b/html/changelogs/AutoChangeLog-pr-2685.yml
new file mode 100644
index 000000000000..35017006bd67
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2685.yml
@@ -0,0 +1,6 @@
+author: Draggeru, Cre
+changes:
+ - {rscadd: 'adds all of the clothing intended for SUNS, including uniforms for the
+ captain, xo, cmo, scientists, miners, engineers, and doctors'}
+ - {rscadd: several job outfits to support future SUNS content}
+delete-after: true
diff --git a/html/changelogs/archive/2023-11.yml b/html/changelogs/archive/2023-11.yml
index b2fcb848dddf..d15d377eecd2 100644
--- a/html/changelogs/archive/2023-11.yml
+++ b/html/changelogs/archive/2023-11.yml
@@ -136,3 +136,30 @@
2023-11-20:
thgvr:
- imageadd: Restored space parallax to its former whimsical glory.
+2023-11-22:
+ GenericDM:
+ - rscdel: removes deepthroat
+2023-11-23:
+ GenericDM:
+ - rscdel: removes the weird examine text for looking at a fat person while starving
+ lizardqueenlexi:
+ - rscdel: Removed the "fat" status - overeating now has no negative effects.
+ - rscdel: Removed lipoplasty surgery.
+ - rscdel: Removed the fat sucker machine.
+ - tweak: Scanner gates no longer have a "nutrition" option available.
+ thgvr:
+ - bugfix: Fixes invisible radiation medkits
+2023-11-26:
+ meemofcourse:
+ - tweak: Fancy pens now write in Adobe Garamond.
+2023-11-29:
+ GenericDM:
+ - rscdel: removes tail club
+ - rscdel: removes all flavors of tail whip
+ - rscdel: removes lizardskin clothing
+ - rscdel: removes 'Genetic Purifier'
+ - tweak: makes bunny ears desc not incredibly sexist
+ - tweak: change up wording in magic mirror gender change
+ - rscdel: removes 'genuine' cat ears
+ thgvr:
+ - bugfix: Marine armor and its subtypes will no longer break digitigrade
diff --git a/html/changelogs/archive/2023-12.yml b/html/changelogs/archive/2023-12.yml
new file mode 100644
index 000000000000..c3c00d75dd3b
--- /dev/null
+++ b/html/changelogs/archive/2023-12.yml
@@ -0,0 +1,136 @@
+2023-12-02:
+ GenericDM:
+ - admin: remove sgt report ~~to debug verbs~~
+ Zevotech:
+ - rscdel: spacegym.dmm and associated code removed
+ - rscdel: removed spacegym lootdrops from the colossus
+2023-12-03:
+ GenericDM:
+ - bugfix: you no longer commit violence against machines
+2023-12-04:
+ PositiveEntropy:
+ - rscadd: Revamps blood-red hardsuits, as well as adding their equivalents to each
+ Gorlex branch!
+ - rscdel: The Scarlet Hardsuit has been shelved.
+2023-12-05:
+ MoonTheBird:
+ - rscadd: Added a LOT of RILENA merch. Plushies, drinks, hoodies, shirts, cosplays...
+ And if you're a RILENA fan (positive trait), you get a special pin, like the
+ clown or mime fan!
+2023-12-07:
+ FalloutFalcon:
+ - rscadd: improved radial menu for mining tools
+ - tweak: menus for removing attachments
+ PositiveEntropy:
+ - rscadd: The Li-Tieguai is now officially, a Syndicate ship!
+ meemofcourse:
+ - tweak: The 2nd Battlegroup officer uniform is now the Syndicate Officer uniform
+ - tweak: The 2nd Battlegroup officer jacket and cap have been updated to reflect
+ not being part of the ACLF
+ thgvr:
+ - rscdel: Removes golems
+ tmtmtl30:
+ - 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.
+2023-12-29:
+ FalloutFalcon:
+ - rscdel: Syndicate Jacket
+ - bugfix: Hos Jacket Invisibility
+ MarkSuckerberg:
+ - admin: The server will now automatically delay round-end when a TGS deployment
+ is incoming
+ - server: Adds more TGS chat commands as well as support for the newer chat message
+ system.
+ SomeguyManperson:
+ - bugfix: the weebstick is no longer held back from its true purpose if you click
+ on a tile you can't see
+ - bugfix: heating rations increases their nutritional value as intended
+ Zevotech:
+ - bugfix: legion core implanting no longer aheals you on use
+ - rscadd: legion core implant now just does a potent organic heal with minor clone
+ damage when used
+ - rscdel: Removes the Lieutenant job datum, locker and clothing
+ - rscadd: The Shetland now has a First Officer and lockers for both them and the
+ captain now
diff --git a/html/changelogs/archive/2024-01.yml b/html/changelogs/archive/2024-01.yml
new file mode 100644
index 000000000000..f2a29eb77d49
--- /dev/null
+++ b/html/changelogs/archive/2024-01.yml
@@ -0,0 +1,81 @@
+2024-01-05:
+ MarkSuckerberg:
+ - bugfix: Sector time now actually shows the month of January.
+2024-01-06:
+ Imaginos16:
+ - rscadd: Resprites most production machines!
+ - rscadd: Resprites handheld radios
+ MarkSuckerberg:
+ - bugfix: IC/sector months now actually start on the first and there's only one
+ year day
+ SomeguyManperson:
+ - rscadd: admins can now spawn vox more efficiently
+ - bugfix: bloodbags can no longer spawn with untyped (and useless) blood in them
+ cowbot92:
+ - rscadd: Ports TG's Coffee Makers
+ - soundadd: Adds coffee making sound
+ - imageadd: Adds a new type of coffee cup and pot
+ - code_imp: this changes code yes
+2024-01-08:
+ PositiveEntropy:
+ - rscadd: Clipboards have been added to the Chronicle, like it should've had since
+ the beginning.
+ thgvr:
+ - rscadd: Autolathe has a new TGUI theme.
+ - imageadd: New TGUI background, the Shiptest logo.
+2024-01-10:
+ MarkSuckerberg:
+ - bugfix: Fixes a bunch of cases of windows not being where they were supposed to
+ be, tables/chairs stacking on each other, and other very small stuff you've
+ never noticed before.
+2024-01-12:
+ PositiveEntropy:
+ - imageadd: The Gorlex 2nd Battlegroup clothing sprites have been updated!
+ tiramisuapimancer:
+ - rscdel: Removed the edgy human trafficking/SGT joke poster
+2024-01-13:
+ FleetingExpertise:
+ - bugfix: The 'phantom round' bug with guns has been fixed
+ - bugfix: Ghosts can no longer toggle gun safety
+ - bugfix: Bulldogs no longer destroy shotgun shells from existence
+ - bugfix: Bows should no longer randomly break
+ - bugfix: A lot of jank involving the E-40 has been fixed
+ Zevotech:
+ - rscadd: adds a fax machine to the paracelsus-class
+ - bugfix: rotates a bedsheet on the paracelsus class to be the right direction
+2024-01-15:
+ tmtmtl30:
+ - rscdel: Holodeck code has been removed.
+ - bugfix: Outposts should end up erroneously spaced less frequently.
+2024-01-18:
+ MeeMOfCourse, retlaw34:
+ - tweak: Repathed almost every faction outfit, and they now apply factions upon
+ being used.
+ - tweak: SecHud icons have been redone. Sprites by retlaw34.
+ - tweak: Descriptions of multiple clothing items.
+ - rscadd: SecHuds now identify factions. Somewhat.
+ - rscadd: More desperate groups of Frontiersmen have been spotted roaming the frontier.
+2024-01-19:
+ SomeguyManperson:
+ - tweak: tend brute/burns can no longer attempt to (very ineffectively) heal the
+ other damage type
+2024-01-23:
+ SomeguyManperson:
+ - bugfix: ore smelter no longer obliterates materials when smelting alloys
+2024-01-26:
+ Apogee-dev:
+ - tweak: Changed prefixes on Syndicate ships to reflect subfaction
+ SomeguyManperson:
+ - bugfix: you can no longer lock yourself out of the icemoon dragon lair by killing
+ the dragon with a crusher
+2024-01-28:
+ Fest1v3:
+ - imageadd: Added vox sprites & a tailhold icon.
+ Skies-Of-Blue:
+ - balance: planetary chem bees have been replaced with the garden variety
+2024-01-30:
+ FalloutFalcon:
+ - balance: reverts some blood red hard suits back to ramzi
+ goober3:
+ - tweak: Added more light switches to the Mudskipper.
+ - bugfix: The Mudskipper bridge now has proper access applied.
diff --git a/html/changelogs/archive/2024-02.yml b/html/changelogs/archive/2024-02.yml
new file mode 100644
index 000000000000..d01da65da4c3
--- /dev/null
+++ b/html/changelogs/archive/2024-02.yml
@@ -0,0 +1,55 @@
+2024-02-02:
+ Martinpachu:
+ - bugfix: updated ship shotgun ammo boxes
+2024-02-03:
+ Apogee-dev:
+ - rscdel: Removed abductor tools from the wrecked analyzer loot pool
+ - rscdel: Removed lost abductor from iceplanet portal loot pool
+ Bokkiewokkie:
+ - imageadd: Added more Kepori socks
+ - imageadd: Added more Kepori shirts
+ - imageadd: Added digitigrade pride thigh-highs
+ - bugfix: Fixed Kepori arms having both left and right sprites per single arm
+ GenericDM:
+ - rscdel: mutation toxin
+ PigeonLord:
+ - rscadd: Adds more Light Switches around the shepherd
+ - rscadd: Added some farming plots in the apiary so bees can actually make honey
+ - bugfix: Fixed bees being able to open the Shepherd Apiary
+ SomeguyManperson:
+ - rscadd: If you are smoking a cigarette, you can light someone else's cigarette
+ via help intent while targeting the mouth
+ bobbahbrown, itsmeow, meemofcourse:
+ - rscadd: CentCom now has some small offices, which recieve physical faxes.
+ - rscadd: Fax machines now announce that they have received a fax over radio.
+ - rscadd: Fax machines announce important faxes VERY LOUDLY.
+ - balance: Faxes no longer require a subspace ansible crystal.
+ - code_imp: Faxes now use typepath instead of varedit.
+ - tweak: Changed how special/faction faxes work. Login is no longer required to
+ use special faxes.
+ - admin: Add Requests Manager to view all fax messages/prayers/centcom and syndicate
+ requests/and nuke code requests within a round.
+ - admin: Removed old fax manager in favor of Requests Manager, added "Send Fax Message"
+ verb to send admin faxes via a menu.
+ - bugfix: Fixed runtime when ghosts tried to view paper.
+ meemofcourse:
+ - rscadd: ACLF Syndicate Inspector ERT
+ - bugfix: Independent background icons
+ - bugfix: ERT Outfits not having access and proper names
+2024-02-04:
+ Martinpachu:
+ - rscadd: Added two flashes, a recharger, a stamp, two commanders, ammo for them
+ and a wideband to the Ranger bridge.
+ - rscdel: The Ranger's ORM.
+2024-02-05:
+ Cadunkus:
+ - spellcheck: Fixed a single typo in the description of the Corvus-class Response
+ Vessel.
+ Luftkommando:
+ - rscadd: Added new ShipTest faction specific stamps
+ Skies-Of-Blue:
+ - tweak: non-motorized wheelchairs can now be folded
+ - imageadd: a few sprites to support the above
+ meemofcourse:
+ - rscadd: Valor-Class Field Care Crusier
+ - rscadd: Haste-Class Ambulance
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/effects/parallax.dmi b/icons/effects/parallax.dmi
index 7825c6d014f2..601146297cc4 100644
Binary files a/icons/effects/parallax.dmi and b/icons/effects/parallax.dmi differ
diff --git a/icons/mob/actions.dmi b/icons/mob/actions.dmi
index ea2c5c556db0..bc600528d825 100644
Binary files a/icons/mob/actions.dmi and b/icons/mob/actions.dmi differ
diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi
index 5d4ee686cde5..aef500b67da9 100644
Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ
diff --git a/icons/mob/clothing/faction/suns/accessory.dmi b/icons/mob/clothing/faction/suns/accessory.dmi
new file mode 100644
index 000000000000..00e868d303fd
Binary files /dev/null and b/icons/mob/clothing/faction/suns/accessory.dmi differ
diff --git a/icons/mob/clothing/faction/suns/eyes.dmi b/icons/mob/clothing/faction/suns/eyes.dmi
new file mode 100644
index 000000000000..0dd74b201876
Binary files /dev/null and b/icons/mob/clothing/faction/suns/eyes.dmi differ
diff --git a/icons/mob/clothing/faction/suns/feet.dmi b/icons/mob/clothing/faction/suns/feet.dmi
new file mode 100644
index 000000000000..0c665a29cda6
Binary files /dev/null and b/icons/mob/clothing/faction/suns/feet.dmi differ
diff --git a/icons/mob/clothing/faction/suns/hands.dmi b/icons/mob/clothing/faction/suns/hands.dmi
new file mode 100644
index 000000000000..c84e17e76662
Binary files /dev/null and b/icons/mob/clothing/faction/suns/hands.dmi differ
diff --git a/icons/mob/clothing/faction/suns/head.dmi b/icons/mob/clothing/faction/suns/head.dmi
new file mode 100644
index 000000000000..22eb273e8041
Binary files /dev/null and b/icons/mob/clothing/faction/suns/head.dmi differ
diff --git a/icons/mob/clothing/faction/suns/mask.dmi b/icons/mob/clothing/faction/suns/mask.dmi
new file mode 100644
index 000000000000..9068c5c74abc
Binary files /dev/null and b/icons/mob/clothing/faction/suns/mask.dmi differ
diff --git a/icons/mob/clothing/faction/suns/neck.dmi b/icons/mob/clothing/faction/suns/neck.dmi
new file mode 100644
index 000000000000..0c8243bbb09b
Binary files /dev/null and b/icons/mob/clothing/faction/suns/neck.dmi differ
diff --git a/icons/mob/clothing/faction/suns/suits.dmi b/icons/mob/clothing/faction/suns/suits.dmi
new file mode 100644
index 000000000000..11d1b5142b99
Binary files /dev/null and b/icons/mob/clothing/faction/suns/suits.dmi differ
diff --git a/icons/mob/clothing/faction/suns/uniforms.dmi b/icons/mob/clothing/faction/suns/uniforms.dmi
new file mode 100644
index 000000000000..a354f10437f5
Binary files /dev/null and b/icons/mob/clothing/faction/suns/uniforms.dmi differ
diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi
index d9580eff1b42..6b974d5a8199 100644
Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index 24468d662a5e..f370aa665669 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/suit.dmi b/icons/mob/clothing/suit.dmi
index 9ce60cc531ee..a832ae961c56 100644
Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ
diff --git a/icons/mob/clothing/suits/hooded.dmi b/icons/mob/clothing/suits/hooded.dmi
index a19af8b7aa64..a4be6f11f793 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/spacesuits.dmi b/icons/mob/clothing/suits/spacesuits.dmi
index 19042f1f08e8..6350fec50200 100644
Binary files a/icons/mob/clothing/suits/spacesuits.dmi and b/icons/mob/clothing/suits/spacesuits.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/under/dress.dmi b/icons/mob/clothing/under/dress.dmi
index eac316815846..a67fcb85331f 100644
Binary files a/icons/mob/clothing/under/dress.dmi and b/icons/mob/clothing/under/dress.dmi differ
diff --git a/icons/mob/clothing/under/syndicate.dmi b/icons/mob/clothing/under/syndicate.dmi
index 27c030aa4b43..7168514ee697 100644
Binary files a/icons/mob/clothing/under/syndicate.dmi and b/icons/mob/clothing/under/syndicate.dmi differ
diff --git a/icons/mob/clothing/underwear/species/underwear_socks_kepori.dmi b/icons/mob/clothing/underwear/species/underwear_socks_kepori.dmi
index d182ee4c238a..7548aeb3a702 100644
Binary files a/icons/mob/clothing/underwear/species/underwear_socks_kepori.dmi and b/icons/mob/clothing/underwear/species/underwear_socks_kepori.dmi differ
diff --git a/icons/mob/clothing/underwear/species/underwear_torso_kepori.dmi b/icons/mob/clothing/underwear/species/underwear_torso_kepori.dmi
index 9d7fdc7a7c9d..19813d4e2946 100644
Binary files a/icons/mob/clothing/underwear/species/underwear_torso_kepori.dmi and b/icons/mob/clothing/underwear/species/underwear_torso_kepori.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/clothing/underwear/underwear_socks.dmi b/icons/mob/clothing/underwear/underwear_socks.dmi
index bc7faddc5479..7ce74422818f 100644
Binary files a/icons/mob/clothing/underwear/underwear_socks.dmi and b/icons/mob/clothing/underwear/underwear_socks.dmi differ
diff --git a/icons/mob/clothing/underwear/underwear_torso.dmi b/icons/mob/clothing/underwear/underwear_torso.dmi
index d3d4db41316e..ad11d77748d0 100644
Binary files a/icons/mob/clothing/underwear/underwear_torso.dmi and b/icons/mob/clothing/underwear/underwear_torso.dmi differ
diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi
index aee25733cdbe..a54640fc17ba 100644
Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ
diff --git a/icons/mob/human_parts.dmi b/icons/mob/human_parts.dmi
index 115688eeca5e..e1bbea2b2006 100644
Binary files a/icons/mob/human_parts.dmi and b/icons/mob/human_parts.dmi differ
diff --git a/icons/mob/human_parts_greyscale.dmi b/icons/mob/human_parts_greyscale.dmi
index 6fb879f40e7c..4e816bbecc65 100644
Binary files a/icons/mob/human_parts_greyscale.dmi and b/icons/mob/human_parts_greyscale.dmi differ
diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi
index 1febae88e98c..9ae2124fa4c5 100644
Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi
index 4a6ec93b5f21..f77386a90062 100644
Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ
diff --git a/icons/mob/inhands/faction/suns/suns_lefthand.dmi b/icons/mob/inhands/faction/suns/suns_lefthand.dmi
new file mode 100644
index 000000000000..f608d69ff95f
Binary files /dev/null and b/icons/mob/inhands/faction/suns/suns_lefthand.dmi differ
diff --git a/icons/mob/inhands/faction/suns/suns_righthand.dmi b/icons/mob/inhands/faction/suns/suns_righthand.dmi
new file mode 100644
index 000000000000..2738ccdd2903
Binary files /dev/null and b/icons/mob/inhands/faction/suns/suns_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index c2f7d7c53334..f5f95c211298 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 6ede1edc7747..f626c077ced5 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi
index cd7fd6d859b8..7b15fb84a247 100644
Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi
index d7e395ff5b57..0354d2352120 100644
Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/melee_lefthand.dmi b/icons/mob/inhands/weapons/melee_lefthand.dmi
index 9ddba4cf47e7..557f281d1502 100644
Binary files a/icons/mob/inhands/weapons/melee_lefthand.dmi and b/icons/mob/inhands/weapons/melee_lefthand.dmi differ
diff --git a/icons/mob/ipc_accessories.dmi b/icons/mob/ipc_accessories.dmi
index 7127d6c0cccc..86311ca3172e 100644
Binary files a/icons/mob/ipc_accessories.dmi and b/icons/mob/ipc_accessories.dmi differ
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
index 64d0cc4ef8ce..142386586679 100644
Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ
diff --git a/icons/mob/pai.dmi b/icons/mob/pai.dmi
index 1c609686be11..4e46503e87c7 100644
Binary files a/icons/mob/pai.dmi and b/icons/mob/pai.dmi differ
diff --git a/icons/mob/pai_item_head.dmi b/icons/mob/pai_item_head.dmi
index 337e22254ea8..38db9379be12 100644
Binary files a/icons/mob/pai_item_head.dmi and b/icons/mob/pai_item_head.dmi differ
diff --git a/icons/mob/pai_item_lh.dmi b/icons/mob/pai_item_lh.dmi
index fb9c77f5abae..49cd390f8d2f 100644
Binary files a/icons/mob/pai_item_lh.dmi and b/icons/mob/pai_item_lh.dmi differ
diff --git a/icons/mob/pai_item_rh.dmi b/icons/mob/pai_item_rh.dmi
index ced27446a451..de7bc143b9c3 100644
Binary files a/icons/mob/pai_item_rh.dmi and b/icons/mob/pai_item_rh.dmi differ
diff --git a/icons/mob/radial.dmi b/icons/mob/radial.dmi
index 8ec3a0fb4666..9b43fa0d710f 100644
Binary files a/icons/mob/radial.dmi and b/icons/mob/radial.dmi differ
diff --git a/icons/mob/species/kepori/bodyparts.dmi b/icons/mob/species/kepori/bodyparts.dmi
index 177efcbbf51a..f19aaeacbe08 100644
Binary files a/icons/mob/species/kepori/bodyparts.dmi and b/icons/mob/species/kepori/bodyparts.dmi differ
diff --git a/icons/mob/species/kepori/onmob_suit_kepori.dmi b/icons/mob/species/kepori/onmob_suit_kepori.dmi
index 9253a5b0be28..4d5eaaab1196 100644
Binary files a/icons/mob/species/kepori/onmob_suit_kepori.dmi and b/icons/mob/species/kepori/onmob_suit_kepori.dmi differ
diff --git a/icons/mob/species/kepori/onmob_uniform_kepori.dmi b/icons/mob/species/kepori/onmob_uniform_kepori.dmi
index 6f28d759ba5f..d9bec6e95185 100644
Binary files a/icons/mob/species/kepori/onmob_uniform_kepori.dmi and b/icons/mob/species/kepori/onmob_uniform_kepori.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/misc/digitigrade.dmi b/icons/mob/species/misc/digitigrade.dmi
index 104387630acb..7c6aca4107b1 100644
Binary files a/icons/mob/species/misc/digitigrade.dmi and b/icons/mob/species/misc/digitigrade.dmi differ
diff --git a/icons/mob/species/vox/onmob_back_vox.dmi b/icons/mob/species/vox/onmob_back_vox.dmi
index f7d7499b6cc5..d8b23da46543 100644
Binary files a/icons/mob/species/vox/onmob_back_vox.dmi and b/icons/mob/species/vox/onmob_back_vox.dmi differ
diff --git a/icons/mob/species/vox/onmob_belt_vox.dmi b/icons/mob/species/vox/onmob_belt_vox.dmi
index 9d183ea045b4..3a054c4952a1 100644
Binary files a/icons/mob/species/vox/onmob_belt_vox.dmi and b/icons/mob/species/vox/onmob_belt_vox.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/aicards.dmi b/icons/obj/aicards.dmi
index 5698962eb9fb..a0b0ecba5be7 100644
Binary files a/icons/obj/aicards.dmi and b/icons/obj/aicards.dmi differ
diff --git a/icons/obj/aicardsradial.dmi b/icons/obj/aicardsradial.dmi
new file mode 100644
index 000000000000..ad5b874b221c
Binary files /dev/null and b/icons/obj/aicardsradial.dmi differ
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index f96b0fd582dc..8a042bc0d081 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi
index 62d085bd97e7..0b48ccfaf785 100644
Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ
diff --git a/icons/obj/clothing/faction/suns/accessory.dmi b/icons/obj/clothing/faction/suns/accessory.dmi
new file mode 100644
index 000000000000..fed96f7c2ee2
Binary files /dev/null and b/icons/obj/clothing/faction/suns/accessory.dmi differ
diff --git a/icons/obj/clothing/faction/suns/eyes.dmi b/icons/obj/clothing/faction/suns/eyes.dmi
new file mode 100644
index 000000000000..5695d1868d4d
Binary files /dev/null and b/icons/obj/clothing/faction/suns/eyes.dmi differ
diff --git a/icons/obj/clothing/faction/suns/feet.dmi b/icons/obj/clothing/faction/suns/feet.dmi
new file mode 100644
index 000000000000..478e4d9110a5
Binary files /dev/null and b/icons/obj/clothing/faction/suns/feet.dmi differ
diff --git a/icons/obj/clothing/faction/suns/hands.dmi b/icons/obj/clothing/faction/suns/hands.dmi
new file mode 100644
index 000000000000..6c7f9455773a
Binary files /dev/null and b/icons/obj/clothing/faction/suns/hands.dmi differ
diff --git a/icons/obj/clothing/faction/suns/head.dmi b/icons/obj/clothing/faction/suns/head.dmi
new file mode 100644
index 000000000000..71855c39bdc3
Binary files /dev/null and b/icons/obj/clothing/faction/suns/head.dmi differ
diff --git a/icons/obj/clothing/faction/suns/mask.dmi b/icons/obj/clothing/faction/suns/mask.dmi
new file mode 100644
index 000000000000..1417e85a42db
Binary files /dev/null and b/icons/obj/clothing/faction/suns/mask.dmi differ
diff --git a/icons/obj/clothing/faction/suns/neck.dmi b/icons/obj/clothing/faction/suns/neck.dmi
new file mode 100644
index 000000000000..617118e56be5
Binary files /dev/null and b/icons/obj/clothing/faction/suns/neck.dmi differ
diff --git a/icons/obj/clothing/faction/suns/suits.dmi b/icons/obj/clothing/faction/suns/suits.dmi
new file mode 100644
index 000000000000..03a003703f73
Binary files /dev/null and b/icons/obj/clothing/faction/suns/suits.dmi differ
diff --git a/icons/obj/clothing/faction/suns/uniforms.dmi b/icons/obj/clothing/faction/suns/uniforms.dmi
new file mode 100644
index 000000000000..69908b5e7988
Binary files /dev/null and b/icons/obj/clothing/faction/suns/uniforms.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 4ed6bb60907c..11a1d9f84857 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/shoes.dmi b/icons/obj/clothing/shoes.dmi
index a17d4b5b2bff..7123ae5ab1c2 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index c464ebddf84e..10eab742cfa6 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/suits/hooded.dmi b/icons/obj/clothing/suits/hooded.dmi
index eaf68b6f9cbd..06d98acf2358 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/spacesuits.dmi b/icons/obj/clothing/suits/spacesuits.dmi
index cde94993e63e..bd8b5e13597f 100644
Binary files a/icons/obj/clothing/suits/spacesuits.dmi and b/icons/obj/clothing/suits/spacesuits.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/clothing/under/dress.dmi b/icons/obj/clothing/under/dress.dmi
index 6227cb21a9b7..7cb59b080c3f 100644
Binary files a/icons/obj/clothing/under/dress.dmi and b/icons/obj/clothing/under/dress.dmi differ
diff --git a/icons/obj/clothing/under/syndicate.dmi b/icons/obj/clothing/under/syndicate.dmi
index 9ae89d62123f..3a0b6ff996b7 100644
Binary files a/icons/obj/clothing/under/syndicate.dmi and b/icons/obj/clothing/under/syndicate.dmi differ
diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi
index 89c576fb6069..ad39d778789b 100644
Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index dbc04307a37a..03fdf63dd00b 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index b1ed971658eb..ddf9be7b356f 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/food/frozen_treats.dmi b/icons/obj/food/frozen_treats.dmi
index 453bfaf277b7..389949dcfa08 100644
Binary files a/icons/obj/food/frozen_treats.dmi and b/icons/obj/food/frozen_treats.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/guns/energy.dmi b/icons/obj/guns/energy.dmi
index 1e250d4c9a5c..3208083cd0bd 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index 56246df09ad9..7a20a687e055 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.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/obj/machines/autolathe.dmi b/icons/obj/machines/autolathe.dmi
new file mode 100644
index 000000000000..e95269fcbcd1
Binary files /dev/null and b/icons/obj/machines/autolathe.dmi differ
diff --git a/icons/obj/machines/coffeemaker.dmi b/icons/obj/machines/coffeemaker.dmi
new file mode 100644
index 000000000000..246159f1c54f
Binary files /dev/null and b/icons/obj/machines/coffeemaker.dmi differ
diff --git a/icons/obj/machines/research.dmi b/icons/obj/machines/research.dmi
index 58fad8fae335..cac198fed256 100644
Binary files a/icons/obj/machines/research.dmi and b/icons/obj/machines/research.dmi differ
diff --git a/icons/obj/miningradio.dmi b/icons/obj/miningradio.dmi
new file mode 100644
index 000000000000..08b6052e91a0
Binary files /dev/null and b/icons/obj/miningradio.dmi differ
diff --git a/icons/obj/modular_laptop.dmi b/icons/obj/modular_laptop.dmi
index 5d1c3dee66ac..e2405820bb47 100644
Binary files a/icons/obj/modular_laptop.dmi and b/icons/obj/modular_laptop.dmi differ
diff --git a/icons/obj/plushes.dmi b/icons/obj/plushes.dmi
index 8d1f4993e770..2c982a8ac8f9 100644
Binary files a/icons/obj/plushes.dmi and b/icons/obj/plushes.dmi differ
diff --git a/icons/obj/printer.dmi b/icons/obj/printer.dmi
new file mode 100644
index 000000000000..6b0ea97e29f4
Binary files /dev/null and b/icons/obj/printer.dmi differ
diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi
index 5ccb6bb1d792..8b6fc77c7726 100644
Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index f208dbbe1547..e88a183d2c40 100644
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 5761aae6d4c4..250f7220713d 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 1fa68293cd4a..d94097ddf2e5 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi
index 583a9fe6c7c6..78aebb9416c4 100644
Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ
diff --git a/icons/obj/vehicles.dmi b/icons/obj/vehicles.dmi
index cb38fecefcfa..87cef669faf0 100644
Binary files a/icons/obj/vehicles.dmi and b/icons/obj/vehicles.dmi differ
diff --git a/icons/stamp_icons/large_stamp-artificer.png b/icons/stamp_icons/large_stamp-artificer.png
new file mode 100644
index 000000000000..058a4407428c
Binary files /dev/null and b/icons/stamp_icons/large_stamp-artificer.png differ
diff --git a/icons/stamp_icons/large_stamp-bard.png b/icons/stamp_icons/large_stamp-bard.png
new file mode 100644
index 000000000000..8ca5a9367e61
Binary files /dev/null and b/icons/stamp_icons/large_stamp-bard.png differ
diff --git a/icons/stamp_icons/large_stamp-cmm.png b/icons/stamp_icons/large_stamp-cmm.png
new file mode 100644
index 000000000000..7ae1c93cfddc
Binary files /dev/null and b/icons/stamp_icons/large_stamp-cmm.png differ
diff --git a/icons/stamp_icons/large_stamp-cybersun.png b/icons/stamp_icons/large_stamp-cybersun.png
new file mode 100644
index 000000000000..5a1791bce623
Binary files /dev/null and b/icons/stamp_icons/large_stamp-cybersun.png differ
diff --git a/icons/stamp_icons/large_stamp-donk.png b/icons/stamp_icons/large_stamp-donk.png
new file mode 100644
index 000000000000..5b9d204bc669
Binary files /dev/null and b/icons/stamp_icons/large_stamp-donk.png differ
diff --git a/icons/stamp_icons/large_stamp-gold.png b/icons/stamp_icons/large_stamp-gold.png
new file mode 100644
index 000000000000..6ca44db30487
Binary files /dev/null and b/icons/stamp_icons/large_stamp-gold.png differ
diff --git a/icons/stamp_icons/large_stamp-inteq.png b/icons/stamp_icons/large_stamp-inteq.png
new file mode 100644
index 000000000000..31370e095c53
Binary files /dev/null and b/icons/stamp_icons/large_stamp-inteq.png differ
diff --git a/icons/stamp_icons/large_stamp-maa.png b/icons/stamp_icons/large_stamp-maa.png
new file mode 100644
index 000000000000..19d4345e2006
Binary files /dev/null and b/icons/stamp_icons/large_stamp-maa.png differ
diff --git a/icons/stamp_icons/large_stamp-vanguard.png b/icons/stamp_icons/large_stamp-vanguard.png
new file mode 100644
index 000000000000..1897011ec86d
Binary files /dev/null and b/icons/stamp_icons/large_stamp-vanguard.png 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/icons/turf/space.dmi b/icons/turf/space.dmi
index 33e3fab9a478..b8c52e459638 100644
Binary files a/icons/turf/space.dmi and b/icons/turf/space.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 071758700aea..f1c0517dbdd3 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -223,7 +223,6 @@
#include "code\_globalvars\lists\achievements.dm"
#include "code\_globalvars\lists\admin.dm"
#include "code\_globalvars\lists\client.dm"
-#include "code\_globalvars\lists\faxes.dm"
#include "code\_globalvars\lists\flavor_misc.dm"
#include "code\_globalvars\lists\jobs.dm"
#include "code\_globalvars\lists\keybindings.dm"
@@ -531,6 +530,7 @@
#include "code\datums\components\udder.dm"
#include "code\datums\components\uplink.dm"
#include "code\datums\components\wearertargeting.dm"
+#include "code\datums\components\weatherannouncer.dm"
#include "code\datums\components\wet_floor.dm"
#include "code\datums\components\crafting\crafting.dm"
#include "code\datums\components\crafting\recipes.dm"
@@ -792,7 +792,6 @@
#include "code\game\area\Space_Station_13_areas.dm"
#include "code\game\area\areas\away_content.dm"
#include "code\game\area\areas\centcom.dm"
-#include "code\game\area\areas\holodeck.dm"
#include "code\game\area\areas\outpost.dm"
#include "code\game\area\areas\shuttles.dm"
#include "code\game\area\areas\ruins\_ruins.dm"
@@ -858,7 +857,6 @@
#include "code\game\machinery\doppler_array.dm"
#include "code\game\machinery\droneDispenser.dm"
#include "code\game\machinery\exp_cloner.dm"
-#include "code\game\machinery\fat_sucker.dm"
#include "code\game\machinery\firealarm.dm"
#include "code\game\machinery\flasher.dm"
#include "code\game\machinery\gulag_item_reclaimer.dm"
@@ -1352,6 +1350,7 @@
#include "code\game\objects\structures\petrified_statue.dm"
#include "code\game\objects\structures\plasticflaps.dm"
#include "code\game\objects\structures\poddoor_assembly.dm"
+#include "code\game\objects\structures\printer.dm"
#include "code\game\objects\structures\radioactive.dm"
#include "code\game\objects\structures\railings.dm"
#include "code\game\objects\structures\reflector.dm"
@@ -1466,6 +1465,7 @@
#include "code\game\turfs\open\space\space.dm"
#include "code\game\turfs\open\space\transit.dm"
#include "code\modules\admin\admin.dm"
+#include "code\modules\admin\admin_fax_panel.dm"
#include "code\modules\admin\admin_follow.dm"
#include "code\modules\admin\admin_investigate.dm"
#include "code\modules\admin\admin_ranks.dm"
@@ -1510,7 +1510,6 @@
#include "code\modules\admin\verbs\deadsay.dm"
#include "code\modules\admin\verbs\debug.dm"
#include "code\modules\admin\verbs\diagnostics.dm"
-#include "code\modules\admin\verbs\fax_manager.dm"
#include "code\modules\admin\verbs\fix_air.dm"
#include "code\modules\admin\verbs\fps.dm"
#include "code\modules\admin\verbs\getlogs.dm"
@@ -1531,6 +1530,7 @@
#include "code\modules\admin\verbs\randomverbs.dm"
#include "code\modules\admin\verbs\reestablish_db_connection.dm"
#include "code\modules\admin\verbs\rejuvenate.dm"
+#include "code\modules\admin\verbs\requests.dm"
#include "code\modules\admin\verbs\secrets.dm"
#include "code\modules\admin\verbs\selectequipment.dm"
#include "code\modules\admin\verbs\shuttlepanel.dm"
@@ -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"
@@ -1924,6 +1923,7 @@
#include "code\modules\clothing\towels.dm"
#include "code\modules\clothing\ears\_ears.dm"
#include "code\modules\clothing\factions\gezena.dm"
+#include "code\modules\clothing\factions\suns.dm"
#include "code\modules\clothing\glasses\_glasses.dm"
#include "code\modules\clothing\glasses\engine_goggles.dm"
#include "code\modules\clothing\glasses\hud.dm"
@@ -1949,14 +1949,26 @@
#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"
-#include "code\modules\clothing\outfits\solgov.dm"
#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\outfits\factions\frontiersmen.dm"
+#include "code\modules\clothing\outfits\factions\gezena.dm"
+#include "code\modules\clothing\outfits\factions\independent.dm"
+#include "code\modules\clothing\outfits\factions\inteq.dm"
+#include "code\modules\clothing\outfits\factions\minutemen.dm"
+#include "code\modules\clothing\outfits\factions\nanotrasen.dm"
+#include "code\modules\clothing\outfits\factions\roumain.dm"
+#include "code\modules\clothing\outfits\factions\solgov.dm"
+#include "code\modules\clothing\outfits\factions\syndicate.dm"
#include "code\modules\clothing\shoes\_shoes.dm"
#include "code\modules\clothing\shoes\bananashoes.dm"
#include "code\modules\clothing\shoes\colour.dm"
@@ -2130,6 +2142,7 @@
#include "code\modules\food_and_drinks\food\snacks\dough.dm"
#include "code\modules\food_and_drinks\food\snacks\meat.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\big_mortar.dm"
+#include "code\modules\food_and_drinks\kitchen_machinery\coffeemaker.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\cutting_board.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\deep_fryer.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\food_cart.dm"
@@ -2171,11 +2184,7 @@
#include "code\modules\holiday\foreign_calendar.dm"
#include "code\modules\holiday\holidays.dm"
#include "code\modules\holodeck\area_copy.dm"
-#include "code\modules\holodeck\computer.dm"
-#include "code\modules\holodeck\holo_effect.dm"
-#include "code\modules\holodeck\holodeck_map_templates.dm"
#include "code\modules\holodeck\items.dm"
-#include "code\modules\holodeck\mobs.dm"
#include "code\modules\holodeck\turfs.dm"
#include "code\modules\hydroponics\biogenerator.dm"
#include "code\modules\hydroponics\fermenting_barrel.dm"
@@ -2317,7 +2326,6 @@
#include "code\modules\language\swarmer.dm"
#include "code\modules\language\sylvan.dm"
#include "code\modules\language\teceti_unified.dm"
-#include "code\modules\language\terrum.dm"
#include "code\modules\language\vox_pidgin.dm"
#include "code\modules\language\xenocommon.dm"
#include "code\modules\library\lib_codex_gigas.dm"
@@ -2373,6 +2381,7 @@
#include "code\modules\mining\equipment\marker_beacons.dm"
#include "code\modules\mining\equipment\mineral_scanner.dm"
#include "code\modules\mining\equipment\mining_tools.dm"
+#include "code\modules\mining\equipment\miningradio.dm"
#include "code\modules\mining\equipment\regenerative_core.dm"
#include "code\modules\mining\equipment\resonator.dm"
#include "code\modules\mining\equipment\survival_pod.dm"
@@ -2530,7 +2539,6 @@
#include "code\modules\mob\living\carbon\human\species_types\dullahan.dm"
#include "code\modules\mob\living\carbon\human\species_types\ethereal.dm"
#include "code\modules\mob\living\carbon\human\species_types\flypeople.dm"
-#include "code\modules\mob\living\carbon\human\species_types\golems.dm"
#include "code\modules\mob\living\carbon\human\species_types\humans.dm"
#include "code\modules\mob\living\carbon\human\species_types\IPC.dm"
#include "code\modules\mob\living\carbon\human\species_types\jellypeople.dm"
@@ -2862,7 +2870,6 @@
#include "code\modules\paperwork\clipboard.dm"
#include "code\modules\paperwork\contract.dm"
#include "code\modules\paperwork\fax.dm"
-#include "code\modules\paperwork\fax_manager.dm"
#include "code\modules\paperwork\filingcabinet.dm"
#include "code\modules\paperwork\folders.dm"
#include "code\modules\paperwork\handlabeler.dm"
@@ -3120,6 +3127,8 @@
#include "code\modules\religion\religion_sects.dm"
#include "code\modules\religion\religion_structures.dm"
#include "code\modules\religion\rites.dm"
+#include "code\modules\requests\request.dm"
+#include "code\modules\requests\requests_manager.dm"
#include "code\modules\research\bepis.dm"
#include "code\modules\research\designs.dm"
#include "code\modules\research\destructive_analyzer.dm"
@@ -3315,7 +3324,6 @@
#include "code\modules\surgery\implant_removal.dm"
#include "code\modules\surgery\ipc_revive.dm"
#include "code\modules\surgery\limb_augmentation.dm"
-#include "code\modules\surgery\lipoplasty.dm"
#include "code\modules\surgery\lobectomy.dm"
#include "code\modules\surgery\mechanic_steps.dm"
#include "code\modules\surgery\mechanical.dm"
diff --git a/sound/machines/coffeemaker_brew.ogg b/sound/machines/coffeemaker_brew.ogg
new file mode 100644
index 000000000000..a8e25c09867a
Binary files /dev/null and b/sound/machines/coffeemaker_brew.ogg differ
diff --git a/strings/names/golem.txt b/strings/names/golem.txt
deleted file mode 100644
index 7cfcefa899da..000000000000
--- a/strings/names/golem.txt
+++ /dev/null
@@ -1,157 +0,0 @@
-Ablation
-Alabaster
-Alunite
-Andesite
-Anyhdrite
-Basalt
-Basin
-Bauxite
-Bedrock
-Bismuth
-Bismuthinite
-Bituminous Coal
-Borax
-Boulder
-Brimstone
-Brittle
-Calcite
-Cassiterite
-Cenozoic
-Chalk
-Chasm
-Cheridite
-Chert
-Chromite
-Cinnabar
-Claystone
-Coast
-Cobaltite
-Column
-Conglomerate
-Core
-Crevasse
-Crust
-Cryolite
-Crystal
-Dacite
-Diorite
-Dolomite
-Dolostone
-Dragonforce
-Earthflow
-Epoch
-Eutrophication
-Fault
-Flint
-Foliation
-Foreshock
-Fossil
-Gabbro
-Galena
-Garnierite
-Geode
-Geoge
-Gneiss
-Granite
-Graphite
-Gravel
-Groove
-Grotto
-Gypsum
-Hematite
-Hornblende
-Humus
-Igneous
-Ilmenite
-Iron
-Island
-Jasper
-Jet
-Kaolinite
-Kettle
-Kimberlite
-Komatiite
-Landslide
-Levee
-Lignite
-Limestone
-Limonite
-Luster
-Madidite
-Magnetite
-Magnitude
-Malachite
-Mantle
-Marble
-Marcasite
-Melange
-Meme
-Mica
-Microcline
-Migmatite
-Mineral
-Mountain
-Mudstone
-Obsidian
-Olivine
-Ore
-Orpiment
-Orthoclase
-Outwash
-Oxbow Lake
-Oynx
-Pahoehoe
-Pebble
-Pegmatite
-Periclase
-Petrified Wood
-Phyllite
-Pitchblende
-Plate
-Pothole
-Puddingstone
-Pyrite
-Pyrolusite
-Quake
-Quarry
-Quartz
-Quartzite
-Realgar
-Reservoir
-Rhyolite
-Rock
-Rock Salt
-Rockfall
-Rutile
-Saltpeter
-Sand
-Sandstone
-Satinspar
-Schist
-Sediment
-Seismic
-Selenite
-Serpentine
-Shale
-Shore
-Siltstone
-Slag
-Slate
-Sphalerite
-Stack
-Stalactite
-Stalagmite
-Stibnite
-Stone
-Stress
-Subduction
-Sylvite
-Talc
-Tetrahedrite
-Tidal
-Trench
-Valley
-Volcano
-Xenolith
-Yardang
-Zone
diff --git a/tgui/packages/tgui-dev-server/package.json b/tgui/packages/tgui-dev-server/package.json
index 2477641c7e79..56951b14846f 100644
--- a/tgui/packages/tgui-dev-server/package.json
+++ b/tgui/packages/tgui-dev-server/package.json
@@ -4,7 +4,7 @@
"version": "4.3.1",
"type": "module",
"dependencies": {
- "axios": "^0.21.1",
+ "axios": "^1.6.0",
"glob": "^7.1.7",
"source-map": "^0.7.3",
"stacktrace-parser": "^0.1.10",
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/assets/bg-shiptest.svg b/tgui/packages/tgui/assets/bg-shiptest.svg
new file mode 100644
index 000000000000..1da0fb0ff642
--- /dev/null
+++ b/tgui/packages/tgui/assets/bg-shiptest.svg
@@ -0,0 +1,29 @@
+
+
+
+
+
+ image/svg+xml
+
+
+ AsciiSquid
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tgui/packages/tgui/interfaces/AdminFax.js b/tgui/packages/tgui/interfaces/AdminFax.js
new file mode 100644
index 000000000000..8245bc4a9ad3
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/AdminFax.js
@@ -0,0 +1,263 @@
+import { useBackend, useLocalState } from '../backend';
+import {
+ Section,
+ Box,
+ Dropdown,
+ Button,
+ Input,
+ TextArea,
+ Divider,
+ NumberInput,
+ Tooltip,
+ Knob,
+} from '../components';
+import { Window } from '../layouts';
+
+export const AdminFax = (props, context) => {
+ return (
+
+
+
+
+ );
+};
+
+export const FaxMainPanel = (props, context) => {
+ const { act, data } = useBackend(context);
+
+ const [fax, setFax] = useLocalState(context, 'fax', '');
+ const [saved, setSaved] = useLocalState(context, 'saved', false);
+ const [paperName, setPaperName] = useLocalState(context, 'paperName', '');
+ const [fromWho, setFromWho] = useLocalState(context, 'fromWho', '');
+ const [rawText, setRawText] = useLocalState(context, 'rawText', '');
+ const [stamp, setStamp] = useLocalState(context, 'stampType', '');
+ const [stampCoordX, setStampCoordX] = useLocalState(
+ context,
+ 'stampCoordX',
+ 0
+ );
+ const [stampCoordY, setStampCoordY] = useLocalState(
+ context,
+ 'stampCoordY',
+ 0
+ );
+ const [stampAngle, setStampAngle] = useLocalState(context, 'stampAngle', 0);
+ if (stamp && data.stamps[0] !== 'None') {
+ data.stamps.unshift('None');
+ }
+ return (
+ <>
+
+
+ act('follow', {
+ faxName: fax,
+ })
+ }
+ >
+ Follow
+
+
+ }
+ >
+
+ setFax(value)}
+ />
+
+
+