| Blob | | |
"
for(var/datum/mind/blob in blob_minds)
- var/mob/M = blob.current
+ var/mob/camera/blob/M = blob.current
if(M)
dat += "| [M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""] | "
dat += "PM | "
dat += "FLW |
"
+ dat += "| Progress: [M.blobs_legit.len]/[M.blobwincount] |
"
else
dat += "| [blob.name]([blob.key])Blob not found! | "
dat += "PM |
"
diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm
index 9fd49ed497..5e1a8300c4 100644
--- a/code/modules/admin/secrets.dm
+++ b/code/modules/admin/secrets.dm
@@ -215,8 +215,8 @@
return
SSblackbox.add_details("admin_secrets_fun_used","Send CentCom Ferry")
if(!SSshuttle.toggleShuttle("ferry","ferry_home","ferry_away"))
- message_admins("[key_name_admin(usr)] moved the centcom ferry")
- log_admin("[key_name(usr)] moved the centcom ferry")
+ message_admins("[key_name_admin(usr)] moved the CentCom ferry")
+ log_admin("[key_name(usr)] moved the CentCom ferry")
if("togglearrivals")
if(!check_rights(R_ADMIN))
@@ -334,17 +334,19 @@
return
SSblackbox.add_details("admin_secrets_fun_used","Traitor All ([objective])")
for(var/mob/living/H in GLOB.player_list)
- if(!(ishuman(H)||istype(H, /mob/living/silicon/))) continue
- if(H.stat == DEAD || !H.client || !H.mind || ispAI(H)) continue
- if(is_special_character(H)) continue
- H.mind.add_antag_datum(ANTAG_DATUM_TRAITOR_CUSTOM)
- var/datum/antagonist/traitor/traitordatum = H.mind.has_antag_datum(ANTAG_DATUM_TRAITOR) //original datum self deletes
+ if(!(ishuman(H)||istype(H, /mob/living/silicon/)))
+ continue
+ if(H.stat == DEAD || !H.client || !H.mind || ispAI(H))
+ continue
+ if(is_special_character(H))
+ continue
+ var/datum/antagonist/traitor/human/T = new(H.mind)
+ T.give_objectives = FALSE
var/datum/objective/new_objective = new
new_objective.owner = H
new_objective.explanation_text = objective
- traitordatum.add_objective(new_objective)
- traitordatum.equip(FALSE)
- traitordatum.greet()
+ T.add_objective(new_objective)
+ H.mind.add_antag_datum(T)
message_admins("[key_name_admin(usr)] used everyone is a traitor secret. Objective is [objective]")
log_admin("[key_name(usr)] used everyone is a traitor secret. Objective is [objective]")
@@ -546,7 +548,8 @@
if(!check_rights(R_DEBUG))
return
var/datum/job/J = SSjob.GetJob("Security Officer")
- if(!J) return
+ if(!J)
+ return
J.total_positions = -1
J.spawn_positions = -1
message_admins("[key_name_admin(usr)] has removed the cap on security officers.")
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 05a76baeb7..73da8d9424 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -165,6 +165,7 @@
return
var/datum/round_event_control/E = locate(href_list["forceevent"]) in SSevents.control
if(E)
+ E.admin_setup(usr)
var/datum/round_event/event = E.runEvent()
if(event.announceWhen>0)
event.processing = FALSE
@@ -2240,7 +2241,7 @@
if(!newname)
return
G.name = newname
- var/description = input("Enter centcom message contents:") as message|null
+ var/description = input("Enter CentCom message contents:") as message|null
if(!description)
return
G.report_message = description
diff --git a/code/modules/admin/verbs/BrokenInhands.dm b/code/modules/admin/verbs/BrokenInhands.dm
index 732ae9e91c..20721077df 100644
--- a/code/modules/admin/verbs/BrokenInhands.dm
+++ b/code/modules/admin/verbs/BrokenInhands.dm
@@ -2,7 +2,8 @@
var/text
for(var/A in typesof(/obj/item))
var/obj/item/O = new A( locate(1,1,1) )
- if(!O) continue
+ if(!O)
+ continue
var/icon/IL = new(O.lefthand_file)
var/list/Lstates = IL.IconStates()
var/icon/IR = new(O.righthand_file)
@@ -28,7 +29,5 @@
if(text)
var/F = file("broken_icons.txt")
fdel(F)
- WRITE_FILE(F, text)
+ WRITE_FILE(F, text)
to_chat(world, "Completely successfully and written to [F]")
-
-
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 3889872275..0135bfbfa0 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -237,6 +237,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
. += " (IC)"
. += " (CLOSE)"
. += " (RSLVE)"
+ . += " (HANDLE)"
//private
/datum/admin_help/proc/LinkedReplyName(ref_src)
@@ -382,6 +383,22 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
AddInteraction("Marked as IC issue by [key_name]")
Resolve(silent = TRUE)
+//Let the initiator know their ahelp is being handled
+/datum/admin_help/proc/HandleIssue(key_name = key_name_admin(usr))
+ if(state != AHELP_ACTIVE)
+ return
+
+ var/msg = "Your ticket is now being handled by an admin. Please be patient."
+
+ if(initiator)
+ to_chat(initiator, msg)
+
+ SSblackbox.inc("ahelp_handleissue")
+ msg = "Ticket [TicketHref("#[id]")] is being handled by [key_name]"
+ message_admins(msg)
+ log_admin_private(msg)
+ AddInteraction("Being handled by [key_name]")
+
//Show the ticket panel
/datum/admin_help/proc/TicketPanel()
var/list/dat = list("Ticket #[id]")
@@ -442,6 +459,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
Close()
if("resolve")
Resolve()
+ if("handleissue")
+ HandleIssue()
if("reopen")
Reopen()
@@ -489,9 +508,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
return
if(handle_spam_prevention(msg,MUTE_ADMINHELP))
return
-
+
msg = trim(msg)
-
+
if(!msg)
return
diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm
index 922e15e8b4..2a95fd7803 100644
--- a/code/modules/admin/verbs/buildmode.dm
+++ b/code/modules/admin/verbs/buildmode.dm
@@ -181,7 +181,8 @@
if(varholder in locked && !check_rights(R_DEBUG,0))
return 1
var/thetype = input(user,"Select variable type:" ,"Type") in list("text","number","mob-reference","obj-reference","turf-reference")
- if(!thetype) return 1
+ if(!thetype)
+ return 1
switch(thetype)
if("text")
valueholder = input(user,"Enter variable value:" ,"Value", "value") as text
@@ -200,7 +201,8 @@
var/datum/mapGenerator/MP = path
options[initial(MP.buildmode_name)] = path
var/type = input(user,"Select Generator Type","Type") as null|anything in options
- if(!type) return
+ if(!type)
+ return
generator_path = options[type]
cornerA = null
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 735d0d9f95..980dfd0a59 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -31,7 +31,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
set name = "Advanced ProcCall"
set waitfor = 0
- if(!check_rights(R_DEBUG)) return
+ if(!check_rights(R_DEBUG))
+ return
var/datum/target = null
var/targetselected = 0
@@ -261,10 +262,7 @@ GLOBAL_PROTECT(LastAdminCalledProc)
if(ishuman(M))
log_admin("[key_name(src)] has blobized [M.key].")
var/mob/living/carbon/human/H = M
- spawn(0)
- var/mob/camera/blob/B = H.become_overmind(FALSE)
- B.place_blob_core(B.base_point_rate, -1) //place them wherever they are
-
+ H.become_overmind()
else
alert("Invalid mob")
diff --git a/code/modules/admin/verbs/manipulate_organs.dm b/code/modules/admin/verbs/manipulate_organs.dm
index 279d157c93..5edb1e7bca 100644
--- a/code/modules/admin/verbs/manipulate_organs.dm
+++ b/code/modules/admin/verbs/manipulate_organs.dm
@@ -36,7 +36,8 @@
var/obj/item/organ = input("Select organ/implant:", "Organ Manipulation", null) in organs
organ = organs[organ]
- if(!organ) return
+ if(!organ)
+ return
var/obj/item/organ/O
var/obj/item/implant/I
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index 6283201b41..3ceb1aeb75 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -194,15 +194,20 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list(
set category = "Mapping"
set name = "Count Objects On Level"
var/level = input("Which z-level?","Level?") as text
- if(!level) return
+ if(!level)
+ return
var/num_level = text2num(level)
- if(!num_level) return
- if(!isnum(num_level)) return
+ if(!num_level)
+ return
+ if(!isnum(num_level))
+ return
var/type_text = input("Which type path?","Path?") as text
- if(!type_text) return
+ if(!type_text)
+ return
var/type_path = text2path(type_text)
- if(!type_path) return
+ if(!type_path)
+ return
var/count = 0
@@ -238,9 +243,11 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list(
set name = "Count Objects All"
var/type_text = input("Which type path?","") as text
- if(!type_text) return
+ if(!type_text)
+ return
var/type_path = text2path(type_text)
- if(!type_path) return
+ if(!type_path)
+ return
var/count = 0
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 2ad40e5c6c..74cbc14eab 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -545,15 +545,20 @@ Traitors and the like can also be revived with the previous role mostly intact.
return
var/devastation = input("Range of total devastation. -1 to none", text("Input")) as num|null
- if(devastation == null) return
+ if(devastation == null)
+ return
var/heavy = input("Range of heavy impact. -1 to none", text("Input")) as num|null
- if(heavy == null) return
+ if(heavy == null)
+ return
var/light = input("Range of light impact. -1 to none", text("Input")) as num|null
- if(light == null) return
+ if(light == null)
+ return
var/flash = input("Range of flash. -1 to none", text("Input")) as num|null
- if(flash == null) return
+ if(flash == null)
+ return
var/flames = input("Range of flames. -1 to none", text("Input")) as num|null
- if(flames == null) return
+ if(flames == null)
+ return
if ((devastation != -1) || (heavy != -1) || (light != -1) || (flash != -1) || (flames != -1))
if ((devastation > 20) || (heavy > 20) || (light > 20) || (flames > 20))
@@ -577,9 +582,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
return
var/heavy = input("Range of heavy pulse.", text("Input")) as num|null
- if(heavy == null) return
+ if(heavy == null)
+ return
var/light = input("Range of light pulse.", text("Input")) as num|null
- if(light == null) return
+ if(light == null)
+ return
if (heavy || light)
@@ -960,7 +967,8 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
set name = "Toggle AntagHUD"
set desc = "Toggles the Admin AntagHUD"
- if(!holder) return
+ if(!holder)
+ return
var/adding_hud = !has_antag_hud()
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index 6c5ab82959..ecb05c17d0 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -107,7 +107,8 @@ Code:
..()
/obj/item/device/assembly/signaler/proc/signal()
- if(!radio_connection) return
+ if(!radio_connection)
+ return
var/datum/signal/signal = new
signal.source = src
@@ -173,7 +174,8 @@ Code:
return "The radio receiver is [on?"on":"off"]."
/obj/item/device/assembly/signaler/reciever/receive_signal(datum/signal/signal)
- if(!on) return
+ if(!on)
+ return
return ..(signal)
diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm
index 94b1b8ee45..025c05f6d4 100644
--- a/code/modules/atmospherics/environmental/LINDA_fire.dm
+++ b/code/modules/atmospherics/environmental/LINDA_fire.dm
@@ -14,10 +14,10 @@
var/oxy = air_contents.gases[/datum/gas/oxygen] ? air_contents.gases[/datum/gas/oxygen][MOLES] : 0
var/tox = air_contents.gases[/datum/gas/plasma] ? air_contents.gases[/datum/gas/plasma][MOLES] : 0
-
+ var/trit = air_contents.gases[/datum/gas/tritium] ? air_contents.gases[/datum/gas/tritium][MOLES] : 0
if(active_hotspot)
if(soh)
- if(tox > 0.5 && oxy > 0.5)
+ if((tox > 0.5 || trit > 0.5) && oxy > 0.5)
if(active_hotspot.temperature < exposed_temperature)
active_hotspot.temperature = exposed_temperature
if(active_hotspot.volume < exposed_volume)
@@ -26,11 +26,11 @@
var/igniting = 0
- if((exposed_temperature > PLASMA_MINIMUM_BURN_TEMPERATURE) && tox > 0.5)
+ if((exposed_temperature > PLASMA_MINIMUM_BURN_TEMPERATURE) && (tox > 0.5 || trit > 0.5))
igniting = 1
if(igniting)
- if(oxy < 0.5 || tox < 0.5)
+ if(oxy < 0.5)
return 0
active_hotspot = new /obj/effect/hotspot(src)
@@ -112,7 +112,7 @@
qdel(src)
return
- if(!(location.air) || !location.air.gases[/datum/gas/plasma] || !location.air.gases[/datum/gas/oxygen] || location.air.gases[/datum/gas/plasma][MOLES] < 0.5 || location.air.gases[/datum/gas/oxygen][MOLES] < 0.5)
+ if(!(location.air) || !(location.air.gases[/datum/gas/plasma] || location.air.gases[/datum/gas/tritium]) || !location.air.gases[/datum/gas/oxygen] || (location.air.gases[/datum/gas/plasma][MOLES] < 0.5 && location.air.gases[/datum/gas/tritium][MOLES] < 0.5) || location.air.gases[/datum/gas/oxygen][MOLES] < 0.5)
qdel(src)
return
diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
index 9b5ea089c2..8ddde526a7 100644
--- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
@@ -6,7 +6,6 @@ What are the archived variables for?
#define MINIMUM_HEAT_CAPACITY 0.0003
#define QUANTIZE(variable) (round(variable,0.0000001))/*I feel the need to document what happens here. Basically this is used to catch most rounding errors, however it's previous value made it so that
once gases got hot enough, most procedures wouldnt occur due to the fact that the mole counts would get rounded away. Thus, we lowered it a few orders of magnititude */
-
GLOBAL_LIST_INIT(meta_gas_info, meta_gas_list()) //see ATMOSPHERICS/gas_types.dm
GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
@@ -401,6 +400,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
/datum/gas_mixture/react(turf/open/dump_location)
. = 0
+
reaction_results = new
var/list/cached_gases = gases
@@ -438,6 +438,9 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
*/
. |= reaction.react(src, dump_location)
+ //to_chat(world,reaction.name)
+ if (. & STOP_REACTIONS)
+ break
if(.)
garbage_collect()
if(temperature < TCMB) //just for safety
diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm
index e8e25fb912..8296ab56f4 100644
--- a/code/modules/atmospherics/gasmixtures/gas_types.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_types.dm
@@ -58,7 +58,7 @@ GLOBAL_LIST_INIT(hardcoded_gases, list(/datum/gas/oxygen, /datum/gas/nitrogen, /
specific_heat = 200
name = "Plasma"
gas_overlay = "plasma"
- moles_visible = MOLES_PLASMA_VISIBLE
+ moles_visible = MOLES_GAS_VISIBLE
dangerous = TRUE
/datum/gas/water_vapor
@@ -66,14 +66,14 @@ GLOBAL_LIST_INIT(hardcoded_gases, list(/datum/gas/oxygen, /datum/gas/nitrogen, /
specific_heat = 40
name = "Water Vapor"
gas_overlay = "water_vapor"
- moles_visible = MOLES_PLASMA_VISIBLE
+ moles_visible = MOLES_GAS_VISIBLE
-/datum/gas/freon
- id = "freon"
+/datum/gas/hypernoblium
+ id = "nob"
specific_heat = 2000
- name = "Freon"
+ name = "Hyper-noblium"
gas_overlay = "freon"
- moles_visible = MOLES_PLASMA_VISIBLE
+ moles_visible = MOLES_GAS_VISIBLE
dangerous = TRUE
/datum/gas/nitrous_oxide
@@ -84,15 +84,21 @@ GLOBAL_LIST_INIT(hardcoded_gases, list(/datum/gas/oxygen, /datum/gas/nitrogen, /
moles_visible = 1
dangerous = TRUE
-/datum/gas/oxygen_agent_b
- id = "agent_b"
- specific_heat = 300
- name = "Oxygen Agent B"
+/datum/gas/brown_gas //This is nitric oxide, but given generic name to avoid confusion with nitrous oxide(N20 vs. NO2)
+ id = "browns"
+ specific_heat = 20
+ name = "Brown Gas"
+ gas_overlay = "browns"
+ moles_visible = MOLES_GAS_VISIBLE
+ dangerous = TRUE
-/datum/gas/volatile_fuel
- id = "v_fuel"
- specific_heat = 30
- name = "Volatile Fuel"
+/datum/gas/tritium
+ id = "tritium"
+ specific_heat = 10
+ name = "Tritium"
+ gas_overlay = "tritium"
+ moles_visible = MOLES_GAS_VISIBLE
+ dangerous = TRUE
/datum/gas/bz
id = "bz"
@@ -100,6 +106,16 @@ GLOBAL_LIST_INIT(hardcoded_gases, list(/datum/gas/oxygen, /datum/gas/nitrogen, /
name = "BZ"
dangerous = TRUE
+/datum/gas/stimulum
+ id = "stim"
+ specific_heat = 5
+ name = "Stimulum"
+
+/datum/gas/pluoxium
+ id = "pluox"
+ specific_heat = 80
+ name = "Pluoxium"
+
/obj/effect/overlay/gas
icon = 'icons/effects/tile_effects.dmi'
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm
index d9389975bb..63b84832af 100644
--- a/code/modules/atmospherics/gasmixtures/reactions.dm
+++ b/code/modules/atmospherics/gasmixtures/reactions.dm
@@ -1,6 +1,33 @@
#define NO_REACTION 0
#define REACTING 1
-
+//Plasma fire properties
+#define OXYGEN_BURN_RATE_BASE 1.4
+#define PLASMA_BURN_RATE_DELTA 9
+#define PLASMA_UPPER_TEMPERATURE 1370+T0C
+#define PLASMA_MINIMUM_OXYGEN_NEEDED 2
+#define PLASMA_MINIMUM_OXYGEN_PLASMA_RATIO 30
+#define PLASMA_OXYGEN_FULLBURN 10
+#define FIRE_CARBON_ENERGY_RELEASED 100000 //Amount of heat released per mole of burnt carbon into the tile
+#define FIRE_PLASMA_ENERGY_RELEASED 3000000 //Amount of heat released per mole of burnt plasma into the tile
+//General assmos defines.
+#define WATER_VAPOR_FREEZE 200
+#define BROWNS_FORMATION_ENERGY 100000
+#define TRITIUM_BURN_OXY_FACTOR 100
+#define TRITIUM_BURN_TRIT_FACTOR 10
+#define SUPER_SATURATION_THRESHOLD 96
+#define STIMULUM_HEAT_SCALE 100000
+#define STIMULUM_FIRST_RISE 0.65
+#define STIMULUM_FIRST_DROP 0.065
+#define STIMULUM_SECOND_RISE 0.0009
+#define STIMULUM_ABSOLUTE_DROP 0.00000335
+#define REACTION_OPPRESSION_THRESHOLD 5
+ //Plasma fusion properties
+#define PLASMA_BINDING_ENERGY 3000000
+#define MAX_CATALYST_EFFICENCY 9
+#define PLASMA_FUSED_COEFFICENT 0.08
+#define CATALYST_COEFFICENT 0.01
+#define FUSION_PURITY_THRESHOLD 0.9
+#define FUSION_HEAT_DROPOFF 20000+T0C
/datum/controller/subsystem/air/var/list/gas_reactions //this is our singleton of all reactions
/proc/init_gas_reactions()
@@ -35,48 +62,15 @@
/datum/gas_reaction/proc/react(datum/gas_mixture/air, atom/location)
return NO_REACTION
-//agent b: converts hot co2 and agent b to oxygen. requires plasma as a catalyst. endothermic
-/datum/gas_reaction/agent_b
- priority = 2
- name = "Agent B"
- id = "agent_b"
+/datum/gas_reaction/nobliumsupression
+ priority = INFINITY
+ name = "Hyper-Noblium Reaction Supression"
+ id = "nobstop"
+/datum/gas_reaction/nobliumsupression/init_reqs()
+ min_requirements = list(/datum/gas/hypernoblium = REACTION_OPPRESSION_THRESHOLD)
-/datum/gas_reaction/agent_b/init_reqs()
- min_requirements = list(
- "TEMP" = 900,
- /datum/gas/oxygen_agent_b = MINIMUM_HEAT_CAPACITY,
- /datum/gas/plasma = MINIMUM_HEAT_CAPACITY,
- /datum/gas/carbon_dioxide = MINIMUM_HEAT_CAPACITY
- )
-
-
-/datum/gas_reaction/agent_b/react(datum/gas_mixture/air)
- var/list/cached_gases = air.gases
- var/reaction_rate = min(cached_gases[/datum/gas/carbon_dioxide][MOLES]*0.75, cached_gases[/datum/gas/plasma][MOLES]*0.25, cached_gases[/datum/gas/oxygen_agent_b][MOLES]*0.05)
-
- cached_gases[/datum/gas/carbon_dioxide][MOLES] -= reaction_rate
- cached_gases[/datum/gas/oxygen_agent_b][MOLES] -= reaction_rate*0.05
-
- ASSERT_GAS(/datum/gas/oxygen, air) //only need to assert oxygen, as this reaction doesn't occur without the other gases existing
- cached_gases[/datum/gas/oxygen][MOLES] += reaction_rate
-
- air.temperature -= (reaction_rate*20000)/air.heat_capacity()
-
- return REACTING
-
-//freon: does a freezy thing?
-/datum/gas_reaction/freon
- priority = 1
- name = "Freon"
- id = "freon"
-
-/datum/gas_reaction/freon/init_reqs()
- min_requirements = list(/datum/gas/freon = MOLES_PLASMA_VISIBLE)
-
-/datum/gas_reaction/freon/react(datum/gas_mixture/air, turf/open/location)
- . = NO_REACTION
- if(location && location.freon_gas_act())
- . = REACTING
+/datum/gas_reaction/nobliumsupression/react()
+ return STOP_REACTIONS
//water vapor: puts out fires?
/datum/gas_reaction/water_vapor
@@ -85,12 +79,15 @@
id = "vapor"
/datum/gas_reaction/water_vapor/init_reqs()
- min_requirements = list(/datum/gas/water_vapor = MOLES_PLASMA_VISIBLE)
+ min_requirements = list(/datum/gas/water_vapor = MOLES_GAS_VISIBLE)
/datum/gas_reaction/water_vapor/react(datum/gas_mixture/air, turf/open/location)
. = NO_REACTION
- if(location && location.water_vapor_gas_act())
- air.gases[/datum/gas/water_vapor][MOLES] -= MOLES_PLASMA_VISIBLE
+ if (air.temperature <= WATER_VAPOR_FREEZE)
+ if(location && location.freon_gas_act())
+ . = REACTING
+ else if(location && location.water_vapor_gas_act())
+ air.gases[/datum/gas/water_vapor][MOLES] -= MOLES_GAS_VISIBLE
. = REACTING
//fire: combustion of plasma and volatile fuel (treated as hydrocarbons). creates hotspots. exothermic
@@ -100,7 +97,7 @@
id = "fire"
/datum/gas_reaction/fire/init_reqs()
- min_requirements = list("TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST) //doesn't include plasma reqs b/c of volatile fuel stuff - consider finally axing volatile fuel
+ min_requirements = list("TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST) //doesn't include plasma reqs b/c of other, rarer, burning gases.
/datum/gas_reaction/fire/react(datum/gas_mixture/air, turf/open/location)
var/energy_released = 0
@@ -111,23 +108,23 @@
cached_results[id] = 0
//General volatile gas burn
- if(cached_gases[/datum/gas/volatile_fuel] && cached_gases[/datum/gas/volatile_fuel][MOLES])
+ if(cached_gases[/datum/gas/tritium] && cached_gases[/datum/gas/tritium][MOLES])
var/burned_fuel
if(!cached_gases[/datum/gas/oxygen])
burned_fuel = 0
- else if(cached_gases[/datum/gas/oxygen][MOLES] < cached_gases[/datum/gas/volatile_fuel][MOLES])
- burned_fuel = cached_gases[/datum/gas/oxygen][MOLES]
- cached_gases[/datum/gas/volatile_fuel][MOLES] -= burned_fuel
- cached_gases[/datum/gas/oxygen][MOLES] = 0
+ else if(cached_gases[/datum/gas/oxygen][MOLES] < cached_gases[/datum/gas/tritium][MOLES])
+ burned_fuel = cached_gases[/datum/gas/oxygen][MOLES]/TRITIUM_BURN_OXY_FACTOR
+ cached_gases[/datum/gas/tritium][MOLES] -= burned_fuel
else
- burned_fuel = cached_gases[/datum/gas/volatile_fuel][MOLES]
- cached_gases[/datum/gas/oxygen][MOLES] -= cached_gases[/datum/gas/volatile_fuel][MOLES]
+ burned_fuel = cached_gases[/datum/gas/tritium][MOLES]*TRITIUM_BURN_TRIT_FACTOR
+ cached_gases[/datum/gas/tritium][MOLES] -= cached_gases[/datum/gas/tritium][MOLES]/TRITIUM_BURN_TRIT_FACTOR
+ cached_gases[/datum/gas/oxygen][MOLES] -= cached_gases[/datum/gas/tritium][MOLES]
if(burned_fuel)
energy_released += FIRE_CARBON_ENERGY_RELEASED * burned_fuel
ASSERT_GAS(/datum/gas/carbon_dioxide, air)
- cached_gases[/datum/gas/carbon_dioxide][MOLES] += burned_fuel
+ cached_gases[/datum/gas/carbon_dioxide][MOLES] += burned_fuel/TRITIUM_BURN_OXY_FACTOR
cached_results[id] += burned_fuel
@@ -137,6 +134,7 @@
var/oxygen_burn_rate = 0
//more plasma released at higher temperatures
var/temperature_scale
+ var/super_saturation
if(temperature > PLASMA_UPPER_TEMPERATURE)
temperature_scale = 1
else
@@ -144,15 +142,25 @@
if(temperature_scale > 0)
var/o2 = cached_gases[/datum/gas/oxygen] ? cached_gases[/datum/gas/oxygen][MOLES] : 0
oxygen_burn_rate = OXYGEN_BURN_RATE_BASE - temperature_scale
+ if (o2 > cached_gases[/datum/gas/plasma][MOLES]*PLASMA_OXYGEN_FULLBURN)
+ plasma_burn_rate = (cached_gases[/datum/gas/plasma][MOLES]*temperature_scale)/PLASMA_BURN_RATE_DELTA
+ if(o2 / cached_gases[/datum/gas/plasma][MOLES] > SUPER_SATURATION_THRESHOLD) //supersaturation. Form Tritium.
+ super_saturation = TRUE
if(o2 > cached_gases[/datum/gas/plasma][MOLES]*PLASMA_OXYGEN_FULLBURN)
plasma_burn_rate = (cached_gases[/datum/gas/plasma][MOLES]*temperature_scale)/PLASMA_BURN_RATE_DELTA
else
plasma_burn_rate = (temperature_scale*(o2/PLASMA_OXYGEN_FULLBURN))/PLASMA_BURN_RATE_DELTA
+
if(plasma_burn_rate > MINIMUM_HEAT_CAPACITY)
ASSERT_GAS(/datum/gas/carbon_dioxide, air) //don't need to assert o2, since if it isn't present we'll never reach this point anyway
cached_gases[/datum/gas/plasma][MOLES] = QUANTIZE(cached_gases[/datum/gas/plasma][MOLES] - plasma_burn_rate)
cached_gases[/datum/gas/oxygen][MOLES] = QUANTIZE(cached_gases[/datum/gas/oxygen][MOLES] - (plasma_burn_rate * oxygen_burn_rate))
- cached_gases[/datum/gas/carbon_dioxide][MOLES] += plasma_burn_rate
+ if (super_saturation)
+ ASSERT_GAS(/datum/gas/tritium,air)
+ cached_gases[/datum/gas/tritium][MOLES] += plasma_burn_rate
+ else
+ ASSERT_GAS(/datum/gas/carbon_dioxide,air)
+ cached_gases[/datum/gas/carbon_dioxide][MOLES] += plasma_burn_rate
energy_released += FIRE_PLASMA_ENERGY_RELEASED * (plasma_burn_rate)
@@ -175,9 +183,9 @@
return cached_results[id] ? REACTING : NO_REACTION
-//fusion: a terrible idea that was fun to try. turns co2 and plasma into REALLY HOT oxygen and nitrogen. super exothermic lol
+//fusion: a terrible idea that was fun but broken. Now reworked to be less broken and more interesting.
/datum/gas_reaction/fusion
- exclude = TRUE
+ exclude = FALSE
priority = 2
name = "Plasmic Fusion"
id = "fusion"
@@ -186,35 +194,37 @@
min_requirements = list(
"ENER" = PLASMA_BINDING_ENERGY * 10,
/datum/gas/plasma = MINIMUM_HEAT_CAPACITY,
- /datum/gas/carbon_dioxide = MINIMUM_HEAT_CAPACITY
+ /datum/gas/tritium = MINIMUM_HEAT_CAPACITY
)
/datum/gas_reaction/fusion/react(datum/gas_mixture/air)
var/list/cached_gases = air.gases
var/temperature = air.temperature
- if((cached_gases[/datum/gas/plasma][MOLES]+cached_gases[/datum/gas/carbon_dioxide][MOLES])/air.total_moles() < FUSION_PURITY_THRESHOLD)
- //Fusion wont occur if the level of impurities is too high.
+ if(((cached_gases[/datum/gas/plasma][MOLES]+cached_gases[/datum/gas/tritium][MOLES])/air.total_moles() < FUSION_PURITY_THRESHOLD) || air.return_pressure() < 10*ONE_ATMOSPHERE)
+ //Fusion wont occur if the level of impurities is too high or if there is too little pressure.
return NO_REACTION
var/old_heat_capacity = air.heat_capacity()
- var/carbon_efficency = min(cached_gases[/datum/gas/plasma][MOLES]/cached_gases[/datum/gas/carbon_dioxide][MOLES],MAX_CARBON_EFFICENCY)
+ var/catalyst_efficency = max(min(cached_gases[/datum/gas/plasma][MOLES]/cached_gases[/datum/gas/tritium][MOLES],MAX_CATALYST_EFFICENCY)-(temperature/FUSION_HEAT_DROPOFF),1)
var/reaction_energy = THERMAL_ENERGY(air)
- var/moles_impurities = air.total_moles()-(cached_gases[/datum/gas/plasma][MOLES]+cached_gases[/datum/gas/carbon_dioxide][MOLES])
+ var/moles_impurities = air.total_moles()-(cached_gases[/datum/gas/plasma][MOLES]+cached_gases[/datum/gas/tritium][MOLES])
- var/plasma_fused = (PLASMA_FUSED_COEFFICENT*carbon_efficency)*(temperature/PLASMA_BINDING_ENERGY)
- var/carbon_catalyzed = (CARBON_CATALYST_COEFFICENT*carbon_efficency)*(temperature/PLASMA_BINDING_ENERGY)
- var/oxygen_added = carbon_catalyzed
- var/nitrogen_added = (plasma_fused-oxygen_added)-(THERMAL_ENERGY(air)/PLASMA_BINDING_ENERGY)
+ var/plasma_fused = (PLASMA_FUSED_COEFFICENT*catalyst_efficency)*(temperature/PLASMA_BINDING_ENERGY)*4
+ var/tritium_catalyzed = (CATALYST_COEFFICENT*catalyst_efficency)*(temperature/PLASMA_BINDING_ENERGY)
+ var/oxygen_added = tritium_catalyzed
+ var/waste_added = (plasma_fused-oxygen_added)-((air.total_moles()*air.heat_capacity())/PLASMA_BINDING_ENERGY)
+ reaction_energy = max(reaction_energy+((catalyst_efficency*cached_gases[/datum/gas/plasma][MOLES])/((moles_impurities/catalyst_efficency)+2)*10)+((plasma_fused/((moles_impurities/catalyst_efficency)))*PLASMA_BINDING_ENERGY),0)
- reaction_energy = max(reaction_energy+((carbon_efficency*cached_gases[/datum/gas/plasma][MOLES])/((moles_impurities/carbon_efficency)+2)*10)+((plasma_fused/(moles_impurities/carbon_efficency))*PLASMA_BINDING_ENERGY),0)
-
- air.assert_gases(/datum/gas/oxygen, /datum/gas/nitrogen)
-
- cached_gases[/datum/gas/plasma][MOLES] -= plasma_fused
- cached_gases[/datum/gas/carbon_dioxide][MOLES] -= carbon_catalyzed
+ air.assert_gases(/datum/gas/oxygen, /datum/gas/nitrogen, /datum/gas/water_vapor, /datum/gas/nitrous_oxide, /datum/gas/brown_gas)
+ //Fusion produces an absurd amount of waste products now, requiring active filtration.
+ cached_gases[/datum/gas/plasma][MOLES] = max(cached_gases[/datum/gas/plasma][MOLES] - plasma_fused,0)
+ cached_gases[/datum/gas/tritium][MOLES] = max(cached_gases[/datum/gas/tritium][MOLES] - tritium_catalyzed,0)
cached_gases[/datum/gas/oxygen][MOLES] += oxygen_added
- cached_gases[/datum/gas/nitrogen][MOLES] += nitrogen_added
+ cached_gases[/datum/gas/nitrogen][MOLES] += waste_added
+ cached_gases[/datum/gas/water_vapor][MOLES] += waste_added
+ cached_gases[/datum/gas/nitrous_oxide][MOLES] += waste_added
+ cached_gases[/datum/gas/brown_gas][MOLES] += waste_added
if(reaction_energy > 0)
var/new_heat_capacity = air.heat_capacity()
@@ -223,5 +233,152 @@
//Prevents whatever mechanism is causing it to hit negative temperatures.
return REACTING
+/datum/gas_reaction/brownsformation //The formation of brown gas. Endothermic. Requires N2O as a catalyst.
+ priority = 3
+ name = "Brown Gas formation"
+ id = "brownsformation"
+
+/datum/gas_reaction/brownsformation/init_reqs()
+ min_requirements = list(
+ /datum/gas/oxygen = 20,
+ /datum/gas/nitrogen = 20,
+ /datum/gas/nitrous_oxide = 5,
+ "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST*400
+ )
+
+/datum/gas_reaction/brownsformation/react(datum/gas_mixture/air)
+ var/list/cached_gases = air.gases
+ var/temperature = air.temperature
+
+ var/old_heat_capacity = air.heat_capacity()
+ var/heat_efficency = temperature/(FIRE_MINIMUM_TEMPERATURE_TO_EXIST*100)
+ var/energy_used = heat_efficency*BROWNS_FORMATION_ENERGY
+ ASSERT_GAS(/datum/gas/brown_gas,air)
+
+ cached_gases[/datum/gas/oxygen][MOLES] -= heat_efficency
+ cached_gases[/datum/gas/nitrogen][MOLES] -= heat_efficency
+ cached_gases[/datum/gas/brown_gas][MOLES] += heat_efficency*2
+
+ if(energy_used > 0)
+ var/new_heat_capacity = air.heat_capacity()
+ if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
+ air.temperature = max(((temperature*old_heat_capacity - energy_used)/new_heat_capacity),TCMB)
+ return REACTING
+
+/datum/gas_reaction/bzformation //Formation of BZ by combining plasma and tritium at low pressures. Exothermic.
+ priority = 4
+ name = "BZ Gas formation"
+ id = "bzformation"
+
+/datum/gas_reaction/bzformation/init_reqs()
+ min_requirements = list(
+ /datum/gas/tritium = 10,
+ /datum/gas/plasma = 10
+ )
+
+
+/datum/gas_reaction/bzformation/react(datum/gas_mixture/air)
+ var/list/cached_gases = air.gases
+ var/temperature = air.temperature
+ var/pressure = air.return_pressure()
+
+ var/old_heat_capacity = air.heat_capacity()
+ var/reaction_efficency = 1/((pressure/(0.1*ONE_ATMOSPHERE))*(max(cached_gases[/datum/gas/plasma][MOLES]/cached_gases[/datum/gas/tritium][MOLES],1)))
+ var/energy_released = 2*reaction_efficency*FIRE_CARBON_ENERGY_RELEASED
+
+ ASSERT_GAS(/datum/gas/bz,air)
+ cached_gases[/datum/gas/bz][MOLES]+= reaction_efficency
+ cached_gases[/datum/gas/tritium][MOLES] = max(cached_gases[/datum/gas/tritium][MOLES]- 2*reaction_efficency,0)
+ cached_gases[/datum/gas/plasma][MOLES] = max(cached_gases[/datum/gas/plasma][MOLES] - reaction_efficency,0)
+
+
+ if(energy_released > 0)
+ var/new_heat_capacity = air.heat_capacity()
+ if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
+ air.temperature = max(((temperature*old_heat_capacity + energy_released)/new_heat_capacity),TCMB)
+ return REACTING
+
+/datum/gas_reaction/stimformation //Stimulum formation follows a strange pattern of how effective it will be at a given temperature, having some multiple peaks and some large dropoffs. Exo and endo thermic.
+ priority = 5
+ name = "Stimulum formation"
+ id = "stimformation"
+/datum/gas_reaction/stimformation/init_reqs()
+ min_requirements = list(
+ /datum/gas/tritium = 30,
+ /datum/gas/plasma = 10,
+ /datum/gas/bz = 20,
+ /datum/gas/brown_gas = 30,
+ "TEMP" = STIMULUM_HEAT_SCALE/2)
+
+/datum/gas_reaction/stimformation/react(datum/gas_mixture/air)
+ var/list/cached_gases = air.gases
+
+ var/old_heat_capacity = air.heat_capacity()
+ var/heat_scale = air.temperature/STIMULUM_HEAT_SCALE
+ var/stim_energy_change
+ stim_energy_change =heat_scale + (STIMULUM_FIRST_RISE(heat_scale**2)) - (STIMULUM_FIRST_DROP(heat_scale**3)) + (STIMULUM_SECOND_RISE(heat_scale**4)) - (STIMULUM_ABSOLUTE_DROP(heat_scale**5))
+
+ ASSERT_GAS(/datum/gas/stimulum,air)
+ cached_gases[/datum/gas/stimulum][MOLES]+= heat_scale/10
+ cached_gases[/datum/gas/tritium][MOLES] = max(cached_gases[/datum/gas/tritium][MOLES]- heat_scale,0)
+ cached_gases[/datum/gas/plasma][MOLES] = max(cached_gases[/datum/gas/plasma][MOLES]- heat_scale,0)
+ cached_gases[/datum/gas/brown_gas][MOLES] = max(cached_gases[/datum/gas/brown_gas][MOLES]- heat_scale,0)
+
+ if(stim_energy_change)
+ var/new_heat_capacity = air.heat_capacity()
+ if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
+ air.temperature = max(((air.temperature*old_heat_capacity + stim_energy_change)/new_heat_capacity),TCMB)
+ return REACTING
+
+/datum/gas_reaction/nobliumformation //Hyper-Nobelium formation is extrememly endothermic, but requires high temperatures to start. Due to its high mass, hyper-nobelium uses large amounts of nitrogen and tritium. BZ can be used as a catalyst to make it less endothermic.
+ priority = 6
+ name = "Hyper-Noblium condensation"
+ id = "nobformation"
+
+/datum/gas_reaction/nobliumformation/init_reqs()
+ min_requirements = list(
+ /datum/gas/nitrogen = 10,
+ /datum/gas/tritium = 5,
+ "TEMP" = 5000000)
+
+/datum/gas_reaction/nobliumformation/react(datum/gas_mixture/air)
+ var/list/cached_gases = air.gases
+ air.assert_gases(/datum/gas/hypernoblium,/datum/gas/bz)
+ var/old_heat_capacity = air.heat_capacity()
+ var/nob_formed = (cached_gases[/datum/gas/nitrogen][MOLES]*cached_gases[/datum/gas/tritium][MOLES])/100
+ var/energy_taken = nob_formed*(10000000/(max(cached_gases[/datum/gas/bz][MOLES],1)))
+ cached_gases[/datum/gas/tritium][MOLES] = max(cached_gases[/datum/gas/tritium][MOLES]- 10*nob_formed,0)
+ cached_gases[/datum/gas/nitrogen][MOLES] = max(cached_gases[/datum/gas/nitrogen][MOLES]- 20*nob_formed,0)
+ cached_gases[/datum/gas/hypernoblium][MOLES]+= nob_formed
+
+
+ if (nob_formed)
+ var/new_heat_capacity = air.heat_capacity()
+ if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
+ air.temperature = max(((air.temperature*old_heat_capacity - energy_taken)/new_heat_capacity),TCMB)
#undef REACTING
#undef NO_REACTION
+#undef OXYGEN_BURN_RATE_BASE
+#undef PLASMA_BURN_RATE_DELTA
+#undef PLASMA_UPPER_TEMPERATURE
+#undef PLASMA_MINIMUM_OXYGEN_NEEDED
+#undef PLASMA_MINIMUM_OXYGEN_PLASMA_RATIO
+#undef PLASMA_OXYGEN_FULLBURN
+#undef FIRE_CARBON_ENERGY_RELEASED
+#undef FIRE_PLASMA_ENERGY_RELEASED
+#undef WATER_VAPOR_FREEZE
+#undef BROWNS_FORMATION_ENERGY
+#undef TRITIUM_BURN_OXY_FACTOR
+#undef SUPER_SATURATION_THRESHOLD
+#undef STIMULUM_HEAT_SCALE
+#undef STIMULUM_FIRST_RISE
+#undef STIMULUM_FIRST_DROP
+#undef STIMULUM_SECOND_RISE
+#undef STIMULUM_ABSOLUTE_DROP
+#undef REACTION_OPPRESSION_THRESHOLD
+#undef PLASMA_BINDING_ENERGY
+#undef MAX_CATALYST_EFFICENCY
+#undef PLASMA_FUSED_COEFFICENT
+#undef CATALYST_COEFFICENT
+#undef FUSION_PURITY_THRESHOLD
+#undef FUSION_HEAT_DROPOFF
\ No newline at end of file
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index 4aaa1469b8..d2603208e5 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -5,10 +5,10 @@
var/max2
/datum/tlv/New(min2 as num, min1 as num, max1 as num, max2 as num)
- src.min2 = min2
- src.min1 = min1
- src.max1 = max1
- src.max2 = max2
+ if(min2) src.min2 = min2
+ if(min1) src.min1 = min1
+ if(max1) src.max1 = max1
+ if(max2) src.max2 = max2
/datum/tlv/proc/get_danger_level(val as num)
if(max2 != -1 && val >= max2)
@@ -21,13 +21,25 @@
return 1
return 0
+/datum/tlv/no_checks
+ min2 = -1
+ min1 = -1
+ max1 = -1
+ max2 = -1
+
+/datum/tlv/dangerous
+ min2 = -1
+ min1 = -1
+ max1 = 0.2
+ max2 = 0.5
+
/obj/item/electronics/airalarm
name = "air alarm electronics"
icon_state = "airalarm_electronics"
/obj/item/wallframe/airalarm
name = "air alarm frame"
- desc = "Used for building Air Alarms"
+ desc = "Used for building Air Alarms."
icon = 'icons/obj/monitors.dmi'
icon_state = "alarm_bitem"
result_path = /obj/machinery/airalarm
@@ -78,25 +90,33 @@
/datum/gas/oxygen = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa
/datum/gas/nitrogen = new/datum/tlv(-1, -1, 1000, 1000), // Partial pressure, kpa
/datum/gas/carbon_dioxide = new/datum/tlv(-1, -1, 5, 10), // Partial pressure, kpa
- /datum/gas/plasma = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
- /datum/gas/nitrous_oxide = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
- /datum/gas/bz = new/datum/tlv(-1, -1, 0.2, 0.5),
- /datum/gas/freon = new/datum/tlv(-1, -1, 0.2, 0.5),
- /datum/gas/water_vapor = new/datum/tlv(-1, -1, 0.2, 0.5)
+ /datum/gas/plasma = new/datum/tlv/dangerous, // Partial pressure, kpa
+ /datum/gas/nitrous_oxide = new/datum/tlv/dangerous, // Partial pressure, kpa
+ /datum/gas/bz = new/datum/tlv/dangerous,
+ /datum/gas/hypernoblium = new/datum/tlv/dangerous,
+ /datum/gas/water_vapor = new/datum/tlv/dangerous,
+ /datum/gas/tritium = new/datum/tlv/dangerous,
+ /datum/gas/stimulum = new/datum/tlv/dangerous,
+ /datum/gas/brown_gas = new/datum/tlv/dangerous,
+ /datum/gas/pluoxium = new/datum/tlv/dangerous
)
/obj/machinery/airalarm/server // No checks here.
TLV = list(
- "pressure" = new/datum/tlv(-1, -1, -1, -1),
- "temperature" = new/datum/tlv(-1, -1, -1, -1),
- /datum/gas/oxygen = new/datum/tlv(-1, -1, -1, -1),
- /datum/gas/nitrogen = new/datum/tlv(-1, -1, -1, -1),
- /datum/gas/carbon_dioxide = new/datum/tlv(-1, -1, -1, -1),
- /datum/gas/plasma = new/datum/tlv(-1, -1, -1, -1),
- /datum/gas/nitrous_oxide = new/datum/tlv(-1, -1, -1, -1),
- /datum/gas/bz = new/datum/tlv(-1, -1, -1, -1),
- /datum/gas/freon = new/datum/tlv(-1, -1, -1, -1),
- /datum/gas/water_vapor = new/datum/tlv(-1, -1, -1, -1)
+ "pressure" = new/datum/tlv/no_checks,
+ "temperature" = new/datum/tlv/no_checks,
+ /datum/gas/oxygen = new/datum/tlv/no_checks,
+ /datum/gas/nitrogen = new/datum/tlv/no_checks,
+ /datum/gas/carbon_dioxide = new/datum/tlv/no_checks,
+ /datum/gas/plasma = new/datum/tlv/no_checks,
+ /datum/gas/nitrous_oxide = new/datum/tlv/no_checks,
+ /datum/gas/bz = new/datum/tlv/no_checks,
+ /datum/gas/hypernoblium = new/datum/tlv/no_checks,
+ /datum/gas/water_vapor = new/datum/tlv/no_checks,
+ /datum/gas/tritium = new/datum/tlv/no_checks,
+ /datum/gas/stimulum = new/datum/tlv/no_checks,
+ /datum/gas/brown_gas = new/datum/tlv/no_checks,
+ /datum/gas/pluoxium = new/datum/tlv/no_checks
)
/obj/machinery/airalarm/kitchen_cold_room // Copypasta: to check temperatures.
@@ -106,11 +126,15 @@
/datum/gas/oxygen = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa
/datum/gas/nitrogen = new/datum/tlv(-1, -1, 1000, 1000), // Partial pressure, kpa
/datum/gas/carbon_dioxide = new/datum/tlv(-1, -1, 5, 10), // Partial pressure, kpa
- /datum/gas/plasma = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
- /datum/gas/nitrous_oxide = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
- /datum/gas/bz = new/datum/tlv(-1, -1, 0.2, 0.5),
- /datum/gas/freon = new/datum/tlv(-1, -1, 0.2, 0.5),
- /datum/gas/water_vapor = new/datum/tlv(-1, -1, 0.2, 0.5)
+ /datum/gas/plasma = new/datum/tlv/dangerous, // Partial pressure, kpa
+ /datum/gas/nitrous_oxide = new/datum/tlv/dangerous, // Partial pressure, kpa
+ /datum/gas/bz = new/datum/tlv/dangerous,
+ /datum/gas/hypernoblium = new/datum/tlv/dangerous,
+ /datum/gas/water_vapor = new/datum/tlv/dangerous,
+ /datum/gas/tritium = new/datum/tlv/dangerous,
+ /datum/gas/stimulum = new/datum/tlv/dangerous,
+ /datum/gas/brown_gas = new/datum/tlv/dangerous,
+ /datum/gas/pluoxium = new/datum/tlv/dangerous
)
/obj/machinery/airalarm/engine
@@ -256,8 +280,7 @@
"filter_co2" = info["filter_co2"],
"filter_toxins" = info["filter_toxins"],
"filter_n2o" = info["filter_n2o"],
- "filter_bz" = info["filter_bz"],
- "filter_freon" = info["filter_freon"],
+ "filter_rare" = info["filter_rare"],
"filter_water_vapor" = info["filter_water_vapor"]
))
data["mode"] = mode
@@ -314,7 +337,7 @@
if(usr.has_unlimited_silicon_privilege && !wires.is_cut(WIRE_IDSCAN))
locked = !locked
. = TRUE
- if("power", "co2_scrub", "tox_scrub", "n2o_scrub", "bz_scrub", "freon_scrub","water_vapor_scrub", "widenet", "scrubbing")
+ if("power", "co2_scrub", "tox_scrub", "n2o_scrub", "rare_scrub","water_vapor_scrub", "widenet", "scrubbing")
send_signal(device_id, list("[action]" = text2num(params["val"])))
. = TRUE
if("excheck")
@@ -433,8 +456,7 @@
"co2_scrub" = 1,
"tox_scrub" = 0,
"n2o_scrub" = 0,
- "bz_scrub" = 0,
- "freon_scrub"= 0,
+ "rare_scrub"= 0,
"water_vapor_scrub"= 0,
"scrubbing" = 1,
"widenet" = 0,
@@ -452,8 +474,7 @@
"co2_scrub" = 1,
"tox_scrub" = 1,
"n2o_scrub" = 1,
- "bz_scrub" = 1,
- "freon_scrub"= 1,
+ "rare_scrub"= 1,
"water_vapor_scrub"= 1,
"scrubbing" = 1,
"widenet" = 1,
@@ -484,8 +505,7 @@
"co2_scrub" = 1,
"tox_scrub" = 0,
"n2o_scrub" = 0,
- "bz_scrub" = 0,
- "freon_scrub"= 0,
+ "rare_scrub"= 0,
"water_vapor_scrub"= 0,
"scrubbing" = 1,
"widenet" = 0,
diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm
index 4eb43d6d11..6c335bf896 100644
--- a/code/modules/atmospherics/machinery/atmosmachinery.dm
+++ b/code/modules/atmospherics/machinery/atmosmachinery.dm
@@ -36,6 +36,9 @@ Pipelines + Other Objects -> Pipe network
var/device_type = 0
var/list/obj/machinery/atmospherics/nodes
+ var/construction_type
+ var/pipe_state //icon_state as a pipe item
+
/obj/machinery/atmospherics/examine(mob/user)
..()
if(is_type_in_list(src, GLOB.ventcrawl_machinery) && isliving(user))
@@ -239,7 +242,7 @@ Pipelines + Other Objects -> Pipe network
/obj/machinery/atmospherics/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1))
if(can_unwrench)
- var/obj/item/pipe/stored = new(loc, piping_layer, dir, src)
+ var/obj/item/pipe/stored = new construction_type(loc, null, dir, src)
stored.setPipingLayer(piping_layer)
if(!disassembled)
stored.obj_integrity = stored.max_integrity * 0.5
@@ -271,7 +274,7 @@ Pipelines + Other Objects -> Pipe network
if(unconnected & direction)
underlays += getpipeimage('icons/obj/atmospherics/components/binary_devices.dmi', "pipe_exposed", direction)
-/obj/machinery/atmospherics/on_construction(pipe_type, obj_color, set_layer)
+/obj/machinery/atmospherics/on_construction(obj_color, set_layer)
if(can_unwrench)
add_atom_colour(obj_color, FIXED_COLOUR_PRIORITY)
pipe_color = obj_color
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
index 158c272543..86c5375d07 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
@@ -21,6 +21,9 @@ Passive gate is similar to the regular pump except:
var/id = null
var/datum/radio_frequency/radio_connection
+ construction_type = /obj/item/pipe/directional
+ pipe_state = "passivegate"
+
/obj/machinery/atmospherics/components/binary/passive_gate/Destroy()
SSradio.remove_object(src,frequency)
return ..()
@@ -167,4 +170,3 @@ Passive gate is similar to the regular pump except:
if(. && on)
to_chat(user, "You cannot unwrench [src], turn it off first!")
return FALSE
-
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
index c5242fb5cc..97bba0e534 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
@@ -26,6 +26,9 @@ Thus, the two variables affect pump operation are set in New():
var/id = null
var/datum/radio_frequency/radio_connection
+ construction_type = /obj/item/pipe/directional
+ pipe_state = "pump"
+
/obj/machinery/atmospherics/components/binary/pump/on
on = TRUE
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm
index dbe1343667..e613012e82 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm
@@ -15,6 +15,9 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
var/open = FALSE
var/valve_type = "m" //lets us have a nice, clean, OOP update_icon_nopipes()
+ construction_type = /obj/item/pipe/binary
+ pipe_state = "mvalve"
+
/obj/machinery/atmospherics/components/binary/valve/open
open = TRUE
@@ -65,6 +68,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
desc = "A digitally controlled valve."
icon_state = "dvalve_map"
valve_type = "d"
+ pipe_state = "dvalve"
/obj/machinery/atmospherics/components/binary/valve/digital/attack_ai(mob/user)
return src.attack_hand(user)
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
index 227c34d9ca..b154c0d3e4 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
@@ -26,6 +26,9 @@ Thus, the two variables affect pump operation are set in New():
var/id = null
var/datum/radio_frequency/radio_connection
+ construction_type = /obj/item/pipe/directional
+ pipe_state = "volumepump"
+
/obj/machinery/atmospherics/components/binary/volume_pump/Destroy()
SSradio.remove_object(src,frequency)
return ..()
diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
index 68814e38b9..d0cba4d581 100644
--- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
+++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
@@ -10,6 +10,9 @@
var/frequency = 0
var/datum/radio_frequency/radio_connection
+ construction_type = /obj/item/pipe/trinary/flippable
+ pipe_state = "filter"
+
/obj/machinery/atmospherics/components/trinary/filter/flipped
icon_state = "filter_off_f"
flipped = TRUE
diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm
index 1fb8b072c6..b706cd3cd9 100644
--- a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm
+++ b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm
@@ -12,6 +12,9 @@
var/node1_concentration = 0.5
var/node2_concentration = 0.5
+ construction_type = /obj/item/pipe/trinary/flippable
+ pipe_state = "mixer"
+
//node 3 is the outlet, nodes 1 & 2 are intakes
/obj/machinery/atmospherics/components/trinary/mixer/flipped
@@ -171,4 +174,3 @@
if(. && on && is_operational())
to_chat(user, "You cannot unwrench [src], turn it off first!")
return FALSE
-
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index 423f3a64a0..4bcbd95c21 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -294,10 +294,15 @@
var/reagentlist = pretty_string_from_reagent_list(I.reagents.reagent_list)
log_game("[key_name(user)] added an [I] to cyro containing [reagentlist]")
return
- if(!on && !occupant && !state_open && (default_deconstruction_screwdriver(user, "pod-o", "pod-off", I) || exchange_parts(user, I)) \
+ if(!on && !occupant && !state_open && (default_deconstruction_screwdriver(user, "pod-off", "pod-off", I) || exchange_parts(user, I)) \
|| default_change_direction_wrench(user, I) \
|| default_pry_open(I) \
|| default_deconstruction_crowbar(I))
+ update_icon()
+ return
+ else if(istype(I, /obj/item/screwdriver))
+ to_chat(user, "You can't access the maintenance panel while the pod is " \
+ + (on ? "active" : (occupant ? "full" : "open")) + ".")
return
return ..()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm b/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm
index ee6e31175b..c8daf29ad3 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm
@@ -3,7 +3,7 @@
icon_state = "he_intact"
name = "heat exchanger"
- desc = "Exchanges heat between two input gases. Setup for fast heat transfer"
+ desc = "Exchanges heat between two input gases. Set up for fast heat transfer."
can_unwrench = TRUE
@@ -12,6 +12,8 @@
var/obj/machinery/atmospherics/components/unary/heat_exchanger/partner = null
var/update_cycle
+ pipe_state = "heunary"
+
/obj/machinery/atmospherics/components/unary/heat_exchanger/update_icon()
if(NODE1)
icon_state = "he_intact"
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
index 215ee77572..37bfb5d952 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
@@ -1,6 +1,6 @@
/obj/machinery/atmospherics/components/unary/outlet_injector
name = "air injector"
- desc = "Has a valve and pump attached to it"
+ desc = "Has a valve and pump attached to it."
icon_state = "inje_map"
use_power = IDLE_POWER_USE
can_unwrench = TRUE
@@ -18,6 +18,8 @@
level = 1
layer = GAS_SCRUBBER_LAYER
+ pipe_state = "injector"
+
/obj/machinery/atmospherics/components/unary/outlet_injector/Destroy()
SSradio.remove_object(src,frequency)
return ..()
@@ -188,4 +190,3 @@
if(. && on && is_operational())
to_chat(user, "You cannot unwrench [src], turn it off first!")
return FALSE
-
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm b/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm
index 035618c5fb..0070cce9a1 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm
@@ -3,7 +3,7 @@
icon_state = "o2gen_map"
name = "oxygen generator"
- desc = "Generates oxygen"
+ desc = "Generates oxygen."
dir = SOUTH
initialize_directions = SOUTH
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm b/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm
index ee48889041..051f3136ee 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm
@@ -9,6 +9,7 @@
level = 0
layer = GAS_FILTER_LAYER
pipe_flags = PIPING_ONE_PER_TURF
+ pipe_state = "connector"
/obj/machinery/atmospherics/components/unary/portables_connector/New()
..()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm
index 04f1068a00..ec1fcdfc52 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm
@@ -28,9 +28,6 @@
icon_state = "orange"
gas_type = /datum/gas/plasma
-/obj/machinery/atmospherics/components/unary/tank/oxygen_agent_b
- icon_state = "orange_2"
- gas_type = /datum/gas/oxygen_agent_b
/obj/machinery/atmospherics/components/unary/tank/oxygen
icon_state = "blue"
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm b/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm
index f629020d74..a335fd2f59 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm
@@ -4,6 +4,7 @@
initialize_directions = SOUTH
device_type = UNARY
pipe_flags = PIPING_ONE_PER_TURF
+ construction_type = /obj/item/pipe/directional
/obj/machinery/atmospherics/components/unary/SetInitDirections()
initialize_directions = dir
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
index 28a76f0a2d..82482b562f 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -31,6 +31,8 @@
var/radio_filter_out
var/radio_filter_in
+ pipe_state = "uvent"
+
/obj/machinery/atmospherics/components/unary/vent_pump/on
on = TRUE
icon_state = "vent_map_on"
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
index 7665f93af3..e0567ee967 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
@@ -20,8 +20,7 @@
var/scrub_CO2 = TRUE
var/scrub_Toxins = FALSE
var/scrub_N2O = FALSE
- var/scrub_BZ = FALSE
- var/scrub_Freon = FALSE
+ var/scrub_Rare = FALSE
var/scrub_WaterVapor = FALSE
@@ -34,6 +33,8 @@
var/radio_filter_out
var/radio_filter_in
+ pipe_state = "scrubber"
+
/obj/machinery/atmospherics/components/unary/vent_scrubber/New()
..()
if(!id_tag)
@@ -70,9 +71,7 @@
amount += idle_power_usage
if(scrub_N2O)
amount += idle_power_usage
- if(scrub_BZ)
- amount += idle_power_usage
- if(scrub_Freon)
+ if(scrub_Rare)
amount += idle_power_usage
if(scrub_WaterVapor)
amount += idle_power_usage
@@ -125,8 +124,7 @@
"filter_co2" = scrub_CO2,
"filter_toxins" = scrub_Toxins,
"filter_n2o" = scrub_N2O,
- "filter_bz" = scrub_BZ,
- "filter_freon" = scrub_Freon,
+ "filter_rare" =scrub_Rare,
"filter_water_vapor" = scrub_WaterVapor,
"sigtype" = "status"
)
@@ -198,37 +196,52 @@
filtered_out.temperature = removed.temperature
if(scrub_Toxins && removed_gases[/datum/gas/plasma])
- ADD_GAS(/datum/gas/plasma, filtered_out.gases)
+ ADD_GAS(/datum/gas/plasma, filtered_gases)
filtered_gases[/datum/gas/plasma][MOLES] = removed_gases[/datum/gas/plasma][MOLES]
removed_gases[/datum/gas/plasma][MOLES] = 0
if(scrub_CO2 && removed_gases[/datum/gas/carbon_dioxide])
- ADD_GAS(/datum/gas/carbon_dioxide, filtered_out.gases)
+ ADD_GAS(/datum/gas/carbon_dioxide, filtered_gases)
filtered_gases[/datum/gas/carbon_dioxide][MOLES] = removed_gases[/datum/gas/carbon_dioxide][MOLES]
removed_gases[/datum/gas/carbon_dioxide][MOLES] = 0
- if(removed_gases[/datum/gas/oxygen_agent_b])
- ADD_GAS(/datum/gas/oxygen_agent_b, filtered_out.gases)
- filtered_gases[/datum/gas/oxygen_agent_b][MOLES] = removed_gases[/datum/gas/oxygen_agent_b][MOLES]
- removed_gases[/datum/gas/oxygen_agent_b][MOLES] = 0
-
if(scrub_N2O && removed_gases[/datum/gas/nitrous_oxide])
- ADD_GAS(/datum/gas/nitrous_oxide, filtered_out.gases)
+ ADD_GAS(/datum/gas/nitrous_oxide, filtered_gases)
filtered_gases[/datum/gas/nitrous_oxide][MOLES] = removed_gases[/datum/gas/nitrous_oxide][MOLES]
removed_gases[/datum/gas/nitrous_oxide][MOLES] = 0
- if(scrub_BZ && removed_gases[/datum/gas/bz])
- ADD_GAS(/datum/gas/bz, filtered_out.gases)
+ if(scrub_Rare && removed_gases[/datum/gas/bz])
+ ADD_GAS(/datum/gas/bz, filtered_gases)
filtered_gases[/datum/gas/bz][MOLES] = removed_gases[/datum/gas/bz][MOLES]
removed_gases[/datum/gas/bz][MOLES] = 0
- if(scrub_Freon && removed_gases[/datum/gas/freon])
- ADD_GAS(/datum/gas/freon, filtered_out.gases)
- filtered_gases[/datum/gas/freon][MOLES] = removed_gases[/datum/gas/freon][MOLES]
- removed_gases[/datum/gas/freon][MOLES] = 0
+ if(scrub_Rare && removed_gases[/datum/gas/hypernoblium])
+ ADD_GAS(/datum/gas/hypernoblium, filtered_gases)
+ filtered_gases[/datum/gas/hypernoblium][MOLES] = removed_gases[/datum/gas/hypernoblium][MOLES]
+ removed_gases[/datum/gas/hypernoblium][MOLES] = 0
+
+ if(scrub_Rare && removed_gases[/datum/gas/stimulum])
+ ADD_GAS(/datum/gas/stimulum, filtered_gases)
+ filtered_gases[/datum/gas/stimulum][MOLES] = removed_gases[/datum/gas/stimulum][MOLES]
+ removed_gases[/datum/gas/stimulum][MOLES] = 0
+
+ if(scrub_Rare && removed_gases[/datum/gas/pluoxium])
+ ADD_GAS(/datum/gas/pluoxium, filtered_gases)
+ filtered_gases[/datum/gas/pluoxium][MOLES] = removed_gases[/datum/gas/pluoxium][MOLES]
+ removed_gases[/datum/gas/pluoxium][MOLES] = 0
+
+ if(scrub_Rare && removed_gases[/datum/gas/brown_gas])
+ ADD_GAS(/datum/gas/brown_gas, filtered_gases)
+ filtered_gases[/datum/gas/brown_gas][MOLES] = removed_gases[/datum/gas/brown_gas][MOLES]
+ removed_gases[/datum/gas/brown_gas][MOLES] = 0
+
+ if(scrub_Rare && removed_gases[/datum/gas/tritium])
+ ADD_GAS(/datum/gas/tritium, filtered_gases)
+ filtered_gases[/datum/gas/tritium][MOLES] = removed_gases[/datum/gas/tritium][MOLES]
+ removed_gases[/datum/gas/tritium][MOLES] = 0
if(scrub_WaterVapor && removed_gases[/datum/gas/water_vapor])
- ADD_GAS(/datum/gas/water_vapor, filtered_out.gases)
+ ADD_GAS(/datum/gas/water_vapor, filtered_gases)
filtered_gases[/datum/gas/water_vapor][MOLES] = removed_gases[/datum/gas/water_vapor][MOLES]
removed_gases[/datum/gas/water_vapor][MOLES] = 0
@@ -303,15 +316,10 @@
if("toggle_n2o_scrub" in signal.data)
scrub_N2O = !scrub_N2O
- if("bz_scrub" in signal.data)
- scrub_BZ = text2num(signal.data["bz_scrub"])
- if("toggle_bz_scrub" in signal.data)
- scrub_BZ = !scrub_BZ
-
- if("freon_scrub" in signal.data)
- scrub_Freon = text2num(signal.data["freon_scrub"])
- if("toggle_freon_scrub" in signal.data)
- scrub_Freon = !scrub_Freon
+ if("rare_scrub" in signal.data)
+ scrub_Rare = text2num(signal.data["rare_scrub"])
+ if("toggle_rare_scrub" in signal.data)
+ scrub_Rare = !scrub_Rare
if("water_vapor_scrub" in signal.data)
scrub_WaterVapor = text2num(signal.data["water_vapor_scrub"])
diff --git a/code/modules/atmospherics/machinery/other/miner.dm b/code/modules/atmospherics/machinery/other/miner.dm
index 99e6cda6af..cb28f17802 100644
--- a/code/modules/atmospherics/machinery/other/miner.dm
+++ b/code/modules/atmospherics/machinery/other/miner.dm
@@ -173,21 +173,6 @@
overlay_color = "#FAFF00"
spawn_id = /datum/gas/bz
-/obj/machinery/atmospherics/miner/freon
- name = "\improper Freon Gas Miner"
- overlay_color = "#00FFE5"
- spawn_id = /datum/gas/freon
-
-/obj/machinery/atmospherics/miner/volatile_fuel
- name = "\improper Volatile Fuel Gas Miner"
- overlay_color = "#564040"
- spawn_id = /datum/gas/volatile_fuel
-
-/obj/machinery/atmospherics/miner/agent_b
- name = "\improper Agent B Gas Miner"
- overlay_color = "#E81E24"
- spawn_id = /datum/gas/oxygen_agent_b
-
/obj/machinery/atmospherics/miner/water_vapor
name = "\improper Water Vapor Gas Miner"
overlay_color = "#99928E"
diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm
index 49c911b858..67186f09f5 100644
--- a/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm
+++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm
@@ -3,7 +3,7 @@
icon_state = "intact"
name = "junction"
- desc = "A one meter junction that connects regular and heat-exchanging pipe"
+ desc = "A one meter junction that connects regular and heat-exchanging pipe."
minimum_temperature_difference = 300
thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
@@ -13,6 +13,9 @@
initialize_directions_he = SOUTH
device_type = BINARY
+
+ construction_type = /obj/item/pipe/directional
+ pipe_state = "junction"
/obj/machinery/atmospherics/pipe/heat_exchanging/junction/SetInitDirections()
switch(dir)
@@ -43,4 +46,4 @@
return 0
init_dir = H.initialize_directions_he
if(init_dir & get_dir(target,src))
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm
index 119ca08c7d..e4df82073b 100644
--- a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm
+++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm
@@ -3,13 +3,16 @@
icon_state = "manifold"
name = "pipe manifold"
- desc = "A manifold composed of regular pipes"
+ desc = "A manifold composed of regular pipes."
dir = SOUTH
initialize_directions_he = EAST|NORTH|WEST
device_type = TRINARY
+ construction_type = /obj/item/pipe/trinary
+ pipe_state = "he_manifold"
+
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/SetInitDirections()
switch(dir)
if(NORTH)
@@ -38,12 +41,15 @@
icon_state = "manifold4w"
name = "4-way pipe manifold"
- desc = "A manifold composed of heat-exchanging pipes"
+ desc = "A manifold composed of heat-exchanging pipes."
initialize_directions_he = NORTH|SOUTH|EAST|WEST
device_type = QUATERNARY
+ construction_type = /obj/item/pipe/quaternary
+ pipe_state = "he_manifold4w"
+
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/SetInitDirections()
initialize_directions_he = initial(initialize_directions_he)
@@ -57,4 +63,4 @@
//Add non-broken pieces
for(DEVICE_TYPE_LOOP)
if(NODE_I)
- add_overlay(getpipeimage('icons/obj/atmospherics/pipes/heat.dmi', "manifold_intact[invis]", get_dir(src, NODE_I)))
\ No newline at end of file
+ add_overlay(getpipeimage('icons/obj/atmospherics/pipes/heat.dmi', "manifold_intact[invis]", get_dir(src, NODE_I)))
diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm
index 46ebf95dd0..637d55306f 100644
--- a/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm
+++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm
@@ -2,13 +2,16 @@
icon_state = "intact"
name = "pipe"
- desc = "A one meter section of heat-exchanging pipe"
+ desc = "A one meter section of heat-exchanging pipe."
dir = SOUTH
initialize_directions_he = SOUTH|NORTH
device_type = BINARY
+ construction_type = /obj/item/pipe/binary/bendable
+ pipe_state = "he"
+
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/SetInitDirections()
if(dir in GLOB.diagonals)
initialize_directions_he = dir
@@ -30,4 +33,4 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/update_icon()
normalize_dir()
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/atmospherics/machinery/pipes/layermanifold.dm b/code/modules/atmospherics/machinery/pipes/layermanifold.dm
index cc9ef36678..fee00baf50 100644
--- a/code/modules/atmospherics/machinery/pipes/layermanifold.dm
+++ b/code/modules/atmospherics/machinery/pipes/layermanifold.dm
@@ -11,6 +11,8 @@
volume = 260
var/list/front_nodes
var/list/back_nodes
+ construction_type = /obj/item/pipe/binary
+ pipe_state = "layer_manifold"
/obj/machinery/atmospherics/pipe/layer_manifold/Initialize()
front_nodes = list()
@@ -31,17 +33,7 @@
A.build_network()
/obj/machinery/atmospherics/pipe/layer_manifold/proc/get_all_connected_nodes()
- var/list/obj/machinery/atmospherics/all_connected = list()
- for(var/obj/machinery/atmospherics/I in front_nodes)
- all_connected[I] = I
- for(var/obj/machinery/atmospherics/I in back_nodes)
- all_connected[I] = I
- for(var/obj/machinery/atmospherics/I in nodes)
- all_connected[I] = I
- var/list/obj/machinery/atmospherics/returnlist = list()
- for(var/obj/machinery/atmospherics/A in all_connected)
- returnlist += all_connected[A]
- return returnlist
+ return front_nodes + back_nodes + nodes
/obj/machinery/atmospherics/pipe/layer_manifold/update_icon() //HEAVILY WIP FOR UPDATE ICONS!!
layer = (initial(layer) + (PIPING_LAYER_MAX * PIPING_LAYER_LCHANGE)) //This is above everything else.
diff --git a/code/modules/atmospherics/machinery/pipes/manifold.dm b/code/modules/atmospherics/machinery/pipes/manifold.dm
index 89aea64a81..8560addc3a 100644
--- a/code/modules/atmospherics/machinery/pipes/manifold.dm
+++ b/code/modules/atmospherics/machinery/pipes/manifold.dm
@@ -6,13 +6,16 @@
icon_state = "manifold"
name = "pipe manifold"
- desc = "A manifold composed of regular pipes"
+ desc = "A manifold composed of regular pipes."
dir = SOUTH
initialize_directions = EAST|NORTH|WEST
device_type = TRINARY
+ construction_type = /obj/item/pipe/trinary
+ pipe_state = "manifold"
+
/obj/machinery/atmospherics/pipe/manifold/SetInitDirections()
switch(dir)
if(NORTH)
@@ -168,4 +171,4 @@
layer = GAS_PIPE_VISIBLE_LAYER
/obj/machinery/atmospherics/pipe/manifold/brown/hidden
- level = PIPE_HIDDEN_LEVEL
\ No newline at end of file
+ level = PIPE_HIDDEN_LEVEL
diff --git a/code/modules/atmospherics/machinery/pipes/manifold4w.dm b/code/modules/atmospherics/machinery/pipes/manifold4w.dm
index 1c969caa28..f368c6bb0f 100644
--- a/code/modules/atmospherics/machinery/pipes/manifold4w.dm
+++ b/code/modules/atmospherics/machinery/pipes/manifold4w.dm
@@ -6,12 +6,15 @@
icon_state = "manifold4w"
name = "4-way pipe manifold"
- desc = "A manifold composed of regular pipes"
+ desc = "A manifold composed of regular pipes."
initialize_directions = NORTH|SOUTH|EAST|WEST
device_type = QUATERNARY
+ construction_type = /obj/item/pipe/quaternary
+ pipe_state = "manifold4w"
+
/obj/machinery/atmospherics/pipe/manifold4w/SetInitDirections()
initialize_directions = initial(initialize_directions)
@@ -160,4 +163,4 @@
layer = GAS_PIPE_VISIBLE_LAYER
/obj/machinery/atmospherics/pipe/manifold4w/brown/hidden
- level = PIPE_HIDDEN_LEVEL
\ No newline at end of file
+ level = PIPE_HIDDEN_LEVEL
diff --git a/code/modules/atmospherics/machinery/pipes/simple.dm b/code/modules/atmospherics/machinery/pipes/simple.dm
index e8d82c611c..0d6537b3d1 100644
--- a/code/modules/atmospherics/machinery/pipes/simple.dm
+++ b/code/modules/atmospherics/machinery/pipes/simple.dm
@@ -16,6 +16,9 @@ The regular pipe you see everywhere, including bent ones.
device_type = BINARY
+ construction_type = /obj/item/pipe/binary/bendable
+ pipe_state = "simple"
+
/obj/machinery/atmospherics/pipe/simple/SetInitDirections()
normalize_cardinal_directions()
if(dir in GLOB.diagonals)
@@ -158,4 +161,4 @@ The regular pipe you see everywhere, including bent ones.
layer = GAS_PIPE_VISIBLE_LAYER
/obj/machinery/atmospherics/pipe/simple/brown/hidden
- level = PIPE_HIDDEN_LEVEL
\ No newline at end of file
+ level = PIPE_HIDDEN_LEVEL
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index 38c96a8ec9..0a7f43b383 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -43,7 +43,6 @@
"n2o" = /obj/machinery/portable_atmospherics/canister/nitrous_oxide,
"bz" = /obj/machinery/portable_atmospherics/canister/bz,
"air" = /obj/machinery/portable_atmospherics/canister/air,
- "freon" = /obj/machinery/portable_atmospherics/canister/freon,
"water vapor" = /obj/machinery/portable_atmospherics/canister/water_vapor,
"caution" = /obj/machinery/portable_atmospherics/canister,
)
@@ -79,11 +78,6 @@
icon_state = "orange"
gas_type = /datum/gas/plasma
-/obj/machinery/portable_atmospherics/canister/agent_b
- name = "agent b canister"
- desc = "Oxygen Agent B. You're not quite sure what it does."
- gas_type = /datum/gas/oxygen_agent_b
-
/obj/machinery/portable_atmospherics/canister/bz
name = "BZ canister"
desc = "BZ, a powerful hallucinogenic nerve agent."
@@ -101,12 +95,30 @@
desc = "Pre-mixed air."
icon_state = "grey"
-/obj/machinery/portable_atmospherics/canister/freon
- name = "freon canister"
- desc = "Freon. Great for the atmosphere!"
- icon_state = "freon"
- gas_type = /datum/gas/freon
- starter_temp = 120
+/obj/machinery/portable_atmospherics/canister/tritium
+ name = "tritium canister"
+ desc = "Tritium. Inhalation might cause irradiation."
+ gas_type = /datum/gas/tritium
+
+/obj/machinery/portable_atmospherics/canister/nob
+ name = "hyper-noblium canister"
+ desc = "Hyper-Noblium. More noble than all other gases."
+ gas_type = /datum/gas/hypernoblium
+
+/obj/machinery/portable_atmospherics/canister/browns
+ name = "brown gas canister"
+ desc = "Browns gas. Feels great 'til the acid eats your lungs."
+ gas_type = /datum/gas/brown_gas
+
+/obj/machinery/portable_atmospherics/canister/stimulum
+ name = "stimulum canister"
+ desc = "Stimulum. High energy gas, high energy people."
+ gas_type = /datum/gas/stimulum
+
+/obj/machinery/portable_atmospherics/canister/pluoxium
+ name = "pluoxium canister"
+ desc = "Pluoxium. Like oxygen, but more bang for your buck."
+ gas_type = /datum/gas/pluoxium
/obj/machinery/portable_atmospherics/canister/water_vapor
name = "water vapor canister"
@@ -115,6 +127,7 @@
gas_type = /datum/gas/water_vapor
filled = 1
+
/obj/machinery/portable_atmospherics/canister/proc/get_time_left()
if(timing)
. = round(max(0, valve_timer - world.time) / 10, 1)
@@ -402,7 +415,7 @@
var/gas = air_contents.gases[id]
if(!gas[GAS_META][META_GAS_DANGER])
continue
- if(gas[MOLES] > (gas[GAS_META][META_GAS_MOLES_VISIBLE] || MOLES_PLASMA_VISIBLE)) //if moles_visible is undefined, default to plasma visibility
+ if(gas[MOLES] > (gas[GAS_META][META_GAS_MOLES_VISIBLE] || MOLES_GAS_VISIBLE)) //if moles_visible is undefined, default to default visibility
danger[gas[GAS_META][META_GAS_NAME]] = gas[MOLES] //ex. "plasma" = 20
if(danger.len)
diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm
index cd857d19a1..bb203fd6ee 100644
--- a/code/modules/atmospherics/machinery/portable/scrubber.dm
+++ b/code/modules/atmospherics/machinery/portable/scrubber.dm
@@ -7,7 +7,7 @@
var/volume_rate = 1000
volume = 1000
- var/list/scrubbing = list(/datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/oxygen_agent_b, /datum/gas/bz, /datum/gas/freon, /datum/gas/water_vapor)
+ var/list/scrubbing = list(/datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz, /datum/gas/brown_gas, /datum/gas/tritium, /datum/gas/hypernoblium, /datum/gas/water_vapor)
/obj/machinery/portable_atmospherics/scrubber/Destroy()
var/turf/T = get_turf(src)
diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm
index e424b09213..5720f1779f 100644
--- a/code/modules/awaymissions/mission_code/Academy.dm
+++ b/code/modules/awaymissions/mission_code/Academy.dm
@@ -84,7 +84,7 @@
/obj/structure/academy_wizard_spawner
name = "Academy Defensive System"
- desc = "Made by Abjuration Inc"
+ desc = "Made by Abjuration, Inc."
icon = 'icons/obj/cult.dmi'
icon_state = "forge"
anchored = TRUE
diff --git a/code/modules/awaymissions/mission_code/Cabin.dm b/code/modules/awaymissions/mission_code/Cabin.dm
index 5449ca9760..c43330d0e6 100644
--- a/code/modules/awaymissions/mission_code/Cabin.dm
+++ b/code/modules/awaymissions/mission_code/Cabin.dm
@@ -18,7 +18,7 @@
/obj/structure/firepit
name = "firepit"
- desc = "warm and toasty"
+ desc = "Warm and toasty."
icon = 'icons/obj/fireplace.dmi'
icon_state = "firepit-active"
density = FALSE
diff --git a/code/modules/awaymissions/mission_code/challenge.dm b/code/modules/awaymissions/mission_code/challenge.dm
index c878ae5361..0f28f6b3e0 100644
--- a/code/modules/awaymissions/mission_code/challenge.dm
+++ b/code/modules/awaymissions/mission_code/challenge.dm
@@ -17,7 +17,7 @@
/obj/machinery/power/emitter/energycannon
name = "Energy Cannon"
- desc = "A heavy duty industrial laser"
+ desc = "A heavy duty industrial laser."
icon = 'icons/obj/singularity.dmi'
icon_state = "emitter"
anchored = TRUE
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
index 22b12bd659..c8658c677f 100644
--- a/code/modules/awaymissions/mission_code/snowdin.dm
+++ b/code/modules/awaymissions/mission_code/snowdin.dm
@@ -40,7 +40,7 @@
/obj/item/paper/crumpled/ruins/snowdin/snowdingatewaynotice
name = "scribbled note"
info = {"The gateway has been inactive for months, engineers think it's due to the recent drop in tempature fucking with the
- circuitry or something. Without a constant supply of resources from central command, our stock is getting awfully low. Some of the security members have taken to
+ circuitry or something. Without a constant supply of resources from Central Command, our stock is getting awfully low. Some of the security members have taken to
using the sparse rifle ammo left to hunting some of the wildlife to try and keep our food supply from emptying. God forbid if the heating goes out, I don't want to
die as a fucking popsicle down here."}
@@ -65,9 +65,9 @@
The colder months are finally hitting, some of the machinery seems to be having trouble starting up sometimes. Central sent some portable heaters to help keep the airlocks from
freezing shut along with a couple storage crates with supplies. Nothing on the radio so far, what the hell do they even expect to hear down here, anyway?
September 15th
Another supply shipment through the gateway, they've sent some heavier sets of clothes for the coming winter months. Central said they might encounter issues with shipments
- during December to Feburary, so we should try to be frugal with the next shipment.
November 20th
Final shipment from central for the next few months. Going outside
+ during December to Feburary, so we should try to be frugal with the next shipment.
November 20th
Final shipment from Central for the next few months. Going outside
for more than 10-15 minutes without losing feeling in your fingers is difficult. We've finally gotten a signal on the radio, it's mostly some weird static though. One of the researchers is trying to decypher it.
-
December 10th
Signal has gotten much stronger, it almost seems like it's coming from under us according to what the researcher managed to decypher. We're waiting from the go from central before investigating.
+
December 10th
Signal has gotten much stronger, it almost seems like it's coming from under us according to what the researcher managed to decypher. We're waiting from the go from Central before investigating.
The rest of the paper seems to be a mixture of scribbles and smudged ink."}
/obj/item/paper/fluff/awaymissions/snowdin/log2
@@ -85,7 +85,7 @@
info = {"You have been assigned a position on a listening outpost. Here you'll be watching over several crewmembers assigned to watching signals of the general area.
As not much is expected in terms of issues, we've only assigned one guard per outpost. Crewmembers are expected to keep to their regulated work schedules and may be
disciplined properly if found slacking. Food hoarding is heavily discouraged as all outposts will be sharing from the same shipment every 2-3 months. Hoarding of supplies
- should be punished severely as to prevent future incidients. Mutiny and/or rioting should be reported to central and dealt with swiftly. You're here to secure and protect
+ should be punished severely as to prevent future incidients. Mutiny and/or rioting should be reported to Central and dealt with swiftly. You're here to secure and protect
Nanotrasen assets, not be a police officer. Do what you must, but make sure it's not messy."}
/obj/item/paper/fluff/awaymissions/snowdin/syndienotice
@@ -199,7 +199,7 @@
/obj/item/clothing/under/syndicate/coldres
name = "insulated tactical turtleneck"
- desc = "A non-descript and slightly suspicious looking turtleneck with digital camouflage cargo pants. The interior has been padded with special insulation for both warmth and protection"
+ desc = "A non-descript and slightly suspicious-looking turtleneck with digital camouflage cargo pants. The interior has been padded with special insulation for both warmth and protection."
armor = list(melee = 20, bullet = 10, laser = 0,energy = 5, bomb = 0, bio = 0, rad = 0, fire = 25, acid = 25)
cold_protection = CHEST|GROIN|ARMS|LEGS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm
index 6e6ee2dc4a..4aa6e88249 100644
--- a/code/modules/awaymissions/mission_code/stationCollision.dm
+++ b/code/modules/awaymissions/mission_code/stationCollision.dm
@@ -136,18 +136,41 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
/*
* Modified Nar-Sie
*/
-/obj/singularity/narsie/mini
+/obj/singularity/narsie/sc_Narsie
desc = "Your body becomes weak and your feel your mind slipping away as you try to comprehend what you know can't be possible."
move_self = 0 //Contianed narsie does not move!
grav_pull = 0 //Contained narsie does not pull stuff in!
+ var/uneatable = list(/turf/open/space, /obj/effect/overlay, /mob/living/simple_animal/hostile/construct)
//Override this to prevent no adminlog runtimes and admin warnings about a singularity without containment
-/obj/singularity/narsie/mini/admin_investigate_setup()
+/obj/singularity/narsie/sc_Narsie/admin_investigate_setup()
return
-/obj/singularity/narsie/mini/process()
+/obj/singularity/narsie/sc_Narsie/process()
eat()
if(prob(25))
mezzer()
-/obj/singularity/narsie/mini/ex_act()
+/obj/singularity/narsie/sc_Narsie/consume(atom/A)
+ if(is_type_in_list(A, uneatable))
+ return 0
+ if(isliving(A))
+ var/mob/living/L = A
+ L.gib()
+ else if(istype(A, /obj/))
+ var/obj/O = A
+ O.ex_act(EXPLODE_DEVASTATE)
+ if(O)
+ qdel(O)
+ else if(isturf(A))
+ var/turf/T = A
+ if(T.intact)
+ for(var/obj/O in T.contents)
+ if(O.level != 1)
+ continue
+ if(O.invisibility == INVISIBILITY_MAXIMUM)
+ src.consume(O)
+ T.ChangeTurf(/turf/open/space)
return
+
+/obj/singularity/narsie/sc_Narsie/ex_act()
+ return
\ No newline at end of file
diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm
index bea67c994f..84e1977179 100644
--- a/code/modules/awaymissions/zlevel.dm
+++ b/code/modules/awaymissions/zlevel.dm
@@ -20,7 +20,7 @@ GLOBAL_LIST_INIT(potentialRandomZlevels, generateMapList(filename = "config/away
/obj/effect/landmark/awaystart
name = "away mission spawn"
- desc = "Randomly picked away mission spawn points"
+ desc = "Randomly picked away mission spawn points."
/obj/effect/landmark/awaystart/New()
GLOB.awaydestinations += src
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index c5b180d8a1..4269de6069 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -937,23 +937,6 @@
crate_type = /obj/structure/closet/crate/secure/science
dangerous = TRUE
-/datum/supply_pack/science/bz_canister
- name = "BZ Canister"
- cost = 2000
- access_any = list(ACCESS_RD, ACCESS_ATMOSPHERICS)
- contains = list(/obj/machinery/portable_atmospherics/canister/bz)
- crate_name = "bz canister crate"
- crate_type = /obj/structure/closet/crate/secure/science
- dangerous = TRUE
-
-/datum/supply_pack/science/freon_canister
- name = "Freon Canister"
- cost = 6000
- access_any = list(ACCESS_RD, ACCESS_ATMOSPHERICS)
- contains = list(/obj/machinery/portable_atmospherics/canister/freon)
- crate_name = "freon canister crate"
- crate_type = /obj/structure/closet/crate/secure/science
- dangerous = TRUE
/datum/supply_pack/science/research
name = "Machine Prototype Crate"
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index deaf283418..cf8fb6ffc7 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -239,7 +239,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
S["real_name"] >> name
if(!name)
name = "Character[i]"
- //if(i!=1) dat += " | "
+ /*if(i!=1)
+ dat += " | " */
dat += "[name] "
dat += ""
diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm
index adf775f0e8..96cadfa392 100644
--- a/code/modules/client/preferences_toggles.dm
+++ b/code/modules/client/preferences_toggles.dm
@@ -391,7 +391,8 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS
set name = "Show/Hide Radio Chatter"
set category = "Preferences"
set desc = "Toggle seeing radiochatter from nearby radios and speakers"
- if(!holder) return
+ if(!holder)
+ return
prefs.chat_toggles ^= CHAT_RADIO
prefs.save_preferences()
to_chat(usr, "You will [(prefs.chat_toggles & CHAT_RADIO) ? "now" : "no longer"] see radio chatter from nearby radios or speakers")
diff --git a/code/modules/client/verbs/looc.dm b/code/modules/client/verbs/looc.dm
index 42c20a2dc6..5e07134d4f 100644
--- a/code/modules/client/verbs/looc.dm
+++ b/code/modules/client/verbs/looc.dm
@@ -4,12 +4,12 @@
set category = "OOC"
if(GLOB.say_disabled) //This is here to try to identify lag problems
- usr << " Speech is currently admin-disabled."
+ to_chat(usr, " Speech is currently admin-disabled.")
return
if(!mob) return
if(IsGuestKey(key))
- src << "Guests may not use OOC."
+ to_chat(src, "Guests may not use OOC.")
return
msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
@@ -17,23 +17,23 @@
return
if(!(prefs.toggles & CHAT_OOC))
- src << " You have OOC muted."
+ to_chat(src, " You have OOC muted.")
return
if(!holder)
if(!GLOB.ooc_allowed)
- src << " OOC is globally muted"
+ to_chat(src, " OOC is globally muted")
return
if(!GLOB.dooc_allowed && (mob.stat == DEAD))
- usr << " OOC for dead mobs has been turned off."
+ to_chat(usr, " OOC for dead mobs has been turned off.")
return
if(prefs.muted & MUTE_OOC)
- src << " You cannot use OOC (muted)."
+ to_chat(src, " You cannot use OOC (muted).")
return
if(handle_spam_prevention(msg,MUTE_OOC))
return
if(findtext(msg, "byond://"))
- src << "Advertising other servers is not allowed."
+ to_chat(src, "Advertising other servers is not allowed.")
log_admin("[key_name(src)] has attempted to advertise in LOOC: [msg]")
return
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 02d3b8e094..58c568f8a6 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -180,23 +180,7 @@
damaged_clothes = 0
cut_overlay(damaged_clothes_icons[index], TRUE)
-//Glasses
-/obj/item/clothing/glasses
- name = "glasses"
- icon = 'icons/obj/clothing/glasses.dmi'
- w_class = WEIGHT_CLASS_SMALL
- flags_cover = GLASSESCOVERSEYES
- slot_flags = SLOT_EYES
- var/vision_flags = 0
- var/darkness_view = 2//Base human is 2
- var/invis_view = SEE_INVISIBLE_LIVING
- var/invis_override = 0 //Override to allow glasses to set higher than normal see_invis
- var/lighting_alpha
- var/list/icon/current = list() //the current hud icons
- var/vision_correction = 0 //does wearing these glasses correct some of our vision defects?
- strip_delay = 20
- equip_delay_other = 25
- resistance_flags = 0
+
/*
SEE_SELF // can see self, no matter what
SEE_MOBS // can see all mobs, no matter what
@@ -207,455 +191,6 @@ SEE_PIXELS// if an object is located on an unlit area, but some of its pixels ar
BLIND // can't see anything
*/
-
-//Gloves
-/obj/item/clothing/gloves
- name = "gloves"
- gender = PLURAL //Carn: for grammarically correct text-parsing
- w_class = WEIGHT_CLASS_SMALL
- icon = 'icons/obj/clothing/gloves.dmi'
- siemens_coefficient = 0.5
- body_parts_covered = HANDS
- slot_flags = SLOT_GLOVES
- attack_verb = list("challenged")
- var/transfer_prints = FALSE
- strip_delay = 20
- equip_delay_other = 40
-
-
-/obj/item/clothing/gloves/worn_overlays(isinhands = FALSE)
- . = list()
- if(!isinhands)
- if(damaged_clothes)
- . += mutable_appearance('icons/effects/item_damage.dmi', "damagedgloves")
- if(blood_DNA)
- . += mutable_appearance('icons/effects/blood.dmi', "bloodyhands")
-
-/obj/item/clothing/gloves/update_clothes_damaged_state(damaging = TRUE)
- ..()
- if(ismob(loc))
- var/mob/M = loc
- M.update_inv_gloves()
-
-// Called just before an attack_hand(), in mob/UnarmedAttack()
-/obj/item/clothing/gloves/proc/Touch(atom/A, proximity)
- return 0 // return 1 to cancel attack_hand()
-
-//Head
-/obj/item/clothing/head
- name = "head"
- icon = 'icons/obj/clothing/hats.dmi'
- icon_state = "top_hat"
- item_state = "that"
- body_parts_covered = HEAD
- slot_flags = SLOT_HEAD
- var/blockTracking = 0 //For AI tracking
- var/can_toggle = null
- dynamic_hair_suffix = "+generic"
-
-/obj/item/clothing/head/Initialize()
- . = ..()
- if(ishuman(loc) && dynamic_hair_suffix)
- var/mob/living/carbon/human/H = loc
- H.update_hair()
-
-/obj/item/clothing/head/worn_overlays(isinhands = FALSE)
- . = list()
- if(!isinhands)
- if(damaged_clothes)
- . += mutable_appearance('icons/effects/item_damage.dmi', "damagedhelmet")
- if(blood_DNA)
- . += mutable_appearance('icons/effects/blood.dmi', "helmetblood")
-
-/obj/item/clothing/head/update_clothes_damaged_state(damaging = TRUE)
- ..()
- if(ismob(loc))
- var/mob/M = loc
- M.update_inv_head()
-
-//Neck
-/obj/item/clothing/neck
- name = "necklace"
- icon = 'icons/obj/clothing/neck.dmi'
- body_parts_covered = NECK
- slot_flags = SLOT_NECK
- strip_delay = 40
- equip_delay_other = 40
-
-/obj/item/clothing/neck/worn_overlays(isinhands = FALSE)
- . = list()
- if(!isinhands)
- if(body_parts_covered & HEAD)
- if(damaged_clothes)
- . += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask")
- if(blood_DNA)
- . += mutable_appearance('icons/effects/blood.dmi', "maskblood")
-
-
-//Mask
-/obj/item/clothing/mask
- name = "mask"
- icon = 'icons/obj/clothing/masks.dmi'
- body_parts_covered = HEAD
- slot_flags = SLOT_MASK
- strip_delay = 40
- equip_delay_other = 40
- var/mask_adjusted = 0
- var/adjusted_flags = null
-
-
-/obj/item/clothing/mask/worn_overlays(isinhands = FALSE)
- . = list()
- if(!isinhands)
- if(body_parts_covered & HEAD)
- if(damaged_clothes)
- . += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask")
- if(blood_DNA)
- . += mutable_appearance('icons/effects/blood.dmi', "maskblood")
-
-/obj/item/clothing/mask/update_clothes_damaged_state(damaging = TRUE)
- ..()
- if(ismob(loc))
- var/mob/M = loc
- M.update_inv_wear_mask()
-
-//Proc that moves gas/breath masks out of the way, disabling them and allowing pill/food consumption
-/obj/item/clothing/mask/proc/adjustmask(mob/living/user)
- if(user && user.incapacitated())
- return
- mask_adjusted = !mask_adjusted
- if(!mask_adjusted)
- src.icon_state = initial(icon_state)
- gas_transfer_coefficient = initial(gas_transfer_coefficient)
- permeability_coefficient = initial(permeability_coefficient)
- flags_1 |= visor_flags
- flags_inv |= visor_flags_inv
- flags_cover |= visor_flags_cover
- to_chat(user, "You push \the [src] back into place.")
- slot_flags = initial(slot_flags)
- else
- icon_state += "_up"
- to_chat(user, "You push \the [src] out of the way.")
- gas_transfer_coefficient = null
- permeability_coefficient = null
- flags_1 &= ~visor_flags
- flags_inv &= ~visor_flags_inv
- flags_cover &= ~visor_flags_cover
- if(adjusted_flags)
- slot_flags = adjusted_flags
- if(user)
- user.wear_mask_update(src, toggle_off = mask_adjusted)
- user.update_action_buttons_icon() //when mask is adjusted out, we update all buttons icon so the user's potential internal tank correctly shows as off.
-
-
-
-
-//Shoes
-/obj/item/clothing/shoes
- name = "shoes"
- icon = 'icons/obj/clothing/shoes.dmi'
- desc = "Comfortable-looking shoes."
- gender = PLURAL //Carn: for grammarically correct text-parsing
- var/chained = 0
-
- body_parts_covered = FEET
- slot_flags = SLOT_FEET
-
- permeability_coefficient = 0.5
- slowdown = SHOES_SLOWDOWN
- var/blood_state = BLOOD_STATE_NOT_BLOODY
- var/list/bloody_shoes = list(BLOOD_STATE_HUMAN = 0,BLOOD_STATE_XENO = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)
- var/offset = 0
- var/equipped_before_drop = FALSE
-
-/obj/item/clothing/shoes/worn_overlays(isinhands = FALSE)
- . = list()
- if(!isinhands)
- var/bloody = 0
- if(blood_DNA)
- bloody = 1
- else
- bloody = bloody_shoes[BLOOD_STATE_HUMAN]
-
- if(damaged_clothes)
- . += mutable_appearance('icons/effects/item_damage.dmi', "damagedshoe")
- if(bloody)
- . += mutable_appearance('icons/effects/blood.dmi', "shoeblood")
-
-/obj/item/clothing/shoes/equipped(mob/user, slot)
- . = ..()
- if(offset && slot_flags & slotdefine2slotbit(slot))
- user.pixel_y += offset
- worn_y_dimension -= (offset * 2)
- user.update_inv_shoes()
- equipped_before_drop = TRUE
-
-/obj/item/clothing/shoes/proc/restore_offsets(mob/user)
- equipped_before_drop = FALSE
- user.pixel_y -= offset
- worn_y_dimension = world.icon_size
-
-/obj/item/clothing/shoes/dropped(mob/user)
- if(offset && equipped_before_drop)
- restore_offsets(user)
- . = ..()
-
-/obj/item/clothing/shoes/update_clothes_damaged_state(damaging = TRUE)
- ..()
- if(ismob(loc))
- var/mob/M = loc
- M.update_inv_shoes()
-
-/obj/item/clothing/shoes/clean_blood()
- ..()
- bloody_shoes = list(BLOOD_STATE_HUMAN = 0,BLOOD_STATE_XENO = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)
- blood_state = BLOOD_STATE_NOT_BLOODY
- if(ismob(loc))
- var/mob/M = loc
- M.update_inv_shoes()
-
-/obj/item/proc/negates_gravity()
- return 0
-
-//Suit
-/obj/item/clothing/suit
- icon = 'icons/obj/clothing/suits.dmi'
- name = "suit"
- var/fire_resist = T0C+100
- allowed = list(/obj/item/tank/internals/emergency_oxygen)
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
- slot_flags = SLOT_OCLOTHING
- var/blood_overlay_type = "suit"
- var/togglename = null
-
-
-/obj/item/clothing/suit/worn_overlays(isinhands = FALSE)
- . = list()
- if(!isinhands)
- if(damaged_clothes)
- . += mutable_appearance('icons/effects/item_damage.dmi', "damaged[blood_overlay_type]")
- if(blood_DNA)
- . += mutable_appearance('icons/effects/blood.dmi', "[blood_overlay_type]blood")
- var/mob/living/carbon/human/M = loc
- if(ishuman(M) && M.w_uniform)
- var/obj/item/clothing/under/U = M.w_uniform
- if(istype(U) && U.attached_accessory)
- var/obj/item/clothing/accessory/A = U.attached_accessory
- if(A.above_suit)
- . += U.accessory_overlay
-
-/obj/item/clothing/suit/update_clothes_damaged_state(damaging = TRUE)
- ..()
- if(ismob(loc))
- var/mob/M = loc
- M.update_inv_wear_suit()
-
-//Spacesuit
-//Note: Everything in modules/clothing/spacesuits should have the entire suit grouped together.
-// Meaning the the suit is defined directly after the corrisponding helmet. Just like below!
-/obj/item/clothing/head/helmet/space
- name = "space helmet"
- icon_state = "spaceold"
- desc = "A special helmet with solar UV shielding to protect your eyes from harmful rays."
- flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
- item_state = "spaceold"
- permeability_coefficient = 0.01
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50, fire = 80, acid = 70)
- flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
- dynamic_hair_suffix = ""
- dynamic_fhair_suffix = ""
- cold_protection = HEAD
- min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
- heat_protection = HEAD
- max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
- flash_protect = 2
- strip_delay = 50
- equip_delay_other = 50
- flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
- resistance_flags = 0
- dog_fashion = null
-
-/obj/item/clothing/suit/space
- name = "space suit"
- desc = "A suit that protects against low pressure environments. Has a big 13 on the back."
- icon_state = "spaceold"
- item_state = "s_suit"
- w_class = WEIGHT_CLASS_BULKY
- gas_transfer_coefficient = 0.01
- permeability_coefficient = 0.02
- flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
- body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
- allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals)
- slowdown = 1
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50, fire = 80, acid = 70)
- flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
- cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS
- min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
- heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
- max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
- strip_delay = 80
- equip_delay_other = 80
- resistance_flags = 0
-
-//Under clothing
-
-/obj/item/clothing/under
- icon = 'icons/obj/clothing/uniforms.dmi'
- name = "under"
- body_parts_covered = CHEST|GROIN|LEGS|ARMS
- permeability_coefficient = 0.9
- slot_flags = SLOT_ICLOTHING
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
- var/fitted = FEMALE_UNIFORM_FULL // For use in alternate clothing styles for women
- var/has_sensor = HAS_SENSORS // For the crew computer
- var/random_sensor = 1
- var/sensor_mode = NO_SENSORS
- var/can_adjust = 1
- var/adjusted = NORMAL_STYLE
- var/alt_covers_chest = 0 // for adjusted/rolled-down jumpsuits, 0 = exposes chest and arms, 1 = exposes arms only
- var/obj/item/clothing/accessory/attached_accessory
- var/mutable_appearance/accessory_overlay
- var/mutantrace_variation = NO_MUTANTRACE_VARIATION //Are there special sprites for specific situations? Don't use this unless you need to.
-
-/obj/item/clothing/under/worn_overlays(isinhands = FALSE)
- . = list()
- if(!isinhands)
-
- if(damaged_clothes)
- . += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform")
- if(blood_DNA)
- . += mutable_appearance('icons/effects/blood.dmi', "uniformblood")
- if(accessory_overlay)
- . += accessory_overlay
-
-/obj/item/clothing/under/attackby(obj/item/I, mob/user, params)
- if((has_sensor == BROKEN_SENSORS) && istype(I, /obj/item/stack/cable_coil))
- var/obj/item/stack/cable_coil/C = I
- C.use(1)
- has_sensor = HAS_SENSORS
- to_chat(user,"You repair the suit sensors on [src] with [C].")
- return 1
- if(!attach_accessory(I, user))
- return ..()
-
-/obj/item/clothing/under/update_clothes_damaged_state(damaging = TRUE)
- ..()
- if(ismob(loc))
- var/mob/M = loc
- M.update_inv_w_uniform()
- if(has_sensor > NO_SENSORS)
- has_sensor = BROKEN_SENSORS
-
-/obj/item/clothing/under/New()
- if(random_sensor)
- //make the sensor mode favor higher levels, except coords.
- sensor_mode = pick(SENSOR_OFF, SENSOR_LIVING, SENSOR_LIVING, SENSOR_VITALS, SENSOR_VITALS, SENSOR_VITALS, SENSOR_COORDS, SENSOR_COORDS)
- adjusted = NORMAL_STYLE
- ..()
-
-/obj/item/clothing/under/equipped(mob/user, slot)
- ..()
- if(adjusted)
- adjusted = NORMAL_STYLE
- fitted = initial(fitted)
- if(!alt_covers_chest)
- body_parts_covered |= CHEST
-
- if(mutantrace_variation && ishuman(user))
- var/mob/living/carbon/human/H = user
- if(DIGITIGRADE in H.dna.species.species_traits)
- adjusted = DIGITIGRADE_STYLE
- H.update_inv_w_uniform()
-
- if(attached_accessory && slot != slot_hands && ishuman(user))
- var/mob/living/carbon/human/H = user
- attached_accessory.on_uniform_equip(src, user)
- if(attached_accessory.above_suit)
- H.update_inv_wear_suit()
-
-/obj/item/clothing/under/dropped(mob/user)
- if(attached_accessory)
- attached_accessory.on_uniform_dropped(src, user)
- if(ishuman(user))
- var/mob/living/carbon/human/H = user
- if(attached_accessory.above_suit)
- H.update_inv_wear_suit()
-
- ..()
-
-/obj/item/clothing/under/proc/attach_accessory(obj/item/I, mob/user, notifyAttach = 1)
- . = FALSE
- if(istype(I, /obj/item/clothing/accessory))
- var/obj/item/clothing/accessory/A = I
- if(attached_accessory)
- if(user)
- to_chat(user, "[src] already has an accessory.")
- return
- else
- if(user && !user.temporarilyRemoveItemFromInventory(I))
- return
- if(!A.attach(src, user))
- return
-
- if(user && notifyAttach)
- to_chat(user, "You attach [I] to [src].")
-
- var/accessory_color = attached_accessory.item_color
- if(!accessory_color)
- accessory_color = attached_accessory.icon_state
- accessory_overlay = mutable_appearance('icons/mob/accessories.dmi', "[accessory_color]")
- accessory_overlay.alpha = attached_accessory.alpha
- accessory_overlay.color = attached_accessory.color
-
- if(ishuman(loc))
- var/mob/living/carbon/human/H = loc
- H.update_inv_w_uniform()
- H.update_inv_wear_suit()
-
- return TRUE
-
-/obj/item/clothing/under/proc/remove_accessory(mob/user)
- if(!isliving(user))
- return
- if(!can_use(user))
- return
-
- if(attached_accessory)
- var/obj/item/clothing/accessory/A = attached_accessory
- attached_accessory.detach(src, user)
- if(user.put_in_hands(A))
- to_chat(user, "You detach [A] from [src].")
- else
- to_chat(user, "You detach [A] from [src] and it falls on the floor.")
-
- if(ishuman(loc))
- var/mob/living/carbon/human/H = loc
- H.update_inv_w_uniform()
- H.update_inv_wear_suit()
-
-
-/obj/item/clothing/under/examine(mob/user)
- ..()
- if(can_adjust)
- if(adjusted == ALT_STYLE)
- to_chat(user, "Alt-click on [src] to wear it normally.")
- else
- to_chat(user, "Alt-click on [src] to wear it casually.")
- if (has_sensor == BROKEN_SENSORS)
- to_chat(user, "Its sensors appear to be shorted out.")
- else if(has_sensor > NO_SENSORS)
- switch(sensor_mode)
- if(SENSOR_OFF)
- to_chat(user, "Its sensors appear to be disabled.")
- if(SENSOR_LIVING)
- to_chat(user, "Its binary life sensors appear to be enabled.")
- if(SENSOR_VITALS)
- to_chat(user, "Its vital tracker appears to be enabled.")
- if(SENSOR_COORDS)
- to_chat(user, "Its vital tracker and tracking beacon appear to be enabled.")
- if(attached_accessory)
- to_chat(user, "\A [attached_accessory] is attached to it.")
-
/proc/generate_female_clothing(index,t_color,icon,type)
var/icon/female_clothing_icon = icon("icon"=icon, "icon_state"=t_color)
var/icon/female_s = icon("icon"='icons/mob/uniform.dmi', "icon_state"="[(type == FEMALE_UNIFORM_FULL) ? "female_full" : "female_top"]")
@@ -799,4 +334,4 @@ BLIND // can't see anything
Shreds.desc = "The sad remains of what used to be [name]."
deconstruct(FALSE)
else
- ..()
+ ..()
\ No newline at end of file
diff --git a/code/modules/clothing/ears/ears.dm b/code/modules/clothing/ears/_ears.dm
similarity index 100%
rename from code/modules/clothing/ears/ears.dm
rename to code/modules/clothing/ears/_ears.dm
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/_glasses.dm
similarity index 92%
rename from code/modules/clothing/glasses/glasses.dm
rename to code/modules/clothing/glasses/_glasses.dm
index fb7abd7622..1263c07a91 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -1,7 +1,22 @@
+//Glasses
/obj/item/clothing/glasses
name = "glasses"
+ icon = 'icons/obj/clothing/glasses.dmi'
+ w_class = WEIGHT_CLASS_SMALL
+ flags_cover = GLASSESCOVERSEYES
+ slot_flags = SLOT_EYES
+ strip_delay = 20
+ equip_delay_other = 25
+ resistance_flags = 0
materials = list(MAT_GLASS = 250)
- var/glass_colour_type = null //colors your vision when worn
+ var/vision_flags = 0
+ var/darkness_view = 2//Base human is 2
+ var/invis_view = SEE_INVISIBLE_LIVING
+ var/invis_override = 0 //Override to allow glasses to set higher than normal see_invis
+ var/lighting_alpha
+ var/list/icon/current = list() //the current hud icons
+ var/vision_correction = 0 //does wearing these glasses correct some of our vision defects?
+ var/glass_colour_type //colors your vision when worn
/obj/item/clothing/glasses/examine(mob/user)
..()
diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm
new file mode 100644
index 0000000000..c230b14295
--- /dev/null
+++ b/code/modules/clothing/gloves/_gloves.dm
@@ -0,0 +1,31 @@
+/obj/item/clothing/gloves
+ name = "gloves"
+ gender = PLURAL //Carn: for grammarically correct text-parsing
+ w_class = WEIGHT_CLASS_SMALL
+ icon = 'icons/obj/clothing/gloves.dmi'
+ siemens_coefficient = 0.5
+ body_parts_covered = HANDS
+ slot_flags = SLOT_GLOVES
+ attack_verb = list("challenged")
+ var/transfer_prints = FALSE
+ strip_delay = 20
+ equip_delay_other = 40
+
+
+/obj/item/clothing/gloves/worn_overlays(isinhands = FALSE)
+ . = list()
+ if(!isinhands)
+ if(damaged_clothes)
+ . += mutable_appearance('icons/effects/item_damage.dmi', "damagedgloves")
+ if(blood_DNA)
+ . += mutable_appearance('icons/effects/blood.dmi', "bloodyhands")
+
+/obj/item/clothing/gloves/update_clothes_damaged_state(damaging = TRUE)
+ ..()
+ if(ismob(loc))
+ var/mob/M = loc
+ M.update_inv_gloves()
+
+// Called just before an attack_hand(), in mob/UnarmedAttack()
+/obj/item/clothing/gloves/proc/Touch(atom/A, proximity)
+ return 0 // return 1 to cancel attack_hand()
\ No newline at end of file
diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm
new file mode 100644
index 0000000000..8bc8f12dec
--- /dev/null
+++ b/code/modules/clothing/head/_head.dm
@@ -0,0 +1,30 @@
+/obj/item/clothing/head
+ name = "head"
+ icon = 'icons/obj/clothing/hats.dmi'
+ icon_state = "top_hat"
+ item_state = "that"
+ body_parts_covered = HEAD
+ slot_flags = SLOT_HEAD
+ var/blockTracking = 0 //For AI tracking
+ var/can_toggle = null
+ dynamic_hair_suffix = "+generic"
+
+/obj/item/clothing/head/Initialize()
+ . = ..()
+ if(ishuman(loc) && dynamic_hair_suffix)
+ var/mob/living/carbon/human/H = loc
+ H.update_hair()
+
+/obj/item/clothing/head/worn_overlays(isinhands = FALSE)
+ . = list()
+ if(!isinhands)
+ if(damaged_clothes)
+ . += mutable_appearance('icons/effects/item_damage.dmi', "damagedhelmet")
+ if(blood_DNA)
+ . += mutable_appearance('icons/effects/blood.dmi', "helmetblood")
+
+/obj/item/clothing/head/update_clothes_damaged_state(damaging = TRUE)
+ ..()
+ if(ismob(loc))
+ var/mob/M = loc
+ M.update_inv_head()
\ No newline at end of file
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 87106d65b4..e7b3473251 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -23,7 +23,7 @@
/obj/item/clothing/head/canada
name = "striped red tophat"
- desc = "it smells like fresh donut holes / il sent comme des trous de beignets frais"
+ desc = "It smells like fresh donut holes. / Il sent comme des trous de beignets frais."
icon_state = "canada"
item_state = "canada"
diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm
new file mode 100644
index 0000000000..eacfa3faea
--- /dev/null
+++ b/code/modules/clothing/masks/_masks.dm
@@ -0,0 +1,53 @@
+/obj/item/clothing/mask
+ name = "mask"
+ icon = 'icons/obj/clothing/masks.dmi'
+ body_parts_covered = HEAD
+ slot_flags = SLOT_MASK
+ strip_delay = 40
+ equip_delay_other = 40
+ var/mask_adjusted = 0
+ var/adjusted_flags = null
+
+
+/obj/item/clothing/mask/worn_overlays(isinhands = FALSE)
+ . = list()
+ if(!isinhands)
+ if(body_parts_covered & HEAD)
+ if(damaged_clothes)
+ . += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask")
+ if(blood_DNA)
+ . += mutable_appearance('icons/effects/blood.dmi', "maskblood")
+
+/obj/item/clothing/mask/update_clothes_damaged_state(damaging = TRUE)
+ ..()
+ if(ismob(loc))
+ var/mob/M = loc
+ M.update_inv_wear_mask()
+
+//Proc that moves gas/breath masks out of the way, disabling them and allowing pill/food consumption
+/obj/item/clothing/mask/proc/adjustmask(mob/living/user)
+ if(user && user.incapacitated())
+ return
+ mask_adjusted = !mask_adjusted
+ if(!mask_adjusted)
+ src.icon_state = initial(icon_state)
+ gas_transfer_coefficient = initial(gas_transfer_coefficient)
+ permeability_coefficient = initial(permeability_coefficient)
+ flags_1 |= visor_flags
+ flags_inv |= visor_flags_inv
+ flags_cover |= visor_flags_cover
+ to_chat(user, "You push \the [src] back into place.")
+ slot_flags = initial(slot_flags)
+ else
+ icon_state += "_up"
+ to_chat(user, "You push \the [src] out of the way.")
+ gas_transfer_coefficient = null
+ permeability_coefficient = null
+ flags_1 &= ~visor_flags
+ flags_inv &= ~visor_flags_inv
+ flags_cover &= ~visor_flags_cover
+ if(adjusted_flags)
+ slot_flags = adjusted_flags
+ if(user)
+ user.wear_mask_update(src, toggle_off = mask_adjusted)
+ user.update_action_buttons_icon() //when mask is adjusted out, we update all buttons icon so the user's potential internal tank correctly shows as off.
\ No newline at end of file
diff --git a/code/modules/clothing/neck/neck.dm b/code/modules/clothing/neck/_neck.dm
similarity index 88%
rename from code/modules/clothing/neck/neck.dm
rename to code/modules/clothing/neck/_neck.dm
index af3049aefd..2b66a85fe6 100644
--- a/code/modules/clothing/neck/neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -1,3 +1,20 @@
+/obj/item/clothing/neck
+ name = "necklace"
+ icon = 'icons/obj/clothing/neck.dmi'
+ body_parts_covered = NECK
+ slot_flags = SLOT_NECK
+ strip_delay = 40
+ equip_delay_other = 40
+
+/obj/item/clothing/neck/worn_overlays(isinhands = FALSE)
+ . = list()
+ if(!isinhands)
+ if(body_parts_covered & HEAD)
+ if(damaged_clothes)
+ . += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask")
+ if(blood_DNA)
+ . += mutable_appearance('icons/effects/blood.dmi', "maskblood")
+
/obj/item/clothing/neck/tie
name = "tie"
desc = "A neosilk clip-on tie."
@@ -42,8 +59,8 @@
var/heart_strength = "no"
var/lung_strength = "no"
- var/obj/item/organ/heart/heart = M.getorganslot("heart")
- var/obj/item/organ/lungs/lungs = M.getorganslot("lungs")
+ var/obj/item/organ/heart/heart = M.getorganslot(ORGAN_SLOT_HEART)
+ var/obj/item/organ/lungs/lungs = M.getorganslot(ORGAN_SLOT_LUNGS)
if(!(M.stat == DEAD || (M.status_flags&FAKEDEATH)))
if(heart && istype(heart))
@@ -162,4 +179,4 @@
desc = "Damn, it feels good to be a gangster."
icon = 'icons/obj/clothing/neck.dmi'
icon_state = "bling"
- item_color = "bling"
+ item_color = "bling"
\ No newline at end of file
diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm
new file mode 100644
index 0000000000..d71827df95
--- /dev/null
+++ b/code/modules/clothing/shoes/_shoes.dm
@@ -0,0 +1,65 @@
+/obj/item/clothing/shoes
+ name = "shoes"
+ icon = 'icons/obj/clothing/shoes.dmi'
+ desc = "Comfortable-looking shoes."
+ gender = PLURAL //Carn: for grammarically correct text-parsing
+ var/chained = 0
+
+ body_parts_covered = FEET
+ slot_flags = SLOT_FEET
+
+ permeability_coefficient = 0.5
+ slowdown = SHOES_SLOWDOWN
+ var/blood_state = BLOOD_STATE_NOT_BLOODY
+ var/list/bloody_shoes = list(BLOOD_STATE_HUMAN = 0,BLOOD_STATE_XENO = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)
+ var/offset = 0
+ var/equipped_before_drop = FALSE
+
+/obj/item/clothing/shoes/worn_overlays(isinhands = FALSE)
+ . = list()
+ if(!isinhands)
+ var/bloody = 0
+ if(blood_DNA)
+ bloody = 1
+ else
+ bloody = bloody_shoes[BLOOD_STATE_HUMAN]
+
+ if(damaged_clothes)
+ . += mutable_appearance('icons/effects/item_damage.dmi', "damagedshoe")
+ if(bloody)
+ . += mutable_appearance('icons/effects/blood.dmi', "shoeblood")
+
+/obj/item/clothing/shoes/equipped(mob/user, slot)
+ . = ..()
+ if(offset && slot_flags & slotdefine2slotbit(slot))
+ user.pixel_y += offset
+ worn_y_dimension -= (offset * 2)
+ user.update_inv_shoes()
+ equipped_before_drop = TRUE
+
+/obj/item/clothing/shoes/proc/restore_offsets(mob/user)
+ equipped_before_drop = FALSE
+ user.pixel_y -= offset
+ worn_y_dimension = world.icon_size
+
+/obj/item/clothing/shoes/dropped(mob/user)
+ if(offset && equipped_before_drop)
+ restore_offsets(user)
+ . = ..()
+
+/obj/item/clothing/shoes/update_clothes_damaged_state(damaging = TRUE)
+ ..()
+ if(ismob(loc))
+ var/mob/M = loc
+ M.update_inv_shoes()
+
+/obj/item/clothing/shoes/clean_blood()
+ ..()
+ bloody_shoes = list(BLOOD_STATE_HUMAN = 0,BLOOD_STATE_XENO = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)
+ blood_state = BLOOD_STATE_NOT_BLOODY
+ if(ismob(loc))
+ var/mob/M = loc
+ M.update_inv_shoes()
+
+/obj/item/proc/negates_gravity()
+ return 0
\ No newline at end of file
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index ab2763f62e..d086139ee8 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -49,7 +49,7 @@
/obj/item/clothing/shoes/sandal/magic
name = "magical sandals"
- desc = "A pair of sandals imbued with magic"
+ desc = "A pair of sandals imbued with magic."
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/clothing/shoes/galoshes
diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm
new file mode 100644
index 0000000000..32caa3adf4
--- /dev/null
+++ b/code/modules/clothing/spacesuits/_spacesuits.dm
@@ -0,0 +1,45 @@
+//Note: Everything in modules/clothing/spacesuits should have the entire suit grouped together.
+// Meaning the the suit is defined directly after the corrisponding helmet. Just like below!
+/obj/item/clothing/head/helmet/space
+ name = "space helmet"
+ icon_state = "spaceold"
+ desc = "A special helmet with solar UV shielding to protect your eyes from harmful rays."
+ flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
+ item_state = "spaceold"
+ permeability_coefficient = 0.01
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50, fire = 80, acid = 70)
+ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+ dynamic_hair_suffix = ""
+ dynamic_fhair_suffix = ""
+ cold_protection = HEAD
+ min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
+ heat_protection = HEAD
+ max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
+ flash_protect = 2
+ strip_delay = 50
+ equip_delay_other = 50
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
+ resistance_flags = 0
+ dog_fashion = null
+
+/obj/item/clothing/suit/space
+ name = "space suit"
+ desc = "A suit that protects against low pressure environments. Has a big 13 on the back."
+ icon_state = "spaceold"
+ item_state = "s_suit"
+ w_class = WEIGHT_CLASS_BULKY
+ gas_transfer_coefficient = 0.01
+ permeability_coefficient = 0.02
+ flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
+ body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals)
+ slowdown = 1
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50, fire = 80, acid = 70)
+ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+ cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS
+ min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
+ heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
+ strip_delay = 80
+ equip_delay_other = 80
+ resistance_flags = 0
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm
index e15f54a500..c5a4f3a58a 100644
--- a/code/modules/clothing/spacesuits/chronosuit.dm
+++ b/code/modules/clothing/spacesuits/chronosuit.dm
@@ -20,7 +20,7 @@
/obj/item/clothing/suit/space/chronos
name = "Chronosuit"
- desc = "An advanced spacesuit equipped with time-bluespace teleportation and anti-compression technology"
+ desc = "An advanced spacesuit equipped with time-bluespace teleportation and anti-compression technology."
icon_state = "chronosuit"
item_state = "chronosuit"
actions_types = list(/datum/action/item_action/toggle)
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 0890e4de74..a604eae015 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -394,7 +394,7 @@
item_state = "medical_helm"
item_color = "medical"
flash_protect = 0
- armor = list(melee = 30, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 50, fire = 75, acid = 75)
+ armor = list(melee = 30, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75, fire = 75, acid = 75)
scan_reagents = 1
/obj/item/clothing/suit/space/hardsuit/medical
@@ -403,7 +403,7 @@
desc = "A special suit that protects against hazardous, low pressure environments. Built with lightweight materials for easier movement."
item_state = "medical_hardsuit"
allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals, /obj/item/storage/firstaid, /obj/item/device/healthanalyzer, /obj/item/stack/medical)
- armor = list(melee = 30, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 50, fire = 75, acid = 75)
+ armor = list(melee = 30, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75, fire = 75, acid = 75)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/medical
//Research Director hardsuit
@@ -475,7 +475,7 @@
//Head of Security hardsuit
/obj/item/clothing/head/helmet/space/hardsuit/security/hos
name = "head of security's hardsuit helmet"
- desc = "a special bulky helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor."
+ desc = "A special bulky helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor."
icon_state = "hardsuit0-hos"
item_color = "hos"
armor = list(melee = 45, bullet = 25, laser = 30,energy = 10, bomb = 25, bio = 100, rad = 50, fire = 95, acid = 95)
@@ -720,7 +720,7 @@
///SWAT version
/obj/item/clothing/suit/space/hardsuit/shielded/swat
name = "death commando spacesuit"
- desc = "an advanced hardsuit favored by commandos for use in special operations."
+ desc = "An advanced hardsuit favored by commandos for use in special operations."
icon_state = "deathsquad"
item_state = "swat_suit"
item_color = "syndi"
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 1136be711f..87f12aa679 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -157,7 +157,7 @@ Contains:
//Emergency Response Team suits
/obj/item/clothing/head/helmet/space/hardsuit/ert
name = "emergency response unit helmet"
- desc = "Standard issue command helmet for the ERT"
+ desc = "Standard issue command helmet for the ERT."
icon_state = "hardsuit0-ert_commander"
item_state = "hardsuit0-ert_commander"
item_color = "ert_commander"
diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm
new file mode 100644
index 0000000000..e934b77f38
--- /dev/null
+++ b/code/modules/clothing/suits/_suits.dm
@@ -0,0 +1,31 @@
+/obj/item/clothing/suit
+ icon = 'icons/obj/clothing/suits.dmi'
+ name = "suit"
+ var/fire_resist = T0C+100
+ allowed = list(/obj/item/tank/internals/emergency_oxygen)
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
+ slot_flags = SLOT_OCLOTHING
+ var/blood_overlay_type = "suit"
+ var/togglename = null
+
+
+/obj/item/clothing/suit/worn_overlays(isinhands = FALSE)
+ . = list()
+ if(!isinhands)
+ if(damaged_clothes)
+ . += mutable_appearance('icons/effects/item_damage.dmi', "damaged[blood_overlay_type]")
+ if(blood_DNA)
+ . += mutable_appearance('icons/effects/blood.dmi', "[blood_overlay_type]blood")
+ var/mob/living/carbon/human/M = loc
+ if(ishuman(M) && M.w_uniform)
+ var/obj/item/clothing/under/U = M.w_uniform
+ if(istype(U) && U.attached_accessory)
+ var/obj/item/clothing/accessory/A = U.attached_accessory
+ if(A.above_suit)
+ . += U.accessory_overlay
+
+/obj/item/clothing/suit/update_clothes_damaged_state(damaging = TRUE)
+ ..()
+ if(ismob(loc))
+ var/mob/M = loc
+ M.update_inv_wear_suit()
\ No newline at end of file
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index 1626340e49..11b60817ed 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -5,7 +5,7 @@
desc = "A hood that protects the head and face from biological comtaminants."
permeability_coefficient = 0.01
flags_1 = THICKMATERIAL_1
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20, fire = 30, acid = 100)
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 80, fire = 30, acid = 100)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE
resistance_flags = ACID_PROOF
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
@@ -22,7 +22,7 @@
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
slowdown = 1
allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/pen, /obj/item/device/flashlight/pen, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray)
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20, fire = 30, acid = 100)
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 80, fire = 30, acid = 100)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
strip_delay = 70
equip_delay_other = 70
@@ -46,11 +46,11 @@
//Security biosuit, grey with red stripe across the chest
/obj/item/clothing/head/bio_hood/security
- armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 100, rad = 20, fire = 30, acid = 100)
+ armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 100, rad = 80, fire = 30, acid = 100)
icon_state = "bio_security"
/obj/item/clothing/suit/bio_suit/security
- armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 100, rad = 20, fire = 30, acid = 100)
+ armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 100, rad = 80, fire = 30, acid = 100)
icon_state = "bio_security"
diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm
index 36da40c206..71c86ca5fb 100644
--- a/code/modules/clothing/suits/cloaks.dm
+++ b/code/modules/clothing/suits/cloaks.dm
@@ -13,7 +13,7 @@
name = "cloak hood"
icon = 'icons/obj/clothing/hats.dmi'
icon_state = "golhood"
- desc = "A hood for a cloak"
+ desc = "A hood for a cloak."
body_parts_covered = HEAD
flags_1 = NODROP_1
flags_inv = HIDEHAIR|HIDEEARS
@@ -75,7 +75,7 @@
/obj/item/clothing/suit/hooded/cloak/drake
name = "drake armour"
icon_state = "dragon"
- desc = "A suit of armour fashioned from the remains of an ash drake. "
+ desc = "A suit of armour fashioned from the remains of an ash drake."
allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/device/mining_scanner, /obj/item/device/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/twohanded/spear)
armor = list(melee = 70, bullet = 30, laser = 50, energy = 40, bomb = 70, bio = 60, rad = 50, fire = 100, acid = 100)
hoodtype = /obj/item/clothing/head/hooded/cloakhood/drake
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 3540a7648c..e50cb8ca6b 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -414,6 +414,24 @@
icon_state = "letterman_n"
item_state = "letterman_n"
+/obj/item/clothing/suit/dracula
+ name = "dracula coat"
+ desc = "Looks like this belongs in a very old movie set."
+ icon_state = "draculacoat"
+ item_state = "draculacoat"
+
+/obj/item/clothing/suit/drfreeze_coat
+ name = "doctor freeze's labcoat"
+ desc = "A labcoat imbued with the power of features and freezes."
+ icon_state = "drfreeze_coat"
+ item_state = "drfreeze_coat"
+
+/obj/item/clothing/suit/gothcoat
+ name = "gothic coat"
+ desc = "Perfect for those who want stalk in a corner of a bar."
+ icon_state = "gothcoat"
+ item_state = "gothcoat"
+
/obj/item/clothing/suit/xenos
name = "xenos suit"
desc = "A suit made out of chitinous alien hide."
@@ -459,7 +477,7 @@
icon_state = "coatcaptain"
item_state = "coatcaptain"
armor = list(melee = 25, bullet = 30, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 0, acid = 50)
- allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/ballistic, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/device/flashlight/seclite, /obj/item/melee/classic_baton/telescopic)
+ allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/ballistic, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/melee/classic_baton/telescopic)
hoodtype = /obj/item/clothing/head/hooded/winterhood/captain
/obj/item/clothing/head/hooded/winterhood/captain
@@ -470,7 +488,7 @@
icon_state = "coatsecurity"
item_state = "coatsecurity"
armor = list(melee = 25, bullet = 15, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 0, acid = 45)
- allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/ballistic, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/device/flashlight/seclite, /obj/item/melee/classic_baton/telescopic)
+ allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/ballistic, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/device/flashlight, /obj/item/melee/classic_baton/telescopic)
hoodtype = /obj/item/clothing/head/hooded/winterhood/security
/obj/item/clothing/head/hooded/winterhood/security
@@ -550,7 +568,7 @@
/obj/item/clothing/suit/spookyghost
name = "spooky ghost"
- desc = "this is obviously just a bedsheet, but maybe try it on?"
+ desc = "This is obviously just a bedsheet, but maybe try it on?"
icon_state = "bedsheet"
user_vars_to_edit = list("name" = "Spooky Ghost", "real_name" = "Spooky Ghost" , "incorporeal_move" = INCORPOREAL_MOVE_BASIC, "appearance_flags" = KEEP_TOGETHER|TILE_BOUND, "alpha" = 150)
alternate_worn_layer = ABOVE_BODY_FRONT_LAYER //so the bedsheet goes over everything but fire
diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm
new file mode 100644
index 0000000000..33eeb03c7e
--- /dev/null
+++ b/code/modules/clothing/under/_under.dm
@@ -0,0 +1,156 @@
+/obj/item/clothing/under
+ icon = 'icons/obj/clothing/uniforms.dmi'
+ name = "under"
+ body_parts_covered = CHEST|GROIN|LEGS|ARMS
+ permeability_coefficient = 0.9
+ slot_flags = SLOT_ICLOTHING
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
+ var/fitted = FEMALE_UNIFORM_FULL // For use in alternate clothing styles for women
+ var/has_sensor = HAS_SENSORS // For the crew computer
+ var/random_sensor = 1
+ var/sensor_mode = NO_SENSORS
+ var/can_adjust = 1
+ var/adjusted = NORMAL_STYLE
+ var/alt_covers_chest = 0 // for adjusted/rolled-down jumpsuits, 0 = exposes chest and arms, 1 = exposes arms only
+ var/obj/item/clothing/accessory/attached_accessory
+ var/mutable_appearance/accessory_overlay
+ var/mutantrace_variation = NO_MUTANTRACE_VARIATION //Are there special sprites for specific situations? Don't use this unless you need to.
+
+/obj/item/clothing/under/worn_overlays(isinhands = FALSE)
+ . = list()
+ if(!isinhands)
+
+ if(damaged_clothes)
+ . += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform")
+ if(blood_DNA)
+ . += mutable_appearance('icons/effects/blood.dmi', "uniformblood")
+ if(accessory_overlay)
+ . += accessory_overlay
+
+/obj/item/clothing/under/attackby(obj/item/I, mob/user, params)
+ if((has_sensor == BROKEN_SENSORS) && istype(I, /obj/item/stack/cable_coil))
+ var/obj/item/stack/cable_coil/C = I
+ C.use(1)
+ has_sensor = HAS_SENSORS
+ to_chat(user,"You repair the suit sensors on [src] with [C].")
+ return 1
+ if(!attach_accessory(I, user))
+ return ..()
+
+/obj/item/clothing/under/update_clothes_damaged_state(damaging = TRUE)
+ ..()
+ if(ismob(loc))
+ var/mob/M = loc
+ M.update_inv_w_uniform()
+ if(has_sensor > NO_SENSORS)
+ has_sensor = BROKEN_SENSORS
+
+/obj/item/clothing/under/New()
+ if(random_sensor)
+ //make the sensor mode favor higher levels, except coords.
+ sensor_mode = pick(SENSOR_OFF, SENSOR_LIVING, SENSOR_LIVING, SENSOR_VITALS, SENSOR_VITALS, SENSOR_VITALS, SENSOR_COORDS, SENSOR_COORDS)
+ adjusted = NORMAL_STYLE
+ ..()
+
+/obj/item/clothing/under/equipped(mob/user, slot)
+ ..()
+ if(adjusted)
+ adjusted = NORMAL_STYLE
+ fitted = initial(fitted)
+ if(!alt_covers_chest)
+ body_parts_covered |= CHEST
+
+ if(mutantrace_variation && ishuman(user))
+ var/mob/living/carbon/human/H = user
+ if(DIGITIGRADE in H.dna.species.species_traits)
+ adjusted = DIGITIGRADE_STYLE
+ H.update_inv_w_uniform()
+
+ if(attached_accessory && slot != slot_hands && ishuman(user))
+ var/mob/living/carbon/human/H = user
+ attached_accessory.on_uniform_equip(src, user)
+ if(attached_accessory.above_suit)
+ H.update_inv_wear_suit()
+
+/obj/item/clothing/under/dropped(mob/user)
+ if(attached_accessory)
+ attached_accessory.on_uniform_dropped(src, user)
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ if(attached_accessory.above_suit)
+ H.update_inv_wear_suit()
+
+ ..()
+
+/obj/item/clothing/under/proc/attach_accessory(obj/item/I, mob/user, notifyAttach = 1)
+ . = FALSE
+ if(istype(I, /obj/item/clothing/accessory))
+ var/obj/item/clothing/accessory/A = I
+ if(attached_accessory)
+ if(user)
+ to_chat(user, "[src] already has an accessory.")
+ return
+ else
+ if(user && !user.temporarilyRemoveItemFromInventory(I))
+ return
+ if(!A.attach(src, user))
+ return
+
+ if(user && notifyAttach)
+ to_chat(user, "You attach [I] to [src].")
+
+ var/accessory_color = attached_accessory.item_color
+ if(!accessory_color)
+ accessory_color = attached_accessory.icon_state
+ accessory_overlay = mutable_appearance('icons/mob/accessories.dmi', "[accessory_color]")
+ accessory_overlay.alpha = attached_accessory.alpha
+ accessory_overlay.color = attached_accessory.color
+
+ if(ishuman(loc))
+ var/mob/living/carbon/human/H = loc
+ H.update_inv_w_uniform()
+ H.update_inv_wear_suit()
+
+ return TRUE
+
+/obj/item/clothing/under/proc/remove_accessory(mob/user)
+ if(!isliving(user))
+ return
+ if(!can_use(user))
+ return
+
+ if(attached_accessory)
+ var/obj/item/clothing/accessory/A = attached_accessory
+ attached_accessory.detach(src, user)
+ if(user.put_in_hands(A))
+ to_chat(user, "You detach [A] from [src].")
+ else
+ to_chat(user, "You detach [A] from [src] and it falls on the floor.")
+
+ if(ishuman(loc))
+ var/mob/living/carbon/human/H = loc
+ H.update_inv_w_uniform()
+ H.update_inv_wear_suit()
+
+
+/obj/item/clothing/under/examine(mob/user)
+ ..()
+ if(can_adjust)
+ if(adjusted == ALT_STYLE)
+ to_chat(user, "Alt-click on [src] to wear it normally.")
+ else
+ to_chat(user, "Alt-click on [src] to wear it casually.")
+ if (has_sensor == BROKEN_SENSORS)
+ to_chat(user, "Its sensors appear to be shorted out.")
+ else if(has_sensor > NO_SENSORS)
+ switch(sensor_mode)
+ if(SENSOR_OFF)
+ to_chat(user, "Its sensors appear to be disabled.")
+ if(SENSOR_LIVING)
+ to_chat(user, "Its binary life sensors appear to be enabled.")
+ if(SENSOR_VITALS)
+ to_chat(user, "Its vital tracker appears to be enabled.")
+ if(SENSOR_COORDS)
+ to_chat(user, "Its vital tracker and tracking beacon appear to be enabled.")
+ if(attached_accessory)
+ to_chat(user, "\A [attached_accessory] is attached to it.")
\ No newline at end of file
diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm
index c5e68ebcec..20bdd96e1a 100644
--- a/code/modules/clothing/under/accessories.dm
+++ b/code/modules/clothing/under/accessories.dm
@@ -139,8 +139,10 @@
log_game("[key_name(M)] was given the following commendation by [key_name(user)]: [input]")
message_admins("[key_name(M)] was given the following commendation by [key_name(user)]: [input]")
- else to_chat(user, "Medals can only be pinned on jumpsuits!")
- else ..()
+ else
+ to_chat(user, "Medals can only be pinned on jumpsuits!")
+ else
+ ..()
/obj/item/clothing/accessory/medal/conduct
name = "distinguished conduct medal"
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index ea5300c692..994db7381b 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -24,7 +24,7 @@
/obj/item/clothing/under/scratch
name = "white suit"
- desc = "A white suit, suitable for an excellent host"
+ desc = "A white suit, suitable for an excellent host."
icon_state = "scratch"
item_state = "scratch"
item_color = "scratch"
@@ -693,6 +693,33 @@
can_adjust = FALSE
resistance_flags = NONE
+/obj/item/clothing/under/draculass
+ name = "draculass coat"
+ desc = "A dress inspired by the ancient \"Victorian\" era."
+ icon_state = "draculass"
+ item_state = "draculass"
+ item_color = "draculass"
+ body_parts_covered = CHEST|GROIN|ARMS
+ fitted = FEMALE_UNIFORM_TOP
+ can_adjust = FALSE
+
+/obj/item/clothing/under/drfreeze
+ name = "doctor freeze's jumpsuit"
+ desc = "A modified scientist jumpsuit to look extra cool."
+ icon_state = "drfreeze"
+ item_state = "drfreeze"
+ item_color = "drfreeze"
+ can_adjust = FALSE
+
+/obj/item/clothing/under/lobster
+ name = "foam lobster suit"
+ desc = "Who beheaded the college mascot?"
+ icon_state = "lobster"
+ item_state = "lobster"
+ item_color = "lobster"
+ fitted = NO_FEMALE_UNIFORM
+ can_adjust = FALSE
+
/obj/item/clothing/under/skeleton
name = "skeleton jumpsuit"
desc = "A black jumpsuit with a white bone pattern printed on it. Spooky!"
@@ -702,4 +729,4 @@
body_parts_covered = CHEST|GROIN|ARMS|LEGS
fitted = NO_FEMALE_UNIFORM
can_adjust = FALSE
- resistance_flags = NONE
\ No newline at end of file
+ resistance_flags = NONE
diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index a1b0fb4ce2..9c1fc9bdd1 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -18,7 +18,7 @@
/obj/item/clothing/under/syndicate/sniper
name = "Tactical turtleneck suit"
- desc = "A double seamed tactical turtleneck disguised as a civilian grade silk suit. Intended for the most formal operator. The collar is really sharp"
+ desc = "A double seamed tactical turtleneck disguised as a civilian grade silk suit. Intended for the most formal operator. The collar is really sharp."
icon_state = "really_black_suit"
item_state = "bl_suit"
item_color = "black_suit"
diff --git a/code/modules/clothing/under/trek.dm b/code/modules/clothing/under/trek.dm
index b777312da7..9e52e47281 100644
--- a/code/modules/clothing/under/trek.dm
+++ b/code/modules/clothing/under/trek.dm
@@ -8,14 +8,14 @@
//TOS
/obj/item/clothing/under/trek/command
name = "command uniform"
- desc = "The uniform worn by command officers"
+ desc = "The uniform worn by command officers."
icon_state = "trek_command"
item_color = "trek_command"
item_state = "y_suit"
/obj/item/clothing/under/trek/engsec
name = "engsec uniform"
- desc = "The uniform worn by engineering/security officers"
+ desc = "The uniform worn by engineering/security officers."
icon_state = "trek_engsec"
item_color = "trek_engsec"
item_state = "r_suit"
@@ -24,7 +24,7 @@
/obj/item/clothing/under/trek/medsci
name = "medsci uniform"
- desc = "The uniform worn by medical/science officers"
+ desc = "The uniform worn by medical/science officers."
icon_state = "trek_medsci"
item_color = "trek_medsci"
item_state = "b_suit"
@@ -66,7 +66,7 @@
//Q
/obj/item/clothing/under/trek/Q
name = "french marshall's uniform"
- desc = "something about it feels off..."
+ desc = "Something about it feels off..."
icon_state = "trek_Q"
item_color = "trek_Q"
item_state = "r_suit"
\ No newline at end of file
diff --git a/code/modules/detectivework/detective_work.dm b/code/modules/detectivework/detective_work.dm
index 6c91fee8c5..d2d633d103 100644
--- a/code/modules/detectivework/detective_work.dm
+++ b/code/modules/detectivework/detective_work.dm
@@ -3,7 +3,7 @@
/atom/var/list/suit_fibers
/atom/proc/add_fibers(mob/living/carbon/human/M)
- if(M.gloves && istype(M.gloves, /obj/item/clothing/))
+ if(M.gloves && istype(M.gloves, /obj/item/clothing/))
var/obj/item/clothing/gloves/G = M.gloves
if(G.transfer_blood > 1) //bloodied gloves transfer blood to touched objects
if(add_blood(G.blood_DNA)) //only reduces the bloodiness of our gloves if the item wasn't already bloody
@@ -11,7 +11,8 @@
else if(M.bloody_hands > 1)
if(add_blood(M.blood_DNA))
M.bloody_hands--
- if(!suit_fibers) suit_fibers = list()
+ if(!suit_fibers)
+ suit_fibers = list()
var/fibertext
var/item_multiplier = isitem(src)?1.2:1
if(M.wear_suit)
diff --git a/code/modules/error_handler/error_handler.dm b/code/modules/error_handler/error_handler.dm
index 17ac8b3628..cb0eb7f40a 100644
--- a/code/modules/error_handler/error_handler.dm
+++ b/code/modules/error_handler/error_handler.dm
@@ -6,6 +6,19 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
if(!istype(E)) //Something threw an unusual exception
log_world("\[[time_stamp()]] Uncaught exception: [E]")
return ..()
+
+ //this is snowflake because of a byond bug (ID:2306577), do not attempt to call non-builtin procs in this if
+ if(copytext(E.name,1,32) == "Maximum recursion level reached")
+ var/list/split = splittext(E.desc, "\n")
+ for (var/i in 1 to split.len)
+ if (split[i] != "")
+ split[i] = "\[[time2text(world.timeofday,"hh:mm:ss")]\][split[i]]"
+ E.desc = jointext(split, "\n")
+ //log to world while intentionally triggering the byond bug.
+ log_world("\[[time2text(world.timeofday,"hh:mm:ss")]\]runtime error: [E.name]\n[E.desc]")
+ //if we got to here without silently ending, the byond bug has been fixed.
+ log_world("The bug with recursion runtimes has been fixed. Please remove the snowflake check from world/Error in [__FILE__]:[__LINE__]")
+ return //this will never happen.
var/static/list/error_last_seen = list()
var/static/list/error_cooldown = list() /* Error_cooldown items will either be positive(cooldown time) or negative(silenced error)
@@ -118,4 +131,4 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
world.log = null
-#endif
\ No newline at end of file
+#endif
diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm
index c33bb463b3..8b2c85d4e3 100644
--- a/code/modules/events/_event.dm
+++ b/code/modules/events/_event.dm
@@ -99,6 +99,10 @@
return E
+//Special admins setup
+/datum/round_event_control/proc/admin_setup()
+ return
+
/datum/round_event //NOTE: Times are measured in master controller ticks!
var/processing = TRUE
var/datum/round_event_control/control
diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm
index 42b54f3856..49eb46194d 100644
--- a/code/modules/events/blob.dm
+++ b/code/modules/events/blob.dm
@@ -1,38 +1,29 @@
-/datum/round_event_control/blob
- name = "Blob"
- typepath = /datum/round_event/ghost_role/blob
- weight = 5
- max_occurrences = 1
-
- min_players = 20
- earliest_start = 18000 //30 minutes
-
- gamemode_blacklist = list("blob") //Just in case a blob survives that long
-
-/datum/round_event/ghost_role/blob
- announceWhen = 12
- role_name = "blob overmind"
- var/new_rate = 2
-
-/datum/round_event/ghost_role/blob/New(my_processing = TRUE, set_point_rate)
- ..()
- if(set_point_rate)
- new_rate = set_point_rate
-
-/datum/round_event/ghost_role/blob/announce()
- priority_announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/ai/outbreak5.ogg')
-
-
-/datum/round_event/ghost_role/blob/spawn_role()
- if(!GLOB.blobstart.len)
- return MAP_ERROR
- var/list/candidates = get_candidates("blob", null, ROLE_BLOB)
- if(!candidates.len)
- return NOT_ENOUGH_PLAYERS
- var/mob/dead/observer/new_blob = pick(candidates)
- var/obj/structure/blob/core/BC = new/obj/structure/blob/core(pick(GLOB.blobstart), new_blob.client, new_rate)
- BC.overmind.blob_points = min(20 + GLOB.player_list.len, BC.overmind.max_blob_points)
- spawned_mobs += BC.overmind
- message_admins("[key_name_admin(BC.overmind)] has been made into a blob overmind by an event.")
- log_game("[key_name(BC.overmind)] was spawned as a blob overmind by an event.")
- return SUCCESSFUL_SPAWN
+/datum/round_event_control/blob
+ name = "Blob"
+ typepath = /datum/round_event/ghost_role/blob
+ weight = 10
+ max_occurrences = 1
+
+ min_players = 20
+
+ gamemode_blacklist = list("blob") //Just in case a blob survives that long
+
+/datum/round_event/ghost_role/blob
+ announceWhen = -1
+ role_name = "blob overmind"
+
+/datum/round_event/ghost_role/blob/announce()
+ priority_announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/ai/outbreak5.ogg')
+
+/datum/round_event/ghost_role/blob/spawn_role()
+ if(!GLOB.blobstart.len)
+ return MAP_ERROR
+ var/list/candidates = get_candidates("blob", null, ROLE_BLOB)
+ if(!candidates.len)
+ return NOT_ENOUGH_PLAYERS
+ var/mob/dead/observer/new_blob = pick(candidates)
+ var/mob/camera/blob/BC = new_blob.become_overmind()
+ spawned_mobs += BC
+ message_admins("[key_name_admin(BC)] has been made into a blob overmind by an event.")
+ log_game("[key_name(BC)] was spawned as a blob overmind by an event.")
+ return SUCCESSFUL_SPAWN
diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm
index 461ffecd3f..5f5033bb6c 100644
--- a/code/modules/events/brand_intelligence.dm
+++ b/code/modules/events/brand_intelligence.dm
@@ -13,16 +13,16 @@
var/list/obj/machinery/vending/infectedMachines = list()
var/obj/machinery/vending/originMachine
var/list/rampant_speeches = list("Try our aggressive new marketing strategies!", \
- "You should buy products to feed your lifestyle obession!", \
+ "You should buy products to feed your lifestyle obsession!", \
"Consume!", \
"Your money can buy happiness!", \
"Engage direct marketing!", \
"Advertising is legalized lying! But don't let that put you off our great deals!", \
- "You don't want to buy anything? Yeah, well I didn't want to buy your mom either.")
+ "You don't want to buy anything? Yeah, well, I didn't want to buy your mom either.")
/datum/round_event/brand_intelligence/announce()
- priority_announce("Rampant brand intelligence has been detected aboard [station_name()], please stand-by. The origin is believed to be \a [originMachine.name].", "Machine Learning Alert")
+ priority_announce("Rampant brand intelligence has been detected aboard [station_name()]. Please stand by. The origin is believed to be \a [originMachine.name].", "Machine Learning Alert")
/datum/round_event/brand_intelligence/start()
diff --git a/code/modules/events/false_alarm.dm b/code/modules/events/false_alarm.dm
index 3636c3e320..83e37dd528 100644
--- a/code/modules/events/false_alarm.dm
+++ b/code/modules/events/false_alarm.dm
@@ -1,37 +1,61 @@
-/datum/round_event_control/falsealarm
- name = "False Alarm"
- typepath = /datum/round_event/falsealarm
- weight = 20
- max_occurrences = 5
-
-/datum/round_event_control/falsealarm/canSpawnEvent(players_amt, gamemode)
- return ..() && length(gather_false_events())
-
-/datum/round_event/falsealarm
- announceWhen = 0
- endWhen = 1
-
-/datum/round_event/falsealarm/announce()
- var/players_amt = get_active_player_count(alive_check = 1, afk_check = 1, human_check = 1)
- var/gamemode = SSticker.mode.config_tag
-
- var/events_list = gather_false_events(players_amt, gamemode)
- var/datum/round_event_control/event_control = pick(events_list)
- if(event_control)
- var/datum/round_event/Event = new event_control.typepath()
- message_admins("False Alarm: [Event]")
- Event.kill() //do not process this event - no starts, no ticks, no ends
- Event.announce() //just announce it like it's happening
-
-/proc/gather_false_events(players_amt, gamemode)
- . = list()
- for(var/datum/round_event_control/E in SSevents.control)
+/datum/round_event_control/falsealarm
+ name = "False Alarm"
+ typepath = /datum/round_event/falsealarm
+ weight = 20
+ max_occurrences = 5
+ var/forced_type //Admin abuse
+
+
+/datum/round_event_control/falsealarm/admin_setup()
+ if(!check_rights(R_FUN))
+ return
+
+ var/list/possible_types = list()
+
+ for(var/datum/round_event_control/E in SSevents.control)
if(istype(E, /datum/round_event_control/falsealarm))
- continue
- if(!E.canSpawnEvent(players_amt, gamemode))
- continue
-
- var/datum/round_event/event = E.typepath
- if(initial(event.announceWhen) <= 0)
- continue
- . += E
+ continue
+ var/datum/round_event/event = E.typepath
+ if(initial(event.announceWhen) <= 0)
+ continue
+ possible_types += E
+
+ forced_type = input(usr, "Select the scare.","False event") as null|anything in possible_types
+
+/datum/round_event_control/falsealarm/canSpawnEvent(players_amt, gamemode)
+ return ..() && length(gather_false_events())
+
+/datum/round_event/falsealarm
+ announceWhen = 0
+ endWhen = 1
+
+/datum/round_event/falsealarm/announce()
+ var/players_amt = get_active_player_count(alive_check = 1, afk_check = 1, human_check = 1)
+ var/gamemode = SSticker.mode.config_tag
+
+ var/events_list = gather_false_events(players_amt, gamemode)
+ var/datum/round_event_control/event_control
+ var/datum/round_event_control/falsealarm/C = control
+ if(C.forced_type)
+ event_control = C.forced_type
+ C.forced_type = null
+ else
+ event_control = pick(events_list)
+ if(event_control)
+ var/datum/round_event/Event = new event_control.typepath()
+ message_admins("False Alarm: [Event]")
+ Event.kill() //do not process this event - no starts, no ticks, no ends
+ Event.announce() //just announce it like it's happening
+
+/proc/gather_false_events(players_amt, gamemode)
+ . = list()
+ for(var/datum/round_event_control/E in SSevents.control)
+ if(istype(E, /datum/round_event_control/falsealarm))
+ continue
+ if(!E.canSpawnEvent(players_amt, gamemode))
+ continue
+
+ var/datum/round_event/event = E.typepath
+ if(initial(event.announceWhen) <= 0)
+ continue
+ . += E
diff --git a/code/modules/events/holiday/halloween.dm b/code/modules/events/holiday/halloween.dm
index db41a84d4f..f83024bd3d 100644
--- a/code/modules/events/holiday/halloween.dm
+++ b/code/modules/events/holiday/halloween.dm
@@ -10,7 +10,8 @@
..()
for(var/mob/living/carbon/human/H in GLOB.mob_list)
var/obj/item/storage/backpack/b = locate() in H.contents
- new /obj/item/storage/spooky(b)
+ if(b)
+ new /obj/item/storage/spooky(b)
for(var/mob/living/simple_animal/pet/dog/corgi/Ian/Ian in GLOB.mob_list)
Ian.place_on_head(new /obj/item/bedsheet(Ian))
@@ -21,77 +22,6 @@
/datum/round_event/spooky/announce()
priority_announce(pick("RATTLE ME BONES!","THE RIDE NEVER ENDS!", "A SKELETON POPS OUT!", "SPOOKY SCARY SKELETONS!", "CREWMEMBERS BEWARE, YOU'RE IN FOR A SCARE!") , "THE CALL IS COMING FROM INSIDE THE HOUSE")
-//Eyeball migration
-/datum/round_event_control/carp_migration/eyeballs
- name = "Eyeball Migration"
- typepath = /datum/round_event/carp_migration/eyeballs
- holidayID = HALLOWEEN
- weight = 25
- earliest_start = 0
-
-/datum/round_event/carp_migration/eyeballs/start()
- for(var/obj/effect/landmark/carpspawn/C in GLOB.landmarks_list)
- new /mob/living/simple_animal/hostile/carp/eyeball(C.loc)
-
-//Pumpking meteors waves
-/datum/round_event_control/meteor_wave/spooky
- name = "Pumpkin Wave"
- typepath = /datum/round_event/meteor_wave/spooky
- holidayID = HALLOWEEN
- weight = 20
- max_occurrences = 2
-
-/datum/round_event/meteor_wave/spooky
- endWhen = 40
-
-/datum/round_event/meteor_wave/spooky/tick()
- if(IsMultiple(activeFor, 4))
- spawn_meteors(3, GLOB.meteorsSPOOKY) //meteor list types defined in gamemode/meteor/meteors.dm
-
-//Creepy clown invasion
-/datum/round_event_control/creepy_clowns
- name = "Clowns"
- typepath = /datum/round_event/creepy_clowns
- holidayID = HALLOWEEN
- weight = 20
- earliest_start = 0
-
-/datum/round_event/creepy_clowns
- endWhen = 40
-
-/datum/round_event/creepy_clowns/start()
- for(var/mob/living/carbon/human/H in GLOB.living_mob_list)
- if(!H.client || !istype(H))
- return
- to_chat(H, "Honk...")
- SEND_SOUND(H, sound('sound/spookoween/scary_clown_appear.ogg'))
- var/turf/T = get_turf(H)
- if(T)
- new /obj/effect/hallucination/simple/clown(T, H, 50)
-
-/datum/round_event/creepy_clowns/tick()
- if(IsMultiple(activeFor, 4))
- for(var/mob/living/carbon/human/H in GLOB.living_mob_list)
- if (prob(66))
- playsound(H.loc, pick('sound/spookoween/scary_horn.ogg','sound/spookoween/scary_horn2.ogg', 'sound/spookoween/scary_horn3.ogg'), 100, 1)
- if (prob(33))
- var/turf/T = get_turf(H)
- if(T)
- new /obj/effect/hallucination/simple/clown(T, H, 25)
- else if (prob(25))
- var/turf/T = get_turf(H)
- if(T)
- new /obj/effect/hallucination/simple/clown/scary(T, H, 25)
- else if (prob(5))
- var/turf/T = get_turf(H)
- if(T)
- spawn_atom_to_turf(/obj/effect/mob_spawn/human/clown/corpse, H, 1)
- else if (prob(1))
- spawn_atom_to_turf(/mob/living/simple_animal/hostile/retaliate/clown, H, 1)
-
-/datum/round_event/creepy_clowns/announce()
- priority_announce("Honk... Honk... honk... HONK! HONK! HONKHONKHONKHONKHONK", "HONK!", 'sound/spookoween/scary_horn.ogg')
-
//spooky foods (you can't actually make these when it's not halloween)
/obj/item/reagent_containers/food/snacks/sugarcookie/spookyskull
name = "skull cookie"
@@ -105,7 +35,6 @@
icon = 'icons/obj/halloween_items.dmi'
icon_state = "coffincookie"
-
//spooky items
/obj/item/storage/spooky
diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm
index d46525a0eb..7940eaeec8 100644
--- a/code/modules/events/meteor_wave.dm
+++ b/code/modules/events/meteor_wave.dm
@@ -1,68 +1,72 @@
-// Normal strength
-
-/datum/round_event_control/meteor_wave
- name = "Meteor Wave: Normal"
- typepath = /datum/round_event/meteor_wave
- weight = 4
- min_players = 5
- max_occurrences = 3
-
-/datum/round_event/meteor_wave
- startWhen = 6
- endWhen = 66
- announceWhen = 1
- var/list/wave_type
- var/wave_name = "normal"
-
-/datum/round_event/meteor_wave/New()
- ..()
- if(!wave_type)
- determine_wave_type()
-
-/datum/round_event/meteor_wave/proc/determine_wave_type()
- if(!wave_name)
- wave_name = pickweight(list(
- "normal" = 50,
- "threatening" = 40,
- "catastrophic" = 10))
- switch(wave_name)
- if("normal")
- wave_type = GLOB.meteors_normal
- if("threatening")
- wave_type = GLOB.meteors_threatening
- if("catastrophic")
- wave_type = GLOB.meteors_catastrophic
- if("meaty")
- wave_type = GLOB.meteorsB
- if("space dust")
- wave_type = GLOB.meteorsC
- else
- WARNING("Wave name of [wave_name] not recognised.")
- kill()
-
-/datum/round_event/meteor_wave/announce()
- priority_announce("Meteors have been detected on collision course with the station.", "Meteor Alert", 'sound/ai/meteors.ogg')
-
-/datum/round_event/meteor_wave/tick()
- if(IsMultiple(activeFor, 3))
- spawn_meteors(5, wave_type) //meteor list types defined in gamemode/meteor/meteors.dm
-
-/datum/round_event_control/meteor_wave/threatening
- name = "Meteor Wave: Threatening"
- typepath = /datum/round_event/meteor_wave/threatening
- weight = 2
- min_players = 5
- max_occurrences = 3
-
-/datum/round_event/meteor_wave/threatening
- wave_name = "threatening"
-
-/datum/round_event_control/meteor_wave/catastrophic
- name = "Meteor Wave: Catastrophic"
- typepath = /datum/round_event/meteor_wave/catastrophic
- weight = 1
- min_players = 5
- max_occurrences = 3
-
-/datum/round_event/meteor_wave/catastrophic
- wave_name = "catastrophic"
+// Normal strength
+
+/datum/round_event_control/meteor_wave
+ name = "Meteor Wave: Normal"
+ typepath = /datum/round_event/meteor_wave
+ weight = 4
+ min_players = 5
+ max_occurrences = 3
+
+/datum/round_event/meteor_wave
+ startWhen = 6
+ endWhen = 66
+ announceWhen = 1
+ var/list/wave_type
+ var/wave_name = "normal"
+
+/datum/round_event/meteor_wave/New()
+ ..()
+ if(!wave_type)
+ determine_wave_type()
+
+/datum/round_event/meteor_wave/proc/determine_wave_type()
+ if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
+ wave_name = "halloween"
+ if(!wave_name)
+ wave_name = pickweight(list(
+ "normal" = 50,
+ "threatening" = 40,
+ "catastrophic" = 10))
+ switch(wave_name)
+ if("normal")
+ wave_type = GLOB.meteors_normal
+ if("threatening")
+ wave_type = GLOB.meteors_threatening
+ if("catastrophic")
+ wave_type = GLOB.meteors_catastrophic
+ if("meaty")
+ wave_type = GLOB.meteorsB
+ if("space dust")
+ wave_type = GLOB.meteorsC
+ if("halloween")
+ wave_type = GLOB.meteorsSPOOKY
+ else
+ WARNING("Wave name of [wave_name] not recognised.")
+ kill()
+
+/datum/round_event/meteor_wave/announce()
+ priority_announce("Meteors have been detected on collision course with the station.", "Meteor Alert", 'sound/ai/meteors.ogg')
+
+/datum/round_event/meteor_wave/tick()
+ if(IsMultiple(activeFor, 3))
+ spawn_meteors(5, wave_type) //meteor list types defined in gamemode/meteor/meteors.dm
+
+/datum/round_event_control/meteor_wave/threatening
+ name = "Meteor Wave: Threatening"
+ typepath = /datum/round_event/meteor_wave/threatening
+ weight = 2
+ min_players = 5
+ max_occurrences = 3
+
+/datum/round_event/meteor_wave/threatening
+ wave_name = "threatening"
+
+/datum/round_event_control/meteor_wave/catastrophic
+ name = "Meteor Wave: Catastrophic"
+ typepath = /datum/round_event/meteor_wave/catastrophic
+ weight = 1
+ min_players = 5
+ max_occurrences = 3
+
+/datum/round_event/meteor_wave/catastrophic
+ wave_name = "catastrophic"
diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm
index fd68e3e5ee..cb1c88919c 100644
--- a/code/modules/events/shuttle_loan.dm
+++ b/code/modules/events/shuttle_loan.dm
@@ -29,9 +29,9 @@
if(HIJACK_SYNDIE)
priority_announce("Cargo: The syndicate are trying to infiltrate your station. If you let them hijack your cargo shuttle, you'll save us a headache.","CentCom Counter Intelligence")
if(RUSKY_PARTY)
- priority_announce("Cargo: A group of angry russians want to have a party, can you send them your cargo shuttle then make them disappear?","CentCom Russian Outreach Program")
+ priority_announce("Cargo: A group of angry Russians want to have a party. Can you send them your cargo shuttle then make them disappear?","CentCom Russian Outreach Program")
if(SPIDER_GIFT)
- priority_announce("Cargo: The Spider Clan has sent us a mysterious gift, can we ship it to you to see what's inside?","CentCom Diplomatic Corps")
+ priority_announce("Cargo: The Spider Clan has sent us a mysterious gift. Can we ship it to you to see what's inside?","CentCom Diplomatic Corps")
if(DEPARTMENT_RESUPPLY)
priority_announce("Cargo: Seems we've ordered doubles of our department resupply packages this month. Can we send them to you?","CentCom Supply Department")
thanks_msg = "The cargo shuttle should return in 5 minutes."
diff --git a/code/modules/events/wizard/departmentrevolt.dm b/code/modules/events/wizard/departmentrevolt.dm
index 83f05fae2c..a22913038f 100644
--- a/code/modules/events/wizard/departmentrevolt.dm
+++ b/code/modules/events/wizard/departmentrevolt.dm
@@ -45,7 +45,7 @@
SSticker.mode.traitors += M
M.special_role = "separatist"
H.log_message("Was made into a separatist, long live [nation]!", INDIVIDUAL_ATTACK_LOG)
- to_chat(H, "You are a separatist! [nation] forever! Protect the soverignty of your newfound land with your comrades in arms!")
+ to_chat(H, "You are a separatist! [nation] forever! Protect the sovereignty of your newfound land with your comrades in arms!")
if(citizens.len)
var/message
for(var/job in jobs_to_revolt)
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index e6897d5e25..99dbe7102a 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -164,7 +164,8 @@ GLOBAL_LIST_INIT(hallucinations_major, list(
feedback_details += "Vent Coords: [center.x],[center.y],[center.z]"
flood_images += image(image_icon,center,image_state,MOB_LAYER)
flood_turfs += center
- if(target.client) target.client.images |= flood_images
+ if(target.client)
+ target.client.images |= flood_images
next_expand = world.time + FAKE_FLOOD_EXPAND_TIME
START_PROCESSING(SSobj, src)
@@ -960,13 +961,18 @@ GLOBAL_LIST_INIT(hallucinations_major, list(
var/l = ui_hand_position(target.get_held_index_of_item(l_hand))
var/r = ui_hand_position(target.get_held_index_of_item(r_hand))
var/list/slots_free = list(l,r)
- if(l_hand) slots_free -= l
- if(r_hand) slots_free -= r
+ if(l_hand)
+ slots_free -= l
+ if(r_hand)
+ slots_free -= r
if(ishuman(target))
var/mob/living/carbon/human/H = target
- if(!H.belt) slots_free += ui_belt
- if(!H.l_store) slots_free += ui_storage1
- if(!H.r_store) slots_free += ui_storage2
+ if(!H.belt)
+ slots_free += ui_belt
+ if(!H.l_store)
+ slots_free += ui_storage1
+ if(!H.r_store)
+ slots_free += ui_storage2
if(slots_free.len)
target.halitem.screen_loc = pick(slots_free)
target.halitem.layer = ABOVE_HUD_LAYER
@@ -999,7 +1005,8 @@ GLOBAL_LIST_INIT(hallucinations_major, list(
target.halitem.icon_state = "flashbang1"
target.halitem.name = "Flashbang"
feedback_details += "Type: [target.halitem.name]"
- if(target.client) target.client.screen += target.halitem
+ if(target.client)
+ target.client.screen += target.halitem
QDEL_IN(target.halitem, rand(150, 350))
qdel(src)
diff --git a/code/modules/flufftext/TextFilters.dm b/code/modules/flufftext/TextFilters.dm
index 7d158be34d..fe8bffa60f 100644
--- a/code/modules/flufftext/TextFilters.dm
+++ b/code/modules/flufftext/TextFilters.dm
@@ -41,8 +41,10 @@
step(M, pick(d,turn(d,90),turn(d,-90)))
/proc/Ellipsis(original_msg, chance = 50, keep_words)
- if(chance <= 0) return "..."
- if(chance >= 100) return original_msg
+ if(chance <= 0)
+ return "..."
+ if(chance >= 100)
+ return original_msg
var/list
words = splittext(original_msg," ")
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 59c1413226..c9f2aa878f 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -15,8 +15,10 @@
resistance_flags = 0
/obj/item/reagent_containers/food/drinks/on_reagent_change()
- if (gulp_size < 5) gulp_size = 5
- else gulp_size = max(round(reagents.total_volume / 5), 5)
+ if (gulp_size < 5)
+ gulp_size = 5
+ else
+ gulp_size = max(round(reagents.total_volume / 5), 5)
/obj/item/reagent_containers/food/drinks/attack(mob/M, mob/user, def_zone)
@@ -51,7 +53,8 @@
return 1
/obj/item/reagent_containers/food/drinks/afterattack(obj/target, mob/user , proximity)
- if(!proximity) return
+ if(!proximity)
+ return
if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
if (!is_open_container())
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
index b4b8b09352..3b12913fe6 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/food_and_drinks/food/condiment.dm
@@ -54,7 +54,8 @@
return 1
/obj/item/reagent_containers/food/condiment/afterattack(obj/target, mob/user , proximity)
- if(!proximity) return
+ if(!proximity)
+ return
if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
if(!target.reagents.total_volume)
@@ -225,7 +226,7 @@
/obj/item/reagent_containers/food/condiment/pack
name = "condiment pack"
- desc = "A small plastic pack with condiments to put on your food"
+ desc = "A small plastic pack with condiments to put on your food."
icon_state = "condi_empty"
volume = 10
amount_per_transfer_from_this = 10
@@ -236,7 +237,8 @@
return
/obj/item/reagent_containers/food/condiment/pack/afterattack(obj/target, mob/user , proximity)
- if(!proximity) return
+ if(!proximity)
+ return
//You can tear the bag open above food to put the condiments on it, obviously.
if(istype(target, /obj/item/reagent_containers/food/snacks))
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index a6a0e3c071..176e3fe8eb 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -57,7 +57,8 @@
update_overlays(S)
to_chat(user, "You add the [I.name] to the [name].")
update_name(S)
- else . = ..()
+ else
+ . = ..()
/obj/item/reagent_containers/food/snacks/customizable/proc/update_name(obj/item/reagent_containers/food/snacks/S)
@@ -308,7 +309,8 @@
else
var/obj/item/reagent_containers/food/snacks/customizable/A = new/obj/item/reagent_containers/food/snacks/customizable/salad(get_turf(src))
A.initialize_custom_food(src, S, user)
- else . = ..()
+ else
+ . = ..()
return
/obj/item/reagent_containers/glass/bowl/on_reagent_change()
diff --git a/code/modules/food_and_drinks/food/snacks/dough.dm b/code/modules/food_and_drinks/food/snacks/dough.dm
index 9af71484f5..6ae8836b28 100644
--- a/code/modules/food_and_drinks/food/snacks/dough.dm
+++ b/code/modules/food_and_drinks/food/snacks/dough.dm
@@ -43,7 +43,7 @@
/obj/item/reagent_containers/food/snacks/pizzabread
name = "pizza bread"
- desc = "Add ingredients to make a pizza"
+ desc = "Add ingredients to make a pizza."
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "pizzabread"
custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/pizza
@@ -124,7 +124,7 @@
/obj/item/reagent_containers/food/snacks/pastrybase
name = "pastry base"
- desc = "A base for any self-respecting pastry"
+ desc = "A base for any self-respecting pastry."
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "pastrybase"
list_reagents = list("nutriment" = 1)
diff --git a/code/modules/food_and_drinks/food/snacks/meat.dm b/code/modules/food_and_drinks/food/snacks/meat.dm
index c8678b5313..106d5abb1e 100644
--- a/code/modules/food_and_drinks/food/snacks/meat.dm
+++ b/code/modules/food_and_drinks/food/snacks/meat.dm
@@ -4,7 +4,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab
name = "meat"
- desc = "A slab of meat"
+ desc = "A slab of meat."
icon_state = "meat"
dried_type = /obj/item/reagent_containers/food/snacks/sosjerky/healthy
bitesize = 3
@@ -82,7 +82,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard
icon_state = "lizardmeat"
- desc = "Delicious dino damage"
+ desc = "Delicious dino damage."
filling_color = "#6B8E23"
tastes = list("meat" = 4, "scales" = 1)
foodtype = MEAT | RAW
@@ -96,7 +96,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/shadow
icon_state = "shadowmeat"
- desc = "Ow, the edge"
+ desc = "Ow, the edge."
filling_color = "#202020"
tastes = list("darkness" = 1, "meat" = 1)
foodtype = MEAT | RAW
@@ -180,7 +180,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab/xeno
name = "xeno meat"
- desc = "A slab of meat"
+ desc = "A slab of meat."
icon_state = "xenomeat"
list_reagents = list("nutriment" = 3, "vitamin" = 1)
bitesize = 4
diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm
index cf51c9867f..0d76bb6e7d 100644
--- a/code/modules/food_and_drinks/food/snacks_bread.dm
+++ b/code/modules/food_and_drinks/food/snacks_bread.dm
@@ -19,7 +19,7 @@
/obj/item/reagent_containers/food/snacks/store/bread/plain
name = "bread"
- desc = "Some plain old Earthen bread."
+ desc = "Some plain old earthen bread."
icon_state = "bread"
bonus_reagents = list("nutriment" = 7)
list_reagents = list("nutriment" = 10)
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
index 2262c2e7f0..0c626ab71e 100644
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -151,7 +151,7 @@
/obj/item/reagent_containers/food/snacks/mint
name = "mint"
- desc = "it is only wafer thin."
+ desc = "It is only wafer thin."
icon_state = "mint"
bitesize = 1
trash = /obj/item/trash/plate
@@ -229,7 +229,7 @@
/obj/item/reagent_containers/food/snacks/chocoorange
name = "chocolate orange"
- desc = "A festive chocolate orange"
+ desc = "A festive chocolate orange."
icon_state = "chocoorange"
bonus_reagents = list("nutriment" = 1, "sugar" = 1)
list_reagents = list("nutriment" = 3, "sugar" = 1)
diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm
index 8e609fcde0..ef518bf5fc 100644
--- a/code/modules/food_and_drinks/food/snacks_pastry.dm
+++ b/code/modules/food_and_drinks/food/snacks_pastry.dm
@@ -303,7 +303,7 @@
/obj/item/reagent_containers/food/snacks/oatmealcookie
name = "oatmeal cookie"
- desc = "The best of both cookie and oat"
+ desc = "The best of both cookie and oat."
icon_state = "oatmealcookie"
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list("nutriment" = 5, "vitamin" = 1)
@@ -333,7 +333,7 @@
/obj/item/reagent_containers/food/snacks/bluecherrycupcake
name = "blue cherry cupcake"
- desc = "Blue cherries inside a delicious cupcake"
+ desc = "Blue cherries inside a delicious cupcake."
icon_state = "bluecherrycupcake"
bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
list_reagents = list("nutriment" = 5, "vitamin" = 1)
diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm
index 5c17053cb5..d0fe1282d2 100644
--- a/code/modules/food_and_drinks/food/snacks_vend.dm
+++ b/code/modules/food_and_drinks/food/snacks_vend.dm
@@ -32,7 +32,7 @@
/obj/item/reagent_containers/food/snacks/chips
name = "chips"
- desc = "Commander Riker's What-The-Crisps"
+ desc = "Commander Riker's What-The-Crisps."
icon_state = "chips"
trash = /obj/item/trash/chips
bitesize = 1
@@ -55,7 +55,7 @@
/obj/item/reagent_containers/food/snacks/no_raisin/healthy
name = "homemade raisins"
- desc = "homemade raisins, the best in all of spess."
+ desc = "Homemade raisins, the best in all of spess."
list_reagents = list("nutriment" = 3, "vitamin" = 2)
junkiness = 0
foodtype = FRUIT
diff --git a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm
index f07bc07ae2..a24263bfa6 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm
@@ -1,7 +1,7 @@
/obj/machinery/juicer
name = "juicer"
- desc = "a centrifugal juicer with two speeds: Juice and Separate."
+ desc = "A centrifugal juicer with two speeds: Juice and Separate."
icon = 'icons/obj/kitchen.dmi'
icon_state = "juicer1"
layer = BELOW_OBJ_LAYER
diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm
index d7a1de4f4b..a041e1d8eb 100644
--- a/code/modules/games/cards.dm
+++ b/code/modules/games/cards.dm
@@ -59,12 +59,14 @@
if (istype(O, /obj/item/hand))
var/obj/item/hand/H = O
- for (var/datum/playingcard/P in H.cards) src.cards.Add(P)
+ for (var/datum/playingcard/P in H.cards)
+ src.cards.Add(P)
qdel (O)
user.show_message("You place your cards on the bottom of the deck.")
- else return ..()
+ else
+ return ..()
/obj/item/deck/attack_self(mob/user)
var/list/newcards = list()
@@ -155,7 +157,8 @@
else if(istype(O, /obj/item/hand))
var/obj/item/hand/H = O
- for(var/datum/playingcard/P in src.cards) H.cards.Add(P)
+ for(var/datum/playingcard/P in src.cards)
+ H.cards.Add(P)
H.update_icon()
diff --git a/code/modules/goonchat/jsErrorHandler.dm b/code/modules/goonchat/jsErrorHandler.dm
index ce257ce660..c7647d47a4 100644
--- a/code/modules/goonchat/jsErrorHandler.dm
+++ b/code/modules/goonchat/jsErrorHandler.dm
@@ -21,7 +21,8 @@
)
/datum/debugFileOutput/proc/error(fileName, message, client/C)
- if (!fileName || !message) return 0
+ if (!fileName || !message)
+ return 0
if (!(fileName in src.validFiles))
throw EXCEPTION("Debug log file '[fileName].[src.ext]' is not a valid path.")
@@ -36,7 +37,8 @@
return 1
/datum/debugFileOutput/proc/clear(fileName)
- if (!fileName) return 0
+ if (!fileName)
+ return 0
if (!fexists("[src.directory]/[fileName].[src.ext]"))
throw EXCEPTION("Debug log file '[fileName].[src.ext]' does not exist.")
diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm
index 3e8985c79a..24f674219e 100644
--- a/code/modules/holiday/easter.dm
+++ b/code/modules/holiday/easter.dm
@@ -89,7 +89,7 @@
name = "Easter Bunny Head"
icon_state = "bunnyhead"
item_state = "bunnyhead"
- desc = "Considerably more cute than 'Frank'"
+ desc = "Considerably more cute than 'Frank'."
slowdown = -1
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm
index c8e9235646..751bc53eac 100644
--- a/code/modules/holiday/holidays.dm
+++ b/code/modules/holiday/holidays.dm
@@ -272,7 +272,7 @@
/datum/holiday/halloween
name = HALLOWEEN
- begin_day = 30
+ begin_day = 28
begin_month = OCTOBER
end_day = 2
end_month = NOVEMBER
diff --git a/code/modules/holodeck/area_copy.dm b/code/modules/holodeck/area_copy.dm
index 295441b04e..bc2c92e3fb 100644
--- a/code/modules/holodeck/area_copy.dm
+++ b/code/modules/holodeck/area_copy.dm
@@ -47,7 +47,8 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars,list("tag","area","type","loc","locs",
// Movement based on lower left corner. Tiles that do not fit
// into the new area will not be moved.
- if(!A || !src) return 0
+ if(!A || !src)
+ return 0
var/list/turfs_src = get_area_turfs(src.type)
var/list/turfs_trg = get_area_turfs(A.type)
diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm
index a735a48ff4..54384753d7 100644
--- a/code/modules/holodeck/items.dm
+++ b/code/modules/holodeck/items.dm
@@ -12,7 +12,7 @@
/obj/item/holo/esword
name = "holographic energy sword"
- desc = "May the force be with you. Sorta"
+ desc = "May the force be with you. Sorta."
icon_state = "sword0"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
@@ -154,7 +154,7 @@
power_channel = ENVIRON
/obj/machinery/readybutton/attack_ai(mob/user as mob)
- to_chat(user, "The station AI is not to interact with these devices")
+ to_chat(user, "The station AI is not to interact with these devices.")
return
/obj/machinery/readybutton/attack_paw(mob/user as mob)
@@ -220,4 +220,4 @@
/obj/item/paper/fluff/holodeck/disclaimer
name = "Holodeck Disclaimer"
- info = "Brusies sustained in the holodeck can be healed simply by sleeping."
+ info = "Bruises sustained in the holodeck can be healed simply by sleeping."
diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm
index 80a7b7a545..680300b404 100644
--- a/code/modules/holodeck/turfs.dm
+++ b/code/modules/holodeck/turfs.dm
@@ -106,7 +106,7 @@
slowdown = 2
/turf/open/floor/holofloor/snow/cold
- initial_gas_mix = "freon=7500;TEMP=0"
+ initial_gas_mix = "nob=7500;TEMP=2.7"
/turf/open/floor/holofloor/asteroid
name = "asteroid sand"
diff --git a/code/modules/html_interface/html_interface.dm b/code/modules/html_interface/html_interface.dm
index 7979604a21..e53d67b364 100644
--- a/code/modules/html_interface/html_interface.dm
+++ b/code/modules/html_interface/html_interface.dm
@@ -71,7 +71,8 @@ You have to use modules/client/asset_cache to ensure they get sent BEFORE the in
/mob/var/datum/html_interface/hi
/mob/verb/test()
- if (!hi) hi = new/datum/html_interface(src, "[src.key]")
+ if (!hi)
+ hi = new/datum/html_interface(src, "[src.key]")
hi.updateLayout("")
hi.updateContent("content", "Lorem ipsum dolor sit amet, consectetur adipiscing elit.
")
@@ -156,14 +157,16 @@ GLOBAL_LIST_EMPTY(html_interfaces)
"on-close" = "byond://?src=\ref[src]&html_interface_action=onclose"
)
- if (hclient.client.hi_last_pos) params["pos"] = "[hclient.client.hi_last_pos]"
+ if (hclient.client.hi_last_pos)
+ params["pos"] = "[hclient.client.hi_last_pos]"
winset(hclient.client, "browser_\ref[src]", list2params(params))
winset(hclient.client, "browser_\ref[src].browser", list2params(list("parent" = "browser_\ref[src]", "type" = "browser", "pos" = "0,0", "size" = "[width]x[height]", "anchor1" = "0,0", "anchor2" = "100,100", "use-title" = "true", "auto-format" = "false")))
/* * Public API */
-/datum/html_interface/proc/getTitle() return src.title
+/datum/html_interface/proc/getTitle()
+ return src.title
/datum/html_interface/proc/setTitle(title, ignore_cache = FALSE)
src.title = title
@@ -173,19 +176,24 @@ GLOBAL_LIST_EMPTY(html_interfaces)
for (var/client in src.clients)
hclient = src._getClient(src.clients[client])
- if (hclient && hclient.active) src._renderTitle(src.clients[client], ignore_cache)
+ if (hclient && hclient.active)
+ src._renderTitle(src.clients[client], ignore_cache)
/datum/html_interface/proc/executeJavaScript(jscript, datum/html_interface_client/hclient = null)
if (hclient)
hclient = getClient(hclient)
if (istype(hclient))
- if (hclient.is_loaded) hclient.client << output(list2params(list(jscript)), "browser_\ref[src].browser:eval")
+ if (hclient.is_loaded)
+ hclient.client << output(list2params(list(jscript)), "browser_\ref[src].browser:eval")
else
- for (var/client in src.clients) if(src.clients[client]) src.executeJavaScript(jscript, src.clients[client])
+ for (var/client in src.clients)
+ if(src.clients[client])
+ src.executeJavaScript(jscript, src.clients[client])
/datum/html_interface/proc/callJavaScript(func, list/arguments, datum/html_interface_client/hclient = null)
- if (!arguments) arguments = new/list()
+ if (!arguments)
+ arguments = new/list()
if (hclient)
hclient = getClient(hclient)
@@ -194,7 +202,9 @@ GLOBAL_LIST_EMPTY(html_interfaces)
if (hclient.is_loaded)
hclient.client << output(list2params(arguments), "browser_\ref[src].browser:[func]")
else
- for (var/client in src.clients) if (src.clients[client]) src.callJavaScript(func, arguments, src.clients[client])
+ for (var/client in src.clients)
+ if (src.clients[client])
+ src.callJavaScript(func, arguments, src.clients[client])
/datum/html_interface/proc/updateLayout(layout)
src.layout = layout
@@ -204,7 +214,8 @@ GLOBAL_LIST_EMPTY(html_interfaces)
for (var/client in src.clients)
hclient = src._getClient(src.clients[client])
- if (hclient && hclient.active) src._renderLayout(hclient)
+ if (hclient && hclient.active)
+ src._renderLayout(hclient)
/datum/html_interface/proc/updateContent(id, content, ignore_cache = FALSE)
src.content_elements[id] = content
@@ -234,7 +245,8 @@ GLOBAL_LIST_EMPTY(html_interfaces)
winshow(hclient.client, "browser_\ref[src]", TRUE)
- while (hclient.client && hclient.active && !hclient.is_loaded) sleep(2)
+ while (hclient.client && hclient.active && !hclient.is_loaded)
+ sleep(2)
/datum/html_interface/proc/hide(datum/html_interface_client/hclient)
hclient = getClient(hclient)
@@ -243,30 +255,38 @@ GLOBAL_LIST_EMPTY(html_interfaces)
if (src.clients)
src.clients.Remove(hclient.client)
- if (!src.clients.len) src.clients = null
+ if (!src.clients.len)
+ src.clients = null
hclient.client.hi_last_pos = winget(hclient.client, "browser_\ref[src]" ,"pos")
winshow(hclient.client, "browser_\ref[src]", FALSE)
winset(hclient.client, "browser_\ref[src]", "parent=none")
- if (hascall(src.ref, "hiOnHide")) call(src.ref, "hiOnHide")(hclient)
+ if (hascall(src.ref, "hiOnHide"))
+ call(src.ref, "hiOnHide")(hclient)
// Convert a /mob to /client, and /client to /datum/html_interface_client
/datum/html_interface/proc/getClient(client, create_if_not_exist = FALSE)
- if (istype(client, /datum/html_interface_client)) return src._getClient(client)
+ if (istype(client, /datum/html_interface_client))
+ return src._getClient(client)
else if (ismob(client))
var/mob/mob = client
client = mob.client
if (istype(client, /client))
if (create_if_not_exist && (!src.clients || !(client in src.clients)))
- if (!src.clients) src.clients = new/list()
- if (!(client in src.clients)) src.clients[client] = new/datum/html_interface_client(client)
+ if (!src.clients)
+ src.clients = new/list()
+ if (!(client in src.clients))
+ src.clients[client] = new/datum/html_interface_client(client)
- if (src.clients && (client in src.clients)) return src._getClient(src.clients[client])
- else return null
- else return null
+ if (src.clients && (client in src.clients))
+ return src._getClient(src.clients[client])
+ else
+ return null
+ else
+ return null
/datum/html_interface/proc/enableFor(datum/html_interface_client/hclient)
hclient.active = TRUE
@@ -284,7 +304,8 @@ GLOBAL_LIST_EMPTY(html_interfaces)
hclient = _getClient(clients[key])
if (hclient)
- if (hclient.active) return TRUE
+ if (hclient.active)
+ return TRUE
else
clients.Remove(key)
@@ -335,7 +356,8 @@ GLOBAL_LIST_EMPTY(html_interfaces)
hclient.client << output(list2params(list(html)), "browser_\ref[src].browser:updateLayout")
- for (var/id in src.content_elements) src._renderContent(id, hclient, ignore_loaded = ignore_loaded)
+ for (var/id in src.content_elements)
+ src._renderContent(id, hclient, ignore_loaded = ignore_loaded)
/datum/html_interface/proc/_renderContent(id, datum/html_interface_client/hclient, ignore_cache = FALSE, ignore_loaded = FALSE)
if (hclient && (ignore_loaded || hclient.is_loaded))
@@ -365,4 +387,5 @@ GLOBAL_LIST_EMPTY(html_interfaces)
if ("onclose")
src.hide(hclient)
- else if (src.ref && hclient.active) src.ref.Topic(href, href_list, hclient)
\ No newline at end of file
+ else if (src.ref && hclient.active)
+ src.ref.Topic(href, href_list, hclient)
\ No newline at end of file
diff --git a/code/modules/html_interface/html_interface_client.dm b/code/modules/html_interface/html_interface_client.dm
index e571a86b3a..b9bac9b4d3 100644
--- a/code/modules/html_interface/html_interface_client.dm
+++ b/code/modules/html_interface/html_interface_client.dm
@@ -26,7 +26,8 @@
src.client = client
/datum/html_interface_client/proc/putExtraVar(key, value)
- if (!src.extra_vars) src.extra_vars = new/list()
+ if (!src.extra_vars)
+ src.extra_vars = new/list()
src.extra_vars[key] = value
/datum/html_interface_client/proc/removeExtraVar(key)
@@ -35,9 +36,11 @@
src.extra_vars.Remove(key)
- if (!src.extra_vars.len) src.extra_vars = null
+ if (!src.extra_vars.len)
+ src.extra_vars = null
return .
/datum/html_interface_client/proc/getExtraVar(key)
- if (src.extra_vars) return src.extra_vars[key]
\ No newline at end of file
+ if (src.extra_vars)
+ return src.extra_vars[key]
\ No newline at end of file
diff --git a/code/modules/html_interface/nanotrasen/nanotrasen.dm b/code/modules/html_interface/nanotrasen/nanotrasen.dm
index 0ac9a67a46..c9758d85ce 100644
--- a/code/modules/html_interface/nanotrasen/nanotrasen.dm
+++ b/code/modules/html_interface/nanotrasen/nanotrasen.dm
@@ -161,10 +161,14 @@ The client is optional and may be a /mob, /client or /html_interface_client obje
if (istype(hclient))
var/resource
switch (color)
- if ("green") resource = 'uiEyeGreen.png'
- if ("orange") resource = 'uiEyeOrange.png'
- if ("red") resource = 'uiEyeRed.png'
- else CRASH("Invalid color: [color]")
+ if ("green")
+ resource = 'uiEyeGreen.png'
+ if ("orange")
+ resource = 'uiEyeOrange.png'
+ if ("red")
+ resource = 'uiEyeRed.png'
+ else
+ CRASH("Invalid color: [color]")
if (hclient.getExtraVar("eye_color") != color)
hclient.putExtraVar("eye_color", color)
diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm
index 19cafc0204..8670cb1016 100644
--- a/code/modules/hydroponics/grown/berries.dm
+++ b/code/modules/hydroponics/grown/berries.dm
@@ -126,7 +126,7 @@
// Blue Cherries
/obj/item/seeds/cherry/blue
name = "pack of blue cherry pits"
- desc = "The blue kind of cherries"
+ desc = "The blue kind of cherries."
icon_state = "seed-bluecherry"
species = "bluecherry"
plantname = "Blue Cherry Tree"
diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm
index 82e998b961..40f158d36d 100644
--- a/code/modules/hydroponics/grown/chili.dm
+++ b/code/modules/hydroponics/grown/chili.dm
@@ -45,7 +45,7 @@
/obj/item/reagent_containers/food/snacks/grown/icepepper
seed = /obj/item/seeds/chili/ice
name = "ice pepper"
- desc = "It's a mutant strain of chili"
+ desc = "It's a mutant strain of chili."
icon_state = "icepepper"
filling_color = "#0000CD"
bitesize_mod = 2
diff --git a/code/modules/hydroponics/grown/corn.dm b/code/modules/hydroponics/grown/corn.dm
index 421d84e29c..827deaea47 100644
--- a/code/modules/hydroponics/grown/corn.dm
+++ b/code/modules/hydroponics/grown/corn.dm
@@ -58,7 +58,7 @@
/obj/item/grown/snapcorn
seed = /obj/item/seeds/corn/snapcorn
name = "snap corn"
- desc = "A cob with snap pops"
+ desc = "A cob with snap pops."
icon_state = "snapcorn"
item_state = "corncob"
w_class = WEIGHT_CLASS_TINY
diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm
index 741bb4e23c..e0845ffb2a 100644
--- a/code/modules/hydroponics/grown/flowers.dm
+++ b/code/modules/hydroponics/grown/flowers.dm
@@ -40,7 +40,7 @@
/obj/item/reagent_containers/food/snacks/grown/poppy/lily
seed = /obj/item/seeds/poppy/lily
name = "lily"
- desc = "A beautiful orange flower"
+ desc = "A beautiful orange flower."
icon_state = "lily"
filling_color = "#FFA500"
@@ -57,7 +57,7 @@
/obj/item/reagent_containers/food/snacks/grown/poppy/geranium
seed = /obj/item/seeds/poppy/geranium
name = "geranium"
- desc = "A beautiful blue flower"
+ desc = "A beautiful blue flower."
icon_state = "geranium"
filling_color = "#008B8B"
@@ -198,7 +198,8 @@
log_game("[key_name(user)] set [key_name(M)] on fire")
/obj/item/grown/novaflower/afterattack(atom/A as mob|obj, mob/user,proximity)
- if(!proximity) return
+ if(!proximity)
+ return
if(force > 0)
force -= rand(1, (force / 3) + 1)
else
diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm
index 4aef3924e9..c65d0a3606 100644
--- a/code/modules/hydroponics/grown/misc.dm
+++ b/code/modules/hydroponics/grown/misc.dm
@@ -1,7 +1,7 @@
// Starthistle
/obj/item/seeds/starthistle
name = "pack of starthistle seeds"
- desc = "A robust species of weed that often springs up in-between the cracks of spaceship parking lots"
+ desc = "A robust species of weed that often springs up in-between the cracks of spaceship parking lots."
icon_state = "seed-starthistle"
species = "starthistle"
plantname = "Starthistle"
diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm
index 6f54ea5e9b..485ab6bfd8 100644
--- a/code/modules/hydroponics/grown/nettle.dm
+++ b/code/modules/hydroponics/grown/nettle.dm
@@ -70,7 +70,8 @@
return TRUE
/obj/item/grown/nettle/afterattack(atom/A as mob|obj, mob/user,proximity)
- if(!proximity) return
+ if(!proximity)
+ return
if(force > 0)
force -= rand(1, (force / 3) + 1) // When you whack someone with it, leaves fall off
else
diff --git a/code/modules/hydroponics/grown/random.dm b/code/modules/hydroponics/grown/random.dm
index 734adae15b..4ba2451a5a 100644
--- a/code/modules/hydroponics/grown/random.dm
+++ b/code/modules/hydroponics/grown/random.dm
@@ -2,7 +2,7 @@
/obj/item/seeds/random
name = "pack of strange seeds"
- desc = "Mysterious seeds as strange as their name implies. Spooky"
+ desc = "Mysterious seeds as strange as their name implies. Spooky."
icon_state = "seed-x"
species = "?????"
plantname = "strange plant"
diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm
index f11d6e0772..0d35c7cb6e 100644
--- a/code/modules/hydroponics/grown/towercap.dm
+++ b/code/modules/hydroponics/grown/towercap.dm
@@ -44,15 +44,11 @@
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
var/plank_type = /obj/item/stack/sheet/mineral/wood
var/plank_name = "wooden planks"
- var/list/accepted = list(/obj/item/reagent_containers/food/snacks/grown/tobacco,
+ var/static/list/accepted = typecacheof(list(/obj/item/reagent_containers/food/snacks/grown/tobacco,
/obj/item/reagent_containers/food/snacks/grown/tea,
/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
/obj/item/reagent_containers/food/snacks/grown/ambrosia/deus,
- /obj/item/reagent_containers/food/snacks/grown/wheat)
-
-/obj/item/grown/log/Initialize()
- . = ..()
- accepted = typecacheof(accepted)
+ /obj/item/reagent_containers/food/snacks/grown/wheat))
/obj/item/grown/log/attackby(obj/item/W, mob/user, params)
if(W.sharpness)
@@ -69,7 +65,7 @@
to_chat(user, "You add the newly-formed [plank_name] to the stack. It now contains [plank.amount] [plank_name].")
qdel(src)
- if(is_type_in_typecache(W,accepted))
+ if(CheckAccepted(W))
var/obj/item/reagent_containers/food/snacks/grown/leaf = W
if(leaf.dry)
user.show_message("You wrap \the [W] around the log, turning it into a torch!")
@@ -84,6 +80,9 @@
else
return ..()
+/obj/item/grown/log/proc/CheckAccepted(obj/item/I)
+ return is_type_in_typecache(I, accepted)
+
/obj/item/grown/log/tree
seed = null
name = "wood log"
@@ -94,10 +93,11 @@
name = "steel-cap log"
desc = "It's made of metal."
icon_state = "steellogs"
- accepted = list()
plank_type = /obj/item/stack/rods
plank_name = "rods"
+/obj/item/grown/log/steel/CheckAccepted(obj/item/I)
+ return FALSE
/////////BONFIRES//////////
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index 5dd9627c2d..c774e4574a 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -693,10 +693,13 @@
var/target = myseed ? myseed.plantname : src
var/visi_msg = ""
var/irrigate = 0 //How am I supposed to irrigate pill contents?
+ var/transfer_amount
if(istype(reagent_source, /obj/item/reagent_containers/food/snacks) || istype(reagent_source, /obj/item/reagent_containers/pill))
visi_msg="[user] composts [reagent_source], spreading it through [target]"
+ transfer_amount = reagent_source.reagents.total_volume
else
+ transfer_amount = reagent_source.amount_per_transfer_from_this
if(istype(reagent_source, /obj/item/reagent_containers/syringe/))
var/obj/item/reagent_containers/syringe/syr = reagent_source
visi_msg="[user] injects [target] with [syr]"
@@ -706,14 +709,14 @@
visi_msg="[user] sprays [target] with [reagent_source]"
playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
irrigate = 1
- else if(reagent_source.amount_per_transfer_from_this) // Droppers, cans, beakers, what have you.
+ else if(transfer_amount) // Droppers, cans, beakers, what have you.
visi_msg="[user] uses [reagent_source] on [target]"
irrigate = 1
// Beakers, bottles, buckets, etc. Can't use is_open_container though.
if(istype(reagent_source, /obj/item/reagent_containers/glass/))
playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
- if(irrigate && reagent_source.amount_per_transfer_from_this > 30 && reagent_source.reagents.total_volume >= 30 && using_irrigation)
+ if(irrigate && transfer_amount > 30 && reagent_source.reagents.total_volume >= 30 && using_irrigation)
trays = FindConnected()
if (trays.len > 1)
visi_msg += ", setting off the irrigation system"
@@ -721,7 +724,7 @@
if(visi_msg)
visible_message("[visi_msg].")
- var/split = round(reagent_source.amount_per_transfer_from_this/trays.len)
+ var/split = round(transfer_amount/trays.len)
for(var/obj/machinery/hydroponics/H in trays)
//cause I don't want to feel like im juggling 15 tamagotchis and I can get to my real work of ripping flooring apart in hopes of validating my life choices of becoming a space-gardener
diff --git a/code/modules/lighting/lighting_source.dm b/code/modules/lighting/lighting_source.dm
index dd5cd53690..178f091fb7 100644
--- a/code/modules/lighting/lighting_source.dm
+++ b/code/modules/lighting/lighting_source.dm
@@ -56,10 +56,11 @@
if (top_atom)
LAZYREMOVE(top_atom.light_sources, src)
-
+
+ if (needs_update)
+ GLOB.lighting_update_lights -= src
+
. = ..()
- if(!force)
- return QDEL_HINT_IWILLGC
// Yes this doesn't align correctly on anything other than 4 width tabs.
// If you want it to go switch everybody to elastic tab stops.
diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm
index 26ba81ff1f..6d6587a73a 100644
--- a/code/modules/mining/lavaland/ash_flora.dm
+++ b/code/modules/mining/lavaland/ash_flora.dm
@@ -109,7 +109,7 @@
icon_state = "t_mushroom"
name = "numerous mushrooms"
desc = "A large number of mushrooms, some of which have long, fleshy stems. They're radiating light!"
- luminosity = 1
+ light_range = 1
harvested_name = "tiny mushrooms"
harvested_desc = "A few tiny mushrooms around larger stumps. You can already see them growing back."
harvest = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_stem
@@ -190,7 +190,7 @@
desc = "A long mushroom stem. It's slightly glowing."
list_reagents = list("tinlux" = 2, "vitamin" = 1, "space_drugs" = 1)
icon_state = "mushroom_stem"
- luminosity = 1
+ light_range = 1
seed = /obj/item/seeds/lavaland/ember
/obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index b019541421..4d3dc5db37 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -194,7 +194,7 @@
desc = "Happy to light your way."
icon = 'icons/obj/lighting.dmi'
icon_state = "orb"
- luminosity = 7
+ light_range = 7
layer = ABOVE_ALL_MOB_LAYER
//Red/Blue Cubes
@@ -275,7 +275,7 @@
/obj/item/ammo_casing/magic/hook
name = "hook"
- desc = "a hook."
+ desc = "A hook."
projectile_type = /obj/item/projectile/hook
caliber = "hook"
icon_state = "hook"
@@ -880,11 +880,7 @@
var/create_delay = 30
var/reset_cooldown = 50
var/timer = 0
- var/banned_turfs
-
-/obj/item/lava_staff/Initialize()
- . = ..()
- banned_turfs = typecacheof(list(/turf/open/space/transit, /turf/closed))
+ var/static/list/banned_turfs = typecacheof(list(/turf/open/space/transit, /turf/closed))
/obj/item/lava_staff/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
..()
@@ -969,7 +965,7 @@
icon = 'icons/obj/wizard.dmi'
icon_state = "scroll2"
color = "#FF0000"
- desc = "Mark your target for death. "
+ desc = "Mark your target for death."
var/used = FALSE
/obj/item/blood_contract/attack_self(mob/user)
diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm
index 0c9bcdc170..c2bf0849bb 100644
--- a/code/modules/mining/machine_stacking.dm
+++ b/code/modules/mining/machine_stacking.dm
@@ -43,7 +43,8 @@
usr.set_machine(src)
src.add_fingerprint(usr)
if(href_list["release"])
- if(!(text2path(href_list["release"]) in machine.stack_list)) return //someone tried to spawn materials by spoofing hrefs
+ if(!(text2path(href_list["release"]) in machine.stack_list))
+ return //someone tried to spawn materials by spoofing hrefs
var/obj/item/stack/sheet/inp = machine.stack_list[text2path(href_list["release"])]
var/obj/item/stack/sheet/out = new inp.type()
out.amount = inp.amount
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index 858bec6607..d5529a7242 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -191,7 +191,7 @@
/obj/item/ore/slag
name = "slag"
- desc = "Completely useless"
+ desc = "Completely useless."
icon_state = "slag"
/obj/item/twohanded/required/gibtonite
@@ -434,7 +434,8 @@
overlays = list()
string_attached = null
to_chat(user, "You detach the string from the coin.")
- else ..()
+ else
+ ..()
/obj/item/coin/attack_self(mob/user)
if(cooldown < world.time)
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index 2e3b46e1eb..2b2c50ed17 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -452,7 +452,8 @@
dat += "[job.title] ([job.current_positions])
"
if(!job_count) //if there's nowhere to go, assistant opens up.
for(var/datum/job/job in SSjob.occupations)
- if(job.title != "Assistant") continue
+ if(job.title != "Assistant")
+ continue
dat += "[job.title] ([job.current_positions])
"
break
dat += ""
@@ -479,6 +480,8 @@
client.prefs.copy_to(H)
H.dna.update_dna_identity()
if(mind)
+ if(transfer_after)
+ mind.late_joiner = TRUE
mind.active = 0 //we wish to transfer the key manually
mind.transfer_to(H) //won't transfer key since the mind is not active
diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm
index 42265b0b6a..f362f09a65 100644
--- a/code/modules/mob/dead/new_player/preferences_setup.dm
+++ b/code/modules/mob/dead/new_player/preferences_setup.dm
@@ -59,7 +59,7 @@
if(previewJob && !nude)
mannequin.job = previewJob.title
previewJob.equip(mannequin, TRUE)
- mannequin.compile_overlays()
+ COMPILE_OVERLAYS(mannequin)
CHECK_TICK
preview_icon = icon('icons/effects/effects.dmi', "nothing")
preview_icon.Scale(48+32, 16+32)
diff --git a/code/modules/mob/dead/new_player/sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories.dm
index 1eb1379dce..bda35bd033 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories.dm
@@ -1,1387 +1,1395 @@
-/*
-
- Hello and welcome to sprite_accessories: For sprite accessories, such as hair,
- facial hair, and possibly tattoos and stuff somewhere along the line. This file is
- intended to be friendly for people with little to no actual coding experience.
- The process of adding in new hairstyles has been made pain-free and easy to do.
- Enjoy! - Doohl
-
-
- Notice: This all gets automatically compiled in a list in dna.dm, so you do not
- have to define any UI values for sprite accessories manually for hair and facial
- hair. Just add in new hair types and the game will naturally adapt.
-
- !!WARNING!!: changing existing hair information can be VERY hazardous to savefiles,
- to the point where you may completely corrupt a server's savefiles. Please refrain
- from doing this unless you absolutely know what you are doing, and have defined a
- conversion in savefile.dm
-*/
-/proc/init_sprite_accessory_subtypes(prototype, list/L, list/male, list/female,var/roundstart = FALSE)//Roundstart argument builds a specific list for roundstart parts where some parts may be locked
- if(!istype(L))
- L = list()
- if(!istype(male))
- male = list()
- if(!istype(female))
- female = list()
-
- for(var/path in typesof(prototype))
- if(path == prototype)
- continue
- if(roundstart)
- var/datum/sprite_accessory/P = path
- if(initial(P.locked))
- continue
- var/datum/sprite_accessory/D = new path()
-
- if(D.icon_state)
- L[D.name] = D
- else
- L += D.name
-
- switch(D.gender)
- if(MALE)
- male += D.name
- if(FEMALE)
- female += D.name
- else
- male += D.name
- female += D.name
- 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/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/hasinner //Decides if this sprite has an "inner" part, such as the fleshy parts on ears.
+/*
+
+ Hello and welcome to sprite_accessories: For sprite accessories, such as hair,
+ facial hair, and possibly tattoos and stuff somewhere along the line. This file is
+ intended to be friendly for people with little to no actual coding experience.
+ The process of adding in new hairstyles has been made pain-free and easy to do.
+ Enjoy! - Doohl
+
+
+ Notice: This all gets automatically compiled in a list in dna.dm, so you do not
+ have to define any UI values for sprite accessories manually for hair and facial
+ hair. Just add in new hair types and the game will naturally adapt.
+
+ !!WARNING!!: changing existing hair information can be VERY hazardous to savefiles,
+ to the point where you may completely corrupt a server's savefiles. Please refrain
+ from doing this unless you absolutely know what you are doing, and have defined a
+ conversion in savefile.dm
+*/
+/proc/init_sprite_accessory_subtypes(prototype, list/L, list/male, list/female,var/roundstart = FALSE)//Roundstart argument builds a specific list for roundstart parts where some parts may be locked
+ if(!istype(L))
+ L = list()
+ if(!istype(male))
+ male = list()
+ if(!istype(female))
+ female = list()
+
+ for(var/path in typesof(prototype))
+ if(path == prototype)
+ continue
+ if(roundstart)
+ var/datum/sprite_accessory/P = path
+ if(initial(P.locked))
+ continue
+ var/datum/sprite_accessory/D = new path()
+
+ if(D.icon_state)
+ L[D.name] = D
+ else
+ L += D.name
+
+ switch(D.gender)
+ if(MALE)
+ male += D.name
+ if(FEMALE)
+ female += D.name
+ else
+ male += D.name
+ female += D.name
+ 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/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/hasinner //Decides if this sprite has an "inner" part, such as the fleshy parts on ears.
var/locked = FALSE //Is this part locked from roundstart selection? Used for parts that apply effects
- var/dimension_x = 32
- var/dimension_y = 32
- var/center = FALSE //Should we center the sprite?
-
-//////////////////////
-// Hair Definitions //
-//////////////////////
-/datum/sprite_accessory/hair
- icon = 'icons/mob/human_face.dmi' // default icon for all hairs
-
-/datum/sprite_accessory/hair/short
- name = "Short Hair" // try to capatilize the names please~ // try to spell
- icon_state = "hair_a" // you do not need to define _s or _l sub-states, game automatically does this for you
-
-/datum/sprite_accessory/hair/shorthair2
- name = "Short Hair 2"
- icon_state = "hair_shorthair2"
-
-/datum/sprite_accessory/hair/shorthair3
- name = "Short Hair 3"
- icon_state = "hair_shorthair3"
-
-/datum/sprite_accessory/hair/cut
- name = "Cut Hair"
- icon_state = "hair_c"
-
-/datum/sprite_accessory/hair/long
- name = "Shoulder-length Hair"
- icon_state = "hair_b"
-
-/datum/sprite_accessory/hair/longer
- name = "Long Hair"
- icon_state = "hair_vlong"
-
-/datum/sprite_accessory/hair/over_eye
- name = "Over Eye"
- icon_state = "hair_shortovereye"
-
-/datum/sprite_accessory/hair/long_over_eye
- name = "Long Over Eye"
- icon_state = "hair_longovereye"
-
-/datum/sprite_accessory/hair/longest2
- name = "Very Long Over Eye"
- icon_state = "hair_longest2"
-
-/datum/sprite_accessory/hair/longest
- name = "Very Long Hair"
- icon_state = "hair_longest"
-
-/datum/sprite_accessory/hair/longfringe
- name = "Long Fringe"
- icon_state = "hair_longfringe"
-
-/datum/sprite_accessory/hair/longestalt
- name = "Longer Fringe"
- icon_state = "hair_vlongfringe"
-
-/datum/sprite_accessory/hair/gentle
- name = "Gentle"
- icon_state = "hair_gentle"
-
-/datum/sprite_accessory/hair/halfbang
- name = "Half-banged Hair"
- icon_state = "hair_halfbang"
-
-/datum/sprite_accessory/hair/halfbang2
- name = "Half-banged Hair 2"
- icon_state = "hair_halfbang2"
-
-/datum/sprite_accessory/hair/ponytail1
- name = "Ponytail"
- icon_state = "hair_ponytail"
-
-/datum/sprite_accessory/hair/ponytail2
- name = "Ponytail 2"
- icon_state = "hair_ponytail2"
-
-/datum/sprite_accessory/hair/ponytail3
- name = "Ponytail 3"
- icon_state = "hair_ponytail3"
-
-/datum/sprite_accessory/hair/ponytail4
- name = "Ponytail 4"
- icon_state = "hair_ponytail4"
-
-/datum/sprite_accessory/hair/ponytail5
- name = "Ponytail 5"
- icon_state = "hair_ponytail5"
-
-
-/datum/sprite_accessory/hair/sidetail
- name = "Side Pony"
- icon_state = "hair_sidetail"
-
-/datum/sprite_accessory/hair/sidetail2
- name = "Side Pony 2"
- icon_state = "hair_sidetail2"
-
-/datum/sprite_accessory/hair/sidetail3
- name = "Side Pony 3"
- icon_state = "hair_sidetail3"
-
-/datum/sprite_accessory/hair/sidetail4
- name = "Side Pony 4"
- icon_state = "hair_sidetail4"
-
-/datum/sprite_accessory/hair/oneshoulder
- name = "One Shoulder"
- icon_state = "hair_oneshoulder"
-
-/datum/sprite_accessory/hair/tressshoulder
- name = "Tress Shoulder"
- icon_state = "hair_tressshoulder"
-
-/datum/sprite_accessory/hair/parted
- name = "Parted"
- icon_state = "hair_parted"
-
-/datum/sprite_accessory/hair/pompadour
- name = "Pompadour"
- icon_state = "hair_pompadour"
-
-/datum/sprite_accessory/hair/bigpompadour
- name = "Big Pompadour"
- icon_state = "hair_bigpompadour"
-
-/datum/sprite_accessory/hair/quiff
- name = "Quiff"
- icon_state = "hair_quiff"
-
-/datum/sprite_accessory/hair/bedhead
- name = "Bedhead"
- icon_state = "hair_bedhead"
-
-/datum/sprite_accessory/hair/bedhead2
- name = "Bedhead 2"
- icon_state = "hair_bedheadv2"
-
-/datum/sprite_accessory/hair/bedhead3
- name = "Bedhead 3"
- icon_state = "hair_bedheadv3"
-
-/datum/sprite_accessory/hair/messy
- name = "Messy"
- icon_state = "hair_messy"
-
-/datum/sprite_accessory/hair/beehive
- name = "Beehive"
- icon_state = "hair_beehive"
-
-/datum/sprite_accessory/hair/beehive2
- name = "Beehive 2"
- icon_state = "hair_beehivev2"
-
-/datum/sprite_accessory/hair/bobcurl
- name = "Bobcurl"
- icon_state = "hair_bobcurl"
-
-/datum/sprite_accessory/hair/bob
- name = "Bob"
- icon_state = "hair_bobcut"
-
-/datum/sprite_accessory/hair/bowl
- name = "Bowl"
- icon_state = "hair_bowlcut"
-
-/datum/sprite_accessory/hair/buzz
- name = "Buzzcut"
- icon_state = "hair_buzzcut"
-
-/datum/sprite_accessory/hair/crew
- name = "Crewcut"
- icon_state = "hair_crewcut"
-
-/datum/sprite_accessory/hair/combover
- name = "Combover"
- icon_state = "hair_combover"
-
-/datum/sprite_accessory/hair/devillock
- name = "Devil Lock"
- icon_state = "hair_devilock"
-
-/datum/sprite_accessory/hair/dreadlocks
- name = "Dreadlocks"
- icon_state = "hair_dreads"
-
-/datum/sprite_accessory/hair/curls
- name = "Curls"
- icon_state = "hair_curls"
-
-/datum/sprite_accessory/hair/afro
- name = "Afro"
- icon_state = "hair_afro"
-
-/datum/sprite_accessory/hair/afro2
- name = "Afro 2"
- icon_state = "hair_afro2"
-
-/datum/sprite_accessory/hair/afro_large
- name = "Big Afro"
- icon_state = "hair_bigafro"
-
-/datum/sprite_accessory/hair/sargeant
- name = "Flat Top"
- icon_state = "hair_sargeant"
-
-/datum/sprite_accessory/hair/emo
- name = "Emo"
- icon_state = "hair_emo"
-
-/datum/sprite_accessory/hair/longemo
- name = "Long Emo"
- icon_state = "hair_longemo"
-
-/datum/sprite_accessory/hair/fag
- name = "Flow Hair"
- icon_state = "hair_f"
-
-/datum/sprite_accessory/hair/feather
- name = "Feather"
- icon_state = "hair_feather"
-
-/datum/sprite_accessory/hair/hitop
- name = "Hitop"
- icon_state = "hair_hitop"
-
-/datum/sprite_accessory/hair/mohawk
- name = "Mohawk"
- icon_state = "hair_d"
-
-/datum/sprite_accessory/hair/reversemohawk
- name = "Reverse Mohawk"
- icon_state = "hair_reversemohawk"
-
-/datum/sprite_accessory/hair/jensen
- name = "Jensen Hair"
- icon_state = "hair_jensen"
-
-/datum/sprite_accessory/hair/gelled
- name = "Gelled Back"
- icon_state = "hair_gelled"
-
-/datum/sprite_accessory/hair/spiky
- name = "Spiky"
- icon_state = "hair_spikey"
-
-/datum/sprite_accessory/hair/spiky2
- name = "Spiky 2"
- icon_state = "hair_spiky"
-
-/datum/sprite_accessory/hair/spiky3
- name = "Spiky 3"
- icon_state = "hair_spiky2"
-
-/datum/sprite_accessory/hair/protagonist
- name = "Slightly Long"
- icon_state = "hair_protagonist"
-
-/datum/sprite_accessory/hair/kusangi
- name = "Kusanagi Hair"
- icon_state = "hair_kusanagi"
-
-/datum/sprite_accessory/hair/kagami
- name = "Pigtails"
- icon_state = "hair_kagami"
-
-/datum/sprite_accessory/hair/pigtail
- name = "Pigtails 2"
- icon_state = "hair_pigtails"
-
-/datum/sprite_accessory/hair/pigtail
- name = "Pigtails 3"
- icon_state = "hair_pigtails2"
-
-/datum/sprite_accessory/hair/himecut
- name = "Hime Cut"
- icon_state = "hair_himecut"
-
-/datum/sprite_accessory/hair/himecut2
- name = "Hime Cut 2"
- icon_state = "hair_himecut2"
-
-/datum/sprite_accessory/hair/himeup
- name = "Hime Updo"
- icon_state = "hair_himeup"
-
-/datum/sprite_accessory/hair/antenna
- name = "Ahoge"
- icon_state = "hair_antenna"
-
-/datum/sprite_accessory/hair/front_braid
- name = "Braided front"
- icon_state = "hair_braidfront"
-
-/datum/sprite_accessory/hair/lowbraid
- name = "Low Braid"
- icon_state = "hair_hbraid"
-
-/datum/sprite_accessory/hair/not_floorlength_braid
- name = "High Braid"
- icon_state = "hair_braid2"
-
-/datum/sprite_accessory/hair/shortbraid
- name = "Short Braid"
- icon_state = "hair_shortbraid"
-
-/datum/sprite_accessory/hair/braid
- name = "Floorlength Braid"
- icon_state = "hair_braid"
-
-/datum/sprite_accessory/hair/odango
- name = "Odango"
- icon_state = "hair_odango"
-
-/datum/sprite_accessory/hair/ombre
- name = "Ombre"
- icon_state = "hair_ombre"
-
-/datum/sprite_accessory/hair/updo
- name = "Updo"
- icon_state = "hair_updo"
-
-/datum/sprite_accessory/hair/skinhead
- name = "Skinhead"
- icon_state = "hair_skinhead"
-
-/datum/sprite_accessory/hair/longbangs
- name = "Long Bangs"
- icon_state = "hair_lbangs"
-
-/datum/sprite_accessory/hair/balding
- name = "Balding Hair"
- icon_state = "hair_e"
-
-/datum/sprite_accessory/hair/bald
- name = "Bald"
- icon_state = null
-
-/datum/sprite_accessory/hair/parted
- name = "Side Part"
- icon_state = "hair_part"
-
-/datum/sprite_accessory/hair/braided
- name = "Braided"
- icon_state = "hair_braided"
-
-/datum/sprite_accessory/hair/bun
- name = "Bun Head"
- icon_state = "hair_bun"
-
-/datum/sprite_accessory/hair/bun2
- name = "Bun Head 2"
- icon_state = "hair_bunhead2"
-
-/datum/sprite_accessory/hair/braidtail
- name = "Braided Tail"
- icon_state = "hair_braidtail"
-
-/datum/sprite_accessory/hair/bigflattop
- name = "Big Flat Top"
- icon_state = "hair_bigflattop"
-
-/datum/sprite_accessory/hair/drillhair
- name = "Drill Hair"
- icon_state = "hair_drillhair"
-
-/datum/sprite_accessory/hair/keanu
- name = "Keanu Hair"
- icon_state = "hair_keanu"
-
-/datum/sprite_accessory/hair/swept
- name = "Swept Back Hair"
- icon_state = "hair_swept"
-
-/datum/sprite_accessory/hair/swept2
- name = "Swept Back Hair 2"
- icon_state = "hair_swept2"
-
-/datum/sprite_accessory/hair/business
- name = "Business Hair"
- icon_state = "hair_business"
-
-/datum/sprite_accessory/hair/business2
- name = "Business Hair 2"
- icon_state = "hair_business2"
-
-/datum/sprite_accessory/hair/business3
- name = "Business Hair 3"
- icon_state = "hair_business3"
-
-/datum/sprite_accessory/hair/business4
- name = "Business Hair 4"
- icon_state = "hair_business4"
-
-/datum/sprite_accessory/hair/hedgehog
- name = "Hedgehog Hair"
- icon_state = "hair_hedgehog"
-
-/datum/sprite_accessory/hair/bob
- name = "Bob Hair"
- icon_state = "hair_bob"
-
-/datum/sprite_accessory/hair/bob2
- name = "Bob Hair 2"
- icon_state = "hair_bob2"
-
-/datum/sprite_accessory/hair/boddicker
- name = "Boddicker"
- icon_state = "hair_boddicker"
-
-/datum/sprite_accessory/hair/long
- name = "Long Hair 1"
- icon_state = "hair_long"
-
-/datum/sprite_accessory/hair/long2
- name = "Long Hair 2"
- icon_state = "hair_long2"
-
-/datum/sprite_accessory/hair/pixie
- name = "Pixie Cut"
- icon_state = "hair_pixie"
-
-/datum/sprite_accessory/hair/megaeyebrows
- name = "Mega Eyebrows"
- icon_state = "hair_megaeyebrows"
-
-/datum/sprite_accessory/hair/highponytail
- name = "High Ponytail"
- icon_state = "hair_highponytail"
-
-/datum/sprite_accessory/hair/longponytail
- name = "Long Ponytail"
- icon_state = "hair_longstraightponytail"
-
-/datum/sprite_accessory/hair/sidepartlongalt
- name = "Long Side Part"
- icon_state = "hair_longsidepart"
-
-/datum/sprite_accessory/hair/sidecut
- name = "Sidecut"
- icon_state = "hair_sidecut"
-
-/datum/sprite_accessory/hair/largebun
- name = "Large Bun"
- icon_state = "hair_largebun"
-
-/////////////////////////////
-// Facial Hair Definitions //
-/////////////////////////////
-/datum/sprite_accessory/facial_hair
- icon = 'icons/mob/human_face.dmi'
- gender = MALE // barf (unless you're a dorf, dorfs dig chix w/ beards :P)
-
-/datum/sprite_accessory/facial_hair/shaved
- name = "Shaved"
- icon_state = null
- gender = NEUTER
-
-/datum/sprite_accessory/facial_hair/watson
- name = "Watson Mustache"
- icon_state = "facial_watson"
-
-/datum/sprite_accessory/facial_hair/hogan
- name = "Hulk Hogan Mustache"
- icon_state = "facial_hogan" //-Neek
-
-/datum/sprite_accessory/facial_hair/vandyke
- name = "Van Dyke Mustache"
- icon_state = "facial_vandyke"
-
-/datum/sprite_accessory/facial_hair/chaplin
- name = "Square Mustache"
- icon_state = "facial_chaplin"
-
-/datum/sprite_accessory/facial_hair/selleck
- name = "Selleck Mustache"
- icon_state = "facial_selleck"
-
-/datum/sprite_accessory/facial_hair/neckbeard
- name = "Neckbeard"
- icon_state = "facial_neckbeard"
-
-/datum/sprite_accessory/facial_hair/fullbeard
- name = "Full Beard"
- icon_state = "facial_fullbeard"
-
-/datum/sprite_accessory/facial_hair/longbeard
- name = "Long Beard"
- icon_state = "facial_longbeard"
-
-/datum/sprite_accessory/facial_hair/vlongbeard
- name = "Very Long Beard"
- icon_state = "facial_wise"
-
-/datum/sprite_accessory/facial_hair/elvis
- name = "Elvis Sideburns"
- icon_state = "facial_elvis"
-
-/datum/sprite_accessory/facial_hair/abe
- name = "Abraham Lincoln Beard"
- icon_state = "facial_abe"
-
-/datum/sprite_accessory/facial_hair/chinstrap
- name = "Chinstrap"
- icon_state = "facial_chin"
-
-/datum/sprite_accessory/facial_hair/hip
- name = "Hipster Beard"
- icon_state = "facial_hip"
-
-/datum/sprite_accessory/facial_hair/gt
- name = "Goatee"
- icon_state = "facial_gt"
-
-/datum/sprite_accessory/facial_hair/jensen
- name = "Jensen Beard"
- icon_state = "facial_jensen"
-
-/datum/sprite_accessory/facial_hair/dwarf
- name = "Dwarf Beard"
- icon_state = "facial_dwarf"
-
-/datum/sprite_accessory/facial_hair/fiveoclock
- name = "Five o Clock Shadow"
- icon_state = "facial_fiveoclock"
-
-/datum/sprite_accessory/facial_hair/fu
- name = "Fu Manchu"
- icon_state = "facial_fumanchu"
-
-/datum/sprite_accessory/facial_hair/brokenman
- name = "Broken Man"
- icon_state = "facial_brokenman"
-
-
-///////////////////////////
-// Underwear Definitions //
-///////////////////////////
-/datum/sprite_accessory/underwear
- icon = 'icons/mob/underwear.dmi'
-
-/datum/sprite_accessory/underwear/nude
- name = "Nude"
- icon_state = null
- gender = NEUTER
-
-/datum/sprite_accessory/underwear/male_white
- name = "Mens White"
- icon_state = "male_white"
- gender = MALE
-
-/datum/sprite_accessory/underwear/male_grey
- name = "Mens Grey"
- icon_state = "male_grey"
- gender = MALE
-
-/datum/sprite_accessory/underwear/male_green
- name = "Mens Green"
- icon_state = "male_green"
- gender = MALE
-
-/datum/sprite_accessory/underwear/male_blue
- name = "Mens Blue"
- icon_state = "male_blue"
- gender = MALE
-
-/datum/sprite_accessory/underwear/male_black
- name = "Mens Black"
- icon_state = "male_black"
- gender = MALE
-
-/datum/sprite_accessory/underwear/male_mankini
- name = "Mankini"
- icon_state = "male_mankini"
- gender = MALE
-
-/datum/sprite_accessory/underwear/male_hearts
- name = "Mens Hearts Boxer"
- icon_state = "male_hearts"
- gender = MALE
-
-/datum/sprite_accessory/underwear/male_blackalt
- name = "Mens Black Boxer"
- icon_state = "male_blackalt"
- gender = MALE
-
-/datum/sprite_accessory/underwear/male_greyalt
- name = "Mens Grey Boxer"
- icon_state = "male_greyalt"
- gender = MALE
-
-/datum/sprite_accessory/underwear/male_stripe
- name = "Mens Striped Boxer"
- icon_state = "male_stripe"
- gender = MALE
-
-/datum/sprite_accessory/underwear/male_commie
- name = "Mens Striped Commie Boxer"
- icon_state = "male_commie"
- gender = MALE
-
-/datum/sprite_accessory/underwear/male_uk
- name = "Mens Striped UK Boxer"
- icon_state = "male_uk"
- gender = MALE
-
-/datum/sprite_accessory/underwear/male_usastripe
- name = "Mens Striped Freedom Boxer"
- icon_state = "male_assblastusa"
- gender = MALE
-
-/datum/sprite_accessory/underwear/male_kinky
- name = "Mens Kinky"
- icon_state = "male_kinky"
- gender = MALE
-
-/datum/sprite_accessory/underwear/male_red
- name = "Mens Red"
- icon_state = "male_red"
- gender = MALE
-
-/datum/sprite_accessory/underwear/female_red
- name = "Ladies Red"
- icon_state = "female_red"
- gender = FEMALE
-
-/datum/sprite_accessory/underwear/female_white
- name = "Ladies White"
- icon_state = "female_white"
- gender = FEMALE
-
-/datum/sprite_accessory/underwear/female_yellow
- name = "Ladies Yellow"
- icon_state = "female_yellow"
- gender = FEMALE
-
-/datum/sprite_accessory/underwear/female_blue
- name = "Ladies Blue"
- icon_state = "female_blue"
- gender = FEMALE
-
-/datum/sprite_accessory/underwear/female_black
- name = "Ladies Black"
- icon_state = "female_black"
- gender = FEMALE
-
-/datum/sprite_accessory/underwear/female_thong
- name = "Ladies Thong"
- icon_state = "female_thong"
- gender = FEMALE
-
-/datum/sprite_accessory/underwear/female_babydoll
- name = "Babydoll"
- icon_state = "female_babydoll"
- gender = FEMALE
-
-/datum/sprite_accessory/underwear/female_babyblue
- name = "Ladies Baby-Blue"
- icon_state = "female_babyblue"
- gender = FEMALE
-
-/datum/sprite_accessory/underwear/female_green
- name = "Ladies Green"
- icon_state = "female_green"
- gender = FEMALE
-
-/datum/sprite_accessory/underwear/female_pink
- name = "Ladies Pink"
- icon_state = "female_pink"
- gender = FEMALE
-
-/datum/sprite_accessory/underwear/female_kinky
- name = "Ladies Kinky"
- icon_state = "female_kinky"
- gender = FEMALE
-
-/datum/sprite_accessory/underwear/female_whitealt
- name = "Ladies White Sport"
- icon_state = "female_whitealt"
- gender = FEMALE
-
-/datum/sprite_accessory/underwear/female_blackalt
- name = "Ladies Black Sport"
- icon_state = "female_blackalt"
- gender = FEMALE
-
-/datum/sprite_accessory/underwear/female_white_neko
- name = "Ladies White Neko"
- icon_state = "female_neko_white"
- gender = FEMALE
-
-/datum/sprite_accessory/underwear/female_black_neko
- name = "Ladies Black Neko"
- icon_state = "female_neko_black"
- gender = FEMALE
-
-/datum/sprite_accessory/underwear/female_usastripe
- name = "Ladies Freedom"
- icon_state = "female_assblastusa"
- gender = FEMALE
-
-/datum/sprite_accessory/underwear/female_uk
- name = "Ladies UK"
- icon_state = "female_uk"
- gender = FEMALE
-
-/datum/sprite_accessory/underwear/female_commie
- name = "Ladies Commie"
- icon_state = "female_commie"
- gender = FEMALE
-
-////////////////////////////
-// Undershirt Definitions //
-////////////////////////////
-/datum/sprite_accessory/undershirt
- icon = 'icons/mob/underwear.dmi'
-
-/datum/sprite_accessory/undershirt/nude
- name = "Nude"
- icon_state = null
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/shirt_white
- name = "White Shirt"
- icon_state = "shirt_white"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/shirt_black
- name = "Black Shirt"
- icon_state = "shirt_black"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/shirt_grey
- name = "Grey Shirt"
- icon_state = "shirt_grey"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/tank_white
- name = "White Tank Top"
- icon_state = "tank_white"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/tank_black
- name = "Black Tank Top"
- icon_state = "tank_black"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/tank_grey
- name = "Grey Tank Top"
- icon_state = "tank_grey"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/female_midriff
- name = "Midriff Tank Top"
- icon_state = "tank_midriff"
- gender = FEMALE
-
-/datum/sprite_accessory/undershirt/lover
- name = "Lover Shirt"
- icon_state = "lover"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/ian
- name = "Blue Ian Shirt"
- icon_state = "ian"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/uk
- name = "UK Shirt"
- icon_state = "uk"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/usa
- name = "USA Shirt"
- icon_state = "shirt_assblastusa"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/ilovent
- name = "I Love NT Shirt"
- icon_state = "ilovent"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/peace
- name = "Peace Shirt"
- icon_state = "peace"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/mondmondjaja
- name = "Band Shirt"
- icon_state = "band"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/pacman
- name = "Pogoman Shirt"
- icon_state = "pogoman"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/matroska
- name = "Matroska Shirt"
- icon_state = "matroska"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/whiteshortsleeve
- name = "White Short-sleeved Shirt"
- icon_state = "whiteshortsleeve"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/purpleshortsleeve
- name = "Purple Short-sleeved Shirt"
- icon_state = "purpleshortsleeve"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/blueshortsleeve
- name = "Blue Short-sleeved Shirt"
- icon_state = "blueshortsleeve"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/greenshortsleeve
- name = "Green Short-sleeved Shirt"
- icon_state = "greenshortsleeve"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/blackshortsleeve
- name = "Black Short-sleeved Shirt"
- icon_state = "blackshortsleeve"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/blueshirt
- name = "Blue T-Shirt"
- icon_state = "blueshirt"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/redshirt
- name = "Red T-Shirt"
- icon_state = "redshirt"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/yellowshirt
- name = "Yellow T-Shirt"
- icon_state = "yellowshirt"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/greenshirt
- name = "Green T-Shirt"
- icon_state = "greenshirt"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/bluepolo
- name = "Blue Polo Shirt"
- icon_state = "bluepolo"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/redpolo
- name = "Red Polo Shirt"
- icon_state = "redpolo"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/whitepolo
- name = "White Polo Shirt"
- icon_state = "whitepolo"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/grayyellowpolo
- name = "Gray-Yellow Polo Shirt"
- icon_state = "grayyellowpolo"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/redtop
- name = "Red Top"
- icon_state = "redtop"
- gender = FEMALE
-
-/datum/sprite_accessory/undershirt/whitetop
- name = "White Top"
- icon_state = "whitetop"
- gender = FEMALE
-
-/datum/sprite_accessory/undershirt/greenshirtsport
- name = "Green Sports Shirt"
- icon_state = "greenshirtsport"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/redshirtsport
- name = "Red Sports Shirt"
- icon_state = "redshirtsport"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/blueshirtsport
- name = "Blue Sports Shirt"
- icon_state = "blueshirtsport"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/ss13
- name = "SS13 Shirt"
- icon_state = "shirt_ss13"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/tankfire
- name = "Fire Tank Top"
- icon_state = "tank_fire"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/question
- name = "Question Shirt"
- icon_state = "shirt_question"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/skull
- name = "Skull Shirt"
- icon_state = "shirt_skull"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/commie
- name = "Commie Shirt"
- icon_state = "shirt_commie"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/nano
- name = "Nanotrasen Shirt"
- icon_state = "shirt_nano"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/stripe
- name = "Striped Shirt"
- icon_state = "shirt_stripes"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/blueshirt
- name = "Blue Shirt"
- icon_state = "shirt_blue"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/redshirt
- name = "Red Shirt"
- icon_state = "shirt_red"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/tank_red
- name = "Red Tank Top"
- icon_state = "tank_red"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/greenshirt
- name = "Green Shirt"
- icon_state = "shirt_green"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/meat
- name = "Meat Shirt"
- icon_state = "shirt_meat"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/tiedye
- name = "Tie-dye Shirt"
- icon_state = "shirt_tiedye"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/redjersey
- name = "Red Jersey"
- icon_state = "shirt_redjersey"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/bluejersey
- name = "Blue Jersey"
- icon_state = "shirt_bluejersey"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/tankstripe
- name = "Striped Tank Top"
- icon_state = "tank_stripes"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/clownshirt
- name = "Clown Shirt"
- icon_state = "shirt_clown"
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/alienshirt
- name = "Alien Shirt"
- icon_state = "shirt_alien"
- gender = NEUTER
-
-
-
-///////////////////////
-// Socks Definitions //
-///////////////////////
-/datum/sprite_accessory/socks
- icon = 'icons/mob/underwear.dmi'
-
-/datum/sprite_accessory/socks/nude
- name = "Nude"
- icon_state = null
-
-/datum/sprite_accessory/socks/white_norm
- name = "Normal White"
- icon_state = "white_norm"
-
-/datum/sprite_accessory/socks/black_norm
- name = "Normal Black"
- icon_state = "black_norm"
-
-/datum/sprite_accessory/socks/white_short
- name = "Short White"
- icon_state = "white_short"
-
-/datum/sprite_accessory/socks/black_short
- name = "Short Black"
- icon_state = "black_short"
-
-/datum/sprite_accessory/socks/white_knee
- name = "Knee-high White"
- icon_state = "white_knee"
-
-/datum/sprite_accessory/socks/black_knee
- name = "Knee-high Black"
- icon_state = "black_knee"
-
-/datum/sprite_accessory/socks/thin_knee
- name = "Knee-high Thin"
- icon_state = "thin_knee"
-
-/datum/sprite_accessory/socks/striped_knee
- name = "Knee-high Striped"
- icon_state = "striped_knee"
-
-/datum/sprite_accessory/socks/rainbow_knee
- name = "Knee-high Rainbow"
- icon_state = "rainbow_knee"
-
-/datum/sprite_accessory/socks/white_thigh
- name = "Thigh-high White"
- icon_state = "white_thigh"
-
-/datum/sprite_accessory/socks/black_thigh
- name = "Thigh-high Black"
- icon_state = "black_thigh"
-
-/datum/sprite_accessory/socks/thin_thigh
- name = "Thigh-high Thin"
- icon_state = "thin_thigh"
-
-/datum/sprite_accessory/socks/striped_thigh
- name = "Thigh-high Striped"
- icon_state = "striped_thigh"
-
-/datum/sprite_accessory/socks/rainbow_thigh
- name = "Thigh-high Rainbow"
- icon_state = "rainbow_thigh"
-
-/datum/sprite_accessory/socks/usa_knee
- name = "Knee-High Freedom Stripes"
- icon_state = "assblastusa_knee"
-
-/datum/sprite_accessory/socks/usa_thigh
- name = "Thigh-high Freedom Stripes"
- icon_state = "assblastusa_thigh"
-
-/datum/sprite_accessory/socks/uk_knee
- name = "Knee-High UK Stripes"
- icon_state = "uk_knee"
-
-/datum/sprite_accessory/socks/uk_thigh
- name = "Thigh-high UK Stripes"
- icon_state = "uk_thigh"
-
-/datum/sprite_accessory/socks/commie_knee
- name = "Knee-High Commie Stripes"
- icon_state = "commie_knee"
-
-/datum/sprite_accessory/socks/commie_thigh
- name = "Thigh-high Commie Stripes"
- icon_state = "commie_thigh"
-
-/datum/sprite_accessory/socks/pantyhose
- name = "Pantyhose"
- icon_state = "pantyhose"
-
-//////////.//////////////////
-// MutantParts Definitions //
-/////////////////////////////
-
-/datum/sprite_accessory/body_markings
- icon = 'icons/mob/mutant_bodyparts.dmi'
-
-/datum/sprite_accessory/body_markings/none
- name = "None"
- icon_state = "none"
-
-/datum/sprite_accessory/body_markings/dtiger
- name = "Dark Tiger Body"
- icon_state = "dtiger"
- gender_specific = 1
-
-/datum/sprite_accessory/body_markings/ltiger
- name = "Light Tiger Body"
- icon_state = "ltiger"
- gender_specific = 1
-
-/datum/sprite_accessory/body_markings/lbelly
- name = "Light Belly"
- icon_state = "lbelly"
- gender_specific = 1
-
-/datum/sprite_accessory/tails
- icon = 'icons/mob/mutant_bodyparts.dmi'
-
-/datum/sprite_accessory/tails_animated
- icon = 'icons/mob/mutant_bodyparts.dmi'
-
-/datum/sprite_accessory/tails/lizard/smooth
- name = "Smooth"
- icon_state = "smooth"
-
-/datum/sprite_accessory/tails_animated/lizard/smooth
- name = "Smooth"
- icon_state = "smooth"
-
-/datum/sprite_accessory/tails/lizard/dtiger
- name = "Dark Tiger"
- icon_state = "dtiger"
-
-/datum/sprite_accessory/tails_animated/lizard/dtiger
- name = "Dark Tiger"
- icon_state = "dtiger"
-
-/datum/sprite_accessory/tails/lizard/ltiger
- name = "Light Tiger"
- icon_state = "ltiger"
-
-/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/human/none
- name = "None"
- icon_state = "none"
-
-/datum/sprite_accessory/tails_animated/human/none
- name = "None"
- icon_state = "none"
-
-/datum/sprite_accessory/tails/human/cat
- name = "Cat"
- icon_state = "cat"
- color_src = HAIR
-
-/datum/sprite_accessory/tails_animated/human/cat
- name = "Cat"
- icon_state = "cat"
- color_src = HAIR
-
-/datum/sprite_accessory/snouts
- icon = 'icons/mob/mutant_bodyparts.dmi'
-
-/datum/sprite_accessory/snouts/sharp
- name = "Sharp"
- icon_state = "sharp"
-
-/datum/sprite_accessory/snouts/round
- name = "Round"
- icon_state = "round"
-
-/datum/sprite_accessory/snouts/sharplight
- name = "Sharp + Light"
- icon_state = "sharplight"
-
-/datum/sprite_accessory/snouts/roundlight
- name = "Round + Light"
- icon_state = "roundlight"
-
-/datum/sprite_accessory/horns
- icon = 'icons/mob/mutant_bodyparts.dmi'
-
-/datum/sprite_accessory/horns/none
- name = "None"
- icon_state = "none"
-
-/datum/sprite_accessory/horns/simple
- name = "Simple"
- icon_state = "simple"
-
-/datum/sprite_accessory/horns/short
- name = "Short"
- icon_state = "short"
-
-/datum/sprite_accessory/horns/curled
- name = "Curled"
- icon_state = "curled"
-
-/datum/sprite_accessory/horns/ram
- name = "Ram"
- icon_state = "ram"
-
-/datum/sprite_accessory/horns/angler
- name = "Angeler"
- icon_state = "angler"
-
-/datum/sprite_accessory/ears
- icon = 'icons/mob/mutant_bodyparts.dmi'
-
-/datum/sprite_accessory/ears/none
- name = "None"
- icon_state = "none"
-
-/datum/sprite_accessory/ears/cat
- name = "Cat"
- icon_state = "cat"
- hasinner = 1
- color_src = HAIR
-
-/datum/sprite_accessory/wings/none
- name = "None"
- icon_state = "none"
-
-/datum/sprite_accessory/wings_open
- icon = 'icons/mob/wings.dmi'
-
-/datum/sprite_accessory/wings_open/angel
- name = "Angel"
- icon_state = "angel"
- color_src = 0
- dimension_x = 46
- center = TRUE
- dimension_y = 34
-
-/datum/sprite_accessory/wings
- icon = 'icons/mob/wings.dmi'
-
-/datum/sprite_accessory/wings/angel
- name = "Angel"
- icon_state = "angel"
- color_src = 0
- dimension_x = 46
- center = TRUE
- dimension_y = 34
- locked = TRUE
-
-/datum/sprite_accessory/frills
- icon = 'icons/mob/mutant_bodyparts.dmi'
-
-/datum/sprite_accessory/frills/none
- name = "None"
- icon_state = "none"
-
-/datum/sprite_accessory/frills/simple
- name = "Simple"
- icon_state = "simple"
-
-/datum/sprite_accessory/frills/short
- name = "Short"
- icon_state = "short"
-
-/datum/sprite_accessory/frills/aquatic
- name = "Aquatic"
- icon_state = "aqua"
-
-/datum/sprite_accessory/spines
- icon = 'icons/mob/mutant_bodyparts.dmi'
-
-/datum/sprite_accessory/spines_animated
- icon = 'icons/mob/mutant_bodyparts.dmi'
-
-/datum/sprite_accessory/spines/none
- name = "None"
- icon_state = "none"
-
-/datum/sprite_accessory/spines_animated/none
- name = "None"
- icon_state = "none"
-
-/datum/sprite_accessory/spines/short
- name = "Short"
- icon_state = "short"
-
-/datum/sprite_accessory/spines_animated/short
- name = "Short"
- icon_state = "short"
-
-/datum/sprite_accessory/spines/shortmeme
- name = "Short + Membrane"
- icon_state = "shortmeme"
-
-/datum/sprite_accessory/spines_animated/shortmeme
- name = "Short + Membrane"
- icon_state = "shortmeme"
-
-/datum/sprite_accessory/spines/long
- name = "Long"
- icon_state = "long"
-
-/datum/sprite_accessory/spines_animated/long
- name = "Long"
- icon_state = "long"
-
-/datum/sprite_accessory/spines/longmeme
- name = "Long + Membrane"
- icon_state = "longmeme"
-
-/datum/sprite_accessory/spines_animated/longmeme
- name = "Long + Membrane"
- icon_state = "longmeme"
-
-/datum/sprite_accessory/spines/aqautic
- name = "Aquatic"
- icon_state = "aqua"
-
-/datum/sprite_accessory/spines_animated/aqautic
- name = "Aquatic"
- icon_state = "aqua"
-
-/datum/sprite_accessory/legs //legs are a special case, they aren't actually sprite_accessories but are updated with them.
- icon = null //These datums exist for selecting legs on preference, and little else
-
-/datum/sprite_accessory/legs/none
- name = "Normal Legs"
-
-/datum/sprite_accessory/legs/digitigrade_lizard
- name = "Digitigrade Legs"
+ var/dimension_x = 32
+ var/dimension_y = 32
+ var/center = FALSE //Should we center the sprite?
+
+//////////////////////
+// Hair Definitions //
+//////////////////////
+/datum/sprite_accessory/hair
+ icon = 'icons/mob/human_face.dmi' // default icon for all hairs
+
+/datum/sprite_accessory/hair/short
+ name = "Short Hair" // try to capatilize the names please~ // try to spell
+ icon_state = "hair_a" // you do not need to define _s or _l sub-states, game automatically does this for you
+
+/datum/sprite_accessory/hair/shorthair2
+ name = "Short Hair 2"
+ icon_state = "hair_shorthair2"
+
+/datum/sprite_accessory/hair/shorthair3
+ name = "Short Hair 3"
+ icon_state = "hair_shorthair3"
+
+/datum/sprite_accessory/hair/cut
+ name = "Cut Hair"
+ icon_state = "hair_c"
+
+/datum/sprite_accessory/hair/long
+ name = "Shoulder-length Hair"
+ icon_state = "hair_b"
+
+/datum/sprite_accessory/hair/longer
+ name = "Long Hair"
+ icon_state = "hair_vlong"
+
+/datum/sprite_accessory/hair/over_eye
+ name = "Over Eye"
+ icon_state = "hair_shortovereye"
+
+/datum/sprite_accessory/hair/long_over_eye
+ name = "Long Over Eye"
+ icon_state = "hair_longovereye"
+
+/datum/sprite_accessory/hair/longest2
+ name = "Very Long Over Eye"
+ icon_state = "hair_longest2"
+
+/datum/sprite_accessory/hair/longest
+ name = "Very Long Hair"
+ icon_state = "hair_longest"
+
+/datum/sprite_accessory/hair/longfringe
+ name = "Long Fringe"
+ icon_state = "hair_longfringe"
+
+/datum/sprite_accessory/hair/longestalt
+ name = "Longer Fringe"
+ icon_state = "hair_vlongfringe"
+
+/datum/sprite_accessory/hair/gentle
+ name = "Gentle"
+ icon_state = "hair_gentle"
+
+/datum/sprite_accessory/hair/halfbang
+ name = "Half-banged Hair"
+ icon_state = "hair_halfbang"
+
+/datum/sprite_accessory/hair/halfbang2
+ name = "Half-banged Hair 2"
+ icon_state = "hair_halfbang2"
+
+/datum/sprite_accessory/hair/ponytail1
+ name = "Ponytail"
+ icon_state = "hair_ponytail"
+
+/datum/sprite_accessory/hair/ponytail2
+ name = "Ponytail 2"
+ icon_state = "hair_ponytail2"
+
+/datum/sprite_accessory/hair/ponytail3
+ name = "Ponytail 3"
+ icon_state = "hair_ponytail3"
+
+/datum/sprite_accessory/hair/ponytail4
+ name = "Ponytail 4"
+ icon_state = "hair_ponytail4"
+
+/datum/sprite_accessory/hair/ponytail5
+ name = "Ponytail 5"
+ icon_state = "hair_ponytail5"
+
+
+/datum/sprite_accessory/hair/sidetail
+ name = "Side Pony"
+ icon_state = "hair_sidetail"
+
+/datum/sprite_accessory/hair/sidetail2
+ name = "Side Pony 2"
+ icon_state = "hair_sidetail2"
+
+/datum/sprite_accessory/hair/sidetail3
+ name = "Side Pony 3"
+ icon_state = "hair_sidetail3"
+
+/datum/sprite_accessory/hair/sidetail4
+ name = "Side Pony 4"
+ icon_state = "hair_sidetail4"
+
+/datum/sprite_accessory/hair/oneshoulder
+ name = "One Shoulder"
+ icon_state = "hair_oneshoulder"
+
+/datum/sprite_accessory/hair/tressshoulder
+ name = "Tress Shoulder"
+ icon_state = "hair_tressshoulder"
+
+/datum/sprite_accessory/hair/parted
+ name = "Parted"
+ icon_state = "hair_parted"
+
+/datum/sprite_accessory/hair/pompadour
+ name = "Pompadour"
+ icon_state = "hair_pompadour"
+
+/datum/sprite_accessory/hair/bigpompadour
+ name = "Big Pompadour"
+ icon_state = "hair_bigpompadour"
+
+/datum/sprite_accessory/hair/quiff
+ name = "Quiff"
+ icon_state = "hair_quiff"
+
+/datum/sprite_accessory/hair/bedhead
+ name = "Bedhead"
+ icon_state = "hair_bedhead"
+
+/datum/sprite_accessory/hair/bedhead2
+ name = "Bedhead 2"
+ icon_state = "hair_bedheadv2"
+
+/datum/sprite_accessory/hair/bedhead3
+ name = "Bedhead 3"
+ icon_state = "hair_bedheadv3"
+
+/datum/sprite_accessory/hair/messy
+ name = "Messy"
+ icon_state = "hair_messy"
+
+/datum/sprite_accessory/hair/beehive
+ name = "Beehive"
+ icon_state = "hair_beehive"
+
+/datum/sprite_accessory/hair/beehive2
+ name = "Beehive 2"
+ icon_state = "hair_beehivev2"
+
+/datum/sprite_accessory/hair/bobcurl
+ name = "Bobcurl"
+ icon_state = "hair_bobcurl"
+
+/datum/sprite_accessory/hair/bob
+ name = "Bob"
+ icon_state = "hair_bobcut"
+
+/datum/sprite_accessory/hair/bowl
+ name = "Bowl"
+ icon_state = "hair_bowlcut"
+
+/datum/sprite_accessory/hair/buzz
+ name = "Buzzcut"
+ icon_state = "hair_buzzcut"
+
+/datum/sprite_accessory/hair/crew
+ name = "Crewcut"
+ icon_state = "hair_crewcut"
+
+/datum/sprite_accessory/hair/combover
+ name = "Combover"
+ icon_state = "hair_combover"
+
+/datum/sprite_accessory/hair/devillock
+ name = "Devil Lock"
+ icon_state = "hair_devilock"
+
+/datum/sprite_accessory/hair/dreadlocks
+ name = "Dreadlocks"
+ icon_state = "hair_dreads"
+
+/datum/sprite_accessory/hair/curls
+ name = "Curls"
+ icon_state = "hair_curls"
+
+/datum/sprite_accessory/hair/afro
+ name = "Afro"
+ icon_state = "hair_afro"
+
+/datum/sprite_accessory/hair/afro2
+ name = "Afro 2"
+ icon_state = "hair_afro2"
+
+/datum/sprite_accessory/hair/afro_large
+ name = "Big Afro"
+ icon_state = "hair_bigafro"
+
+/datum/sprite_accessory/hair/sargeant
+ name = "Flat Top"
+ icon_state = "hair_sargeant"
+
+/datum/sprite_accessory/hair/emo
+ name = "Emo"
+ icon_state = "hair_emo"
+
+/datum/sprite_accessory/hair/longemo
+ name = "Long Emo"
+ icon_state = "hair_longemo"
+
+/datum/sprite_accessory/hair/fag
+ name = "Flow Hair"
+ icon_state = "hair_f"
+
+/datum/sprite_accessory/hair/feather
+ name = "Feather"
+ icon_state = "hair_feather"
+
+/datum/sprite_accessory/hair/hitop
+ name = "Hitop"
+ icon_state = "hair_hitop"
+
+/datum/sprite_accessory/hair/mohawk
+ name = "Mohawk"
+ icon_state = "hair_d"
+
+/datum/sprite_accessory/hair/reversemohawk
+ name = "Reverse Mohawk"
+ icon_state = "hair_reversemohawk"
+
+/datum/sprite_accessory/hair/jensen
+ name = "Jensen Hair"
+ icon_state = "hair_jensen"
+
+/datum/sprite_accessory/hair/gelled
+ name = "Gelled Back"
+ icon_state = "hair_gelled"
+
+/datum/sprite_accessory/hair/spiky
+ name = "Spiky"
+ icon_state = "hair_spikey"
+
+/datum/sprite_accessory/hair/spiky2
+ name = "Spiky 2"
+ icon_state = "hair_spiky"
+
+/datum/sprite_accessory/hair/spiky3
+ name = "Spiky 3"
+ icon_state = "hair_spiky2"
+
+/datum/sprite_accessory/hair/protagonist
+ name = "Slightly Long"
+ icon_state = "hair_protagonist"
+
+/datum/sprite_accessory/hair/kusangi
+ name = "Kusanagi Hair"
+ icon_state = "hair_kusanagi"
+
+/datum/sprite_accessory/hair/kagami
+ name = "Pigtails"
+ icon_state = "hair_kagami"
+
+/datum/sprite_accessory/hair/pigtail
+ name = "Pigtails 2"
+ icon_state = "hair_pigtails"
+
+/datum/sprite_accessory/hair/pigtail
+ name = "Pigtails 3"
+ icon_state = "hair_pigtails2"
+
+/datum/sprite_accessory/hair/himecut
+ name = "Hime Cut"
+ icon_state = "hair_himecut"
+
+/datum/sprite_accessory/hair/himecut2
+ name = "Hime Cut 2"
+ icon_state = "hair_himecut2"
+
+/datum/sprite_accessory/hair/himeup
+ name = "Hime Updo"
+ icon_state = "hair_himeup"
+
+/datum/sprite_accessory/hair/antenna
+ name = "Ahoge"
+ icon_state = "hair_antenna"
+
+/datum/sprite_accessory/hair/front_braid
+ name = "Braided front"
+ icon_state = "hair_braidfront"
+
+/datum/sprite_accessory/hair/lowbraid
+ name = "Low Braid"
+ icon_state = "hair_hbraid"
+
+/datum/sprite_accessory/hair/not_floorlength_braid
+ name = "High Braid"
+ icon_state = "hair_braid2"
+
+/datum/sprite_accessory/hair/shortbraid
+ name = "Short Braid"
+ icon_state = "hair_shortbraid"
+
+/datum/sprite_accessory/hair/braid
+ name = "Floorlength Braid"
+ icon_state = "hair_braid"
+
+/datum/sprite_accessory/hair/odango
+ name = "Odango"
+ icon_state = "hair_odango"
+
+/datum/sprite_accessory/hair/ombre
+ name = "Ombre"
+ icon_state = "hair_ombre"
+
+/datum/sprite_accessory/hair/updo
+ name = "Updo"
+ icon_state = "hair_updo"
+
+/datum/sprite_accessory/hair/skinhead
+ name = "Skinhead"
+ icon_state = "hair_skinhead"
+
+/datum/sprite_accessory/hair/longbangs
+ name = "Long Bangs"
+ icon_state = "hair_lbangs"
+
+/datum/sprite_accessory/hair/balding
+ name = "Balding Hair"
+ icon_state = "hair_e"
+
+/datum/sprite_accessory/hair/bald
+ name = "Bald"
+ icon_state = null
+
+/datum/sprite_accessory/hair/parted
+ name = "Side Part"
+ icon_state = "hair_part"
+
+/datum/sprite_accessory/hair/braided
+ name = "Braided"
+ icon_state = "hair_braided"
+
+/datum/sprite_accessory/hair/bun
+ name = "Bun Head"
+ icon_state = "hair_bun"
+
+/datum/sprite_accessory/hair/bun2
+ name = "Bun Head 2"
+ icon_state = "hair_bunhead2"
+
+/datum/sprite_accessory/hair/braidtail
+ name = "Braided Tail"
+ icon_state = "hair_braidtail"
+
+/datum/sprite_accessory/hair/bigflattop
+ name = "Big Flat Top"
+ icon_state = "hair_bigflattop"
+
+/datum/sprite_accessory/hair/drillhair
+ name = "Drill Hair"
+ icon_state = "hair_drillhair"
+
+/datum/sprite_accessory/hair/keanu
+ name = "Keanu Hair"
+ icon_state = "hair_keanu"
+
+/datum/sprite_accessory/hair/swept
+ name = "Swept Back Hair"
+ icon_state = "hair_swept"
+
+/datum/sprite_accessory/hair/swept2
+ name = "Swept Back Hair 2"
+ icon_state = "hair_swept2"
+
+/datum/sprite_accessory/hair/business
+ name = "Business Hair"
+ icon_state = "hair_business"
+
+/datum/sprite_accessory/hair/business2
+ name = "Business Hair 2"
+ icon_state = "hair_business2"
+
+/datum/sprite_accessory/hair/business3
+ name = "Business Hair 3"
+ icon_state = "hair_business3"
+
+/datum/sprite_accessory/hair/business4
+ name = "Business Hair 4"
+ icon_state = "hair_business4"
+
+/datum/sprite_accessory/hair/hedgehog
+ name = "Hedgehog Hair"
+ icon_state = "hair_hedgehog"
+
+/datum/sprite_accessory/hair/bob
+ name = "Bob Hair"
+ icon_state = "hair_bob"
+
+/datum/sprite_accessory/hair/bob2
+ name = "Bob Hair 2"
+ icon_state = "hair_bob2"
+
+/datum/sprite_accessory/hair/boddicker
+ name = "Boddicker"
+ icon_state = "hair_boddicker"
+
+/datum/sprite_accessory/hair/long
+ name = "Long Hair 1"
+ icon_state = "hair_long"
+
+/datum/sprite_accessory/hair/long2
+ name = "Long Hair 2"
+ icon_state = "hair_long2"
+
+/datum/sprite_accessory/hair/pixie
+ name = "Pixie Cut"
+ icon_state = "hair_pixie"
+
+/datum/sprite_accessory/hair/megaeyebrows
+ name = "Mega Eyebrows"
+ icon_state = "hair_megaeyebrows"
+
+/datum/sprite_accessory/hair/highponytail
+ name = "High Ponytail"
+ icon_state = "hair_highponytail"
+
+/datum/sprite_accessory/hair/longponytail
+ name = "Long Ponytail"
+ icon_state = "hair_longstraightponytail"
+
+/datum/sprite_accessory/hair/sidepartlongalt
+ name = "Long Side Part"
+ icon_state = "hair_longsidepart"
+
+/datum/sprite_accessory/hair/sidecut
+ name = "Sidecut"
+ icon_state = "hair_sidecut"
+
+/datum/sprite_accessory/hair/largebun
+ name = "Large Bun"
+ icon_state = "hair_largebun"
+
+/////////////////////////////
+// Facial Hair Definitions //
+/////////////////////////////
+/datum/sprite_accessory/facial_hair
+ icon = 'icons/mob/human_face.dmi'
+ gender = MALE // barf (unless you're a dorf, dorfs dig chix w/ beards :P)
+
+/datum/sprite_accessory/facial_hair/shaved
+ name = "Shaved"
+ icon_state = null
+ gender = NEUTER
+
+/datum/sprite_accessory/facial_hair/watson
+ name = "Watson Mustache"
+ icon_state = "facial_watson"
+
+/datum/sprite_accessory/facial_hair/hogan
+ name = "Hulk Hogan Mustache"
+ icon_state = "facial_hogan" //-Neek
+
+/datum/sprite_accessory/facial_hair/vandyke
+ name = "Van Dyke Mustache"
+ icon_state = "facial_vandyke"
+
+/datum/sprite_accessory/facial_hair/chaplin
+ name = "Square Mustache"
+ icon_state = "facial_chaplin"
+
+/datum/sprite_accessory/facial_hair/selleck
+ name = "Selleck Mustache"
+ icon_state = "facial_selleck"
+
+/datum/sprite_accessory/facial_hair/neckbeard
+ name = "Neckbeard"
+ icon_state = "facial_neckbeard"
+
+/datum/sprite_accessory/facial_hair/fullbeard
+ name = "Full Beard"
+ icon_state = "facial_fullbeard"
+
+/datum/sprite_accessory/facial_hair/longbeard
+ name = "Long Beard"
+ icon_state = "facial_longbeard"
+
+/datum/sprite_accessory/facial_hair/vlongbeard
+ name = "Very Long Beard"
+ icon_state = "facial_wise"
+
+/datum/sprite_accessory/facial_hair/elvis
+ name = "Elvis Sideburns"
+ icon_state = "facial_elvis"
+
+/datum/sprite_accessory/facial_hair/abe
+ name = "Abraham Lincoln Beard"
+ icon_state = "facial_abe"
+
+/datum/sprite_accessory/facial_hair/chinstrap
+ name = "Chinstrap"
+ icon_state = "facial_chin"
+
+/datum/sprite_accessory/facial_hair/hip
+ name = "Hipster Beard"
+ icon_state = "facial_hip"
+
+/datum/sprite_accessory/facial_hair/gt
+ name = "Goatee"
+ icon_state = "facial_gt"
+
+/datum/sprite_accessory/facial_hair/jensen
+ name = "Jensen Beard"
+ icon_state = "facial_jensen"
+
+/datum/sprite_accessory/facial_hair/dwarf
+ name = "Dwarf Beard"
+ icon_state = "facial_dwarf"
+
+/datum/sprite_accessory/facial_hair/fiveoclock
+ name = "Five o Clock Shadow"
+ icon_state = "facial_fiveoclock"
+
+/datum/sprite_accessory/facial_hair/fu
+ name = "Fu Manchu"
+ icon_state = "facial_fumanchu"
+
+/datum/sprite_accessory/facial_hair/brokenman
+ name = "Broken Man"
+ icon_state = "facial_brokenman"
+
+
+///////////////////////////
+// Underwear Definitions //
+///////////////////////////
+/datum/sprite_accessory/underwear
+ icon = 'icons/mob/underwear.dmi'
+
+/datum/sprite_accessory/underwear/nude
+ name = "Nude"
+ icon_state = null
+ gender = NEUTER
+
+/datum/sprite_accessory/underwear/male_white
+ name = "Mens White"
+ icon_state = "male_white"
+ gender = MALE
+
+/datum/sprite_accessory/underwear/male_grey
+ name = "Mens Grey"
+ icon_state = "male_grey"
+ gender = MALE
+
+/datum/sprite_accessory/underwear/male_green
+ name = "Mens Green"
+ icon_state = "male_green"
+ gender = MALE
+
+/datum/sprite_accessory/underwear/male_blue
+ name = "Mens Blue"
+ icon_state = "male_blue"
+ gender = MALE
+
+/datum/sprite_accessory/underwear/male_black
+ name = "Mens Black"
+ icon_state = "male_black"
+ gender = MALE
+
+/datum/sprite_accessory/underwear/male_mankini
+ name = "Mankini"
+ icon_state = "male_mankini"
+ gender = MALE
+
+/datum/sprite_accessory/underwear/male_hearts
+ name = "Mens Hearts Boxer"
+ icon_state = "male_hearts"
+ gender = MALE
+
+/datum/sprite_accessory/underwear/male_blackalt
+ name = "Mens Black Boxer"
+ icon_state = "male_blackalt"
+ gender = MALE
+
+/datum/sprite_accessory/underwear/male_greyalt
+ name = "Mens Grey Boxer"
+ icon_state = "male_greyalt"
+ gender = MALE
+
+/datum/sprite_accessory/underwear/male_stripe
+ name = "Mens Striped Boxer"
+ icon_state = "male_stripe"
+ gender = MALE
+
+/datum/sprite_accessory/underwear/male_commie
+ name = "Mens Striped Commie Boxer"
+ icon_state = "male_commie"
+ gender = MALE
+
+/datum/sprite_accessory/underwear/male_uk
+ name = "Mens Striped UK Boxer"
+ icon_state = "male_uk"
+ gender = MALE
+
+/datum/sprite_accessory/underwear/male_usastripe
+ name = "Mens Striped Freedom Boxer"
+ icon_state = "male_assblastusa"
+ gender = MALE
+
+/datum/sprite_accessory/underwear/male_kinky
+ name = "Mens Kinky"
+ icon_state = "male_kinky"
+ gender = MALE
+
+/datum/sprite_accessory/underwear/male_red
+ name = "Mens Red"
+ icon_state = "male_red"
+ gender = MALE
+
+/datum/sprite_accessory/underwear/female_red
+ name = "Ladies Red"
+ icon_state = "female_red"
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/female_white
+ name = "Ladies White"
+ icon_state = "female_white"
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/female_yellow
+ name = "Ladies Yellow"
+ icon_state = "female_yellow"
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/female_blue
+ name = "Ladies Blue"
+ icon_state = "female_blue"
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/female_black
+ name = "Ladies Black"
+ icon_state = "female_black"
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/female_thong
+ name = "Ladies Thong"
+ icon_state = "female_thong"
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/female_babydoll
+ name = "Babydoll"
+ icon_state = "female_babydoll"
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/female_babyblue
+ name = "Ladies Baby-Blue"
+ icon_state = "female_babyblue"
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/female_green
+ name = "Ladies Green"
+ icon_state = "female_green"
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/female_pink
+ name = "Ladies Pink"
+ icon_state = "female_pink"
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/female_kinky
+ name = "Ladies Kinky"
+ icon_state = "female_kinky"
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/female_whitealt
+ name = "Ladies White Sport"
+ icon_state = "female_whitealt"
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/female_blackalt
+ name = "Ladies Black Sport"
+ icon_state = "female_blackalt"
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/female_white_neko
+ name = "Ladies White Neko"
+ icon_state = "female_neko_white"
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/female_black_neko
+ name = "Ladies Black Neko"
+ icon_state = "female_neko_black"
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/female_usastripe
+ name = "Ladies Freedom"
+ icon_state = "female_assblastusa"
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/female_uk
+ name = "Ladies UK"
+ icon_state = "female_uk"
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/female_commie
+ name = "Ladies Commie"
+ icon_state = "female_commie"
+ gender = FEMALE
+
+////////////////////////////
+// Undershirt Definitions //
+////////////////////////////
+/datum/sprite_accessory/undershirt
+ icon = 'icons/mob/underwear.dmi'
+
+/datum/sprite_accessory/undershirt/nude
+ name = "Nude"
+ icon_state = null
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/shirt_white
+ name = "White Shirt"
+ icon_state = "shirt_white"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/shirt_black
+ name = "Black Shirt"
+ icon_state = "shirt_black"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/shirt_grey
+ name = "Grey Shirt"
+ icon_state = "shirt_grey"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/tank_white
+ name = "White Tank Top"
+ icon_state = "tank_white"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/tank_black
+ name = "Black Tank Top"
+ icon_state = "tank_black"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/tank_grey
+ name = "Grey Tank Top"
+ icon_state = "tank_grey"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/female_midriff
+ name = "Midriff Tank Top"
+ icon_state = "tank_midriff"
+ gender = FEMALE
+
+/datum/sprite_accessory/undershirt/lover
+ name = "Lover Shirt"
+ icon_state = "lover"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/ian
+ name = "Blue Ian Shirt"
+ icon_state = "ian"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/uk
+ name = "UK Shirt"
+ icon_state = "uk"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/usa
+ name = "USA Shirt"
+ icon_state = "shirt_assblastusa"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/ilovent
+ name = "I Love NT Shirt"
+ icon_state = "ilovent"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/peace
+ name = "Peace Shirt"
+ icon_state = "peace"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/mondmondjaja
+ name = "Band Shirt"
+ icon_state = "band"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/pacman
+ name = "Pogoman Shirt"
+ icon_state = "pogoman"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/matroska
+ name = "Matroska Shirt"
+ icon_state = "matroska"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/whiteshortsleeve
+ name = "White Short-sleeved Shirt"
+ icon_state = "whiteshortsleeve"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/purpleshortsleeve
+ name = "Purple Short-sleeved Shirt"
+ icon_state = "purpleshortsleeve"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/blueshortsleeve
+ name = "Blue Short-sleeved Shirt"
+ icon_state = "blueshortsleeve"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/greenshortsleeve
+ name = "Green Short-sleeved Shirt"
+ icon_state = "greenshortsleeve"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/blackshortsleeve
+ name = "Black Short-sleeved Shirt"
+ icon_state = "blackshortsleeve"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/blueshirt
+ name = "Blue T-Shirt"
+ icon_state = "blueshirt"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/redshirt
+ name = "Red T-Shirt"
+ icon_state = "redshirt"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/yellowshirt
+ name = "Yellow T-Shirt"
+ icon_state = "yellowshirt"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/greenshirt
+ name = "Green T-Shirt"
+ icon_state = "greenshirt"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/bluepolo
+ name = "Blue Polo Shirt"
+ icon_state = "bluepolo"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/redpolo
+ name = "Red Polo Shirt"
+ icon_state = "redpolo"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/whitepolo
+ name = "White Polo Shirt"
+ icon_state = "whitepolo"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/grayyellowpolo
+ name = "Gray-Yellow Polo Shirt"
+ icon_state = "grayyellowpolo"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/redtop
+ name = "Red Top"
+ icon_state = "redtop"
+ gender = FEMALE
+
+/datum/sprite_accessory/undershirt/whitetop
+ name = "White Top"
+ icon_state = "whitetop"
+ gender = FEMALE
+
+/datum/sprite_accessory/undershirt/greenshirtsport
+ name = "Green Sports Shirt"
+ icon_state = "greenshirtsport"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/redshirtsport
+ name = "Red Sports Shirt"
+ icon_state = "redshirtsport"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/blueshirtsport
+ name = "Blue Sports Shirt"
+ icon_state = "blueshirtsport"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/ss13
+ name = "SS13 Shirt"
+ icon_state = "shirt_ss13"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/tankfire
+ name = "Fire Tank Top"
+ icon_state = "tank_fire"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/question
+ name = "Question Shirt"
+ icon_state = "shirt_question"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/skull
+ name = "Skull Shirt"
+ icon_state = "shirt_skull"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/commie
+ name = "Commie Shirt"
+ icon_state = "shirt_commie"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/nano
+ name = "Nanotrasen Shirt"
+ icon_state = "shirt_nano"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/stripe
+ name = "Striped Shirt"
+ icon_state = "shirt_stripes"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/blueshirt
+ name = "Blue Shirt"
+ icon_state = "shirt_blue"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/redshirt
+ name = "Red Shirt"
+ icon_state = "shirt_red"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/tank_red
+ name = "Red Tank Top"
+ icon_state = "tank_red"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/greenshirt
+ name = "Green Shirt"
+ icon_state = "shirt_green"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/meat
+ name = "Meat Shirt"
+ icon_state = "shirt_meat"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/tiedye
+ name = "Tie-dye Shirt"
+ icon_state = "shirt_tiedye"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/redjersey
+ name = "Red Jersey"
+ icon_state = "shirt_redjersey"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/bluejersey
+ name = "Blue Jersey"
+ icon_state = "shirt_bluejersey"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/tankstripe
+ name = "Striped Tank Top"
+ icon_state = "tank_stripes"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/clownshirt
+ name = "Clown Shirt"
+ icon_state = "shirt_clown"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/alienshirt
+ name = "Alien Shirt"
+ icon_state = "shirt_alien"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/sports_bra
+ name = "Sports Bra"
+ icon_state = "sports_bra"
+ gender = NEUTER
+
+/datum/sprite_accessory/undershirt/sports_bra2
+ name = "Alt Sports Bra"
+ icon_state = "sports_bra_alt"
+ gender = NEUTER
+
+///////////////////////
+// Socks Definitions //
+///////////////////////
+/datum/sprite_accessory/socks
+ icon = 'icons/mob/underwear.dmi'
+
+/datum/sprite_accessory/socks/nude
+ name = "Nude"
+ icon_state = null
+
+/datum/sprite_accessory/socks/white_norm
+ name = "Normal White"
+ icon_state = "white_norm"
+
+/datum/sprite_accessory/socks/black_norm
+ name = "Normal Black"
+ icon_state = "black_norm"
+
+/datum/sprite_accessory/socks/white_short
+ name = "Short White"
+ icon_state = "white_short"
+
+/datum/sprite_accessory/socks/black_short
+ name = "Short Black"
+ icon_state = "black_short"
+
+/datum/sprite_accessory/socks/white_knee
+ name = "Knee-high White"
+ icon_state = "white_knee"
+
+/datum/sprite_accessory/socks/black_knee
+ name = "Knee-high Black"
+ icon_state = "black_knee"
+
+/datum/sprite_accessory/socks/thin_knee
+ name = "Knee-high Thin"
+ icon_state = "thin_knee"
+
+/datum/sprite_accessory/socks/striped_knee
+ name = "Knee-high Striped"
+ icon_state = "striped_knee"
+
+/datum/sprite_accessory/socks/rainbow_knee
+ name = "Knee-high Rainbow"
+ icon_state = "rainbow_knee"
+
+/datum/sprite_accessory/socks/white_thigh
+ name = "Thigh-high White"
+ icon_state = "white_thigh"
+
+/datum/sprite_accessory/socks/black_thigh
+ name = "Thigh-high Black"
+ icon_state = "black_thigh"
+
+/datum/sprite_accessory/socks/thin_thigh
+ name = "Thigh-high Thin"
+ icon_state = "thin_thigh"
+
+/datum/sprite_accessory/socks/striped_thigh
+ name = "Thigh-high Striped"
+ icon_state = "striped_thigh"
+
+/datum/sprite_accessory/socks/rainbow_thigh
+ name = "Thigh-high Rainbow"
+ icon_state = "rainbow_thigh"
+
+/datum/sprite_accessory/socks/usa_knee
+ name = "Knee-High Freedom Stripes"
+ icon_state = "assblastusa_knee"
+
+/datum/sprite_accessory/socks/usa_thigh
+ name = "Thigh-high Freedom Stripes"
+ icon_state = "assblastusa_thigh"
+
+/datum/sprite_accessory/socks/uk_knee
+ name = "Knee-High UK Stripes"
+ icon_state = "uk_knee"
+
+/datum/sprite_accessory/socks/uk_thigh
+ name = "Thigh-high UK Stripes"
+ icon_state = "uk_thigh"
+
+/datum/sprite_accessory/socks/commie_knee
+ name = "Knee-High Commie Stripes"
+ icon_state = "commie_knee"
+
+/datum/sprite_accessory/socks/commie_thigh
+ name = "Thigh-high Commie Stripes"
+ icon_state = "commie_thigh"
+
+/datum/sprite_accessory/socks/pantyhose
+ name = "Pantyhose"
+ icon_state = "pantyhose"
+
+//////////.//////////////////
+// MutantParts Definitions //
+/////////////////////////////
+
+/datum/sprite_accessory/body_markings
+ icon = 'icons/mob/mutant_bodyparts.dmi'
+
+/datum/sprite_accessory/body_markings/none
+ name = "None"
+ icon_state = "none"
+
+/datum/sprite_accessory/body_markings/dtiger
+ name = "Dark Tiger Body"
+ icon_state = "dtiger"
+ gender_specific = 1
+
+/datum/sprite_accessory/body_markings/ltiger
+ name = "Light Tiger Body"
+ icon_state = "ltiger"
+ gender_specific = 1
+
+/datum/sprite_accessory/body_markings/lbelly
+ name = "Light Belly"
+ icon_state = "lbelly"
+ gender_specific = 1
+
+/datum/sprite_accessory/tails
+ icon = 'icons/mob/mutant_bodyparts.dmi'
+
+/datum/sprite_accessory/tails_animated
+ icon = 'icons/mob/mutant_bodyparts.dmi'
+
+/datum/sprite_accessory/tails/lizard/smooth
+ name = "Smooth"
+ icon_state = "smooth"
+
+/datum/sprite_accessory/tails_animated/lizard/smooth
+ name = "Smooth"
+ icon_state = "smooth"
+
+/datum/sprite_accessory/tails/lizard/dtiger
+ name = "Dark Tiger"
+ icon_state = "dtiger"
+
+/datum/sprite_accessory/tails_animated/lizard/dtiger
+ name = "Dark Tiger"
+ icon_state = "dtiger"
+
+/datum/sprite_accessory/tails/lizard/ltiger
+ name = "Light Tiger"
+ icon_state = "ltiger"
+
+/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/human/none
+ name = "None"
+ icon_state = "none"
+
+/datum/sprite_accessory/tails_animated/human/none
+ name = "None"
+ icon_state = "none"
+
+/datum/sprite_accessory/tails/human/cat
+ name = "Cat"
+ icon_state = "cat"
+ color_src = HAIR
+
+/datum/sprite_accessory/tails_animated/human/cat
+ name = "Cat"
+ icon_state = "cat"
+ color_src = HAIR
+
+/datum/sprite_accessory/snouts
+ icon = 'icons/mob/mutant_bodyparts.dmi'
+
+/datum/sprite_accessory/snouts/sharp
+ name = "Sharp"
+ icon_state = "sharp"
+
+/datum/sprite_accessory/snouts/round
+ name = "Round"
+ icon_state = "round"
+
+/datum/sprite_accessory/snouts/sharplight
+ name = "Sharp + Light"
+ icon_state = "sharplight"
+
+/datum/sprite_accessory/snouts/roundlight
+ name = "Round + Light"
+ icon_state = "roundlight"
+
+/datum/sprite_accessory/horns
+ icon = 'icons/mob/mutant_bodyparts.dmi'
+
+/datum/sprite_accessory/horns/none
+ name = "None"
+ icon_state = "none"
+
+/datum/sprite_accessory/horns/simple
+ name = "Simple"
+ icon_state = "simple"
+
+/datum/sprite_accessory/horns/short
+ name = "Short"
+ icon_state = "short"
+
+/datum/sprite_accessory/horns/curled
+ name = "Curled"
+ icon_state = "curled"
+
+/datum/sprite_accessory/horns/ram
+ name = "Ram"
+ icon_state = "ram"
+
+/datum/sprite_accessory/horns/angler
+ name = "Angeler"
+ icon_state = "angler"
+
+/datum/sprite_accessory/ears
+ icon = 'icons/mob/mutant_bodyparts.dmi'
+
+/datum/sprite_accessory/ears/none
+ name = "None"
+ icon_state = "none"
+
+/datum/sprite_accessory/ears/cat
+ name = "Cat"
+ icon_state = "cat"
+ hasinner = 1
+ color_src = HAIR
+
+/datum/sprite_accessory/wings/none
+ name = "None"
+ icon_state = "none"
+
+/datum/sprite_accessory/wings_open
+ icon = 'icons/mob/wings.dmi'
+
+/datum/sprite_accessory/wings_open/angel
+ name = "Angel"
+ icon_state = "angel"
+ color_src = 0
+ dimension_x = 46
+ center = TRUE
+ dimension_y = 34
+
+/datum/sprite_accessory/wings
+ icon = 'icons/mob/wings.dmi'
+
+/datum/sprite_accessory/wings/angel
+ name = "Angel"
+ icon_state = "angel"
+ color_src = 0
+ dimension_x = 46
+ center = TRUE
+ dimension_y = 34
+ locked = TRUE
+
+/datum/sprite_accessory/frills
+ icon = 'icons/mob/mutant_bodyparts.dmi'
+
+/datum/sprite_accessory/frills/none
+ name = "None"
+ icon_state = "none"
+
+/datum/sprite_accessory/frills/simple
+ name = "Simple"
+ icon_state = "simple"
+
+/datum/sprite_accessory/frills/short
+ name = "Short"
+ icon_state = "short"
+
+/datum/sprite_accessory/frills/aquatic
+ name = "Aquatic"
+ icon_state = "aqua"
+
+/datum/sprite_accessory/spines
+ icon = 'icons/mob/mutant_bodyparts.dmi'
+
+/datum/sprite_accessory/spines_animated
+ icon = 'icons/mob/mutant_bodyparts.dmi'
+
+/datum/sprite_accessory/spines/none
+ name = "None"
+ icon_state = "none"
+
+/datum/sprite_accessory/spines_animated/none
+ name = "None"
+ icon_state = "none"
+
+/datum/sprite_accessory/spines/short
+ name = "Short"
+ icon_state = "short"
+
+/datum/sprite_accessory/spines_animated/short
+ name = "Short"
+ icon_state = "short"
+
+/datum/sprite_accessory/spines/shortmeme
+ name = "Short + Membrane"
+ icon_state = "shortmeme"
+
+/datum/sprite_accessory/spines_animated/shortmeme
+ name = "Short + Membrane"
+ icon_state = "shortmeme"
+
+/datum/sprite_accessory/spines/long
+ name = "Long"
+ icon_state = "long"
+
+/datum/sprite_accessory/spines_animated/long
+ name = "Long"
+ icon_state = "long"
+
+/datum/sprite_accessory/spines/longmeme
+ name = "Long + Membrane"
+ icon_state = "longmeme"
+
+/datum/sprite_accessory/spines_animated/longmeme
+ name = "Long + Membrane"
+ icon_state = "longmeme"
+
+/datum/sprite_accessory/spines/aqautic
+ name = "Aquatic"
+ icon_state = "aqua"
+
+/datum/sprite_accessory/spines_animated/aqautic
+ name = "Aquatic"
+ icon_state = "aqua"
+
+/datum/sprite_accessory/legs //legs are a special case, they aren't actually sprite_accessories but are updated with them.
+ icon = null //These datums exist for selecting legs on preference, and little else
+
+/datum/sprite_accessory/legs/none
+ name = "Normal Legs"
+
+/datum/sprite_accessory/legs/digitigrade_lizard
+ name = "Digitigrade Legs"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories_Citadel.dm b/code/modules/mob/dead/new_player/sprite_accessories_Citadel.dm
index 228c9fe6e7..9cc031af1b 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories_Citadel.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories_Citadel.dm
@@ -39,7 +39,7 @@
name = "Bear"
icon_state = "bear"
icon = 'icons/mob/mam_bodyparts.dmi'
-
+
/datum/sprite_accessory/tails/human/bear
name = "Bear"
icon_state = "bear"
@@ -65,7 +65,7 @@
icon_state = "cow"
icon = 'icons/mob/mam_bodyparts.dmi'
gender_specific = 1
-
+
/datum/sprite_accessory/tails/human/cow
name = "Cow"
icon_state = "cow"
@@ -175,21 +175,24 @@
name = "Otusian"
icon_state = "otie"
hasinner= 1
+ icon = 'icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails/human/otie
name = "Otusian"
icon_state = "otie"
+ icon = 'icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails_animated/human/otie
name = "Otusian"
icon_state = "otie"
+ icon = 'icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/ears/human/rabbit
name = "Rabbit"
icon_state = "rabbit"
hasinner= 1
icon = 'icons/mob/mam_bodyparts.dmi'
-
+
/datum/sprite_accessory/tails/human/rabbit
name = "Rabbit"
icon_state = "rabbit"
@@ -201,10 +204,11 @@
icon_state = "rabbit"
color_src = 0
icon = 'icons/mob/mam_bodyparts.dmi'
-
+
/datum/sprite_accessory/ears/human/skunk
name = "skunk"
icon_state = "skunk"
+ icon = 'icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails/human/skunk
name = "skunk"
@@ -248,6 +252,7 @@
name = "Wolf"
icon_state = "wolf"
hasinner = 1
+ icon = 'icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails/human/wolf
name = "Wolf"
@@ -341,7 +346,7 @@
/datum/sprite_accessory/mam_ears/bear
name = "Bear"
icon_state = "bear"
-
+
/datum/sprite_accessory/mam_tails/bear
name = "Bear"
icon_state = "bear"
@@ -352,9 +357,9 @@
/datum/sprite_accessory/mam_ears/catbig
name = "Cat, Big"
- icon_state = "cat"
+ icon_state = "catbig"
hasinner = 1
-
+
/datum/sprite_accessory/mam_tails/catbig
name = "Cat, Big"
icon_state = "catbig"
@@ -367,7 +372,7 @@
name = "Cow"
icon_state = "cow"
gender_specific = 1
-
+
/datum/sprite_accessory/mam_tail/cow
name = "Cow"
icon_state = "cow"
@@ -522,7 +527,7 @@
name = "Rabbit"
icon_state = "rabbit"
hasinner= 1
-
+
/datum/sprite_accessory/mam_tails/rabbit
name = "Rabbit"
icon_state = "rabbit"
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 6cc0a9324f..f6b362e959 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -305,15 +305,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/dead/observer/is_active()
return 0
-/mob/dead/observer/Stat()
- ..()
- if(statpanel("Status"))
- if(SSticker.HasRoundStarted())
- if(istype(SSticker.mode, /datum/game_mode/blob))
- var/datum/game_mode/blob/B = SSticker.mode
- if(B.message_sent)
- stat(null, "Blobs to Blob Win: [GLOB.blobs_legit.len]/[B.blobwincount]")
-
/mob/dead/observer/verb/reenter_corpse()
set category = "Ghost"
set name = "Re-enter Corpse"
@@ -486,7 +477,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set name = "Boo!"
set desc= "Scare your crew members because of boredom!"
- if(bootime > world.time) return
+ if(bootime > world.time)
+ return
var/obj/machinery/light/L = locate(/obj/machinery/light) in view(1, src)
if(L)
L.flicker()
@@ -622,7 +614,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
//this is called when a ghost is drag clicked to something.
/mob/dead/observer/MouseDrop(atom/over)
- if(!usr || !over) return
+ if(!usr || !over)
+ return
if (isobserver(usr) && usr.client.holder && isliving(over))
if (usr.client.holder.cmd_ghost_drag(src,over))
return
diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm
index 6ac5ab1bad..a3642684db 100644
--- a/code/modules/mob/living/brain/brain_item.dm
+++ b/code/modules/mob/living/brain/brain_item.dm
@@ -6,7 +6,7 @@
throw_range = 5
layer = ABOVE_MOB_LAYER
zone = "head"
- slot = "brain"
+ slot = ORGAN_SLOT_BRAIN
vital = TRUE
origin_tech = "biotech=5"
attack_verb = list("attacked", "slapped", "whacked")
@@ -70,7 +70,7 @@
C.dna.copy_dna(brainmob.stored_dna)
if(L.disabilities & NOCLONE)
brainmob.disabilities |= NOCLONE //This is so you can't just decapitate a husked guy and clone them without needing to get a new body
- var/obj/item/organ/zombie_infection/ZI = L.getorganslot("zombie_infection")
+ var/obj/item/organ/zombie_infection/ZI = L.getorganslot(ORGAN_SLOT_ZOMBIE)
if(ZI)
brainmob.set_species(ZI.old_species) //For if the brain is cloned
if(L.mind && L.mind.current)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
index 1323112a53..eb17ecc40a 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
@@ -61,7 +61,7 @@ Doesn't work on other aliens/AI.*/
/obj/effect/proc_holder/alien/plant
name = "Plant Weeds"
- desc = "Plants some alien weeds"
+ desc = "Plants some alien weeds."
plasma_cost = 50
check_turf = 1
action_icon_state = "alien_plant"
@@ -76,7 +76,7 @@ Doesn't work on other aliens/AI.*/
/obj/effect/proc_holder/alien/whisper
name = "Whisper"
- desc = "Whisper to someone"
+ desc = "Whisper to someone."
plasma_cost = 10
action_icon_state = "alien_whisper"
@@ -104,7 +104,7 @@ Doesn't work on other aliens/AI.*/
/obj/effect/proc_holder/alien/transfer
name = "Transfer Plasma"
- desc = "Transfer Plasma to another alien"
+ desc = "Transfer Plasma to another alien."
plasma_cost = 0
action_icon_state = "alien_transfer"
@@ -169,7 +169,8 @@ Doesn't work on other aliens/AI.*/
return
var/mob/living/carbon/user = usr
var/obj/effect/proc_holder/alien/acid/A = locate() in user.abilities
- if(!A) return
+ if(!A)
+ return
if(user.getPlasma() > A.plasma_cost && A.corrode(O))
user.adjustPlasma(-A.plasma_cost)
@@ -268,7 +269,7 @@ Doesn't work on other aliens/AI.*/
/obj/effect/proc_holder/alien/regurgitate
name = "Regurgitate"
- desc = "Empties the contents of your stomach"
+ desc = "Empties the contents of your stomach."
plasma_cost = 0
action_icon_state = "alien_barf"
@@ -305,13 +306,15 @@ Doesn't work on other aliens/AI.*/
/mob/living/carbon/proc/getPlasma()
var/obj/item/organ/alien/plasmavessel/vessel = getorgan(/obj/item/organ/alien/plasmavessel)
- if(!vessel) return 0
+ if(!vessel)
+ return 0
return vessel.storedPlasma
/mob/living/carbon/proc/adjustPlasma(amount)
var/obj/item/organ/alien/plasmavessel/vessel = getorgan(/obj/item/organ/alien/plasmavessel)
- if(!vessel) return 0
+ if(!vessel)
+ return 0
vessel.storedPlasma = max(vessel.storedPlasma + amount,0)
vessel.storedPlasma = min(vessel.storedPlasma, vessel.max_plasma) //upper limit of max_plasma, lower limit of 0
for(var/X in abilities)
diff --git a/code/modules/mob/living/carbon/alien/say.dm b/code/modules/mob/living/carbon/alien/say.dm
index 6c492dd24c..1d35a2c134 100644
--- a/code/modules/mob/living/carbon/alien/say.dm
+++ b/code/modules/mob/living/carbon/alien/say.dm
@@ -1,7 +1,8 @@
/mob/living/proc/alien_talk(message, shown_name = real_name)
log_talk(src,"[key_name(src)] : [message]",LOGSAY)
message = trim(message)
- if(!message) return
+ if(!message)
+ return
var/message_a = say_quote(message, get_spans())
var/rendered = "Hivemind, [shown_name] [message_a]"
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 218af45c6e..4174b08642 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -224,7 +224,7 @@
internal = null
update_internals_hud_icon(0)
else if(ITEM && istype(ITEM, /obj/item/tank))
- if((wear_mask && (wear_mask.flags_1 & MASKINTERNALS_1)) || getorganslot("breathing_tube"))
+ if((wear_mask && (wear_mask.flags_1 & MASKINTERNALS_1)) || getorganslot(ORGAN_SLOT_BREATHING_TUBE))
internal = ITEM
update_internals_hud_icon(1)
@@ -523,7 +523,7 @@
sight = initial(sight)
lighting_alpha = initial(lighting_alpha)
- var/obj/item/organ/eyes/E = getorganslot("eye_sight")
+ var/obj/item/organ/eyes/E = getorganslot(ORGAN_SLOT_EYES)
if(!E)
update_tint()
else
@@ -580,7 +580,7 @@
if(wear_mask)
. += wear_mask.tint
- var/obj/item/organ/eyes/E = getorganslot("eye_sight")
+ var/obj/item/organ/eyes/E = getorganslot(ORGAN_SLOT_EYES)
if(E)
. += E.tint
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 66f4fc8fb2..1d6f7f6484 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -14,7 +14,7 @@
var/obj/item/clothing/mask/MFP = src.wear_mask
number += MFP.flash_protect
- var/obj/item/organ/eyes/E = getorganslot("eye_sight")
+ var/obj/item/organ/eyes/E = getorganslot(ORGAN_SLOT_EYES)
if(!E)
number = INFINITY //Can't get flashed without eyes
else
@@ -28,7 +28,7 @@
number += 1
if(head && (head.flags_2 & BANG_PROTECT_2))
number += 1
- var/obj/item/organ/ears/E = getorganslot("ears")
+ var/obj/item/organ/ears/E = getorganslot(ORGAN_SLOT_EARS)
if(!E)
number = INFINITY
else
@@ -279,7 +279,7 @@
var/damage = intensity - get_eye_protection()
if(.) // we've been flashed
- var/obj/item/organ/eyes/eyes = getorganslot("eye_sight")
+ var/obj/item/organ/eyes/eyes = getorganslot(ORGAN_SLOT_EYES)
if (!eyes)
return
if(visual)
@@ -323,7 +323,7 @@
/mob/living/carbon/soundbang_act(intensity = 1, stun_pwr = 20, damage_pwr = 5, deafen_pwr = 15)
var/ear_safety = get_ear_protection()
- var/obj/item/organ/ears/ears = getorganslot("ears")
+ var/obj/item/organ/ears/ears = getorganslot(ORGAN_SLOT_EARS)
var/effect_amount = intensity - ear_safety
if(effect_amount > 0)
if(stun_pwr)
@@ -363,6 +363,6 @@
/mob/living/carbon/can_hear()
. = FALSE
- var/obj/item/organ/ears/ears = getorganslot("ears")
+ var/obj/item/organ/ears/ears = getorganslot(ORGAN_SLOT_EARS)
if(istype(ears) && !ears.deaf)
. = TRUE
diff --git a/code/modules/mob/living/carbon/carbon_movement.dm b/code/modules/mob/living/carbon/carbon_movement.dm
index aa37315b13..ed731408d8 100644
--- a/code/modules/mob/living/carbon/carbon_movement.dm
+++ b/code/modules/mob/living/carbon/carbon_movement.dm
@@ -39,7 +39,7 @@
return 1
// Do we have a jetpack implant (and is it on)?
- var/obj/item/organ/cyberimp/chest/thrusters/T = getorganslot("thrusters")
+ var/obj/item/organ/cyberimp/chest/thrusters/T = getorganslot(ORGAN_SLOT_THRUSTERS)
if(istype(T) && movement_dir && T.allow_thrust(0.01))
return 1
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index c3ae5c39c3..4b1afe0780 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -20,7 +20,7 @@
if(stat == DEAD)
return
stop_sound_channel(CHANNEL_HEARTBEAT)
- var/obj/item/organ/heart/H = getorganslot("heart")
+ var/obj/item/organ/heart/H = getorganslot(ORGAN_SLOT_HEART)
if(H)
H.beat = BEAT_NONE
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 1d7b482875..a39b84e47c 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -270,13 +270,13 @@
if(ishuman(usr))
var/mob/living/carbon/human/H = usr
var/perpname = get_face_name(get_id_name(""))
- if(istype(H.glasses, /obj/item/clothing/glasses/hud) || istype(H.getorganslot("eye_hud"), /obj/item/organ/cyberimp/eyes/hud))
+ if(istype(H.glasses, /obj/item/clothing/glasses/hud) || istype(H.getorganslot(ORGAN_SLOT_HUD), /obj/item/organ/cyberimp/eyes/hud))
var/datum/data/record/R = find_record("name", perpname, GLOB.data_core.general)
if(href_list["photo_front"] || href_list["photo_side"])
if(R)
if(!H.canUseHUD())
return
- else if(!istype(H.glasses, /obj/item/clothing/glasses/hud) && !istype(H.getorganslot("eye_hud"), /obj/item/organ/cyberimp/eyes/hud/medical))
+ else if(!istype(H.glasses, /obj/item/clothing/glasses/hud) && !istype(H.getorganslot(ORGAN_SLOT_HUD), /obj/item/organ/cyberimp/eyes/hud/medical))
return
var/obj/item/photo/P = null
if(href_list["photo_front"])
@@ -287,13 +287,13 @@
P.show(H)
if(href_list["hud"] == "m")
- if(istype(H.glasses, /obj/item/clothing/glasses/hud/health) || istype(H.getorganslot("eye_hud"), /obj/item/organ/cyberimp/eyes/hud/medical))
+ if(istype(H.glasses, /obj/item/clothing/glasses/hud/health) || istype(H.getorganslot(ORGAN_SLOT_HUD), /obj/item/organ/cyberimp/eyes/hud/medical))
if(href_list["p_stat"])
var/health_status = input(usr, "Specify a new physical status for this person.", "Medical HUD", R.fields["p_stat"]) in list("Active", "Physically Unfit", "*Unconscious*", "*Deceased*", "Cancel")
if(R)
if(!H.canUseHUD())
return
- else if(!istype(H.glasses, /obj/item/clothing/glasses/hud/health) && !istype(H.getorganslot("eye_hud"), /obj/item/organ/cyberimp/eyes/hud/medical))
+ else if(!istype(H.glasses, /obj/item/clothing/glasses/hud/health) && !istype(H.getorganslot(ORGAN_SLOT_HUD), /obj/item/organ/cyberimp/eyes/hud/medical))
return
if(health_status && health_status != "Cancel")
R.fields["p_stat"] = health_status
@@ -303,7 +303,7 @@
if(R)
if(!H.canUseHUD())
return
- else if(!istype(H.glasses, /obj/item/clothing/glasses/hud/health) && !istype(H.getorganslot("eye_hud"), /obj/item/organ/cyberimp/eyes/hud/medical))
+ else if(!istype(H.glasses, /obj/item/clothing/glasses/hud/health) && !istype(H.getorganslot(ORGAN_SLOT_HUD), /obj/item/organ/cyberimp/eyes/hud/medical))
return
if(health_status && health_status != "Cancel")
R.fields["m_stat"] = health_status
@@ -352,7 +352,7 @@
to_chat(usr, "Gathered data is inconsistent with the analysis, possible cause: poisoning.")
if(href_list["hud"] == "s")
- if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.getorganslot("eye_hud"), /obj/item/organ/cyberimp/eyes/hud/security))
+ if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.getorganslot(ORGAN_SLOT_HUD), /obj/item/organ/cyberimp/eyes/hud/security))
if(usr.stat || usr == src) //|| !usr.canmove || usr.restrained()) Fluff: Sechuds have eye-tracking technology and sets 'arrest' to people that the wearer looks and blinks at.
return //Non-fluff: This allows sec to set people to arrest as they get disarmed or beaten
// Checks the user has security clearence before allowing them to change arrest status via hud, comment out to enable all access
@@ -379,7 +379,7 @@
if(setcriminal != "Cancel")
if(R)
if(H.canUseHUD())
- if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.getorganslot("eye_hud"), /obj/item/organ/cyberimp/eyes/hud/security))
+ if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.getorganslot(ORGAN_SLOT_HUD), /obj/item/organ/cyberimp/eyes/hud/security))
investigate_log("[src.key] has been set from [R.fields["criminal"]] to [setcriminal] by [usr.name] ([usr.key]).", INVESTIGATE_RECORDS)
R.fields["criminal"] = setcriminal
sec_hud_set_security_status()
@@ -389,7 +389,7 @@
if(R)
if(!H.canUseHUD())
return
- else if(!istype(H.glasses, /obj/item/clothing/glasses/hud/security) && !istype(H.getorganslot("eye_hud"), /obj/item/organ/cyberimp/eyes/hud/security))
+ else if(!istype(H.glasses, /obj/item/clothing/glasses/hud/security) && !istype(H.getorganslot(ORGAN_SLOT_HUD), /obj/item/organ/cyberimp/eyes/hud/security))
return
to_chat(usr, "Name: [R.fields["name"]] Criminal Status: [R.fields["criminal"]]")
to_chat(usr, "Minor Crimes:")
@@ -418,7 +418,7 @@
return
else if(!H.canUseHUD())
return
- else if(!istype(H.glasses, /obj/item/clothing/glasses/hud/security) && !istype(H.getorganslot("eye_hud"), /obj/item/organ/cyberimp/eyes/hud/security))
+ else if(!istype(H.glasses, /obj/item/clothing/glasses/hud/security) && !istype(H.getorganslot(ORGAN_SLOT_HUD), /obj/item/organ/cyberimp/eyes/hud/security))
return
var/crime = GLOB.data_core.createCrimeEntry(t1, t2, allowed_access, worldtime2text())
GLOB.data_core.addMinorCrime(R.fields["id"], crime)
@@ -433,7 +433,7 @@
return
else if (!H.canUseHUD())
return
- else if (!istype(H.glasses, /obj/item/clothing/glasses/hud/security) && !istype(H.getorganslot("eye_hud"), /obj/item/organ/cyberimp/eyes/hud/security))
+ else if (!istype(H.glasses, /obj/item/clothing/glasses/hud/security) && !istype(H.getorganslot(ORGAN_SLOT_HUD), /obj/item/organ/cyberimp/eyes/hud/security))
return
var/crime = GLOB.data_core.createCrimeEntry(t1, t2, allowed_access, worldtime2text())
GLOB.data_core.addMajorCrime(R.fields["id"], crime)
@@ -444,7 +444,7 @@
if(R)
if(!H.canUseHUD())
return
- else if(!istype(H.glasses, /obj/item/clothing/glasses/hud/security) && !istype(H.getorganslot("eye_hud"), /obj/item/organ/cyberimp/eyes/hud/security))
+ else if(!istype(H.glasses, /obj/item/clothing/glasses/hud/security) && !istype(H.getorganslot(ORGAN_SLOT_HUD), /obj/item/organ/cyberimp/eyes/hud/security))
return
to_chat(usr, "Comments/Log:")
var/counter = 1
@@ -462,7 +462,7 @@
return
else if(!H.canUseHUD())
return
- else if(!istype(H.glasses, /obj/item/clothing/glasses/hud/security) && !istype(H.getorganslot("eye_hud"), /obj/item/organ/cyberimp/eyes/hud/security))
+ else if(!istype(H.glasses, /obj/item/clothing/glasses/hud/security) && !istype(H.getorganslot(ORGAN_SLOT_HUD), /obj/item/organ/cyberimp/eyes/hud/security))
return
var/counter = 1
while(R.fields[text("com_[]", counter)])
@@ -637,7 +637,7 @@
return 0
var/they_breathe = (!(NOBREATH in C.dna.species.species_traits))
- var/they_lung = C.getorganslot("lungs")
+ var/they_lung = C.getorganslot(ORGAN_SLOT_LUNGS)
if(C.health > HEALTH_THRESHOLD_CRIT)
return
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 07bcb484a0..f21f872d0a 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -451,7 +451,7 @@
siemens_coeff = gloves_siemens_coeff
if(undergoing_cardiac_arrest() && !illusion)
if(shock_damage * siemens_coeff >= 1 && prob(25))
- var/obj/item/organ/heart/heart = getorganslot("heart")
+ var/obj/item/organ/heart/heart = getorganslot(ORGAN_SLOT_HEART)
heart.beating = TRUE
if(stat == CONSCIOUS)
to_chat(src, "You feel your heart beating again!")
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 06ee810bc0..8e72b26419 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -45,6 +45,6 @@
var/datum/personal_crafting/handcrafting
can_buckle = TRUE
buckle_lying = FALSE
- can_ride_typecache = list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot)
var/creamed = FALSE //to use with creampie overlays
+ var/static/list/can_ride_typecache = typecacheof(list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot))
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index 4fba96df58..51de0c2d91 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -45,14 +45,15 @@
return
else
//No oldFP or it's a different kind of blood
- S.bloody_shoes[S.blood_state] = max(0, S.bloody_shoes[S.blood_state]-BLOOD_LOSS_PER_STEP)
- var/obj/effect/decal/cleanable/blood/footprints/FP = new /obj/effect/decal/cleanable/blood/footprints(T)
- FP.blood_state = S.blood_state
- FP.entered_dirs |= dir
- FP.bloodiness = S.bloody_shoes[S.blood_state]
- if(S.blood_DNA && S.blood_DNA.len)
- FP.transfer_blood_dna(S.blood_DNA)
- FP.update_icon()
+ S.bloody_shoes[S.blood_state] = max(0, S.bloody_shoes[S.blood_state] - BLOOD_LOSS_PER_STEP)
+ if (S.bloody_shoes[S.blood_state] > BLOOD_LOSS_IN_SPREAD)
+ var/obj/effect/decal/cleanable/blood/footprints/FP = new /obj/effect/decal/cleanable/blood/footprints(T)
+ FP.blood_state = S.blood_state
+ FP.entered_dirs |= dir
+ FP.bloodiness = S.bloody_shoes[S.blood_state] - BLOOD_LOSS_IN_SPREAD
+ if(S.blood_DNA && S.blood_DNA.len)
+ FP.transfer_blood_dna(S.blood_DNA)
+ FP.update_icon()
update_inv_shoes()
//End bloody footprints
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 1679ff5d42..71c5dedc26 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -225,7 +225,7 @@
/mob/living/carbon/human/wear_mask_update(obj/item/clothing/C, toggle_off = 1)
if((C.flags_inv & (HIDEHAIR|HIDEFACIALHAIR)) || (initial(C.flags_inv) & (HIDEHAIR|HIDEFACIALHAIR)))
update_hair()
- if(toggle_off && internal && !getorganslot("breathing_tube"))
+ if(toggle_off && internal && !getorganslot(ORGAN_SLOT_BREATHING_TUBE))
update_internals_hud_icon(0)
internal = null
if(C.flags_inv & HIDEEYES)
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index e2a257e0ce..67843b3e64 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -59,6 +59,8 @@
return ONE_ATMOSPHERE
if(ismob(loc))
return ONE_ATMOSPHERE
+ if(istype(loc, /obj/item/device/dogborg/sleeper))
+ return ONE_ATMOSPHERE
else
return pressure
@@ -91,7 +93,7 @@
#define HUMAN_CRIT_MAX_OXYLOSS (SSmobs.wait/30)
/mob/living/carbon/human/check_breath(datum/gas_mixture/breath)
- var/L = getorganslot("lungs")
+ var/L = getorganslot(ORGAN_SLOT_LUNGS)
if(!L)
if(health >= HEALTH_THRESHOLD_CRIT)
@@ -133,6 +135,12 @@
/mob/living/carbon/human/proc/get_thermal_protection()
var/thermal_protection = 0 //Simple check to estimate how protected we are against multiple temperatures
+
+ if(istype(loc, /obj/item/device/dogborg/sleeper))
+ return FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
+ if(ismob(loc))
+ return FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
+
if(wear_suit)
if(wear_suit.max_heat_protection_temperature >= FIRE_SUIT_MAX_TEMP_PROTECT)
thermal_protection += (wear_suit.max_heat_protection_temperature*0.7)
@@ -244,7 +252,9 @@
if(dna && (RESISTCOLD in dna.species.species_traits))
return 1
-
+
+ if(istype(loc, /obj/item/device/dogborg/sleeper))
+ return 1 //freezing to death in sleepers ruins fun.
if(ismob(loc))
return 1 //because lazy and being inside somemone insulates you from space
@@ -328,7 +338,7 @@
/mob/living/carbon/human/proc/undergoing_cardiac_arrest()
if(!can_heartattack())
return FALSE
- var/obj/item/organ/heart/heart = getorganslot("heart")
+ var/obj/item/organ/heart/heart = getorganslot(ORGAN_SLOT_HEART)
if(istype(heart) && heart.beating)
return FALSE
return TRUE
@@ -337,7 +347,7 @@
if(!can_heartattack())
return FALSE
- var/obj/item/organ/heart/heart = getorganslot("heart")
+ var/obj/item/organ/heart/heart = getorganslot(ORGAN_SLOT_HEART)
if(!istype(heart))
return
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index b02ef243c8..1374b391ce 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -16,7 +16,8 @@
for(var/i=1, ((i <= D.stage) && (i <= temp_message.len)), i++) //Loop for each stage of the disease or until we run out of words
if(prob(3 * D.stage)) //Stage 1: 3% Stage 2: 6% Stage 3: 9% Stage 4: 12%
var/H = pick(pick_list)
- if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":")) continue
+ if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":"))
+ continue
temp_message[H] = "HONK"
pick_list -= H //Make sure that you dont HONK the same word twice
message = jointext(temp_message, " ")
@@ -48,7 +49,7 @@
CHECK_DNA_AND_SPECIES(src)
// how do species that don't breathe talk? magic, that's what.
- if(!(NOBREATH in dna.species.species_traits) && !getorganslot("lungs"))
+ if(!(NOBREATH in dna.species.species_traits) && !getorganslot(ORGAN_SLOT_LUNGS))
return 0
if(mind)
return !mind.miming
@@ -69,8 +70,10 @@
/mob/living/carbon/human/binarycheck()
if(ears)
var/obj/item/device/radio/headset/dongle = ears
- if(!istype(dongle)) return 0
- if(dongle.translate_binary) return 1
+ if(!istype(dongle))
+ return 0
+ if(dongle.translate_binary)
+ return 1
/mob/living/carbon/human/radio(message, message_mode, list/spans, language)
. = ..()
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index e7f193ec80..aebd1af9ba 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -137,15 +137,15 @@ GLOBAL_LIST_EMPTY(roundstart_races)
//Will regenerate missing organs
/datum/species/proc/regenerate_organs(mob/living/carbon/C,datum/species/old_species,replace_current=TRUE)
- var/obj/item/organ/brain/brain = C.getorganslot("brain")
- var/obj/item/organ/heart/heart = C.getorganslot("heart")
- var/obj/item/organ/lungs/lungs = C.getorganslot("lungs")
- var/obj/item/organ/appendix/appendix = C.getorganslot("appendix")
- var/obj/item/organ/eyes/eyes = C.getorganslot("eye_sight")
- var/obj/item/organ/ears/ears = C.getorganslot("ears")
- var/obj/item/organ/tongue/tongue = C.getorganslot("tongue")
- var/obj/item/organ/liver/liver = C.getorganslot("liver")
- var/obj/item/organ/stomach/stomach = C.getorganslot("stomach")
+ var/obj/item/organ/brain/brain = C.getorganslot(ORGAN_SLOT_BRAIN)
+ var/obj/item/organ/heart/heart = C.getorganslot(ORGAN_SLOT_HEART)
+ var/obj/item/organ/lungs/lungs = C.getorganslot(ORGAN_SLOT_LUNGS)
+ var/obj/item/organ/appendix/appendix = C.getorganslot(ORGAN_SLOT_APPENDIX)
+ var/obj/item/organ/eyes/eyes = C.getorganslot(ORGAN_SLOT_EYES)
+ var/obj/item/organ/ears/ears = C.getorganslot(ORGAN_SLOT_EARS)
+ var/obj/item/organ/tongue/tongue = C.getorganslot(ORGAN_SLOT_TONGUE)
+ var/obj/item/organ/liver/liver = C.getorganslot(ORGAN_SLOT_LIVER)
+ var/obj/item/organ/stomach/stomach = C.getorganslot(ORGAN_SLOT_STOMACH)
var/should_have_brain = TRUE
var/should_have_heart = !(NOBLOOD in species_traits)
@@ -1219,7 +1219,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(!gravity)
var/obj/item/tank/jetpack/J = H.back
var/obj/item/clothing/suit/space/hardsuit/C = H.wear_suit
- var/obj/item/organ/cyberimp/chest/thrusters/T = H.getorganslot("thrusters")
+ var/obj/item/organ/cyberimp/chest/thrusters/T = H.getorganslot(ORGAN_SLOT_THRUSTERS)
if(!istype(J) && istype(C))
J = C.jetpack
if(istype(J) && J.full_speed && J.allow_thrust(0.01, H)) //Prevents stacking
@@ -1275,7 +1275,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
return 1
else
var/we_breathe = (!(NOBREATH in user.dna.species.species_traits))
- var/we_lung = user.getorganslot("lungs")
+ var/we_lung = user.getorganslot(ORGAN_SLOT_LUNGS)
if(we_breathe && we_lung)
user.do_cpr(target)
diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm
index 97b88d7715..f6dac06eea 100644
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -419,6 +419,7 @@
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)
@@ -479,6 +480,11 @@
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
+
/datum/species/golem/bananium/random_name(gender,unique,lastname)
var/clown_name = pick(GLOB.clown_names)
var/golem_name = "[uppertext(clown_name)]"
@@ -553,10 +559,13 @@
. = ..()
C.faction |= "cult"
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)
diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
index fd030fad45..a326150c60 100644
--- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
@@ -1,4 +1,5 @@
#define HEART_RESPAWN_THRESHHOLD 40
+#define HEART_SPECIAL_SHADOWIFY 2
/datum/species/shadow
// Humans cursed to stay in the darkness, lest their life forces drain. They regain health in shadow and die in light.
@@ -116,14 +117,15 @@
/obj/item/organ/heart/nightmare/Insert(mob/living/carbon/M, special = 0)
..()
- blade = new/obj/item/light_eater
- M.put_in_hands(blade)
+ if(special != HEART_SPECIAL_SHADOWIFY)
+ blade = new/obj/item/light_eater
+ M.put_in_hands(blade)
START_PROCESSING(SSobj, src)
/obj/item/organ/heart/nightmare/Remove(mob/living/carbon/M, special = 0)
STOP_PROCESSING(SSobj, src)
respawn_progress = 0
- if(blade)
+ if(blade && special != HEART_SPECIAL_SHADOWIFY)
QDEL_NULL(blade)
M.visible_message("\The [blade] disintegrates!")
..()
@@ -146,6 +148,13 @@
playsound(owner,'sound/effects/singlebeat.ogg',40,1)
if(respawn_progress >= HEART_RESPAWN_THRESHHOLD)
owner.revive(full_heal = TRUE)
+ if(!(owner.dna.species.id == "shadow" || owner.dna.species.id == "nightmare"))
+ var/mob/living/carbon/old_owner = owner
+ Remove(owner, HEART_SPECIAL_SHADOWIFY)
+ old_owner.set_species(/datum/species/shadow)
+ Insert(old_owner, HEART_SPECIAL_SHADOWIFY)
+ to_chat(owner, "You feel the shadows invade your skin, leaping into the center of your chest! You're alive!")
+ SEND_SOUND(owner, sound('sound/effects/ghost.ogg'))
owner.visible_message("[owner] staggers to their feet!")
playsound(owner, 'sound/hallucinations/far_noise.ogg', 50, 1)
respawn_progress = 0
@@ -198,4 +207,5 @@
O.burn()
playsound(src, 'sound/items/welder.ogg', 50, 1)
+#undef HEART_SPECIAL_SHADOWIFY
#undef HEART_RESPAWN_THRESHHOLD
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm
index bcf49cd556..8c87e1c9c9 100644
--- a/code/modules/mob/living/carbon/human/species_types/zombies.dm
+++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm
@@ -61,7 +61,7 @@
// Infection organ needs to be handled separately from mutant_organs
// because it persists through species transitions
var/obj/item/organ/zombie_infection/infection
- infection = C.getorganslot("zombie_infection")
+ infection = C.getorganslot(ORGAN_SLOT_ZOMBIE)
if(!infection)
infection = new()
infection.Insert(C)
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 31f8eb3f73..0d50285859 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -58,7 +58,7 @@
var/datum/gas_mixture/breath
- if(!getorganslot("breathing_tube"))
+ if(!getorganslot(ORGAN_SLOT_BREATHING_TUBE))
if(health <= HEALTH_THRESHOLD_FULLCRIT || (pulledby && pulledby.grab_state >= GRAB_KILL))
losebreath++ //You can't breath at all when in critical or when being choked, so you're going to miss a breath
@@ -110,7 +110,7 @@
if((status_flags & GODMODE))
return
- var/lungs = getorganslot("lungs")
+ var/lungs = getorganslot(ORGAN_SLOT_LUNGS)
if(!lungs)
adjustOxyLoss(2)
@@ -203,6 +203,16 @@
hallucination += 20
else if(bz_partialpressure > 0.01)
hallucination += 5//Removed at 2 per tick so this will slowly build up
+ //TRITIUM
+ if(breath_gases[/datum/gas/tritium])
+ var/tritium_partialpressure = (breath_gases[/datum/gas/tritium][MOLES]/breath.total_moles())*breath_pressure
+ radiation += tritium_partialpressure/10
+ //Brown Gas
+ if (breath_gases[/datum/gas/brown_gas])
+ var/browns_partialpressure = (breath_gases[/datum/gas/brown_gas][MOLES]/breath.total_moles())*breath_pressure
+ adjustFireLoss(browns_partialpressure/4)
+
+
breath.garbage_collect()
@@ -220,7 +230,7 @@
if(internal.loc != src)
internal = null
update_internals_hud_icon(0)
- else if ((!wear_mask || !(wear_mask.flags_1 & MASKINTERNALS_1)) && !getorganslot("breathing_tube"))
+ else if ((!wear_mask || !(wear_mask.flags_1 & MASKINTERNALS_1)) && !getorganslot(ORGAN_SLOT_BREATHING_TUBE))
internal = null
update_internals_hud_icon(0)
else
@@ -391,7 +401,7 @@
/////////
/mob/living/carbon/proc/handle_liver()
- var/obj/item/organ/liver/liver = getorganslot("liver")
+ var/obj/item/organ/liver/liver = getorganslot(ORGAN_SLOT_LIVER)
if((!dna && !liver) || (NOLIVER in dna.species.species_traits))
return
if(liver)
@@ -404,17 +414,17 @@
liver_failure()
/mob/living/carbon/proc/undergoing_liver_failure()
- var/obj/item/organ/liver/liver = getorganslot("liver")
+ var/obj/item/organ/liver/liver = getorganslot(ORGAN_SLOT_LIVER)
if(liver && liver.failing)
return TRUE
/mob/living/carbon/proc/return_liver_damage()
- var/obj/item/organ/liver/liver = getorganslot("liver")
+ var/obj/item/organ/liver/liver = getorganslot(ORGAN_SLOT_LIVER)
if(liver)
return liver.damage
/mob/living/carbon/proc/applyLiverDamage(var/d)
- var/obj/item/organ/liver/L = getorganslot("liver")
+ var/obj/item/organ/liver/L = getorganslot(ORGAN_SLOT_LIVER)
if(L)
L.damage += d
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index 2fcfe97d65..779e7f2f90 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -140,7 +140,7 @@
return protection
/mob/living/carbon/monkey/IsVocal()
- if(!getorganslot("lungs"))
+ if(!getorganslot(ORGAN_SLOT_LUNGS))
return 0
return 1
diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/say.dm
index d6ee2ebbfc..526a2ea09b 100644
--- a/code/modules/mob/living/carbon/say.dm
+++ b/code/modules/mob/living/carbon/say.dm
@@ -1,6 +1,6 @@
/mob/living/carbon/treat_message(message)
message = ..(message)
- var/obj/item/organ/tongue/T = getorganslot("tongue")
+ var/obj/item/organ/tongue/T = getorganslot(ORGAN_SLOT_TONGUE)
if(!T) //hoooooouaah!
var/regex/tongueless_lower = new("\[gdntke]+", "g")
var/regex/tongueless_upper = new("\[GDNTKE]+", "g")
@@ -21,7 +21,7 @@
/mob/living/carbon/get_spans()
. = ..()
- var/obj/item/organ/tongue/T = getorganslot("tongue")
+ var/obj/item/organ/tongue/T = getorganslot(ORGAN_SLOT_TONGUE)
if(T)
. |= T.get_spans()
@@ -30,7 +30,7 @@
. |= I.get_held_item_speechspans(src)
/mob/living/carbon/could_speak_in_language(datum/language/dt)
- var/obj/item/organ/tongue/T = getorganslot("tongue")
+ var/obj/item/organ/tongue/T = getorganslot(ORGAN_SLOT_TONGUE)
if(T)
. = T.could_speak_in_language(dt)
else
diff --git a/code/modules/mob/living/carbon/status_procs.dm b/code/modules/mob/living/carbon/status_procs.dm
index 13a97c4407..ccd5f7296b 100644
--- a/code/modules/mob/living/carbon/status_procs.dm
+++ b/code/modules/mob/living/carbon/status_procs.dm
@@ -3,7 +3,7 @@
// eye damage, eye_blind, eye_blurry, druggy, BLIND disability, NEARSIGHT disability, and HUSK disability.
/mob/living/carbon/damage_eyes(amount)
- var/obj/item/organ/eyes/eyes = getorganslot("eye_sight")
+ var/obj/item/organ/eyes/eyes = getorganslot(ORGAN_SLOT_EYES)
if (!eyes)
return
if(amount>0)
@@ -15,7 +15,7 @@
overlay_fullscreen("eye_damage", /obj/screen/fullscreen/impaired, 1)
/mob/living/carbon/set_eye_damage(amount)
- var/obj/item/organ/eyes/eyes = getorganslot("eye_sight")
+ var/obj/item/organ/eyes/eyes = getorganslot(ORGAN_SLOT_EYES)
if (!eyes)
return
eyes.eye_damage = max(amount,0)
@@ -28,7 +28,7 @@
clear_fullscreen("eye_damage")
/mob/living/carbon/adjust_eye_damage(amount)
- var/obj/item/organ/eyes/eyes = getorganslot("eye_sight")
+ var/obj/item/organ/eyes/eyes = getorganslot(ORGAN_SLOT_EYES)
if (!eyes)
return
eyes.eye_damage = max(eyes.eye_damage+amount, 0)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 0cfda3821f..87092e580c 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -196,7 +196,7 @@
M.pass_flags &= ~PASSMOB
now_pushing = 0
-
+
if(!move_failed)
return 1
@@ -780,16 +780,6 @@
/mob/living/proc/get_standard_pixel_y_offset(lying = 0)
return initial(pixel_y)
-/mob/living/Stat()
- ..()
-
- if(statpanel("Status"))
- if(SSticker && SSticker.mode)
- if(istype(SSticker.mode, /datum/game_mode/blob))
- var/datum/game_mode/blob/B = SSticker.mode
- if(B.message_sent)
- stat(null, "Blobs to Blob Win: [GLOB.blobs_legit.len]/[B.blobwincount]")
-
/mob/living/cancel_camera()
..()
cameraFollow = null
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index e3f7795f64..f77c65225f 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -338,18 +338,11 @@
/mob/living/ratvar_act()
if(status_flags & GODMODE)
return
-
if(stat != DEAD && !is_servant_of_ratvar(src))
- for(var/obj/item/implant/mindshield/M in implants)
- qdel(M)
- if(!add_servant_of_ratvar(src))
- to_chat(src, "A blinding light boils you alive! Run!")
- adjustFireLoss(35)
- if(src)
- adjust_fire_stacks(1)
- IgniteMob()
- return FALSE
- return TRUE
+ to_chat(src, "A blinding light boils you alive! Run!")
+ adjust_fire_stacks(20)
+ IgniteMob()
+ return FALSE
//called when the mob receives a bright flash
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 9c34ca4dbd..7e3d1cd320 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -362,7 +362,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
if(message_mode == MODE_VOCALCORDS)
if(iscarbon(src))
var/mob/living/carbon/C = src
- var/obj/item/organ/vocal_cords/V = C.getorganslot("vocal_cords")
+ var/obj/item/organ/vocal_cords/V = C.getorganslot(ORGAN_SLOT_VOICE)
if(V && V.can_speak_with())
V.handle_speech(message) //message
V.speak_with(message) //action
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index 8318f2459f..97034d389c 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -139,9 +139,12 @@
ai_restore_power()
return
switch(PRP)
- if (1) to_chat(src, "APC located. Optimizing route to APC to avoid needless power waste.")
- if (2) to_chat(src, "Best route identified. Hacking offline APC power port.")
- if (3) to_chat(src, "Power port upload access confirmed. Loading control program into APC power port software.")
+ if (1)
+ to_chat(src, "APC located. Optimizing route to APC to avoid needless power waste.")
+ if (2)
+ to_chat(src, "Best route identified. Hacking offline APC power port.")
+ if (3)
+ to_chat(src, "Power port upload access confirmed. Loading control program into APC power port software.")
if (4)
to_chat(src, "Transfer complete. Forcing APC to execute program.")
sleep(50)
diff --git a/code/modules/mob/living/silicon/pai/personality.dm b/code/modules/mob/living/silicon/pai/personality.dm
index 4b2bc45118..84a30d9cf3 100644
--- a/code/modules/mob/living/silicon/pai/personality.dm
+++ b/code/modules/mob/living/silicon/pai/personality.dm
@@ -17,12 +17,12 @@
var/savefile/F = new /savefile(src.savefile_path(user))
- WRITE_FILE(F["name"], name)
- WRITE_FILE(F["description"], description)
- WRITE_FILE(F["role"], role)
- WRITE_FILE(F["comments"], comments)
+ WRITE_FILE(F["name"], name)
+ WRITE_FILE(F["description"], description)
+ WRITE_FILE(F["role"], role)
+ WRITE_FILE(F["comments"], comments)
- WRITE_FILE(F["version"], 1)
+ WRITE_FILE(F["version"], 1)
return 1
@@ -42,7 +42,8 @@
var/savefile/F = new /savefile(path)
- if(!F) return //Not everyone has a pai savefile.
+ if(!F)
+ return //Not everyone has a pai savefile.
var/version = null
F["version"] >> version
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index 8c05958cea..d70a12eb38 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -196,7 +196,8 @@
var/mob/living/M = card.loc
var/count = 0
while(!isliving(M))
- if(!M || !M.loc) return 0 //For a runtime where M ends up in nullspace (similar to bluespace but less colourful)
+ if(!M || !M.loc)
+ return 0 //For a runtime where M ends up in nullspace (similar to bluespace but less colourful)
M = M.loc
count++
if(count >= 6)
@@ -248,7 +249,7 @@
medHUD = !medHUD
if(medHUD)
add_med_hud()
-
+
else
var/datum/atom_hud/med = GLOB.huds[med_hud]
med.remove_hud_from(src)
diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm
index 4f195b9d99..81e99abcc6 100644
--- a/code/modules/mob/living/silicon/robot/inventory.dm
+++ b/code/modules/mob/living/silicon/robot/inventory.dm
@@ -11,33 +11,21 @@
/mob/living/silicon/robot/proc/uneq_module(obj/item/O)
if(!O)
return 0
- O.mouse_opacity = MOUSE_OPACITY_OPAQUE
- if(istype(O, /obj/item/borg/sight))
+ O.mouse_opacity = MOUSE_OPACITY_OPAQUE
+ if(istype(O, /obj/item/borg/sight))
var/obj/item/borg/sight/S = O
sight_mode &= ~S.sight_mode
update_sight()
else if(istype(O, /obj/item/storage/bag/tray/))
var/obj/item/storage/bag/tray/T = O
T.do_quick_empty()
- else if(istype(O,/obj/item/gun/energy/laser/cyborg))
- laser = 0
- update_icons()
- else if(istype(O,/obj/item/gun/energy/disabler/cyborg))
- disabler = 0
- update_icons()
- else if(istype(O,/obj/item/device/dogborg/sleeper))
- sleeper_g = 0
- sleeper_r = 0
- update_icons()
- var/obj/item/device/dogborg/sleeper/S = O
- S.go_out()
if(client)
client.screen -= O
observer_screen_update(O,FALSE)
O.forceMove(module) //Return item to module so it appears in its contents, so it can be taken out again.
- if(O.flags_1 & DROPDEL_1)
- O.flags_1 &= ~DROPDEL_1 //we shouldn't HAVE things with DROPDEL_1 in our modules, but better safe than runtiming horribly
+ if(O.flags_1 & DROPDEL_1)
+ O.flags_1 &= ~DROPDEL_1 //we shouldn't HAVE things with DROPDEL_1 in our modules, but better safe than runtiming horribly
O.dropped(src)
@@ -62,12 +50,6 @@
if(activated(O))
to_chat(src, "That module is already activated.")
return
- if(istype(O,/obj/item/gun/energy/laser/cyborg))
- laser = 1
- update_icons()
- if(istype(O,/obj/item/gun/energy/disabler/cyborg))
- disabler = 1
- update_icons()
if(!held_items[1])
held_items[1] = O
O.screen_loc = inv1.screen_loc
@@ -194,7 +176,8 @@
//toggle_module(module) - Toggles the selection of the module slot specified by "module".
/mob/living/silicon/robot/proc/toggle_module(module) //Module is 1-3
- if(module < 1 || module > 3) return
+ if(module < 1 || module > 3)
+ return
if(module_selected(module))
deselect_module(module)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 6e899269f3..96467be074 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -95,7 +95,7 @@
can_buckle = TRUE
buckle_lying = FALSE
- can_ride_typecache = list(/mob/living/carbon/human)
+ var/static/list/can_ride_typecache = typecacheof(/mob/living/carbon/human)
/mob/living/silicon/robot/get_cell()
return cell
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 6df7717327..3758e73688 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -352,10 +352,9 @@
/obj/item/soap/tongue,
/obj/item/device/analyzer/nose,
/obj/item/device/dogborg/sleeper/K9,
- /obj/item/pinpointer/crew)
- emag_modules = list(/obj/item/gun/energy/laser/cyborg,
/obj/item/gun/energy/disabler/cyborg,
- /obj/item/pinpointer/nuke)
+ /obj/item/pinpointer/crew)
+ emag_modules = list(/obj/item/gun/energy/laser/cyborg)
ratvar_modules = list(/obj/item/clockwork/slab/cyborg/security,
/obj/item/clockwork/weapon/ratvarian_spear)
cyborg_base_icon = "k9"
@@ -387,9 +386,9 @@
/obj/item/device/analyzer/nose,
/obj/item/soap/tongue,
/obj/item/device/healthanalyzer,
- /obj/item/device/dogborg/sleeper,
+ /obj/item/device/dogborg/sleeper/medihound,
/obj/item/twohanded/shockpaddles/hound,
- /obj/item/reagent_containers/borghypo,
+ /obj/item/stack/medical/gauze/cyborg,
/obj/item/device/sensor_device)
emag_modules = list(/obj/item/dogborg/pounce)
ratvar_modules = list(/obj/item/clockwork/slab/cyborg/medical,
@@ -408,7 +407,6 @@
/obj/item/robot_module/scrubpup
name = "Janitor"
basic_modules = list(
- /obj/item/device/assembly/flash/cyborg,
/obj/item/dogborg/jaws/small,
/obj/item/device/analyzer/nose,
/obj/item/soap/tongue/scrubpup,
@@ -422,6 +420,7 @@
moduleselect_icon = "scrubpup"
feedback_key = "cyborg_scrubpup"
hat_offset = INFINITY
+ clean_on_move = TRUE
/obj/item/robot_module/scrubpup/respawn_consumable(mob/living/silicon/robot/R, coeff = 1)
..()
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 46a62a1d50..527474a0f3 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -47,6 +47,10 @@
diag_hud_set_status()
diag_hud_set_health()
+/mob/living/silicon/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/rad_insulation, RAD_NO_INSULATION, TRUE, TRUE)
+
/mob/living/silicon/med_hud_set_health()
return //we use a different hud
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 98b1b46ed8..299fa25226 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -5,7 +5,7 @@
icon = 'icons/mob/aibots.dmi'
layer = MOB_LAYER
gender = NEUTER
- luminosity = 3
+ light_range = 3
stop_automated_movement = 1
wander = 0
healable = 0
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index af4d8736b6..18c4dcd40c 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -124,6 +124,9 @@
if(!target) //Search for decals then.
target = scan(/obj/effect/decal/cleanable)
+
+ if(!target) //Checks for remains
+ target = scan(/obj/effect/decal/remains)
if(!target && trash) //Then for trash.
target = scan(/obj/item/trash)
@@ -178,7 +181,8 @@
/obj/effect/decal/cleanable/ash,
/obj/effect/decal/cleanable/greenglow,
/obj/effect/decal/cleanable/dirt,
- /obj/effect/decal/cleanable/deadcockroach
+ /obj/effect/decal/cleanable/deadcockroach,
+ /obj/effect/decal/remains
)
if(blood)
@@ -213,9 +217,9 @@
target = null
mode = BOT_IDLE
icon_state = "cleanbot[on]"
- else if(istype(A, /obj/item))
+ else if(istype(A, /obj/item) || istype(A, /obj/effect/decal/remains))
visible_message("[src] sprays hydrofluoric acid at [A]!")
- playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
+ playsound(src, 'sound/effects/spray2.ogg', 50, 1, -6)
A.acid_act(75, 10)
else if(istype(A, /mob/living/simple_animal/cockroach) || istype(A, /mob/living/simple_animal/mouse))
var/mob/living/simple_animal/M = target
diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm
index 9d0a623b35..6c23fed112 100644
--- a/code/modules/mob/living/simple_animal/bot/construction.dm
+++ b/code/modules/mob/living/simple_animal/bot/construction.dm
@@ -193,7 +193,7 @@
//Floorbot assemblies
/obj/item/toolbox_tiles
- desc = "It's a toolbox with tiles sticking out the top"
+ desc = "It's a toolbox with tiles sticking out the top."
name = "tiles and toolbox"
icon = 'icons/mob/aibots.dmi'
icon_state = "toolbox_tiles"
@@ -205,7 +205,7 @@
var/created_name = "Floorbot"
/obj/item/toolbox_tiles_sensor
- desc = "It's a toolbox with tiles sticking out the top and a sensor attached"
+ desc = "It's a toolbox with tiles sticking out the top and a sensor attached."
name = "tiles, toolbox and sensor arrangement"
icon = 'icons/mob/aibots.dmi'
icon_state = "toolbox_tiles_sensor"
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 3360efc79c..d8fcfd9344 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -490,7 +490,8 @@
var/oldloc = loc
var/moved = step_towards(src, next) // attempt to move
- if(cell) cell.use(1)
+ if(cell)
+ cell.use(1)
if(moved && oldloc!=loc) // successful move
blockcount = 0
path -= loc
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index feb581e03b..fd03dc2359 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -38,7 +38,7 @@
/mob/living/simple_animal/pet/cat/update_canmove()
..()
- if(client)
+ if(client && stat != DEAD)
if (resting)
icon_state = "[icon_living]_rest"
else
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index 35b4b37445..5e8a875dce 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -63,7 +63,8 @@
/mob/living/simple_animal/pet/dog/corgi/show_inv(mob/user)
user.set_machine(src)
- if(user.stat) return
+ if(user.stat)
+ return
var/dat = "Inventory of [name]
"
if(inventory_head)
@@ -123,7 +124,8 @@
/mob/living/simple_animal/pet/dog/corgi/Topic(href, href_list)
- if(usr.stat) return
+ if(usr.stat)
+ return
//Removing from inventory
if(href_list["remove_inv"])
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index 4053df61a6..865ae48b4c 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -460,7 +460,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
/obj/item/guardiancreator
name = "deck of tarot cards"
- desc = "An enchanted deck of tarot cards, rumored to be a source of unimaginable power. "
+ desc = "An enchanted deck of tarot cards, rumored to be a source of unimaginable power."
icon = 'icons/obj/toy.dmi'
icon_state = "deck_syndicate_full"
var/used = FALSE
diff --git a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm
index 2fa2101aa2..4a8e7ea455 100644
--- a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm
@@ -87,7 +87,7 @@
boss.atb.refund(boss_cost)
/mob/living/simple_animal/hostile/boss/paper_wizard/copy
- desc = "tis a ruse!"
+ desc = "'Tis a ruse!"
health = 1
maxHealth = 1
alpha = 200
diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm
index 68e6745c8d..1807e39a71 100644
--- a/code/modules/mob/living/simple_animal/hostile/faithless.dm
+++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm
@@ -1,6 +1,6 @@
/mob/living/simple_animal/hostile/faithless
name = "The Faithless"
- desc = "The Wish Granter's faith in humanity, incarnate"
+ desc = "The Wish Granter's faith in humanity, incarnate."
icon_state = "faithless"
icon_living = "faithless"
icon_dead = "faithless_dead"
@@ -41,4 +41,4 @@
var/mob/living/carbon/C = target
C.Knockdown(60)
C.visible_message("\The [src] knocks down \the [C]!", \
- "\The [src] knocks you down!")
\ No newline at end of file
+ "\The [src] knocks you down!")
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm b/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm
index 05896c80b5..7aabc37679 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm
@@ -209,7 +209,7 @@
/obj/effect/temp_visual/mook_dust
name = "dust"
- desc = "it's just a dust cloud!"
+ desc = "It's just a dust cloud!"
icon = 'icons/mob/jungle/mook.dmi'
icon_state = "mook_leap_cloud"
layer = BELOW_MOB_LAYER
diff --git a/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm b/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm
index 378b5d9b8e..f9868771ac 100644
--- a/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm
@@ -41,7 +41,7 @@
/mob/living/simple_animal/hostile/syndicate/mecha_pilot/no_mech/Initialize()
. = ..()
- wanted_objects = typecacheof(/obj/mecha/combat, ignore_root_path=TRUE)
+ wanted_objects = typecacheof(/obj/mecha/combat, TRUE)
/mob/living/simple_animal/hostile/syndicate/mecha_pilot/nanotrasen //nanotrasen are syndies! no it's just a weird path.
name = "Nanotrasen Mecha Pilot"
@@ -101,7 +101,7 @@
targets_from = src
//Find a new mecha
- wanted_objects = typecacheof(/obj/mecha/combat, ignore_root_path=TRUE)
+ wanted_objects = typecacheof(/obj/mecha/combat, TRUE)
var/search_aggressiveness = 2
for(var/obj/mecha/combat/C in range(vision_range,src))
if(is_valid_mecha(C))
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
index 14b313d815..03f466ddfd 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
@@ -159,18 +159,18 @@ Difficulty: Medium
Shoot(target)
changeNext_move(CLICK_CD_RANGE)
+//I'm still of the belief that this entire proc needs to be wiped from existence.
+// do not take my touching of it to be endorsement of it. ~mso
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/proc/quick_attack_loop()
- if(next_move <= world.time)
- stoplag(1)
- .() //retry
- return
- sleep((next_move - world.time) * 1.5)
+ while(!QDELETED(target) && next_move <= world.time) //this is done this way because next_move can change to be sooner while we sleep.
+ stoplag(1)
+ sleep((next_move - world.time) * 1.5) //but don't ask me what the fuck this is about
if(QDELETED(target))
return
if(dashing || next_move > world.time || !Adjacent(target))
if(dashing && next_move <= world.time)
next_move = world.time + 1
- .() //recurse
+ INVOKE_ASYNC(src, .proc/quick_attack_loop) //lets try that again.
return
AttackingTarget()
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 380248877e..a214895b83 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -616,7 +616,7 @@ Difficulty: Very Hard
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
- gold_core_spawnable = 0
+ gold_core_spawnable = TRUE
verb_say = "warps"
verb_ask = "floats inquisitively"
verb_exclaim = "zaps"
@@ -634,7 +634,6 @@ Difficulty: Very Hard
environment_smash = ENVIRONMENT_SMASH_NONE
AIStatus = AI_OFF
stop_automated_movement = 1
- gold_core_spawnable = TRUE
var/heal_power = 5
/mob/living/simple_animal/hostile/lightgeist/Initialize()
@@ -663,12 +662,7 @@ Difficulty: Very Hard
activation_method = ACTIVATE_TOUCH
cooldown_add = 50
activation_sound = 'sound/magic/timeparadox2.ogg'
- var/list/banned_items_typecache = list(/obj/item/storage, /obj/item/implant, /obj/item/implanter, /obj/item/disk/nuclear, /obj/item/projectile, /obj/item/spellbook)
-
-/obj/machinery/anomalous_crystal/refresher/Initialize()
- . = ..()
- banned_items_typecache = typecacheof(banned_items_typecache)
-
+ var/static/list/banned_items_typecache = typecacheof(list(/obj/item/storage, /obj/item/implant, /obj/item/implanter, /obj/item/disk/nuclear, /obj/item/projectile, /obj/item/spellbook))
/obj/machinery/anomalous_crystal/refresher/ActivationReaction(mob/user, method)
if(..())
@@ -757,7 +751,7 @@ Difficulty: Very Hard
/obj/effect/proc_holder/spell/targeted/exit_possession
name = "Exit Possession"
- desc = "Exits the body you are possessing"
+ desc = "Exits the body you are possessing."
charge_max = 60
clothes_req = 0
invocation_type = "none"
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
index 363b5a460d..4c803d6c00 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
@@ -172,16 +172,9 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa
search_objects = 1
attack_all_objects = TRUE //attempt to nibble everything
lose_patience_timeout = 150
- var/static/list/sharedWanted = list(/turf/closed/mineral, /turf/closed/wall) //eat rocks and walls
+ var/static/list/sharedWanted = typecacheof(list(/turf/closed/mineral, /turf/closed/wall)) //eat rocks and walls
var/static/list/sharedIgnore = list()
-
-/mob/living/simple_animal/hostile/swarmer/ai/resource/Initialize()
- . = ..()
- sharedWanted = typecacheof(sharedWanted)
- sharedIgnore = typecacheof(sharedIgnore)
-
-
//This handles viable things to eat/attack
//Place specific cases of AI derpiness here
//Most can be left to the automatic Gain/LosePatience() system
@@ -239,18 +232,15 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa
//So swarmers can learn what is and isn't food
/mob/living/simple_animal/hostile/swarmer/ai/resource/proc/add_type_to_wanted(typepath)
- LAZYINITLIST(sharedWanted)
if(!sharedWanted[typepath])// this and += is faster than |=
sharedWanted += typecacheof(typepath)
/mob/living/simple_animal/hostile/swarmer/ai/resource/proc/add_type_to_ignore(typepath)
- LAZYINITLIST(sharedIgnore)
if(!sharedIgnore[typepath])
sharedIgnore += typecacheof(typepath)
-
//RANGED SWARMER
/mob/living/simple_animal/hostile/swarmer/ai/ranged_combat
icon_state = "swarmer_ranged"
@@ -299,7 +289,7 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa
//Used so they can survive lavaland better
/obj/structure/lattice/catwalk/swarmer_catwalk
name = "swarmer catwalk"
- desc = "a catwalk-like mesh, produced by swarmers to allow them to navigate hostile terrain."
+ desc = "A catwalk-like mesh, produced by swarmers to allow them to navigate hostile terrain."
icon = 'icons/obj/smooth_structures/swarmer_catwalk.dmi'
icon_state = "swarmer_catwalk"
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
index d53b741301..b22d3fc135 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
@@ -1,6 +1,6 @@
/mob/living/simple_animal/hostile/retaliate/clown
name = "Clown"
- desc = "A denizen of clown planet"
+ desc = "A denizen of clown planet."
icon = 'icons/mob/simple_human.dmi'
icon_state = "clown"
icon_living = "clown"
diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm
index b4dc7c8fac..b207b82e26 100644
--- a/code/modules/mob/living/simple_animal/hostile/statue.dm
+++ b/code/modules/mob/living/simple_animal/hostile/statue.dm
@@ -2,7 +2,7 @@
/mob/living/simple_animal/hostile/statue
name = "statue" // matches the name of the statue with the flesh-to-stone spell
- desc = "An incredibly lifelike marble carving. Its eyes seems to follow you.." // same as an ordinary statue with the added "eye following you" description
+ desc = "An incredibly lifelike marble carving. Its eyes seem to follow you.." // same as an ordinary statue with the added "eye following you" description
icon = 'icons/obj/statue.dmi'
icon_state = "human_male"
icon_living = "human_male"
diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm
index aa51fb4e17..ced75cb076 100644
--- a/code/modules/mob/living/simple_animal/hostile/tree.dm
+++ b/code/modules/mob/living/simple_animal/hostile/tree.dm
@@ -62,7 +62,7 @@
/mob/living/simple_animal/hostile/tree/festivus
name = "festivus pole"
- desc = "serenity now... SERENITY NOW!"
+ desc = "Serenity now... SERENITY NOW!"
icon_state = "festivus_pole"
icon_living = "festivus_pole"
icon_dead = "festivus_pole"
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 16e09b59c8..085a95540f 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -514,7 +514,8 @@
return
walk_to(src, parrot_interest, 1, parrot_speed)
- if(isStuck()) return
+ if(isStuck())
+ return
return
@@ -534,7 +535,8 @@
return
walk_to(src, parrot_perch, 1, parrot_speed)
- if(isStuck()) return
+ if(isStuck())
+ return
return
@@ -547,7 +549,8 @@
walk_away(src, parrot_interest, 1, parrot_speed)
/*if(parrot_been_shot > 0)
parrot_been_shot-- didn't work anyways, and besides, any bullet poly survives isn't worth the speed boost.*/
- if(isStuck()) return
+ if(isStuck())
+ return
return
@@ -586,7 +589,8 @@
//Otherwise, fly towards the mob!
else
walk_to(src, parrot_interest, 1, parrot_speed)
- if(isStuck()) return
+ if(isStuck())
+ return
return
//-----STATE MISHAP
@@ -901,9 +905,6 @@
/mob/living/simple_animal/parrot/Poly/Life()
if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
- rounds_survived = max(++rounds_survived,1)
- if(rounds_survived > longest_survival)
- longest_survival = rounds_survived
Write_Memory(FALSE)
memory_saved = TRUE
..()
@@ -969,7 +970,7 @@
/mob/living/simple_animal/parrot/Poly/ghost
name = "The Ghost of Poly"
- desc = "Doomed to squawk the earth."
+ desc = "Doomed to squawk the Earth."
color = "#FFFFFF77"
speak_chance = 20
status_flags = GODMODE
@@ -1004,7 +1005,6 @@
parrot_interest = null
H.visible_message("[src] dive bombs into [H]'s chest and vanishes!", "[src] dive bombs into your chest, vanishing! This can't be good!")
-
/mob/living/simple_animal/parrot/clock_hawk
name = "clock hawk"
desc = "Cbyl jnaan penpxre! Fdhnnnjx!"
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index 809e8b80d4..d7c4f0cb03 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -1,7 +1,7 @@
/mob/living/simple_animal/shade
name = "Shade"
real_name = "Shade"
- desc = "A bound spirit"
+ desc = "A bound spirit."
gender = PLURAL
icon = 'icons/mob/mob.dmi'
icon_state = "shade"
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index a9ed6a4120..fffc05ccf9 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -285,6 +285,7 @@
return 1
/mob/living/simple_animal/death(gibbed)
+ movement_type &= ~FLYING
if(nest)
nest.spawned_mobs -= src
nest = null
@@ -340,6 +341,7 @@
density = initial(density)
lying = 0
. = 1
+ movement_type = initial(movement_type)
/mob/living/simple_animal/proc/make_babies() // <3 <3 <3
if(gender != FEMALE || stat || next_scan_time > world.time || !childtype || !animal_species || !SSticker.IsRoundInProgress())
diff --git a/code/modules/mob/living/taste.dm b/code/modules/mob/living/taste.dm
index 45fdf55fb4..c66168cee4 100644
--- a/code/modules/mob/living/taste.dm
+++ b/code/modules/mob/living/taste.dm
@@ -8,7 +8,7 @@
return DEFAULT_TASTE_SENSITIVITY
/mob/living/carbon/get_taste_sensitivity()
- var/obj/item/organ/tongue/tongue = getorganslot("tongue")
+ var/obj/item/organ/tongue/tongue = getorganslot(ORGAN_SLOT_TONGUE)
if(istype(tongue))
. = tongue.taste_sensitivity
else
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 1d0cce5a09..ddd1d3e2dc 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -26,13 +26,12 @@
else
GLOB.living_mob_list += src
prepare_huds()
- can_ride_typecache = typecacheof(can_ride_typecache)
- hook_vr("mob_new",list(src))
for(var/v in GLOB.active_alternate_appearances)
if(!v)
continue
var/datum/atom_hud/alternate_appearance/AA = v
AA.onNewMob(src)
+ hook_vr("mob_new",list(src))
. = ..()
/atom/proc/prepare_huds()
@@ -46,7 +45,8 @@
set category = "Admin"
set hidden = 1
- if(!loc) return 0
+ if(!loc)
+ return 0
var/datum/gas_mixture/environment = loc.return_air()
@@ -197,7 +197,8 @@
//set disable_warning to disable the 'you are unable to equip that' warning.
//unset redraw_mob to prevent the mob from being redrawn at the end.
/mob/proc/equip_to_slot_if_possible(obj/item/W, slot, qdel_on_fail = FALSE, disable_warning = FALSE, redraw_mob = TRUE, bypass_equip_delay_self = FALSE)
- if(!istype(W)) return 0
+ if(!istype(W))
+ return 0
if(!W.mob_can_equip(src, null, slot, disable_warning, bypass_equip_delay_self))
if(qdel_on_fail)
qdel(W)
@@ -221,7 +222,8 @@
//puts the item "W" into an appropriate slot in a human's inventory
//returns 0 if it cannot, 1 if successful
/mob/proc/equip_to_appropriate_slot(obj/item/W)
- if(!istype(W)) return 0
+ if(!istype(W))
+ return 0
var/slot_priority = W.slot_equipment_priority
if(!slot_priority)
@@ -388,7 +390,7 @@
pulling = null
grab_state = 0
update_pull_hud_icon()
-
+
if(isliving(ex_pulled))
var/mob/living/L = ex_pulled
L.update_canmove()// mob gets up if it was lyng down in a chokehold
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 6becdb3ddd..5260ace246 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -27,8 +27,9 @@
var/damageoverlaytemp = 0
var/computer_id = null
var/lastattacker = null
- var/lastattacked = null
- var/list/logging = list(INDIVIDUAL_ATTACK_LOG, INDIVIDUAL_SAY_LOG, INDIVIDUAL_EMOTE_LOG, INDIVIDUAL_OOC_LOG, INDIVIDUAL_LOOC_LOG)
+ var/lastattackerckey = null
+ var/list/logging = list(INDIVIDUAL_ATTACK_LOG, INDIVIDUAL_SAY_LOG, INDIVIDUAL_EMOTE_LOG, INDIVIDUAL_OOC_LOG)
+
var/obj/machinery/machine = null
var/other_mobs = null
var/disabilities = 0 //Carbon
@@ -140,7 +141,6 @@
var/list/observers = null //The list of people observing this mob.
var/list/progressbars = null //for stacking do_after bars
- var/list/can_ride_typecache = list()
var/list/mousemove_intercept_objects
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index a605d5e479..af12b87eec 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -335,9 +335,9 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
/proc/is_special_character(mob/M) // returns 1 for special characters and 2 for heroes of gamemode //moved out of admins.dm because things other than admin procs were calling this.
if(!SSticker.HasRoundStarted())
- return 0
+ return FALSE
if(!istype(M))
- return 0
+ return FALSE
if(issilicon(M))
if(iscyborg(M)) //For cyborgs, returns 1 if the cyborg has a law 0 and special_role. Returns 0 if the borg is merely slaved to an AI traitor.
var/mob/living/silicon/robot/R = M
@@ -346,13 +346,13 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
if(R.connected_ai)
if(is_special_character(R.connected_ai) && R.connected_ai.laws && (R.connected_ai.laws.zeroth_borg == R.laws.zeroth || R.connected_ai.laws.zeroth == R.laws.zeroth))
return 0 //AI is the real traitor here, so the borg itself is not a traitor
- return 1 //Slaved but also a traitor
- return 1 //Unslaved, traitor
+ return TRUE//Slaved but also a traitor
+ return TRUE //Unslaved, traitor
else if(isAI(M))
var/mob/living/silicon/ai/A = M
if(A.laws && A.laws.zeroth && A.mind && A.mind.special_role)
- return 1
- return 0
+ return TRUE
+ return FALSE
if(M.mind && M.mind.special_role)//If they have a mind and special role, they are some type of traitor or antagonist.
switch(SSticker.mode.config_tag)
if("revolution")
@@ -379,8 +379,10 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
if("abductor")
if(M.mind in SSticker.mode.abductors)
return 2
- return 1
- return 0
+ return TRUE
+ if(M.mind && LAZYLEN(M.mind.antag_datums)) //they have an antag datum!
+ return TRUE
+ return FALSE
/mob/proc/reagent_check(datum/reagent/R) // utilized in the species code
return 1
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index dc87736e5d..d17b79eddc 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -376,8 +376,6 @@
if(!transfer_after)
mind.active = FALSE
mind.transfer_to(R)
- if(mind.special_role)
- R.mind.store_memory("In case you look at this after being borged, the objectives are only here until I find a way to make them not show up for you, as I can't simply delete them without screwing up round-end reporting. --NeoFite")
else if(transfer_after)
R.key = key
@@ -462,12 +460,9 @@
. = new_slime
qdel(src)
-/mob/proc/become_overmind(mode_made, starting_points = 60)
- var/mob/camera/blob/B = new /mob/camera/blob(loc, 0, mode_made, starting_points)
- if(mind)
- mind.transfer_to(B)
- else
- B.key = key
+/mob/proc/become_overmind(starting_points = 60)
+ var/mob/camera/blob/B = new /mob/camera/blob(loc, starting_points)
+ B.key = key
. = B
qdel(src)
diff --git a/code/modules/orbit/orbit.dm b/code/modules/orbit/orbit.dm
index 27fc2d86df..e4df15efaf 100644
--- a/code/modules/orbit/orbit.dm
+++ b/code/modules/orbit/orbit.dm
@@ -1,112 +1,114 @@
-/datum/orbit
- var/atom/movable/orbiter
- var/atom/orbiting
- var/lock = TRUE
- var/turf/lastloc
- var/lastprocess
-
-/datum/orbit/New(_orbiter, _orbiting, _lock)
- orbiter = _orbiter
- orbiting = _orbiting
- SSorbit.processing += src
- if (!orbiting.orbiters)
- orbiting.orbiters = list()
- orbiting.orbiters += src
-
- if (orbiter.orbiting)
- orbiter.stop_orbit()
- orbiter.orbiting = src
- Check()
- lock = _lock
-
-
-
-//do not qdel directly, use stop_orbit on the orbiter. (This way the orbiter can bind to the orbit stopping)
-/datum/orbit/Destroy(force = FALSE)
- SSorbit.processing -= src
- if (orbiter)
- orbiter.orbiting = null
- orbiter = null
- if (orbiting)
- if (orbiting.orbiters)
- orbiting.orbiters -= src
- if (!orbiting.orbiters.len)//we are the last orbit, delete the list
- orbiting.orbiters = null
- orbiting = null
- return ..()
-
-/datum/orbit/proc/Check(turf/targetloc)
- if (!orbiter)
- qdel(src)
- return
- if (!orbiting)
- orbiter.stop_orbit()
- return
- if (!orbiter.orbiting) //admin wants to stop the orbit.
- orbiter.orbiting = src //set it back to us first
- orbiter.stop_orbit()
- lastprocess = world.time
- if (!targetloc)
- targetloc = get_turf(orbiting)
- if (!targetloc || (!lock && orbiter.loc != lastloc && orbiter.loc != targetloc))
- orbiter.stop_orbit()
- return
- orbiter.loc = targetloc
- orbiter.update_parallax_contents()
- lastloc = orbiter.loc
-
-
-/atom/movable/var/datum/orbit/orbiting = null
-/atom/var/list/orbiters = null
-
-//A: atom to orbit
-//radius: range to orbit at, radius of the circle formed by orbiting (in pixels)
-//clockwise: whether you orbit clockwise or anti clockwise
-//rotation_speed: how fast to rotate (how many ds should it take for a rotation to complete)
-//rotation_segments: the resolution of the orbit circle, less = a more block circle, this can be used to produce hexagons (6 segments) triangles (3 segments), and so on, 36 is the best default.
-//pre_rotation: Chooses to rotate src 90 degress towards the orbit dir (clockwise/anticlockwise), useful for things to go "head first" like ghosts
-//lockinorbit: Forces src to always be on A's turf, otherwise the orbit cancels when src gets too far away (eg: ghosts)
-
-/atom/movable/proc/orbit(atom/A, radius = 10, clockwise = FALSE, rotation_speed = 20, rotation_segments = 36, pre_rotation = TRUE, lockinorbit = FALSE)
- if (!istype(A))
- return
-
- new/datum/orbit(src, A, lockinorbit)
- if (!orbiting) //something failed, and our orbit datum deleted itself
- return
- var/matrix/initial_transform = matrix(transform)
-
- //Head first!
- if (pre_rotation)
- var/matrix/M = matrix(transform)
- var/pre_rot = 90
- if(!clockwise)
- pre_rot = -90
- M.Turn(pre_rot)
- transform = M
-
- var/matrix/shift = matrix(transform)
- shift.Translate(0,radius)
- transform = shift
-
- SpinAnimation(rotation_speed, -1, clockwise, rotation_segments)
-
- //we stack the orbits up client side, so we can assign this back to normal server side without it breaking the orbit
- transform = initial_transform
-
-/atom/movable/proc/stop_orbit()
- SpinAnimation(0,0)
- qdel(orbiting)
-
-/atom/Destroy(force = FALSE)
- . = ..()
- if (orbiters)
- for (var/thing in orbiters)
- var/datum/orbit/O = thing
- if (O.orbiter)
- O.orbiter.stop_orbit()
-
-/atom/movable/Destroy(force = FALSE)
- . = ..()
- if (orbiting)
- stop_orbit()
+/datum/orbit
+ var/atom/movable/orbiter
+ var/atom/orbiting
+ var/lock = TRUE
+ var/turf/lastloc
+ var/lastprocess
+
+/datum/orbit/New(_orbiter, _orbiting, _lock)
+ orbiter = _orbiter
+ orbiting = _orbiting
+ SSorbit.processing += src
+ if (!orbiting.orbiters)
+ orbiting.orbiters = list()
+ orbiting.orbiters += src
+
+ if (orbiter.orbiting)
+ orbiter.stop_orbit()
+ orbiter.orbiting = src
+ Check()
+ lock = _lock
+
+//do not qdel directly, use stop_orbit on the orbiter. (This way the orbiter can bind to the orbit stopping)
+/datum/orbit/Destroy(force = FALSE)
+ SSorbit.processing -= src
+ if (orbiter)
+ orbiter.orbiting = null
+ orbiter = null
+ if (orbiting)
+ if (orbiting.orbiters)
+ orbiting.orbiters -= src
+ if (!orbiting.orbiters.len)//we are the last orbit, delete the list
+ orbiting.orbiters = null
+ orbiting = null
+ return ..()
+
+/datum/orbit/proc/Check(turf/targetloc)
+ if (!orbiter)
+ qdel(src)
+ return
+ if (!orbiting)
+ orbiter.stop_orbit()
+ return
+ if (!orbiter.orbiting) //admin wants to stop the orbit.
+ orbiter.orbiting = src //set it back to us first
+ orbiter.stop_orbit()
+ lastprocess = world.time
+ if (!targetloc)
+ targetloc = get_turf(orbiting)
+ if (!targetloc || (!lock && orbiter.loc != lastloc && orbiter.loc != targetloc))
+ orbiter.stop_orbit()
+ return
+ orbiter.loc = targetloc
+ orbiter.update_parallax_contents()
+ lastloc = orbiter.loc
+ for(var/other_orbit in orbiter.orbiters)
+ var/datum/orbit/OO = other_orbit
+ if(OO == src)
+ continue
+ OO.Check(targetloc)
+
+/atom/movable/var/datum/orbit/orbiting = null
+/atom/var/list/orbiters = null
+
+//A: atom to orbit
+//radius: range to orbit at, radius of the circle formed by orbiting (in pixels)
+//clockwise: whether you orbit clockwise or anti clockwise
+//rotation_speed: how fast to rotate (how many ds should it take for a rotation to complete)
+//rotation_segments: the resolution of the orbit circle, less = a more block circle, this can be used to produce hexagons (6 segments) triangles (3 segments), and so on, 36 is the best default.
+//pre_rotation: Chooses to rotate src 90 degress towards the orbit dir (clockwise/anticlockwise), useful for things to go "head first" like ghosts
+//lockinorbit: Forces src to always be on A's turf, otherwise the orbit cancels when src gets too far away (eg: ghosts)
+
+/atom/movable/proc/orbit(atom/A, radius = 10, clockwise = FALSE, rotation_speed = 20, rotation_segments = 36, pre_rotation = TRUE, lockinorbit = FALSE)
+ if (!istype(A))
+ return
+
+ new/datum/orbit(src, A, lockinorbit)
+ if (!orbiting) //something failed, and our orbit datum deleted itself
+ return
+ var/matrix/initial_transform = matrix(transform)
+
+ //Head first!
+ if (pre_rotation)
+ var/matrix/M = matrix(transform)
+ var/pre_rot = 90
+ if(!clockwise)
+ pre_rot = -90
+ M.Turn(pre_rot)
+ transform = M
+
+ var/matrix/shift = matrix(transform)
+ shift.Translate(0,radius)
+ transform = shift
+
+ SpinAnimation(rotation_speed, -1, clockwise, rotation_segments)
+
+ //we stack the orbits up client side, so we can assign this back to normal server side without it breaking the orbit
+ transform = initial_transform
+
+/atom/movable/proc/stop_orbit()
+ SpinAnimation(0,0)
+ qdel(orbiting)
+
+/atom/Destroy(force = FALSE)
+ . = ..()
+ if (orbiters)
+ for (var/thing in orbiters)
+ var/datum/orbit/O = thing
+ if (O.orbiter)
+ O.orbiter.stop_orbit()
+
+/atom/movable/Destroy(force = FALSE)
+ . = ..()
+ if (orbiting)
+ stop_orbit()
diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm
index bfad2c9c83..d63474e357 100644
--- a/code/modules/paperwork/handlabeler.dm
+++ b/code/modules/paperwork/handlabeler.dm
@@ -36,7 +36,8 @@
return OXYLOSS
/obj/item/hand_labeler/afterattack(atom/A, mob/user,proximity)
- if(!proximity) return
+ if(!proximity)
+ return
if(!mode) //if it's off, give up.
return
@@ -112,6 +113,6 @@
desc = "A roll of paper. Use it on a hand labeler to refill it."
icon_state = "labeler_refill"
item_state = "electropack"
- lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+ lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
w_class = WEIGHT_CLASS_TINY
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index 55a0875b62..962802aa6d 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -25,10 +25,6 @@
P.loc = src
bin_pen = P
update_icon()
- var/static/warned = FALSE
- if(P.type == /obj/item/pen && !warned)
- warning("one or more paperbins ate a pen duing initialize()")
- warned = TRUE
/obj/item/paper_bin/fire_act(exposed_temperature, exposed_volume)
if(!total_paper)
diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm
index 12fff6844f..2d5fcc6e3a 100644
--- a/code/modules/paperwork/paperplane.dm
+++ b/code/modules/paperwork/paperplane.dm
@@ -1,6 +1,6 @@
/obj/item/paperplane
name = "paper plane"
- desc = "Paper, folded in the shape of a plane"
+ desc = "Paper, folded in the shape of a plane."
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "paperplane"
throw_range = 7
diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm
index 39353737bb..f0bcf5e9f1 100644
--- a/code/modules/power/antimatter/shielding.dm
+++ b/code/modules/power/antimatter/shielding.dm
@@ -3,7 +3,8 @@
var/list/things = list()
for(var/direction in GLOB.cardinals)
var/turf/T = get_step(center, direction)
- if(!T) continue
+ if(!T)
+ continue
things += T.contents
return things
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index a17fd05d68..cab682857a 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -78,7 +78,6 @@
powernet = 0 // set so that APCs aren't found as powernet nodes //Hackish, Horrible, was like this before I changed it :(
var/malfhack = 0 //New var for my changes to AI malf. --NeoFite
var/mob/living/silicon/ai/malfai = null //See above --NeoFite
-// luminosity = 1
var/has_electronics = 0 // 0 - none, 1 - plugged in, 2 - secured by screwdriver
var/overload = 1 //used for the Blackout malf module
var/beenhit = 0 // used for counting how many times it has been hit, used for Aliens at the moment
@@ -600,7 +599,8 @@
"You hear welding.")
playsound(src.loc, WT.usesound, 50, 1)
if(do_after(user, 50*W.toolspeed, target = src))
- if(!src || !WT.remove_fuel(3, user)) return
+ if(!src || !WT.remove_fuel(3, user))
+ return
if ((stat & BROKEN) || opened==2)
new /obj/item/stack/sheet/metal(loc)
user.visible_message(\
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 2353a9fcc1..ec23f5b7f8 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -1,3 +1,14 @@
+GLOBAL_LIST_INIT(cable_colors, list(
+ "yellow" = "#ffff00",
+ "green" = "#00aa00",
+ "blue" = "#1919c8",
+ "pink" = "#ff3cc8",
+ "orange" = "#ff8000",
+ "cyan" = "#00ffff",
+ "white" = "#ffffff",
+ "red" = "#ff0000"
+ ))
+
///////////////////////////////
//CABLE STRUCTURE
///////////////////////////////
@@ -23,62 +34,54 @@ By design, d1 is the smallest direction and d2 is the highest
*/
/obj/structure/cable
- level = 1 //is underfloor
- anchored =1
- on_blueprints = TRUE
- var/datum/powernet/powernet
name = "power cable"
desc = "A flexible, superconducting insulated cable for heavy-duty power transfer."
- icon = 'icons/obj/power_cond/power_cond_red.dmi'
+ icon = 'icons/obj/power_cond/cables.dmi'
icon_state = "0-1"
+ level = 1 //is underfloor
+ layer = WIRE_LAYER //Above hidden pipes, GAS_PIPE_HIDDEN_LAYER
+ anchored = TRUE
+ on_blueprints = TRUE
var/d1 = 0 // cable direction 1 (see above)
var/d2 = 1 // cable direction 2 (see above)
- layer = WIRE_LAYER //Above hidden pipes, GAS_PIPE_HIDDEN_LAYER
- var/cable_color = "red"
+ var/datum/powernet/powernet
var/obj/item/stack/cable_coil/stored
+ var/cable_color = "red"
+
/obj/structure/cable/yellow
cable_color = "yellow"
- icon = 'icons/obj/power_cond/power_cond_yellow.dmi'
/obj/structure/cable/green
cable_color = "green"
- icon = 'icons/obj/power_cond/power_cond_green.dmi'
/obj/structure/cable/blue
cable_color = "blue"
- icon = 'icons/obj/power_cond/power_cond_blue.dmi'
/obj/structure/cable/pink
cable_color = "pink"
- icon = 'icons/obj/power_cond/power_cond_pink.dmi'
/obj/structure/cable/orange
cable_color = "orange"
- icon = 'icons/obj/power_cond/power_cond_orange.dmi'
/obj/structure/cable/cyan
cable_color = "cyan"
- icon = 'icons/obj/power_cond/power_cond_cyan.dmi'
/obj/structure/cable/white
cable_color = "white"
- icon = 'icons/obj/power_cond/power_cond_white.dmi'
// the power cable object
-/obj/structure/cable/Initialize()
+/obj/structure/cable/Initialize(mapload, param_color)
. = ..()
// ensure d1 & d2 reflect the icon_state for entering and exiting cable
var/dash = findtext(icon_state, "-")
-
d1 = text2num( copytext( icon_state, 1, dash ) )
-
d2 = text2num( copytext( icon_state, dash+1 ) )
var/turf/T = get_turf(src) // hide if turf is not intact
-
- if(level==1) hide(T.intact)
+ if(level==1)
+ hide(T.intact)
GLOB.cable_list += src //add it to the global cable list
if(d1)
@@ -86,6 +89,12 @@ By design, d1 is the smallest direction and d2 is the highest
else
stored = new/obj/item/stack/cable_coil(null,1,cable_color)
+ var/list/cable_colors = GLOB.cable_colors
+ cable_color = param_color || cable_color || pick(cable_colors)
+ if(cable_colors[cable_color])
+ cable_color = cable_colors[cable_color]
+ update_icon()
+
/obj/structure/cable/Destroy() // called when a cable is deleted
if(powernet)
cut_cable_from_powernet() // update the powernets
@@ -114,6 +123,7 @@ By design, d1 is the smallest direction and d2 is the highest
icon_state = "[d1]-[d2]-f"
else
icon_state = "[d1]-[d2]"
+ add_atom_colour(cable_color, FIXED_COLOUR_PRIORITY)
/obj/structure/cable/proc/handlecable(obj/item/W, mob/user, params)
var/turf/T = get_turf(src)
@@ -174,26 +184,6 @@ By design, d1 is the smallest direction and d2 is the highest
if(current_size >= STAGE_FIVE)
deconstruct()
-/obj/structure/cable/proc/cableColor(colorC = "red")
- cable_color = colorC
- switch(colorC)
- if("red")
- icon = 'icons/obj/power_cond/power_cond_red.dmi'
- if("yellow")
- icon = 'icons/obj/power_cond/power_cond_yellow.dmi'
- if("green")
- icon = 'icons/obj/power_cond/power_cond_green.dmi'
- if("blue")
- icon = 'icons/obj/power_cond/power_cond_blue.dmi'
- if("pink")
- icon = 'icons/obj/power_cond/power_cond_pink.dmi'
- if("orange")
- icon = 'icons/obj/power_cond/power_cond_orange.dmi'
- if("cyan")
- icon = 'icons/obj/power_cond/power_cond_cyan.dmi'
- if("white")
- icon = 'icons/obj/power_cond/power_cond_white.dmi'
-
/obj/structure/cable/proc/update_stored(length = 1, colorC = "red")
stored.amount = length
stored.item_color = colorC
@@ -389,7 +379,8 @@ By design, d1 is the smallest direction and d2 is the highest
//needed as this can, unlike other placements, disconnect cables
/obj/structure/cable/proc/denode()
var/turf/T1 = loc
- if(!T1) return
+ if(!T1)
+ return
var/list/powerlist = power_list(T1,src,0,0) //find the other cables that ended in the centre of the turf, with or without a powernet
if(powerlist.len>0)
@@ -454,8 +445,8 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
name = "cable coil"
gender = NEUTER //That's a cable coil sounds better than that's some cable coils
icon = 'icons/obj/power.dmi'
- icon_state = "coil_red"
- item_state = "coil_red"
+ icon_state = "coil"
+ item_state = "coil"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
max_amount = MAXCOIL
@@ -495,8 +486,12 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
. = ..()
if(new_amount) // MAXCOIL by default
amount = new_amount
- if(param_color)
- item_color = param_color
+
+ var/list/cable_colors = GLOB.cable_colors
+ item_color = param_color || item_color || pick(cable_colors)
+ if(cable_colors[item_color])
+ item_color = cable_colors[item_color]
+
pixel_x = rand(-2,2)
pixel_y = rand(-2,2)
update_icon()
@@ -526,18 +521,9 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
/obj/item/stack/cable_coil/update_icon()
- if(!item_color)
- item_color = pick("red", "yellow", "blue", "green")
- item_state = "coil_[item_color]"
- if(amount == 1)
- icon_state = "coil_[item_color]1"
- name = "cable piece"
- else if(amount == 2)
- icon_state = "coil_[item_color]2"
- name = "cable piece"
- else
- icon_state = "coil_[item_color]"
- name = "cable coil"
+ icon_state = "[initial(item_state)][amount < 3 ? amount : ""]"
+ name = "cable [amount < 3 ? "piece" : "coil"]"
+ add_atom_colour(item_color, FIXED_COLOUR_PRIORITY)
/obj/item/stack/cable_coil/attack_hand(mob/user)
var/obj/item/stack/cable_coil/new_cable = ..()
@@ -560,8 +546,8 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
//////////////////////////////////////////////
/obj/item/stack/cable_coil/proc/get_new_cable(location)
- var/path = "/obj/structure/cable" + (item_color == "red" ? "" : "/" + item_color)
- return new path (location)
+ var/path = /obj/structure/cable
+ return new path(location, item_color)
// called when cable_coil is clicked on a turf
/obj/item/stack/cable_coil/proc/place_turf(turf/T, mob/user, dirnew)
@@ -712,7 +698,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
return
- C.cableColor(item_color)
+ C.update_icon()
C.d1 = nd1
C.d2 = nd2
@@ -748,11 +734,8 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
// Misc.
/////////////////////////////
-/obj/item/stack/cable_coil/cut
- item_state = "coil_red2"
-
/obj/item/stack/cable_coil/cut/Initialize(mapload)
- . =..()
+ . = ..()
amount = rand(1,2)
pixel_x = rand(-2,2)
pixel_y = rand(-2,2)
@@ -760,42 +743,30 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
/obj/item/stack/cable_coil/red
item_color = "red"
- icon_state = "coil_red"
/obj/item/stack/cable_coil/yellow
item_color = "yellow"
- icon_state = "coil_yellow"
/obj/item/stack/cable_coil/blue
item_color = "blue"
- icon_state = "coil_blue"
- item_state = "coil_blue"
/obj/item/stack/cable_coil/green
item_color = "green"
- icon_state = "coil_green"
/obj/item/stack/cable_coil/pink
item_color = "pink"
- icon_state = "coil_pink"
/obj/item/stack/cable_coil/orange
item_color = "orange"
- icon_state = "coil_orange"
/obj/item/stack/cable_coil/cyan
item_color = "cyan"
- icon_state = "coil_cyan"
/obj/item/stack/cable_coil/white
item_color = "white"
- icon_state = "coil_white"
-
-/obj/item/stack/cable_coil/random/Initialize(mapload)
- . = ..()
- item_color = pick("red","orange","yellow","green","cyan","blue","pink","white")
- icon_state = "coil_[item_color]"
+/obj/item/stack/cable_coil/random
+ item_color = null
/obj/item/stack/cable_coil/random/five
amount = 5
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 16e2ae92f2..5d1e2fa6d9 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -339,7 +339,7 @@
/obj/item/stock_parts/cell/beam_rifle
name = "beam rifle capacitor"
- desc = "A high powered capacitor that can provide huge amounts of energy in an instant"
+ desc = "A high powered capacitor that can provide huge amounts of energy in an instant."
maxcharge = 50000
chargerate = 5000 //Extremely energy intensive
rating = 4
@@ -348,4 +348,4 @@
return
/obj/item/stock_parts/cell/beam_rifle/emp_act(severity)
- charge = Clamp((charge-(10000/severity)),0,maxcharge)
\ No newline at end of file
+ charge = Clamp((charge-(10000/severity)),0,maxcharge)
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index def373f6b3..98fb2ed233 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -424,11 +424,13 @@
/obj/machinery/light/proc/flicker(var/amount = rand(10, 20))
set waitfor = 0
- if(flickering) return
+ if(flickering)
+ return
flickering = 1
if(on && status == LIGHT_OK)
for(var/i = 0; i < amount; i++)
- if(status != LIGHT_OK) break
+ if(status != LIGHT_OK)
+ break
on = !on
update(0)
sleep(rand(5, 15))
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index 0f4a58e5ef..6031f6edab 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -15,6 +15,15 @@
var/power_output = 1
var/consumption = 0
var/base_icon = "portgen0"
+ var/datum/looping_sound/generator/soundloop
+
+/obj/machinery/power/port_gen/Initialize()
+ . = ..()
+ soundloop = new(list(src), active)
+
+/obj/machinery/power/port_gen/Destroy()
+ QDEL_NULL(soundloop)
+ return ..()
/obj/machinery/power/port_gen/proc/HasFuel() //Placeholder for fuel check.
return 1
@@ -36,11 +45,13 @@
add_avail(power_gen * power_output)
UseFuel()
src.updateDialog()
+ soundloop.start()
else
active = 0
handleInactive()
update_icon()
+ soundloop.stop()
/obj/machinery/power/port_gen/attack_hand(mob/user)
if(..())
@@ -94,7 +105,8 @@
/obj/machinery/power/port_gen/pacman/examine(mob/user)
..()
to_chat(user, "The generator has [sheets] units of [sheet_name] fuel left, producing [power_gen] per cycle.")
- if(crit_fail) to_chat(user, "The generator seems to have broken down.")
+ if(crit_fail)
+ to_chat(user, "The generator seems to have broken down.")
/obj/machinery/power/port_gen/pacman/HasFuel()
if(sheets >= 1 / (time_per_sheet / power_output) - sheet_left)
diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index f4d09167c8..c2610ebc44 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -9,7 +9,7 @@
density = FALSE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
use_power = NO_POWER_USE
- luminosity = 4
+ light_range = 4
layer = ABOVE_OBJ_LAYER
var/obj/machinery/field/generator/FG1 = null
var/obj/machinery/field/generator/FG2 = null
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index b566d65f49..81dcd573f5 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -142,7 +142,7 @@
for(var/mob/living/carbon/food in GLOB.living_mob_list) //we don't care about constructs or cult-Ians or whatever. cult-monkeys are fair game i guess
var/turf/pos = get_turf(food)
- if(pos.z != src.z)
+ if(!pos || (pos.z != z))
continue
if(iscultist(food))
@@ -163,7 +163,7 @@
if(!ghost.client)
continue
var/turf/pos = get_turf(ghost)
- if(pos.z != src.z)
+ if(!pos || (pos.z != z))
continue
cultists += ghost
if(cultists.len)
diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
index e1c80913e9..b1b1856e37 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
@@ -187,13 +187,13 @@
/obj/structure/particle_accelerator/end_cap
name = "Alpha Particle Generation Array"
- desc = "This is where Alpha particles are generated from \[REDACTED\]"
+ desc = "This is where Alpha particles are generated from \[REDACTED\]."
icon_state = "end_cap"
reference = "end_cap"
/obj/structure/particle_accelerator/power_box
name = "Particle Focusing EM Lens"
- desc = "This uses electromagnetic waves to focus the Alpha-Particles."
+ desc = "This uses electromagnetic waves to focus the Alpha particles."
icon = 'icons/obj/machines/particle_accelerator.dmi'
icon_state = "power_box"
reference = "power_box"
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index ce2cd90a49..681bb88c6b 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -8,7 +8,7 @@
anchored = TRUE
density = TRUE
layer = MASSIVE_OBJ_LAYER
- luminosity = 6
+ light_range = 6
appearance_flags = 0
var/current_size = 1
var/allowed_size = 1
@@ -278,7 +278,7 @@
desc = "[initial(desc)] It glows fiercely with inner fire."
name = "supermatter-charged [initial(name)]"
consumedSupermatter = 1
- luminosity = 10
+ set_light(10)
return
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index d9aabd1197..7ce459a712 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -9,7 +9,6 @@
#define OXYGEN_TRANSMIT_MODIFIER 1.5 //Higher == Bigger bonus to power generation.
#define PLASMA_TRANSMIT_MODIFIER 4
-#define FREON_TRANSMIT_PENALTY 0.75 // Scales how much freon reduces total power transmission. 1 equals 1% per 1% of freon in the mix.
#define N2O_HEAT_RESISTANCE 6 //Higher == Gas makes the crystal more resistant against heat damage.
@@ -30,7 +29,7 @@
#define THERMAL_RELEASE_MODIFIER 5 //Higher == less heat released during reaction, not to be confused with the above values
#define PLASMA_RELEASE_MODIFIER 750 //Higher == less plasma released by reaction
#define OXYGEN_RELEASE_MODIFIER 325 //Higher == less oxygen released at high temperature/power
-#define FREON_BREEDING_MODIFIER 100 //Higher == less freon created
+
#define REACTION_POWER_MODIFIER 0.55 //Higher == more overall power
#define MATTER_POWER_CONVERSION 10 //Crystal converts 1/this value of stored matter into energy.
@@ -92,7 +91,6 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
var/power = 0
var/n2comp = 0 // raw composition of each gas in the chamber, ranges from 0 to 1
- var/freoncomp = 0
var/plasmacomp = 0
var/o2comp = 0
@@ -107,7 +105,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
var/powerloss_dynamic_scaling= 0
var/power_transmission_bonus = 0
var/mole_heat_penalty = 0
- var/freon_transmit_modifier = 1
+
var/matter_power = 0
@@ -135,6 +133,8 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
var/is_main_engine = FALSE
+ var/datum/looping_sound/supermatter/soundloop
+
/obj/machinery/power/supermatter_shard/Initialize()
. = ..()
SSair.atmos_machinery += src
@@ -149,6 +149,8 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
if(is_main_engine)
GLOB.main_supermatter_engine = src
+ soundloop = new(list(src), TRUE)
+
/obj/machinery/power/supermatter_shard/Destroy()
investigate_log("has been destroyed.", INVESTIGATE_SUPERMATTER)
SSair.atmos_machinery -= src
@@ -157,7 +159,8 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
QDEL_NULL(countdown)
if(is_main_engine && GLOB.main_supermatter_engine == src)
GLOB.main_supermatter_engine = null
- . = ..()
+ QDEL_NULL(soundloop)
+ return ..()
/obj/machinery/power/supermatter_shard/examine(mob/user)
..()
@@ -251,6 +254,9 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
if(!istype(T)) //We are in a crate or somewhere that isn't turf, if we return to turf resume processing but for now.
return //Yeah just stop.
+ if(power)
+ soundloop.volume = min(50, (round(power, 50)/50)+1) // 5 +1 volume per 20 power. 2500 power is max
+
//Ok, get the air from the turf
var/datum/gas_mixture/env = T.return_air()
@@ -284,7 +290,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
if(damage > damage_archived && prob(10))
playsound(get_turf(src), 'sound/effects/empulse.ogg', 50, 1)
- removed.assert_gases(/datum/gas/oxygen, /datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/nitrogen, /datum/gas/freon)
+ removed.assert_gases(/datum/gas/oxygen, /datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/nitrogen)
//calculating gas related values
combined_gas = max(removed.total_moles(), 0)
@@ -294,16 +300,15 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
n2ocomp = max(removed.gases[/datum/gas/nitrous_oxide][MOLES]/combined_gas, 0)
n2comp = max(removed.gases[/datum/gas/nitrogen][MOLES]/combined_gas, 0)
- freoncomp = max(removed.gases[/datum/gas/freon][MOLES]/combined_gas, 0)
- gasmix_power_ratio = min(max(plasmacomp + o2comp + co2comp - n2comp - freoncomp, 0), 1)
+ gasmix_power_ratio = min(max(plasmacomp + o2comp + co2comp - n2comp, 0), 1)
dynamic_heat_modifier = max((plasmacomp * PLASMA_HEAT_PENALTY)+(o2comp * OXYGEN_HEAT_PENALTY)+(co2comp * CO2_HEAT_PENALTY)+(n2comp * NITROGEN_HEAT_MODIFIER), 0.5)
dynamic_heat_resistance = max(n2ocomp * N2O_HEAT_RESISTANCE, 1)
power_transmission_bonus = max((plasmacomp * PLASMA_TRANSMIT_MODIFIER) + (o2comp * OXYGEN_TRANSMIT_MODIFIER), 0)
- freon_transmit_modifier = max(1-(freoncomp * FREON_TRANSMIT_PENALTY), 0)
+
//more moles of gases are harder to heat than fewer, so let's scale heat damage around them
mole_heat_penalty = max(combined_gas / MOLE_HEAT_PENALTY, 0.25)
@@ -332,7 +337,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
power = max( (removed.temperature * temp_factor / T0C) * gasmix_power_ratio + power, 0) //Total laser power plus an overload
if(prob(50))
- radiation_pulse(src, power * (1 + power_transmission_bonus/10 * freon_transmit_modifier))
+ radiation_pulse(src, power * (1 + power_transmission_bonus/10))
var/device_energy = power * REACTION_POWER_MODIFIER
@@ -352,9 +357,6 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
removed.gases[/datum/gas/oxygen][MOLES] += max(((device_energy + removed.temperature * dynamic_heat_modifier) - T0C) / OXYGEN_RELEASE_MODIFIER, 0)
- if(combined_gas < 50)
- removed.gases[/datum/gas/freon][MOLES] = max((removed.gases[/datum/gas/freon][MOLES] + device_energy) * freoncomp / FREON_BREEDING_MODIFIER, 0)
-
if(produces_gas)
env.merge(removed)
air_update_turf()
diff --git a/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm
index 6fdcccd43f..4f761412f7 100644
--- a/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm
+++ b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm
@@ -32,7 +32,7 @@
/datum/mapGeneratorModule/bottomLayer/massdelete/no_delete_mobs/New()
..()
- ignore_typecache = typecacheof(list(/mob))
+ ignore_typecache = GLOB.typecache_mob
/datum/mapGeneratorModule/bottomLayer/massdelete/leave_turfs
deleteturfs = FALSE
@@ -42,7 +42,7 @@
/datum/mapGeneratorModule/bottomLayer/massdelete/regeneration_delete/New()
..()
- ignore_typecache = typecacheof(list(/mob))
+ ignore_typecache = GLOB.typecache_mob
//Only places atoms/turfs on area borders
/datum/mapGeneratorModule/border
diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm
index cf8c30baf2..d51ea36e15 100644
--- a/code/modules/projectiles/ammunition/ammo_casings.dm
+++ b/code/modules/projectiles/ammunition/ammo_casings.dm
@@ -170,7 +170,7 @@
/obj/item/ammo_casing/mm195x129/incen
name = "1.95x129mm incendiary bullet casing"
- desc = "A 1.95x129mm bullet casing designed with a chemical-filled capsule on the tip that when bursted, reacts with the atmosphere to produce a fireball, engulfing the target in flames. "
+ desc = "A 1.95x129mm bullet casing designed with a chemical-filled capsule on the tip that when bursted, reacts with the atmosphere to produce a fireball, engulfing the target in flames."
projectile_type = /obj/item/projectile/bullet/incendiary/mm195x129
// Shotgun
diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
index 1ff6a9d611..dcd9d356ad 100644
--- a/code/modules/projectiles/ammunition/energy.dm
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -1,6 +1,6 @@
/obj/item/ammo_casing/energy
name = "energy weapon lens"
- desc = "The part of the gun that makes the laser go pew"
+ desc = "The part of the gun that makes the laser go pew."
caliber = "energy"
projectile_type = /obj/item/projectile/energy
var/e_cost = 100 //The amount of energy a cell needs to expend to create this shot.
diff --git a/code/modules/projectiles/boxes_magazines/external_mag.dm b/code/modules/projectiles/boxes_magazines/external_mag.dm
index 5ffe1b475a..f288482349 100644
--- a/code/modules/projectiles/boxes_magazines/external_mag.dm
+++ b/code/modules/projectiles/boxes_magazines/external_mag.dm
@@ -42,7 +42,7 @@
/obj/item/ammo_box/magazine/m10mm/ap
name = "pistol magazine (10mm AP)"
icon_state = "9x19pA"
- desc= "A gun magazine. Loaded with rounds which penetrate armour, but are less effective against normal targets"
+ desc= "A gun magazine. Loaded with rounds which penetrate armour, but are less effective against normal targets."
ammo_type = /obj/item/ammo_casing/c10mm/ap
/obj/item/ammo_box/magazine/m45
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index 0b6a9f1de7..b7db29084a 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -1,5 +1,5 @@
/obj/item/gun/ballistic
- desc = "Now comes in flavors like GUN. Uses 10mm ammo, for some reason"
+ desc = "Now comes in flavors like GUN. Uses 10mm ammo, for some reason."
name = "projectile gun"
icon_state = "pistol"
origin_tech = "combat=2;materials=2"
@@ -139,7 +139,7 @@
#define BRAINS_BLOWN_THROW_RANGE 3
#define BRAINS_BLOWN_THROW_SPEED 1
/obj/item/gun/ballistic/suicide_act(mob/user)
- var/obj/item/organ/brain/B = user.getorganslot("brain")
+ var/obj/item/organ/brain/B = user.getorganslot(ORGAN_SLOT_BRAIN)
if (B && chambered && chambered.BB && can_trigger_gun(user) && !chambered.BB.nodamage)
user.visible_message("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!")
sleep(25)
diff --git a/code/modules/projectiles/guns/ballistic/laser_gatling.dm b/code/modules/projectiles/guns/ballistic/laser_gatling.dm
index 9621c5294d..f7b5b4cd61 100644
--- a/code/modules/projectiles/guns/ballistic/laser_gatling.dm
+++ b/code/modules/projectiles/guns/ballistic/laser_gatling.dm
@@ -3,7 +3,7 @@
//The ammo/gun is stored in a back slot item
/obj/item/minigunpack
name = "backpack power source"
- desc = "The massive external power source for the laser gatling gun"
+ desc = "The massive external power source for the laser gatling gun."
icon = 'icons/obj/guns/minigun.dmi'
icon_state = "holstered"
item_state = "backpack"
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index 7c0ec28a44..584445a573 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -341,7 +341,7 @@
/obj/item/gun/ballistic/revolver/doublebarrel/improvised/sawn
name = "sawn-off improvised shotgun"
- desc = "A single-shot shotgun, better not miss"
+ desc = "A single-shot shotgun. Better not miss."
icon_state = "ishotgun"
item_state = "gun"
w_class = WEIGHT_CLASS_NORMAL
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index 6cd603c8d1..105e170429 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -137,7 +137,7 @@
/obj/item/gun/ballistic/shotgun/boltaction/enchanted/arcane_barrage
name = "arcane barrage"
- desc = "Pew Pew Pew"
+ desc = "Pew Pew Pew."
fire_sound = 'sound/weapons/emitter.ogg'
pin = /obj/item/device/firing_pin/magic
icon_state = "arcane_barrage"
diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm
index 1ce94796fc..c9ec6077aa 100644
--- a/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -75,7 +75,7 @@
/obj/item/gun/energy/e_gun/dragnet/snare
name = "Energy Snare Launcher"
- desc = "Fires an energy snare that slows the target down"
+ desc = "Fires an energy snare that slows the target down."
ammo_type = list(/obj/item/ammo_casing/energy/trap)
/obj/item/gun/energy/e_gun/turret
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index bdcf1fb1c9..6f916a5709 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -108,7 +108,7 @@
/obj/item/gun/energy/xray
name = "x-ray laser gun"
- desc = "A high-power laser gun capable of expelling concentrated x-ray blasts that pass through multiple soft targets and heavier materials"
+ desc = "A high-power laser gun capable of expelling concentrated x-ray blasts that pass through multiple soft targets and heavier materials."
icon_state = "xray"
item_state = null
origin_tech = "combat=6;materials=4;magnets=4;syndicate=1"
diff --git a/code/modules/projectiles/guns/grenade_launcher.dm b/code/modules/projectiles/guns/grenade_launcher.dm
index e63bf7938c..d87a657710 100644
--- a/code/modules/projectiles/guns/grenade_launcher.dm
+++ b/code/modules/projectiles/guns/grenade_launcher.dm
@@ -1,6 +1,6 @@
/obj/item/gun/grenadelauncher
name = "grenade launcher"
- desc = "a terrible, terrible thing. it's really awful!"
+ desc = "A terrible, terrible thing. It's really awful!"
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "riotgun"
item_state = "riotgun"
diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm
index 3c8460b57d..ee0826f677 100644
--- a/code/modules/projectiles/guns/magic/staff.dm
+++ b/code/modules/projectiles/guns/magic/staff.dm
@@ -6,7 +6,7 @@
/obj/item/gun/magic/staff/change
name = "staff of change"
- desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself"
+ desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself."
fire_sound = 'sound/magic/staff_change.ogg'
ammo_type = /obj/item/ammo_casing/magic/change
icon_state = "staffofchange"
@@ -62,7 +62,7 @@
/obj/item/gun/magic/staff/honk
name = "staff of the honkmother"
- desc = "Honk"
+ desc = "Honk."
fire_sound = 'sound/items/airhorn.ogg'
ammo_type = /obj/item/ammo_casing/magic/honk
icon_state = "honker"
diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm
index f79b59fe7d..17d2ea7cbe 100644
--- a/code/modules/projectiles/guns/syringe_gun.dm
+++ b/code/modules/projectiles/guns/syringe_gun.dm
@@ -41,7 +41,8 @@
var/obj/item/reagent_containers/syringe/S = syringes[syringes.len]
- if(!S) return 0
+ if(!S)
+ return 0
S.loc = user.loc
syringes.Remove(S)
@@ -78,16 +79,16 @@
force = 2 //Also very weak because it's smaller
suppressed = TRUE //Softer fire sound
can_unsuppress = FALSE //Permanently silenced
-
+
/obj/item/gun/syringe/dna
name = "modified syringe gun"
desc = "A syringe gun that has been modified to fit DNA injectors instead of normal syringes."
origin_tech = "combat=2;syndicate=2;biotech=3"
-
+
/obj/item/gun/syringe/dna/Initialize()
. = ..()
chambered = new /obj/item/ammo_casing/dnainjector(src)
-
+
/obj/item/gun/syringe/dna/attackby(obj/item/A, mob/user, params, show_msg = TRUE)
if(istype(A, /obj/item/dnainjector))
var/obj/item/dnainjector/D = A
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 24844d6deb..3f70f4f8ff 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -205,11 +205,12 @@
/obj/item/projectile/proc/select_target(atom/A) //Selects another target from a wall if we hit a wall.
- if(!A || !A.density || (A.flags_1 & ON_BORDER_1) || ismob(A)) //if we hit a dense non-border obj or dense turf then we also hit one of the mobs or machines/structures on that tile.
+ if(!A || !A.density || (A.flags_1 & ON_BORDER_1) || ismob(A) || A == original) //if we hit a dense non-border obj or dense turf then we also hit one of the mobs or machines/structures on that tile.
return
- if(A == original || original in A)
+ var/turf/T = get_turf(A)
+ if(original in T)
return original
- var/list/mob/possible_mobs = typecache_filter_list(A, GLOB.typecache_mob)
+ var/list/mob/possible_mobs = typecache_filter_list(T, GLOB.typecache_mob) - A
var/list/mob/mobs = list()
for(var/i in possible_mobs)
var/mob/M = i
@@ -219,10 +220,9 @@
var/mob/M = safepick(mobs)
if(M)
return M.lowest_buckled_mob()
- var/obj/O = safepick(typecache_filter_list(A, GLOB.typecache_machine_or_structure))
+ var/obj/O = safepick(typecache_filter_list(T, GLOB.typecache_machine_or_structure) - A)
if(O)
return O
- return A
/obj/item/projectile/proc/check_ricochet()
if(prob(ricochet_chance))
@@ -265,10 +265,10 @@
if(!log_override && firer && original)
add_logs(firer, original, "fired at", src, " [get_area(src)]")
if(direct_target)
- prehit(direct_target)
- direct_target.bullet_act(src, def_zone)
- qdel(src)
- return
+ if(prehit(direct_target))
+ direct_target.bullet_act(src, def_zone)
+ qdel(src)
+ return
if(isnum(angle))
setAngle(angle)
if(spread)
@@ -394,7 +394,7 @@
/obj/item/projectile/Crossed(atom/movable/AM) //A mob moving on a tile with a projectile is hit by it.
..()
- if(isliving(AM) && AM.density && !checkpass(PASSMOB))
+ if(isliving(AM) && (AM.density || AM == original) && !checkpass(PASSMOB))
Collide(AM)
/obj/item/projectile/Destroy()
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index edb344fb12..323960c7f3 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -103,7 +103,7 @@
// 4.6x30mm (Autorifles)
/obj/item/projectile/bullet/c46x30mm
- desc = "4.6x30mm bullet"
+ name = "4.6x30mm bullet"
damage = 20
/obj/item/projectile/bullet/c46x30mm_ap
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index f3bc7ab9e0..57960fcea7 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -132,16 +132,14 @@
if("monkey")
new_mob = new /mob/living/carbon/monkey(M.loc)
if("robot")
- var/robot = pick("cyborg","syndiborg","drone")
+ var/robot = pick("random_cyborg","syndiborg","drone")
+ var/path
switch(robot)
- if("cyborg")
- new_mob = new /mob/living/silicon/robot(M.loc)
+ if("random_cyborg")
+ path = pick(typesof(/mob/living/silicon/robot/modules) - typesof(/mob/living/silicon/robot/modules/syndicate))
+ new_mob = new path(M.loc)
if("syndiborg")
- var/path
- if(prob(50))
- path = /mob/living/silicon/robot/modules/syndicate
- else
- path = /mob/living/silicon/robot/modules/syndicate/medical
+ path = pick(typesof(/mob/living/silicon/robot/modules/syndicate))
new_mob = new path(M.loc)
if("drone")
new_mob = new /mob/living/simple_animal/drone/polymorphed(M.loc)
@@ -158,9 +156,15 @@
new_mob = new /mob/living/simple_animal/slime/random(M.loc)
if("xeno")
if(prob(50))
- new_mob = new /mob/living/carbon/alien/humanoid/hunter(M.loc)
+ if(!M.ckey) //spawn an AI alien if it isn't a player controlled mob.
+ new_mob = new /mob/living/simple_animal/hostile/alien(M.loc)
+ else
+ new_mob = new /mob/living/carbon/alien/humanoid/hunter(M.loc)
else
- new_mob = new /mob/living/carbon/alien/humanoid/sentinel(M.loc)
+ if(!M.ckey)
+ new_mob = new /mob/living/simple_animal/hostile/alien/sentinel(M.loc)
+ else
+ new_mob = new /mob/living/carbon/alien/humanoid/sentinel(M.loc)
if("animal")
var/path
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index a6c0c75644..5a650ff2c3 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -55,7 +55,7 @@
/obj/item/projectile/bullet/srmrocket
name ="SRM-8 Rocket"
- desc = "Boom"
+ desc = "Boom."
icon_state = "missile"
damage = 30
ricochets_max = 0 //it's a MISSILE
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index eeb5016445..b16d0bc2e7 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -626,7 +626,8 @@
return jointext(names, ",")
/datum/reagents/proc/remove_all_type(reagent_type, amount, strict = 0, safety = 1) // Removes all reagent of X type. @strict set to 1 determines whether the childs of the type are included.
- if(!isnum(amount)) return 1
+ if(!isnum(amount))
+ return 1
var/list/cached_reagents = reagent_list
var/has_removed_reagent = 0
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index f5ff59d1ac..af5597d790 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -68,7 +68,8 @@
recharged -= 1
/obj/machinery/chem_dispenser/proc/recharge()
- if(stat & (BROKEN|NOPOWER)) return
+ if(stat & (BROKEN|NOPOWER))
+ return
var/usedpower = cell.give( 1 / powerefficiency) //Should always be a gain of one on the UI.
if(usedpower)
use_power(2500)
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index 8c84954ad6..a7bdab2d4b 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -285,7 +285,9 @@
updateUsrDialog()
/obj/machinery/reagentgrinder/proc/get_allowed_by_obj(obj/item/O)
- return blend_items[O.type]
+ for (var/i in blend_items)
+ if (istype(O, i))
+ return blend_items[i]
/obj/machinery/reagentgrinder/proc/get_allowed_juice_by_obj(obj/item/reagent_containers/food/snacks/O)
for(var/i in juice_items)
@@ -433,7 +435,7 @@
if (O.Uses > 0)
beaker.reagents.add_reagent("slimejelly",min(20, space))
remove_object(O)
- else if(istype(I, /obj/item/reagent_containers))
+ if(istype(I, /obj/item/reagent_containers))
var/obj/item/reagent_containers/O = I
var/amount = O.reagents.total_volume
O.reagents.trans_to(beaker, amount)
diff --git a/code/modules/reagents/chemistry/machinery/smoke_machine.dm b/code/modules/reagents/chemistry/machinery/smoke_machine.dm
index e2a6d5c269..63f7e48281 100644
--- a/code/modules/reagents/chemistry/machinery/smoke_machine.dm
+++ b/code/modules/reagents/chemistry/machinery/smoke_machine.dm
@@ -117,7 +117,7 @@
on = !on
if(on)
message_admins("[key_name_admin(usr)] activated a smoke machine that contains [english_list(reagents.reagent_list)] at [ADMIN_COORDJMP(src)].")
- log_admin("[key_name(usr)] activated a smoke machine that contains [english_list(reagents.reagent_list)] at [COORD(src)].")
+ log_game("[key_name(usr)] activated a smoke machine that contains [english_list(reagents.reagent_list)] at [COORD(src)].")
add_logs(usr, src, "has activated [src] which contains [english_list(reagents.reagent_list)].")
if("goScreen")
screen = params["screen"]
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index c114f7017b..cc91819611 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -38,7 +38,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
var/mob/living/carbon/human/H = M
if(H.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER)
H.drunkenness = max((H.drunkenness + (sqrt(volume) * boozepwr * ALCOHOL_RATE)), 0) //Volume, power, and server alcohol rate effect how quickly one gets drunk
- var/obj/item/organ/liver/L = H.getorganslot("liver")
+ var/obj/item/organ/liver/L = H.getorganslot(ORGAN_SLOT_LIVER)
H.applyLiverDamage((max(sqrt(volume) * boozepwr * L.alcohol_tolerance, 0))/10)
return ..() || .
diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index a6f6782d30..60d1f64754 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -15,7 +15,8 @@
M.set_drugginess(15)
if(isturf(M.loc) && !isspaceturf(M.loc))
if(M.canmove)
- if(prob(10)) step(M, pick(GLOB.cardinals))
+ if(prob(10))
+ step(M, pick(GLOB.cardinals))
if(prob(7))
M.emote(pick("twitch","drool","moan","giggle"))
..()
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index f1b076ca68..d25df998e3 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -550,7 +550,7 @@
if(!M.is_mouth_covered() && !M.is_eyes_covered())
unprotected = TRUE
if(unprotected)
- if(!M.getorganslot("eye_sight")) //can't blind somebody with no eyes
+ if(!M.getorganslot(ORGAN_SLOT_EYES)) //can't blind somebody with no eyes
to_chat(M, "Your eye sockets feel wet.")
else
if(!M.eye_blurry)
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 818ea3d17f..24b424e156 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -466,7 +466,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/M)
- M.radiation -= min(M.radiation-RAD_MOB_SAFE, 0)/100
+ M.radiation -= max(M.radiation-RAD_MOB_SAFE, 0)/100
M.adjustToxLoss(-2*REM, 0)
for(var/datum/reagent/R in M.reagents.reagent_list)
if(R != src)
@@ -671,7 +671,7 @@
taste_description = "dull toxin"
/datum/reagent/medicine/oculine/on_mob_life(mob/living/M)
- var/obj/item/organ/eyes/eyes = M.getorganslot("eyes_sight")
+ var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES)
if (!eyes)
return
if(M.disabilities & BLIND)
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 7c10bc3fe1..85b72294b1 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -197,7 +197,8 @@
..()
/datum/reagent/water/holywater/on_mob_life(mob/living/M)
- if(!data) data = 1
+ if(!data)
+ data = 1
data++
M.jitteriness = min(M.jitteriness+4,10)
if(data >= 30) // 12 units, 54 seconds @ metabolism 0.4 units & tick rate 1.8 sec
@@ -230,7 +231,8 @@
/datum/reagent/water/holywater/reaction_turf(turf/T, reac_volume)
..()
- if(!istype(T)) return
+ if(!istype(T))
+ return
if(reac_volume>=10)
for(var/obj/effect/rune/R in T)
qdel(R)
@@ -367,8 +369,6 @@
if(method == INGEST)
if(show_message)
to_chat(M, "That tasted horrible.")
- M.AdjustStun(40)
- M.AdjustKnockdown(40)
..()
@@ -1159,6 +1159,34 @@
M.confused = min(M.confused + 2, 5)
..()
+/datum/reagent/stimulum
+ name = "Stimulum"
+ id = "stimulum"
+ description = "An unstable experimental gas that greatly increases the energy of those that inhale it"
+ reagent_state = GAS
+ metabolization_rate = 1.5 * REAGENTS_METABOLISM
+ color = "E1A116"
+ taste_description = "sourness"
+
+/datum/reagent/stimulum/on_mob_life(mob/living/M) // Has a speedup, and the anti-stun effects of nicotine.
+ M.status_flags |= GOTTAGOFAST
+ M.AdjustStun(-20, 0)
+ M.AdjustKnockdown(-20, 0)
+ M.AdjustUnconscious(-20, 0)
+ M.adjustStaminaLoss(-0.5*REM, 0)
+
+/datum/reagent/browngas
+ name = "Brown gas"
+ id = "brown_gas"
+ description = "A strange brown gas that makes you feel faster"
+ reagent_state = GAS
+ metabolization_rate = REAGENTS_METABOLISM
+ color = "90560B"
+ taste_description = "burning"
+
+/datum/reagent/browngas/on_mob_life(mob/living/M) //Has just a speedup
+ M.status_flags |= GOTTAGOFAST
+
/////////////////////////Coloured Crayon Powder////////////////////////////
//For colouring in /proc/mix_color_from_reagents
@@ -1568,7 +1596,7 @@
/datum/reagent/romerol/on_mob_life(mob/living/carbon/human/H)
// Silently add the zombie infection organ to be activated upon death
- if(!H.getorganslot("zombie_infection"))
+ if(!H.getorganslot(ORGAN_SLOT_ZOMBIE))
var/obj/item/organ/zombie_infection/ZI = new()
ZI.Insert(H)
..()
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index 62e5fd723d..27bf596df0 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -243,7 +243,7 @@
if(holder && holder.my_atom)
var/turf/open/T = get_turf(holder.my_atom)
if(istype(T))
- T.atmos_spawn_air("freon=50;TEMP=120")
+ T.atmos_spawn_air("nitrogen=50;TEMP=2.7")
/datum/chemical_reaction/slime/slimefireproof
name = "Slime Fireproof"
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index afcc0b8197..f87df197fc 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -54,7 +54,8 @@
for (var/datum/reagent/R in snack.reagents.reagent_list) //no reagents will be left behind
data += "[R.id]([R.volume] units); " //Using IDs because SOME chemicals(I'm looking at you, chlorhydrate-beer) have the same names as other chemicals.
return data
- else return "No reagents"
+ else
+ return "No reagents"
/obj/item/reagent_containers/proc/canconsume(mob/eater, mob/user)
if(!iscarbon(eater))
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index a7f8fc9195..3a5f1c3f96 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -170,7 +170,8 @@ Borg Shaker
RG.add_reagent(reagent_ids[valueofi], 5)
/obj/item/reagent_containers/borghypo/borgshaker/afterattack(obj/target, mob/user, proximity)
- if(!proximity) return
+ if(!proximity)
+ return
else if(target.is_open_container() && target.reagents)
var/datum/reagents/R = reagent_list[mode]
diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm
index 7da343f31d..c0cd009104 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/bottle.dm
@@ -311,4 +311,4 @@
/obj/item/reagent_containers/glass/bottle/tuberculosiscure
name = "BVAK bottle"
desc = "A small bottle containing Bio Virus Antidote Kit."
- list_reagents = list("atropine" = 5, "epinephrine" = 5, "salbutamol" = 10, "spaceacillin" = 10)
+ list_reagents = list("atropine" = 5, "epinephrine" = 5, "salbutamol" = 10, "spaceacillin" = 10)
\ No newline at end of file
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index 346f246045..30aa67e91a 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -9,8 +9,10 @@
container_type = TRANSPARENT_1
/obj/item/reagent_containers/dropper/afterattack(obj/target, mob/user , proximity)
- if(!proximity) return
- if(!target.reagents) return
+ if(!proximity)
+ return
+ if(!target.reagents)
+ return
if(reagents.total_volume > 0)
if(target.reagents.total_volume >= target.reagents.maximum_volume)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 5ee18c2dba..4b7ba22574 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -53,7 +53,8 @@
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
/obj/item/reagent_containers/glass/afterattack(obj/target, mob/user, proximity)
- if((!proximity) || !check_allowed_items(target,target_self=1)) return
+ if((!proximity) || !check_allowed_items(target,target_self=1))
+ return
else if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
@@ -289,7 +290,7 @@
/obj/item/reagent_containers/glass/beaker/waterbottle
name = "bottle of water"
- desc = "A bottle of water filled at an old Earth bottling facility,"
+ desc = "A bottle of water filled at an old Earth bottling facility."
icon = 'icons/obj/drinks.dmi'
icon_state = "smallbottle"
item_state = "bottle"
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 8c19d105de..324623edbd 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -4,8 +4,8 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "pill"
item_state = "pill"
- lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
possible_transfer_amounts = list()
volume = 50
var/apply_type = INGEST
@@ -54,7 +54,8 @@
/obj/item/reagent_containers/pill/afterattack(obj/target, mob/user , proximity)
- if(!proximity) return
+ if(!proximity)
+ return
if(target.is_open_container() != 0 && target.reagents)
if(!target.reagents.total_volume)
to_chat(user, "[target] is empty! There's nothing to dissolve [src] in.")
@@ -150,4 +151,4 @@
desc = "I wouldn't eat this if I were you."
icon_state = "pill9"
color = "#454545"
- list_reagents = list("shadowmutationtoxin" = 1)
\ No newline at end of file
+ list_reagents = list("shadowmutationtoxin" = 1)
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index daf955d0ef..b6c4180d76 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -238,7 +238,7 @@
/obj/item/reagent_containers/syringe/bluespace
name = "bluespace syringe"
- desc = "An advanced syringe that can hold 60 units of chemicals"
+ desc = "An advanced syringe that can hold 60 units of chemicals."
amount_per_transfer_from_this = 20
volume = 60
origin_tech = "bluespace=4;materials=4;biotech=4"
diff --git a/code/modules/recycling/disposal-structures.dm b/code/modules/recycling/disposal-structures.dm
index 97ee38357c..5a7428d1d1 100644
--- a/code/modules/recycling/disposal-structures.dm
+++ b/code/modules/recycling/disposal-structures.dm
@@ -311,7 +311,8 @@
to_chat(user, "You start slicing the disposal pipe...")
// check if anything changed over 2 seconds
if(do_after(user,30, target = src))
- if(!src || !W.isOn()) return
+ if(!src || !W.isOn())
+ return
deconstruct()
to_chat(user, "You slice the disposal pipe.")
else
@@ -709,7 +710,8 @@
playsound(src.loc, 'sound/items/welder2.ogg', 100, 1)
to_chat(user, "You start slicing the floorweld off \the [src]...")
if(do_after(user,20*I.toolspeed, target = src))
- if(!src || !W.isOn()) return
+ if(!src || !W.isOn())
+ return
to_chat(user, "You slice the floorweld off \the [src].")
stored.loc = loc
src.transfer_fingerprints_to(stored)
diff --git a/code/modules/recycling/disposal-unit.dm b/code/modules/recycling/disposal-unit.dm
index aaaf2596ef..926e6326ad 100644
--- a/code/modules/recycling/disposal-unit.dm
+++ b/code/modules/recycling/disposal-unit.dm
@@ -468,13 +468,17 @@
return
switch(dir)
if(NORTH)
- if(AM.loc.y != loc.y+1) return
+ if(AM.loc.y != loc.y+1)
+ return
if(EAST)
- if(AM.loc.x != loc.x+1) return
+ if(AM.loc.x != loc.x+1)
+ return
if(SOUTH)
- if(AM.loc.y != loc.y-1) return
+ if(AM.loc.y != loc.y-1)
+ return
if(WEST)
- if(AM.loc.x != loc.x-1) return
+ if(AM.loc.x != loc.x-1)
+ return
if(isobj(AM))
var/obj/O = AM
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index efb64c6623..d912bc908e 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -168,12 +168,12 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(href_list["menu"]) //Switches menu screens. Converts a sent text string into a number. Saves a LOT of code.
var/temp_screen = text2num(href_list["menu"])
screen = temp_screen
-
-
+
+
var/datum/component/material_container/linked_materials
if(linked_lathe)
linked_materials = linked_lathe.GetComponent(/datum/component/material_container)
-
+
var/datum/component/material_container/imprinter_materials
if(linked_imprinter)
imprinter_materials = linked_imprinter.GetComponent(/datum/component/material_container)
@@ -303,7 +303,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
break
if(!cancontinue)
var/choice = input("This item does not raise tech levels. Proceed destroying loaded item anyway?") in list("Proceed", "Cancel")
- if(choice == "Cancel" || !linked_destroy || !linked_destroy.loaded_item) return
+ if(choice == "Cancel" || !linked_destroy || !linked_destroy.loaded_item)
+ return
linked_destroy.busy = TRUE
screen = 0.1
updateUsrDialog()
@@ -642,20 +643,22 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(linked_imprinter == null)
screen = 4.0
-
+
var/datum/component/material_container/linked_materials
if(linked_lathe)
linked_materials = linked_lathe.GetComponent(/datum/component/material_container)
-
+
var/datum/component/material_container/imprinter_materials
if(linked_imprinter)
imprinter_materials = linked_imprinter.GetComponent(/datum/component/material_container)
switch(screen)
//////////////////////R&D CONSOLE SCREENS//////////////////
- if(0.0) dat += "
Updating Database....
"
+ if(0.0)
+ dat += "Updating Database....
"
- if(0.1) dat += "Processing and Updating Database...
"
+ if(0.1)
+ dat += "Processing and Updating Database...
"
if(0.2)
dat += "SYSTEM LOCKED
"
@@ -740,13 +743,20 @@ won't update every console in existence) but it's more of a hassle to do. Also,
dat += "Name: [D.name]
"
if(D.build_type)
dat += "Lathe Types:
"
- if(D.build_type & IMPRINTER) dat += "Circuit Imprinter
"
- if(D.build_type & PROTOLATHE) dat += "Protolathe
"
- if(D.build_type & AUTOLATHE) dat += "Autolathe
"
- if(D.build_type & MECHFAB) dat += "Exosuit Fabricator
"
- if(D.build_type & BIOGENERATOR) dat += "Biogenerator
"
- if(D.build_type & LIMBGROWER) dat += "Limbgrower
"
- if(D.build_type & SMELTER) dat += "Smelter
"
+ if(D.build_type & IMPRINTER)
+ dat += "Circuit Imprinter
"
+ if(D.build_type & PROTOLATHE)
+ dat += "Protolathe
"
+ if(D.build_type & AUTOLATHE)
+ dat += "Autolathe
"
+ if(D.build_type & MECHFAB)
+ dat += "Exosuit Fabricator
"
+ if(D.build_type & BIOGENERATOR)
+ dat += "Biogenerator
"
+ if(D.build_type & LIMBGROWER)
+ dat += "Limbgrower
"
+ if(D.build_type & SMELTER)
+ dat += "Smelter
"
dat += "Required Materials:
"
var/all_mats = D.materials + D.reagents_list
for(var/M in all_mats)
@@ -935,9 +945,12 @@ won't update every console in existence) but it's more of a hassle to do. Also,
for(var/mat_id in linked_materials.materials)
var/datum/material/M = linked_materials.materials[mat_id]
dat += "* [M.amount] of [M.name]: "
- if(M.amount >= MINERAL_MATERIAL_AMOUNT) dat += "Eject "
- if(M.amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "5x "
- if(M.amount >= MINERAL_MATERIAL_AMOUNT) dat += "All"
+ if(M.amount >= MINERAL_MATERIAL_AMOUNT)
+ dat += "Eject "
+ if(M.amount >= MINERAL_MATERIAL_AMOUNT*5)
+ dat += "5x "
+ if(M.amount >= MINERAL_MATERIAL_AMOUNT)
+ dat += "All"
dat += "
"
dat += ""
@@ -1047,9 +1060,12 @@ won't update every console in existence) but it's more of a hassle to do. Also,
for(var/mat_id in imprinter_materials.materials)
var/datum/material/M = imprinter_materials.materials[mat_id]
dat += "* [M.amount] of [M.name]: "
- if(M.amount >= MINERAL_MATERIAL_AMOUNT) dat += "Eject "
- if(M.amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "5x "
- if(M.amount >= MINERAL_MATERIAL_AMOUNT) dat += "All"
+ if(M.amount >= MINERAL_MATERIAL_AMOUNT)
+ dat += "Eject "
+ if(M.amount >= MINERAL_MATERIAL_AMOUNT*5)
+ dat += "5x "
+ if(M.amount >= MINERAL_MATERIAL_AMOUNT)
+ dat += "All"
dat += "
"
dat += ""
diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm
index 917df417b3..89c0607060 100644
--- a/code/modules/research/research.dm
+++ b/code/modules/research/research.dm
@@ -349,8 +349,8 @@ research holder datum.
max_tech_stored = 10
/obj/item/disk/tech_disk/debug
- name = "centcom technology disk"
- desc = "A debug item for research"
+ name = "\improper CentCom technology disk"
+ desc = "A debug item for research."
materials = list()
max_tech_stored = 0
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index 0f30347c74..98f5fef616 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -31,7 +31,8 @@
/obj/machinery/r_n_d/server/Initialize(mapload)
. = ..()
- if(!files) files = new /datum/research(src)
+ if(!files)
+ files = new /datum/research(src)
var/list/temp_list
if(!id_with_upload.len)
temp_list = list()
@@ -254,7 +255,8 @@
dat += "[S.name] || "
dat += "Access Rights | "
dat += "Data Management"
- if(badmin) dat += " | Server-to-Server Transfer"
+ if(badmin)
+ dat += " | Server-to-Server Transfer"
dat += "
"
if(1) //Access rights menu
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 6eedd257d0..cca88a0dda 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -194,7 +194,7 @@
SM.mind.enslave_mind_to_creator(user)
SM.sentience_act()
to_chat(SM, "All at once it makes sense: you know what you are and who you are! Self awareness is yours!")
- to_chat(SM, "You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist [user.p_them()] in completing [user.p_their()] goals at any cost.")
+ to_chat(SM, "You are grateful to be self aware and owe [user.real_name] a great debt. Serve [user.real_name], and assist [user.p_them()] in completing [user.p_their()] goals at any cost.")
to_chat(user, "[SM] accepts [src] and suddenly becomes attentive and aware. It worked!")
qdel(src)
else
@@ -415,7 +415,7 @@
/obj/item/clothing/under/golem
name = "adamantine skin"
- desc = "a golem's skin"
+ desc = "A golem's skin."
icon_state = "golem"
item_state = "golem"
item_color = "golem"
@@ -425,7 +425,7 @@
/obj/item/clothing/suit/golem
name = "adamantine shell"
- desc = "a golem's thick outer shell"
+ desc = "A golem's thick outer shell."
icon_state = "golem"
item_state = "golem"
w_class = WEIGHT_CLASS_BULKY
@@ -438,7 +438,7 @@
/obj/item/clothing/shoes/golem
name = "golem's feet"
- desc = "sturdy adamantine feet"
+ desc = "Sturdy adamantine feet."
icon_state = "golem"
item_state = null
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
@@ -447,7 +447,7 @@
/obj/item/clothing/mask/breath/golem
name = "golem's face"
- desc = "the imposing face of an adamantine golem"
+ desc = "The imposing face of an adamantine golem."
icon_state = "golem"
item_state = "golem"
siemens_coefficient = 0
@@ -457,7 +457,7 @@
/obj/item/clothing/gloves/golem
name = "golem's hands"
- desc = "strong adamantine hands"
+ desc = "Strong adamantine hands."
icon_state = "golem"
item_state = null
siemens_coefficient = 0
@@ -470,82 +470,14 @@
item_state = "dermal"
item_color = "dermal"
name = "golem's head"
- desc = "a golem's head"
+ desc = "A golem's head."
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
flags_1 = ABSTRACT_1 | NODROP_1
-
-/obj/effect/golemrune
- anchored = TRUE
- desc = "a strange rune used to create golems. It glows when spirits are nearby."
- name = "rune"
- icon = 'icons/obj/rune.dmi'
- icon_state = "golem"
- resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
- layer = TURF_LAYER
-
-/obj/effect/golemrune/Initialize()
- . = ..()
- START_PROCESSING(SSobj, src)
- notify_ghosts("Golem rune created in [get_area(src)].", 'sound/misc/server-ready.ogg', source = src)
-
-/obj/effect/golemrune/Destroy()
- STOP_PROCESSING(SSobj, src)
- return ..()
-
-/obj/effect/golemrune/process()
- var/mob/dead/observer/ghost
- for(var/mob/dead/observer/O in src.loc)
- if(!O.client)
- continue
- if(O.mind && O.mind.current && O.mind.current.stat != DEAD)
- continue
- if (O.orbiting)
- continue
- ghost = O
- break
- if(ghost)
- icon_state = "golem2"
- else
- icon_state = "golem"
-
-/obj/effect/golemrune/attack_hand(mob/living/user)
- var/mob/dead/observer/ghost
- for(var/mob/dead/observer/O in src.loc)
- if(!O.client)
- continue
- if(O.mind && O.mind.current && O.mind.current.stat != DEAD)
- continue
- if (O.orbiting)
- continue
- ghost = O
- break
- if(!ghost)
- to_chat(user, "The rune fizzles uselessly! There is no spirit nearby.")
- return
- var/mob/living/carbon/human/G = new /mob/living/carbon/human
- G.set_species(/datum/species/golem/adamantine)
- G.set_cloned_appearance()
- G.real_name = G.dna.species.random_name()
- G.name = G.real_name
- G.dna.unique_enzymes = G.dna.generate_unique_enzymes()
- G.dna.species.auto_equip(G)
- G.loc = src.loc
- G.key = ghost.key
- to_chat(G, "You are an adamantine golem. 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. \
- Serve [user], and assist [user.p_them()] in completing their goals at any cost.")
- G.mind.store_memory("Serve [user.real_name], your creator.")
- G.mind.assigned_role = "Servant Golem"
-
- G.mind.enslave_mind_to_creator(user)
-
- log_game("[key_name(G)] was made a golem by [key_name(user)].")
- log_admin("[key_name(G)] was made a golem by [key_name(user)].")
- qdel(src)
-
+
/obj/item/stack/tile/bluespace
name = "bluespace floor tile"
singular_name = "floor tile"
- desc = "Through a series of micro-teleports these tiles let people move at incredible speeds"
+ desc = "Through a series of micro-teleports these tiles let people move at incredible speeds."
icon_state = "tile-bluespace"
w_class = WEIGHT_CLASS_NORMAL
force = 6
@@ -561,7 +493,7 @@
/obj/item/stack/tile/sepia
name = "sepia floor tile"
singular_name = "floor tile"
- desc = "Time seems to flow very slowly around these tiles"
+ desc = "Time seems to flow very slowly around these tiles."
icon_state = "tile-sepia"
w_class = WEIGHT_CLASS_NORMAL
force = 6
diff --git a/code/modules/ruins/spaceruin_code/crashedship.dm b/code/modules/ruins/spaceruin_code/crashedship.dm
index f2e6abf211..e125109168 100644
--- a/code/modules/ruins/spaceruin_code/crashedship.dm
+++ b/code/modules/ruins/spaceruin_code/crashedship.dm
@@ -28,13 +28,13 @@
/obj/item/paper/fluff/ruins/crashedship/scribbled
name = "scribbled note"
info = "The next person who takes one of my screwdrivers gets stabbed with one. They are MINE. - Love, Madsen"
-
-
+
+
/obj/item/paper/fluff/ruins/crashedship/captains_log
name = "Captain's log entry"
info = "I'm no scientist, but judging from the design and components, it seems to be some kind of teleporter. This thing is gonna be worth a lot of cash to the right man. The boys are excited, as they have every right to be, and I've let them crack into that case of beer we got. I normally wouldn't allow such a thing, but this is a time for celebration! It's not like a couple drinks will hurt anything."
/obj/item/paper/fluff/ruins/crashedship/old_diary
name = "Old Diary"
- info = "DEAR DAIRY: So we was doing our typpical route when the captain says we've been picking up weird signals on some backwatter planet. Madsen wanted to stay on course but he ain't the captain, so we went out of the way to check it out. There was lots of rocks on the way, but we got to the planet fine. Found a big fancy camp with nobody around and this big metal donut thing with NT stamps all over it right in the middle. Case of beer too. Captain reckons we can pass it off to some buyer in the Syndicate. Ingram says it's bad luck and that someone is going to come look for it but it sounds like better money than selling bad meat to jerky companies."
+ info = "DEAR DIARY: So we was doing our typical route when the captain says we've been picking up weird signals on some backwater planet. Madsen wanted to stay on course but he ain't the captain, so we went out of the way to check it out. There was lots of rocks on the way, but we got to the planet fine. Found a big fancy camp with nobody around and this big metal donut thing with NT stamps all over it right in the middle. Case of beer too. Captain reckons we can pass it off to some buyer in the Syndicate. Ingram says it's bad luck and that someone is going to come look for it but it sounds like better money than selling bad meat to jerky companies."
diff --git a/code/modules/ruins/spaceruin_code/listeningstation.dm b/code/modules/ruins/spaceruin_code/listeningstation.dm
index be9c9f16f2..0c2ec7817d 100644
--- a/code/modules/ruins/spaceruin_code/listeningstation.dm
+++ b/code/modules/ruins/spaceruin_code/listeningstation.dm
@@ -40,7 +40,7 @@
/obj/item/paper/fluff/ruins/listeningstation/odd_report
name = "odd report"
- info = "I wonder how much longer they will accept my empty reports. They will cancel the case soon without results. When the pickup comes, I will tell them I have lost faith in our cause, and beg them to consider a diplomatic solution. How many nuclear teams have been dispatched with those nukes? I must try and prevent more from ever being sent. If they will not listen to reason, I will detonate the warehouse myself. Maybe some day in the immediate future, space will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that stabilised your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should it ever rear it's ugly head again. -Donk Co. Operative #451"
+ info = "I wonder how much longer they will accept my empty reports. They will cancel the case soon without results. When the pickup comes, I will tell them I have lost faith in our cause, and beg them to consider a diplomatic solution. How many nuclear teams have been dispatched with those nukes? I must try and prevent more from ever being sent. If they will not listen to reason, I will detonate the warehouse myself. Maybe some day in the immediate future, space will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that stabilized your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should it ever rear its ugly head again. -Donk Co. Operative #451"
/obj/item/paper/fluff/ruins/listeningstation/briefing
name = "mission briefing"
diff --git a/code/modules/ruins/spaceruin_code/oldstation.dm b/code/modules/ruins/spaceruin_code/oldstation.dm
index 192552d71b..2365c0c773 100644
--- a/code/modules/ruins/spaceruin_code/oldstation.dm
+++ b/code/modules/ruins/spaceruin_code/oldstation.dm
@@ -10,7 +10,7 @@
/obj/item/paper/fluff/ruins/oldstation/protosuit
name = "B01-RIG Hardsuit Report"
- info = "*Prototype Hardsuit*
The B01-RIG Hardsuit is a prototype powered exoskeleton. Based off of a recovered pre-void war era united earth government powered military \
+ info = "*Prototype Hardsuit*
The B01-RIG Hardsuit is a prototype powered exoskeleton. Based off of a recovered pre-void war era united Earth government powered military \
exosuit, the RIG Hardsuit is a breakthrough in Hardsuit technology, and is the first post-void war era Hardsuit that can be safely used by an operator.
The B01 however suffers \
a myriad of constraints. It is slow and bulky to move around, it lacks any significant armor plating against direct attacks and its internal heads up display is unfinished, \
resulting in the user being unable to see long distances.
The B01 is unlikely to see any form of mass production, but will serve as a base for future Hardsuit developments."
diff --git a/code/modules/ruins/spaceruin_code/whiteshipruin_box.dm b/code/modules/ruins/spaceruin_code/whiteshipruin_box.dm
new file mode 100644
index 0000000000..56b572b11a
--- /dev/null
+++ b/code/modules/ruins/spaceruin_code/whiteshipruin_box.dm
@@ -0,0 +1,8 @@
+/////////// ruined whiteship
+
+/obj/machinery/computer/shuttle/white_ship/ruin
+ shuttleId = "whiteship_ruin"
+
+/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship/ruin
+ shuttleId = "whiteship_ruin"
+
diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm
index 4e2903ecf1..6af111506d 100644
--- a/code/modules/shuttle/navigation_computer.dm
+++ b/code/modules/shuttle/navigation_computer.dm
@@ -8,8 +8,9 @@
var/shuttlePortId = ""
var/shuttlePortName = ""
var/list/jumpto_ports = list() //hashset of ports to jump to and ignore for collision purposes
- var/list/blacklisted_turfs
- var/obj/docking_port/stationary/my_port
+ var/list/blacklisted_turfs //turfs we cannot go on, by default, any turf covered by a docking port that we did not place and cannot jump to
+ var/obj/docking_port/stationary/my_port //the custom docking port placed by this console
+ var/obj/docking_port/mobile/shuttle_port //the mobile docking port of the connected shuttle
var/view_range = 7
var/x_offset = 0
var/y_offset = 0
@@ -31,21 +32,19 @@
actions += place_action
/obj/machinery/computer/camera_advanced/shuttle_docker/CreateEye()
- var/obj/docking_port/mobile/M = SSshuttle.getShuttle(shuttleId)
- if(QDELETED(M))
+ shuttle_port = SSshuttle.getShuttle(shuttleId)
+ if(QDELETED(shuttle_port))
+ shuttle_port = null
return
+
eyeobj = new /mob/camera/aiEye/remote/shuttle_docker()
var/mob/camera/aiEye/remote/shuttle_docker/the_eye = eyeobj
the_eye.origin = src
- the_eye.dir = M.dir
-
- var/turf/origin = locate(M.x + x_offset, M.y + y_offset, M.z)
-
- for(var/i in M.shuttle_areas)
- var/area/place = i
- if(QDELETED(place))
- continue
- for(var/turf/T in place)
+ the_eye.dir = shuttle_port.dir
+ var/turf/origin = locate(shuttle_port.x + x_offset, shuttle_port.y + y_offset, shuttle_port.z)
+ for(var/V in shuttle_port.shuttle_areas)
+ var/area/A = V
+ for(var/turf/T in A)
if(T.z != origin.z)
continue
var/image/I = image('icons/effects/alphacolors.dmi', origin, "red")
@@ -127,7 +126,7 @@
checkLandingSpot()
/obj/machinery/computer/camera_advanced/shuttle_docker/proc/checkLandingTurf(turf/T)
- return T && (!blacklisted_turfs || !blacklisted_turfs[T]) && (!space_turfs_only || isspaceturf(T)) && (T.x > 1 && T.y > 1 && T.x < world.maxx && T.y < world.maxy)
+ return T && (shuttle_port.shuttle_areas[T.loc] || (!blacklisted_turfs || !blacklisted_turfs[T]) && (!space_turfs_only || isspaceturf(T)) ) && (T.x > 1 && T.y > 1 && T.x < world.maxx && T.y < world.maxy)
/obj/machinery/computer/camera_advanced/shuttle_docker/proc/generateBlacklistedTurfs()
blacklisted_turfs = list()
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index c9c2476d96..0f5567fd90 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -179,7 +179,8 @@
/obj/docking_port/proc/getDockedId()
var/obj/docking_port/P = get_docked()
- if(P) return P.id
+ if(P)
+ return P.id
/obj/docking_port/stationary
name = "dock"
diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm
index d3008625cf..e8d65cae9f 100644
--- a/code/modules/spells/spell.dm
+++ b/code/modules/spells/spell.dm
@@ -90,7 +90,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
/obj/effect/proc_holder/spell
name = "Spell"
- desc = "A wizard spell"
+ desc = "A wizard spell."
panel = "Spells"
var/sound = null //The sound the spell makes when it is cast
anchored = TRUE // Crap like fireball projectiles are proc_holders, this is needed so fireballs don't get blown back into your face via atmos etc.
@@ -429,7 +429,8 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
else
if(los_check(user,L))
M = L
- if(M in view_or_range(range, user, selection_type)) targets += M
+ if(M in view_or_range(range, user, selection_type))
+ targets += M
else
var/list/possible_targets = list()
diff --git a/code/modules/spells/spell_types/construct_spells.dm b/code/modules/spells/spell_types/construct_spells.dm
index 5c28ff5029..ca6a534ee0 100644
--- a/code/modules/spells/spell_types/construct_spells.dm
+++ b/code/modules/spells/spell_types/construct_spells.dm
@@ -33,7 +33,7 @@
/obj/effect/proc_holder/spell/aoe_turf/conjure/floor
name = "Summon Cult Floor"
- desc = "This spell constructs a cult floor"
+ desc = "This spell constructs a cult floor."
school = "conjuration"
charge_max = 20
@@ -49,7 +49,7 @@
/obj/effect/proc_holder/spell/aoe_turf/conjure/wall
name = "Summon Cult Wall"
- desc = "This spell constructs a cult wall"
+ desc = "This spell constructs a cult wall."
school = "conjuration"
charge_max = 100
@@ -66,7 +66,7 @@
/obj/effect/proc_holder/spell/aoe_turf/conjure/wall/reinforced
name = "Greater Construction"
- desc = "This spell constructs a reinforced metal wall"
+ desc = "This spell constructs a reinforced metal wall."
school = "conjuration"
charge_max = 300
@@ -79,7 +79,7 @@
/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone
name = "Summon Soulstone"
- desc = "This spell reaches into Nar-Sie's realm, summoning one of the legendary fragments across time and space"
+ desc = "This spell reaches into Nar-Sie's realm, summoning one of the legendary fragments across time and space."
school = "conjuration"
charge_max = 3000
@@ -104,7 +104,7 @@
/obj/effect/proc_holder/spell/aoe_turf/conjure/lesserforcewall
name = "Shield"
- desc = "This spell creates a temporary forcefield to shield yourself and allies from incoming fire"
+ desc = "This spell creates a temporary forcefield to shield yourself and allies from incoming fire."
school = "transmutation"
charge_max = 300
@@ -121,7 +121,7 @@
/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift
name = "Phase Shift"
- desc = "This spell allows you to pass through walls"
+ desc = "This spell allows you to pass through walls."
school = "transmutation"
charge_max = 250
diff --git a/code/modules/spells/spell_types/ethereal_jaunt.dm b/code/modules/spells/spell_types/ethereal_jaunt.dm
index eb855921e8..2b4974ec5e 100644
--- a/code/modules/spells/spell_types/ethereal_jaunt.dm
+++ b/code/modules/spells/spell_types/ethereal_jaunt.dm
@@ -87,7 +87,8 @@
return ..()
/obj/effect/dummy/spell_jaunt/relaymove(var/mob/user, direction)
- if ((movedelay > world.time) || reappearing || !direction) return
+ if ((movedelay > world.time) || reappearing || !direction)
+ return
var/turf/newLoc = get_step(src,direction)
setDir(direction)
if(!(newLoc.flags_1 & NOJAUNT_1))
diff --git a/code/modules/spells/spell_types/rightandwrong.dm b/code/modules/spells/spell_types/rightandwrong.dm
index 0cb7e6c47d..b992871004 100644
--- a/code/modules/spells/spell_types/rightandwrong.dm
+++ b/code/modules/spells/spell_types/rightandwrong.dm
@@ -13,7 +13,7 @@
if(H.stat == DEAD || !(H.client))
continue
if(H.mind)
- if(iswizard(H) || H.mind.special_role == "survivalist")
+ if(H.mind.special_role == "Wizard" || H.mind.special_role == "apprentice" || H.mind.special_role == "survivalist")
continue
if(prob(survivor_probability) && !(H.mind in SSticker.mode.traitors))
SSticker.mode.traitors += H.mind
@@ -218,4 +218,4 @@
SSevents.reschedule()
message_admins("Summon Events intensifies, events will now occur every [SSevents.frequency_lower / 600] to [SSevents.frequency_upper / 600] minutes.")
- log_game("Summon Events was increased!")
+ log_game("Summon Events was increased!")
\ No newline at end of file
diff --git a/code/modules/spells/spell_types/shapeshift.dm b/code/modules/spells/spell_types/shapeshift.dm
index 63c840a9b0..c32c45c86a 100644
--- a/code/modules/spells/spell_types/shapeshift.dm
+++ b/code/modules/spells/spell_types/shapeshift.dm
@@ -18,6 +18,7 @@
/mob/living/simple_animal/pet/dog/corgi,\
/mob/living/simple_animal/hostile/carp/ranged/chaos,\
/mob/living/simple_animal/bot/ed209,\
+ /mob/living/simple_animal/hostile/poison/giant_spider/hunter/viper,\
/mob/living/simple_animal/hostile/construct/armored)
/obj/effect/proc_holder/spell/targeted/shapeshift/cast(list/targets,mob/user = usr)
diff --git a/code/modules/spells/spell_types/turf_teleport.dm b/code/modules/spells/spell_types/turf_teleport.dm
index 060bbb0374..0b378fbaaa 100644
--- a/code/modules/spells/spell_types/turf_teleport.dm
+++ b/code/modules/spells/spell_types/turf_teleport.dm
@@ -16,9 +16,12 @@
for(var/mob/living/target in targets)
var/list/turfs = new/list()
for(var/turf/T in range(target,outer_tele_radius))
- if(T in range(target,inner_tele_radius)) continue
- if(isspaceturf(T) && !include_space) continue
- if(T.density && !include_dense) continue
+ if(T in range(target,inner_tele_radius))
+ continue
+ if(isspaceturf(T) && !include_space)
+ continue
+ if(T.density && !include_dense)
+ continue
if(T.x>world.maxx-outer_tele_radius || T.xworld.maxy-outer_tele_radius || T.yYou feel resistant to airborne toxins.")
if(locate(/obj/item/organ/lungs) in H.internal_organs)
- var/obj/item/organ/lungs/L = H.internal_organs_slot["lungs"]
+ var/obj/item/organ/lungs/L = H.internal_organs_slot[ORGAN_SLOT_LUNGS]
L.tox_breath_dam_min = 0
L.tox_breath_dam_max = 0
S.species_traits |= VIRUSIMMUNE
diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm
index c7120168d0..b00dff2ef7 100644
--- a/code/modules/station_goals/shield.dm
+++ b/code/modules/station_goals/shield.dm
@@ -127,8 +127,8 @@
return ..()
/obj/machinery/satellite/meteor_shield
- name = "Meteor Shield Satellite"
- desc = "Meteor Point Defense Satellite"
+ name = "\improper Meteor Shield Satellite"
+ desc = "A meteor point-defense satellite."
mode = "M-SHIELD"
speed_process = TRUE
var/kill_range = 14
diff --git a/code/modules/stock_market/industries.dm b/code/modules/stock_market/industries.dm
index 497d669549..1a90db874a 100644
--- a/code/modules/stock_market/industries.dm
+++ b/code/modules/stock_market/industries.dm
@@ -96,34 +96,62 @@
/datum/industry/it/proc/latin_number(n)
if (n < 20 || !(n % 10))
switch(n)
- if (0) return "Nihil"
- if (1) return "Unus"
- if (2) return "Duo"
- if (3) return "Tres"
- if (4) return "Quattour"
- if (5) return "Quinque"
- if (6) return "Sex"
- if (7) return "Septem"
- if (8) return "Octo"
- if (9) return "Novem"
- if (10) return "Decim"
- if (11) return "Undecim"
- if (12) return "Duodecim"
- if (13) return "Tredecim"
- if (14) return "Quattourdecim"
- if (15) return "Quindecim"
- if (16) return "Sedecim"
- if (17) return "Septdecim"
- if (18) return "Duodeviginti"
- if (19) return "Undeviginti"
- if (20) return "Viginti"
- if (30) return "Triginta"
- if (40) return "Quadriginta"
- if (50) return "Quinquaginta"
- if (60) return "Sexaginta"
- if (70) return "Septuaginta"
- if (80) return "Octoginta"
- if (90) return "Nonaginta"
+ if (0)
+ return "Nihil"
+ if (1)
+ return "Unus"
+ if (2)
+ return "Duo"
+ if (3)
+ return "Tres"
+ if (4)
+ return "Quattour"
+ if (5)
+ return "Quinque"
+ if (6)
+ return "Sex"
+ if (7)
+ return "Septem"
+ if (8)
+ return "Octo"
+ if (9)
+ return "Novem"
+ if (10)
+ return "Decim"
+ if (11)
+ return "Undecim"
+ if (12)
+ return "Duodecim"
+ if (13)
+ return "Tredecim"
+ if (14)
+ return "Quattourdecim"
+ if (15)
+ return "Quindecim"
+ if (16)
+ return "Sedecim"
+ if (17)
+ return "Septdecim"
+ if (18)
+ return "Duodeviginti"
+ if (19)
+ return "Undeviginti"
+ if (20)
+ return "Viginti"
+ if (30)
+ return "Triginta"
+ if (40)
+ return "Quadriginta"
+ if (50)
+ return "Quinquaginta"
+ if (60)
+ return "Sexaginta"
+ if (70)
+ return "Septuaginta"
+ if (80)
+ return "Octoginta"
+ if (90)
+ return "Nonaginta"
else
return "[latin_number(n - (n % 10))] [lowertext(latin_number(n % 10))]"
diff --git a/code/modules/surgery/amputation.dm b/code/modules/surgery/amputation.dm
index 7684484a42..f6a2c057d0 100644
--- a/code/modules/surgery/amputation.dm
+++ b/code/modules/surgery/amputation.dm
@@ -4,7 +4,7 @@
steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/sever_limb)
species = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
possible_locs = list("r_arm", "l_arm", "l_leg", "r_leg", "head")
- requires_organic_bodypart = 0
+ requires_bodypart_type = 0
/datum/surgery_step/sever_limb
@@ -22,4 +22,4 @@
var/obj/item/bodypart/target_limb = surgery.operated_bodypart
target_limb.drop_limb()
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index f05a3a7e42..adfcfd6b81 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -1,7 +1,7 @@
/obj/item/bodypart
name = "limb"
- desc = "why is it detached..."
+ desc = "Why is it detached..."
force = 3
throwforce = 3
icon = 'icons/mob/human_parts.dmi'
diff --git a/code/modules/surgery/bodyparts/robot_bodyparts.dm b/code/modules/surgery/bodyparts/robot_bodyparts.dm
index 0a8e98144d..8ec0172fad 100644
--- a/code/modules/surgery/bodyparts/robot_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/robot_bodyparts.dm
@@ -135,7 +135,7 @@
flash2.forceMove(user.loc)
flash2 = null
else
- to_chat(user, "There are no flash to remove from [src].")
+ to_chat(user, "There is no flash to remove from [src].")
else
return ..()
diff --git a/code/modules/surgery/eye_surgery.dm b/code/modules/surgery/eye_surgery.dm
index 2aeadffc65..9099489420 100644
--- a/code/modules/surgery/eye_surgery.dm
+++ b/code/modules/surgery/eye_surgery.dm
@@ -1,38 +1,38 @@
-/datum/surgery/eye_surgery
- name = "eye surgery"
- steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/fix_eyes, /datum/surgery_step/close)
- species = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
- possible_locs = list("eyes")
- requires_organic_bodypart = 0
-
-//fix eyes
-/datum/surgery_step/fix_eyes
- name = "fix eyes"
- implements = list(/obj/item/hemostat = 100, /obj/item/screwdriver = 45, /obj/item/pen = 25)
- time = 64
-
-/datum/surgery/eye_surgery/can_start(mob/user, mob/living/carbon/target)
- var/obj/item/organ/eyes/E = target.getorganslot("eye_sight")
- if(!E)
- to_chat(user, "It's hard to do surgery on someones eyes when they don't have any.")
- return FALSE
-
-/datum/surgery_step/fix_eyes/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to fix [target]'s eyes.", "You begin to fix [target]'s eyes...")
-
-/datum/surgery_step/fix_eyes/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] successfully fixes [target]'s eyes!", "You succeed in fixing [target]'s eyes.")
- target.cure_blind()
- target.set_blindness(0)
- target.cure_nearsighted()
- target.blur_eyes(35) //this will fix itself slowly.
- target.set_eye_damage(0)
- return TRUE
-
-/datum/surgery_step/fix_eyes/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- if(target.getorgan(/obj/item/organ/brain))
- user.visible_message("[user] accidentally stabs [target] right in the brain!", "You accidentally stab [target] right in the brain!")
- target.adjustBrainLoss(100)
- else
- user.visible_message("[user] accidentally stabs [target] right in the brain! Or would have, if [target] had a brain.", "You accidentally stab [target] right in the brain! Or would have, if [target] had a brain.")
+/datum/surgery/eye_surgery
+ name = "eye surgery"
+ steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/fix_eyes, /datum/surgery_step/close)
+ species = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ possible_locs = list("eyes")
+ requires_bodypart_type = 0
+
+//fix eyes
+/datum/surgery_step/fix_eyes
+ name = "fix eyes"
+ implements = list(/obj/item/hemostat = 100, /obj/item/screwdriver = 45, /obj/item/pen = 25)
+ time = 64
+
+/datum/surgery/eye_surgery/can_start(mob/user, mob/living/carbon/target)
+ var/obj/item/organ/eyes/E = target.getorganslot(ORGAN_SLOT_EYES)
+ if(!E)
+ to_chat(user, "It's hard to do surgery on someones eyes when they don't have any.")
+ return FALSE
+
+/datum/surgery_step/fix_eyes/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] begins to fix [target]'s eyes.", "You begin to fix [target]'s eyes...")
+
+/datum/surgery_step/fix_eyes/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] successfully fixes [target]'s eyes!", "You succeed in fixing [target]'s eyes.")
+ target.cure_blind()
+ target.set_blindness(0)
+ target.cure_nearsighted()
+ target.blur_eyes(35) //this will fix itself slowly.
+ target.set_eye_damage(0)
+ return TRUE
+
+/datum/surgery_step/fix_eyes/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ if(target.getorgan(/obj/item/organ/brain))
+ user.visible_message("[user] accidentally stabs [target] right in the brain!", "You accidentally stab [target] right in the brain!")
+ target.adjustBrainLoss(100)
+ else
+ user.visible_message("[user] accidentally stabs [target] right in the brain! Or would have, if [target] had a brain.", "You accidentally stab [target] right in the brain! Or would have, if [target] had a brain.")
return FALSE
\ No newline at end of file
diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm
index 97426305b5..a4e9b16989 100644
--- a/code/modules/surgery/helpers.dm
+++ b/code/modules/surgery/helpers.dm
@@ -29,7 +29,7 @@
if(affecting)
if(!S.requires_bodypart)
continue
- if(S.requires_organic_bodypart && affecting.status == BODYPART_ROBOTIC)
+ if(S.requires_bodypart_type && affecting.status == BODYPART_ROBOTIC)
continue
if(S.requires_real_bodypart && affecting.is_pseudopart)
continue
@@ -56,7 +56,7 @@
if(affecting)
if(!S.requires_bodypart)
return
- if(S.requires_organic_bodypart && affecting.status == BODYPART_ROBOTIC)
+ if(S.requires_bodypart_type && affecting.status == BODYPART_ROBOTIC)
return
else if(C && S.requires_bodypart)
return
@@ -78,13 +78,23 @@
user.visible_message("[user] removes the drapes from [M]'s [parse_zone(selected_zone)].", \
"You remove the drapes from [M]'s [parse_zone(selected_zone)].")
qdel(current_surgery)
- else if(istype(user.get_inactive_held_item(), /obj/item/cautery) && current_surgery.can_cancel)
- M.surgeries -= current_surgery
- user.visible_message("[user] mends the incision and removes the drapes from [M]'s [parse_zone(selected_zone)].", \
- "You mend the incision and remove the drapes from [M]'s [parse_zone(selected_zone)].")
- qdel(current_surgery)
else if(current_surgery.can_cancel)
- to_chat(user, "You need to hold a cautery in inactive hand to stop [M]'s surgery!")
+ if(current_surgery.requires_bodypart_type == BODYPART_ORGANIC)
+ if(istype(user.get_inactive_held_item(), /obj/item/cautery))
+ M.surgeries -= current_surgery
+ user.visible_message("[user] mends the incision and removes the drapes from [M]'s [parse_zone(selected_zone)].", \
+ "You mend the incision and remove the drapes from [M]'s [parse_zone(selected_zone)].")
+ qdel(current_surgery)
+ else
+ to_chat(user, "You need to hold a cautery in inactive hand to stop [M]'s surgery!")
+ else if(current_surgery.requires_bodypart_type == BODYPART_ROBOTIC)
+ if(istype(user.get_inactive_held_item(), /obj/item/screwdriver))
+ M.surgeries -= current_surgery
+ user.visible_message("[user] screw the shell and removes the drapes from [M]'s [parse_zone(selected_zone)].", \
+ "You screw the shell and remove the drapes from [M]'s [parse_zone(selected_zone)].")
+ qdel(current_surgery)
+ else
+ to_chat(user, "You need to hold a screwdriver in inactive hand to stop [M]'s surgery!")
return 1
@@ -161,4 +171,3 @@
return 0
return 1
-
diff --git a/code/modules/surgery/implant_removal.dm b/code/modules/surgery/implant_removal.dm
index c459748a6c..4a1a8f98eb 100644
--- a/code/modules/surgery/implant_removal.dm
+++ b/code/modules/surgery/implant_removal.dm
@@ -3,7 +3,6 @@
steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/extract_implant, /datum/surgery_step/close)
species = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
possible_locs = list("chest")
- requires_organic_bodypart = 0
//extract implant
@@ -43,4 +42,15 @@
else
to_chat(user, "You can't find anything in [target]'s [target_zone]!")
- return 1
\ No newline at end of file
+ return 1
+
+/datum/surgery/implant_removal/mechanic
+ name = "implant removal"
+ requires_bodypart_type = BODYPART_ROBOTIC
+ steps = list(
+ /datum/surgery_step/mechanic_open,
+ /datum/surgery_step/open_hatch,
+ /datum/surgery_step/mechanic_unwrench,
+ /datum/surgery_step/extract_implant,
+ /datum/surgery_step/mechanic_wrench,
+ /datum/surgery_step/mechanic_close)
diff --git a/code/modules/surgery/mechanic_steps.dm b/code/modules/surgery/mechanic_steps.dm
new file mode 100644
index 0000000000..657564f112
--- /dev/null
+++ b/code/modules/surgery/mechanic_steps.dm
@@ -0,0 +1,85 @@
+//open shell
+/datum/surgery_step/mechanic_open
+ name = "unscrew shell"
+ implements = list(
+ /obj/item/screwdriver = 100,
+ /obj/item/scalpel = 75, // med borgs could try to unskrew shell with scalpel
+ /obj/item/kitchen/knife = 50,
+ /obj/item = 10) // 10% success with any sharp item.
+ time = 24
+
+/datum/surgery_step/mechanic_open/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] begins to unscrew the shell of [target]'s [parse_zone(target_zone)].",
+ "You begin to unscrew the shell of [target]'s [parse_zone(target_zone)]...")
+
+/datum/surgery_step/mechanic_incise/tool_check(mob/user, obj/item/tool)
+ if(implement_type == /obj/item && !tool.is_sharp())
+ return FALSE
+
+ return TRUE
+
+//close shell
+/datum/surgery_step/mechanic_close
+ name = "screw shell"
+ implements = list(
+ /obj/item/screwdriver = 100,
+ /obj/item/scalpel = 75,
+ /obj/item/kitchen/knife = 50,
+ /obj/item = 10) // 10% success with any sharp item.
+ time = 24
+
+/datum/surgery_step/mechanic_close/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] begins to screw the shell of [target]'s [parse_zone(target_zone)].",
+ "You begin to screw the shell of [target]'s [parse_zone(target_zone)]...")
+
+/datum/surgery_step/mechanic_close/tool_check(mob/user, obj/item/tool)
+ if(implement_type == /obj/item && !tool.is_sharp())
+ return FALSE
+
+ return TRUE
+
+//prepare electronics
+/datum/surgery_step/prepare_electronics
+ name = "prepare electronics"
+ implements = list(
+ /obj/item/device/multitool = 100,
+ /obj/item/hemostat = 10) // try to reboot internal controllers via short circuit with some conductor
+ time = 24
+
+/datum/surgery_step/prepare_electronics/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] begins to prepare electronics in [target]'s [parse_zone(target_zone)].",
+ "You begin to prepare electronics in [target]'s [parse_zone(target_zone)]...")
+
+//unwrench
+/datum/surgery_step/mechanic_unwrench
+ name = "unwrench bolts"
+ implements = list(
+ /obj/item/wrench = 100,
+ /obj/item/retractor = 10)
+ time = 24
+
+/datum/surgery_step/mechanic_unwrench/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] begins to unwrench some bolts in [target]'s [parse_zone(target_zone)].",
+ "You begin to unwrench some bolts in [target]'s [parse_zone(target_zone)]...")
+
+//wrench
+/datum/surgery_step/mechanic_wrench
+ name = "wrench bolts"
+ implements = list(
+ /obj/item/wrench = 100,
+ /obj/item/retractor = 10)
+ time = 24
+
+/datum/surgery_step/mechanic_wrench/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] begins to wrench some bolts in [target]'s [parse_zone(target_zone)].",
+ "You begin to wrench some bolts in [target]'s [parse_zone(target_zone)]...")
+
+//open hatch
+/datum/surgery_step/open_hatch
+ name = "open the hatch"
+ accept_hand = 1
+ time = 10
+
+/datum/surgery_step/open_hatch/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] begins to open the hatch holders in [target]'s [parse_zone(target_zone)].",
+ "You begin to open the hatch holders in [target]'s [parse_zone(target_zone)]...")
diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm
index f30d45e422..10e57babcd 100644
--- a/code/modules/surgery/organ_manipulation.dm
+++ b/code/modules/surgery/organ_manipulation.dm
@@ -1,38 +1,79 @@
/datum/surgery/organ_manipulation
name = "organ manipulation"
- steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/clamp_bleeders,
- /datum/surgery_step/incise, /datum/surgery_step/manipulate_organs)
species = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
possible_locs = list("chest", "head")
- requires_organic_bodypart = FALSE
- requires_real_bodypart = TRUE
+ requires_real_bodypart = 1
+ steps = list(
+ /datum/surgery_step/incise,
+ /datum/surgery_step/retract_skin,
+ /datum/surgery_step/saw,
+ /datum/surgery_step/clamp_bleeders,
+ /datum/surgery_step/incise,
+ /datum/surgery_step/manipulate_organs,
+ //there should be bone fixing
+ /datum/surgery_step/close
+ )
/datum/surgery/organ_manipulation/soft
possible_locs = list("groin", "eyes", "mouth", "l_arm", "r_arm")
- steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/clamp_bleeders,
- /datum/surgery_step/incise, /datum/surgery_step/manipulate_organs)
+ steps = list(
+ /datum/surgery_step/incise,
+ /datum/surgery_step/retract_skin,
+ /datum/surgery_step/clamp_bleeders,
+ /datum/surgery_step/incise,
+ /datum/surgery_step/manipulate_organs,
+ /datum/surgery_step/close
+ )
/datum/surgery/organ_manipulation/alien
name = "alien organ manipulation"
possible_locs = list("chest", "head", "groin", "eyes", "mouth", "l_arm", "r_arm")
species = list(/mob/living/carbon/alien/humanoid)
- steps = list(/datum/surgery_step/saw, /datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/manipulate_organs)
-
+ steps = list(
+ /datum/surgery_step/saw,
+ /datum/surgery_step/incise,
+ /datum/surgery_step/retract_skin,
+ /datum/surgery_step/saw,
+ /datum/surgery_step/manipulate_organs,
+ /datum/surgery_step/close
+ )
+/datum/surgery/organ_manipulation/mechanic
+ name = "prosthesis organ manipulation"
+ possible_locs = list("chest", "head")
+ requires_bodypart_type = BODYPART_ROBOTIC
+ steps = list(
+ /datum/surgery_step/mechanic_open,
+ /datum/surgery_step/open_hatch,
+ /datum/surgery_step/mechanic_unwrench,
+ /datum/surgery_step/prepare_electronics,
+ /datum/surgery_step/manipulate_organs,
+ /datum/surgery_step/mechanic_wrench,
+ /datum/surgery_step/mechanic_close
+ )
+/datum/surgery/organ_manipulation/mechanic/soft
+ possible_locs = list("groin", "eyes", "mouth", "l_arm", "r_arm")
+ steps = list(
+ /datum/surgery_step/mechanic_open,
+ /datum/surgery_step/open_hatch,
+ /datum/surgery_step/prepare_electronics,
+ /datum/surgery_step/manipulate_organs,
+ /datum/surgery_step/mechanic_close
+ )
/datum/surgery_step/manipulate_organs
time = 64
name = "manipulate organs"
+ repeatable = 1
implements = list(/obj/item/organ = 100, /obj/item/reagent_containers/food/snacks/organ = 0, /obj/item/organ_storage = 100)
var/implements_extract = list(/obj/item/hemostat = 100, /obj/item/crowbar = 55)
- var/implements_mend = list(/obj/item/cautery = 100, /obj/item/weldingtool = 70, /obj/item/lighter = 45, /obj/item/match = 20)
var/current_type
var/obj/item/organ/I = null
/datum/surgery_step/manipulate_organs/New()
..()
- implements = implements + implements_extract + implements_mend
+ implements = implements + implements_extract
/datum/surgery_step/manipulate_organs/tool_check(mob/user, obj/item/tool)
if(istype(tool, /obj/item/weldingtool))
@@ -96,29 +137,19 @@
I = input("Remove which organ?", "Surgery", null, null) as null|anything in organs
if(I && user && target && user.Adjacent(target) && user.get_active_held_item() == tool)
I = organs[I]
- if(!I) return -1
+ if(!I)
+ return -1
user.visible_message("[user] begins to extract [I] from [target]'s [parse_zone(target_zone)].",
"You begin to extract [I] from [target]'s [parse_zone(target_zone)]...")
else
return -1
- else if(implement_type in implements_mend)
- current_type = "mend"
- user.visible_message("[user] begins to mend the incision in [target]'s [parse_zone(target_zone)].",
- "You begin to mend the incision in [target]'s [parse_zone(target_zone)]...")
-
else if(istype(tool, /obj/item/reagent_containers/food/snacks/organ))
to_chat(user, "[tool] was bitten by someone! It's too damaged to use!")
return -1
/datum/surgery_step/manipulate_organs/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- if(current_type == "mend")
- user.visible_message("[user] mends the incision in [target]'s [parse_zone(target_zone)].",
- "You mend the incision in [target]'s [parse_zone(target_zone)].")
- if(locate(/datum/surgery_step/saw) in surgery.steps)
- target.heal_bodypart_damage(45,0)
- return 1
- else if(current_type == "insert")
+ if(current_type == "insert")
if(istype(tool, /obj/item/organ_storage))
I = tool.contents[1]
tool.icon_state = "evidenceobj"
diff --git a/code/modules/surgery/generic_steps.dm b/code/modules/surgery/organic_steps.dm
similarity index 99%
rename from code/modules/surgery/generic_steps.dm
rename to code/modules/surgery/organic_steps.dm
index 5e3c3f33ba..8a4c795c63 100644
--- a/code/modules/surgery/generic_steps.dm
+++ b/code/modules/surgery/organic_steps.dm
@@ -2,7 +2,7 @@
//make incision
/datum/surgery_step/incise
name = "make incision"
- implements = list(/obj/item/scalpel = 100, /obj/item/melee/transforming/energy/sword = 75, /obj/item/kitchen/knife = 65,
+ implements = list(/obj/item/scalpel = 100, /obj/item/melee/transforming/energy/sword = 75, /obj/item/kitchen/knife = 65,
/obj/item/shard = 45, /obj/item = 30) // 30% success with any sharp item.
time = 16
@@ -87,7 +87,7 @@
//saw bone
/datum/surgery_step/saw
name = "saw bone"
- implements = list(/obj/item/circular_saw = 100, /obj/item/melee/transforming/energy/sword/cyborg/saw = 100,
+ implements = list(/obj/item/circular_saw = 100, /obj/item/melee/transforming/energy/sword/cyborg/saw = 100,
/obj/item/melee/arm_blade = 75, /obj/item/mounted_chainsaw = 65, /obj/item/twohanded/required/chainsaw = 50,
/obj/item/twohanded/fireaxe = 50, /obj/item/hatchet = 35, /obj/item/kitchen/knife/butcher = 25)
time = 54
diff --git a/code/modules/surgery/organs/appendix.dm b/code/modules/surgery/organs/appendix.dm
index ad51c48d85..35a2d851e3 100644
--- a/code/modules/surgery/organs/appendix.dm
+++ b/code/modules/surgery/organs/appendix.dm
@@ -2,7 +2,7 @@
name = "appendix"
icon_state = "appendix"
zone = "groin"
- slot = "appendix"
+ slot = ORGAN_SLOT_APPENDIX
var/inflamed = 0
/obj/item/organ/appendix/update_icon()
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index 3ebe5dd061..aa1ea10cd0 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -2,7 +2,6 @@
name = "arm-mounted implant"
desc = "You shouldn't see this! Adminhelp and report this as an issue on github!"
zone = "r_arm"
- slot = "r_arm_device"
icon_state = "implant-toolkit"
w_class = WEIGHT_CLASS_NORMAL
actions_types = list(/datum/action/item_action/organ_action/toggle)
@@ -20,9 +19,18 @@
holder = new holder(src)
update_icon()
- slot = zone + "_device"
+ SetSlotFromZone()
items_list = contents.Copy()
+/obj/item/organ/cyberimp/arm/proc/SetSlotFromZone()
+ switch(zone)
+ if("l_arm")
+ slot = ORGAN_SLOT_LEFT_ARM_AUG
+ if("r_arm")
+ slot = ORGAN_SLOT_RIGHT_ARM_AUG
+ else
+ CRASH("Invalid zone for [type]")
+
/obj/item/organ/cyberimp/arm/update_icon()
if(zone == "r_arm")
transform = null
@@ -40,7 +48,7 @@
zone = "l_arm"
else
zone = "r_arm"
- slot = zone + "_device"
+ SetSlotFromZone()
to_chat(user, "You modify [src] to be installed on the [zone == "r_arm" ? "right" : "left"] arm.")
update_icon()
else if(istype(W, /obj/item/card/emag))
@@ -173,7 +181,7 @@
/obj/item/organ/cyberimp/arm/toolset
name = "integrated toolset implant"
- desc = "A stripped-down version of engineering cyborg toolset, designed to be installed on subject's arm. Contains all necessary tools."
+ desc = "A stripped-down version of the engineering cyborg toolset, designed to be installed on subject's arm. Contains all necessary tools."
origin_tech = "materials=3;engineering=4;biotech=3;powerstorage=4"
contents = newlist(/obj/item/screwdriver/cyborg, /obj/item/wrench/cyborg, /obj/item/weldingtool/largetank/cyborg,
/obj/item/crowbar/cyborg, /obj/item/wirecutters/cyborg, /obj/item/device/multitool/cyborg)
@@ -190,7 +198,7 @@
/obj/item/organ/cyberimp/arm/esword
name = "arm-mounted energy blade"
- desc = "An illegal, and highly dangerous cybernetic implant that can project a deadly blade of concentrated energy."
+ desc = "An illegal and highly dangerous cybernetic implant that can project a deadly blade of concentrated energy."
contents = newlist(/obj/item/melee/transforming/energy/blade/hardlight)
origin_tech = "materials=4;combat=5;biotech=3;powerstorage=2;syndicate=5"
@@ -202,7 +210,7 @@
/obj/item/organ/cyberimp/arm/flash
name = "integrated high-intensity photon projector" //Why not
- desc = "An integrated projector mounted onto a user's arm, that is able to be used as a powerful flash."
+ desc = "An integrated projector mounted onto a user's arm that is able to be used as a powerful flash."
contents = newlist(/obj/item/device/assembly/flash/armimplant)
origin_tech = "materials=4;combat=3;biotech=4;magnets=4;powerstorage=3"
@@ -220,7 +228,7 @@
/obj/item/organ/cyberimp/arm/combat
name = "combat cybernetics implant"
- desc = "A powerful cybernetic implant that contains combat modules built into the user's arm"
+ desc = "A powerful cybernetic implant that contains combat modules built into the user's arm."
contents = newlist(/obj/item/melee/transforming/energy/blade/hardlight, /obj/item/gun/medbeam, /obj/item/borg/stun, /obj/item/device/assembly/flash/armimplant)
origin_tech = "materials=5;combat=7;biotech=5;powerstorage=5;syndicate=6;programming=5"
@@ -232,6 +240,6 @@
/obj/item/organ/cyberimp/arm/surgery
name = "surgical toolset implant"
- desc = "A set of surgical tools hidden behind a concealed panel on the user's arm"
+ desc = "A set of surgical tools hidden behind a concealed panel on the user's arm."
contents = newlist(/obj/item/retractor/augment, /obj/item/hemostat/augment, /obj/item/cautery/augment, /obj/item/surgicaldrill/augment, /obj/item/scalpel/augment, /obj/item/circular_saw/augment, /obj/item/surgical_drapes)
origin_tech = "materials=3;engineering=3;biotech=3;programming=2;magnets=3"
diff --git a/code/modules/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm
index 6ebc278e53..1e93c4df4a 100644
--- a/code/modules/surgery/organs/augments_chest.dm
+++ b/code/modules/surgery/organs/augments_chest.dm
@@ -1,19 +1,19 @@
/obj/item/organ/cyberimp/chest
name = "cybernetic torso implant"
- desc = "implants for the organs in your torso"
+ desc = "Implants for the organs in your torso."
icon_state = "chest_implant"
implant_overlay = "chest_implant_overlay"
zone = "chest"
/obj/item/organ/cyberimp/chest/nutriment
name = "Nutriment pump implant"
- desc = "This implant with synthesize and pump into your bloodstream a small amount of nutriment when you are starving."
+ desc = "This implant will synthesize and pump into your bloodstream a small amount of nutriment when you are starving."
icon_state = "chest_implant"
implant_color = "#00AA00"
var/hunger_threshold = NUTRITION_LEVEL_STARVING
var/synthesizing = 0
var/poison_amount = 5
- slot = "stomach"
+ slot = ORGAN_SLOT_STOMACH
origin_tech = "materials=2;powerstorage=2;biotech=2"
/obj/item/organ/cyberimp/chest/nutriment/on_life()
@@ -51,7 +51,7 @@
icon_state = "chest_implant"
implant_color = "#AD0000"
origin_tech = "materials=5;programming=4;biotech=4"
- slot = "heartdrive"
+ slot = ORGAN_SLOT_HEART_AID
var/revive_cost = 0
var/reviving = 0
var/cooldown = 0
@@ -120,7 +120,7 @@
name = "implantable thrusters set"
desc = "An implantable set of thruster ports. They use the gas from environment or subject's internals for propulsion in zero-gravity areas. \
Unlike regular jetpack, this device has no stabilization system."
- slot = "thrusters"
+ slot = ORGAN_SLOT_THRUSTERS
icon_state = "imp_jetpack"
origin_tech = "materials=4;magnets=4;biotech=4;engineering=5"
implant_overlay = null
diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm
index 62b427f883..f928db5dd6 100644
--- a/code/modules/surgery/organs/augments_eyes.dm
+++ b/code/modules/surgery/organs/augments_eyes.dm
@@ -3,7 +3,7 @@
desc = "artificial photoreceptors with specialized functionality"
icon_state = "eye_implant"
implant_overlay = "eye_implant_overlay"
- slot = "eye_sight"
+ slot = ORGAN_SLOT_EYES
zone = "eyes"
w_class = WEIGHT_CLASS_TINY
@@ -11,7 +11,7 @@
/obj/item/organ/cyberimp/eyes/hud
name = "HUD implant"
desc = "These cybernetic eyes will display a HUD over everything you see. Maybe."
- slot = "eye_hud"
+ slot = ORGAN_SLOT_HUD
var/HUD_type = 0
/obj/item/organ/cyberimp/eyes/hud/Insert(var/mob/living/carbon/M, var/special = 0, drop_if_replaced = FALSE)
diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
index 1eec609fc0..a6c1517faa 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -2,7 +2,7 @@
/obj/item/organ/cyberimp
name = "cybernetic implant"
- desc = "a state-of-the-art implant that improves a baseline's functionality"
+ desc = "A state-of-the-art implant that improves a baseline's functionality."
status = ORGAN_ROBOTIC
var/implant_color = "#FFFFFF"
var/implant_overlay
@@ -23,7 +23,7 @@
/obj/item/organ/cyberimp/brain
name = "cybernetic brain implant"
- desc = "injectors of extra sub-routines for the brain"
+ desc = "Injectors of extra sub-routines for the brain."
icon_state = "brain_implant"
implant_overlay = "brain_implant_overlay"
zone = "head"
@@ -44,7 +44,7 @@
var/active = 0
var/list/stored_items = list()
implant_color = "#DE7E00"
- slot = "brain_antidrop"
+ slot = ORGAN_SLOT_BRAIN_ANTIDROP
origin_tech = "materials=4;programming=5;biotech=4"
actions_types = list(/datum/action/item_action/organ_action/toggle)
@@ -101,7 +101,7 @@
name = "CNS Rebooter implant"
desc = "This implant will automatically give you back control over your central nervous system, reducing downtime when stunned."
implant_color = "#FFFF00"
- slot = "brain_antistun"
+ slot = ORGAN_SLOT_BRAIN_ANTISTUN
origin_tech = "materials=5;programming=4;biotech=5"
/obj/item/organ/cyberimp/brain/anti_stun/on_life()
@@ -133,7 +133,7 @@
name = "breathing tube implant"
desc = "This simple implant adds an internals connector to your back, allowing you to use internals without a mask and protecting you from being choked."
icon_state = "implant_mask"
- slot = "breathing_tube"
+ slot = ORGAN_SLOT_BREATHING_TUBE
w_class = WEIGHT_CLASS_TINY
origin_tech = "materials=2;biotech=3"
diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm
index f8a310c8f7..e3aaec0266 100644
--- a/code/modules/surgery/organs/ears.dm
+++ b/code/modules/surgery/organs/ears.dm
@@ -3,7 +3,7 @@
icon_state = "ears"
desc = "There are three parts to the ear. Inner, middle and outer. Only one of these parts should be normally visible."
zone = "head"
- slot = "ears"
+ slot = ORGAN_SLOT_EARS
gender = PLURAL
// `deaf` measures "ticks" of deafness. While > 0, the person is unable
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index 8a3b3a92ab..75d4aa0bcc 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -3,7 +3,7 @@
icon_state = "eyeballs"
desc = "I see you!"
zone = "eyes"
- slot = "eye_sight"
+ slot = ORGAN_SLOT_EYES
gender = PLURAL
var/sight_flags = 0
@@ -68,7 +68,7 @@
/obj/item/organ/eyes/night_vision/zombie
name = "undead eyes"
- desc = "Somewhat counterintuitively, these half rotten eyes actually have superior vision to those of a living human."
+ desc = "Somewhat counterintuitively, these half-rotten eyes actually have superior vision to those of a living human."
/obj/item/organ/eyes/night_vision/nightmare
name = "burning red eyes"
@@ -100,8 +100,8 @@
sight_flags = SEE_MOBS | SEE_OBJS | SEE_TURFS
/obj/item/organ/eyes/robotic/thermals
- name = "Thermals eyes"
- desc = "These cybernetic eye implants will give you Thermal vision. Vertical slit pupil included."
+ name = "thermal eyes"
+ desc = "These cybernetic eye implants will give you thermal vision. Vertical slit pupil included."
eye_color = "FC0"
origin_tech = "materials=5;programming=4;biotech=4;magnets=4;syndicate=1"
sight_flags = SEE_MOBS
@@ -111,7 +111,7 @@
/obj/item/organ/eyes/robotic/flashlight
name = "flashlight eyes"
- desc = "It's two flashlights rigged together with some wire. Why would you put these in someones head?"
+ desc = "It's two flashlights rigged together with some wire. Why would you put these in someone's head?"
eye_color ="fee5a3"
icon = 'icons/obj/lighting.dmi'
icon_state = "flashlight_eyes"
diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index 9308154c48..30825f46bb 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -3,7 +3,7 @@
desc = "I feel bad for the heartless bastard who lost this."
icon_state = "heart-on"
zone = "chest"
- slot = "heart"
+ slot = ORGAN_SLOT_HEART
origin_tech = "biotech=5"
// Heart attack code is in code/modules/mob/living/carbon/human/life.dm
var/beating = 1
@@ -63,10 +63,9 @@
H.stop_sound_channel(CHANNEL_HEARTBEAT)
beat = BEAT_NONE
- if(H.jitteriness)
- if(!beat || beat == BEAT_SLOW)
- H.playsound_local(get_turf(H),fastbeat,40,0, channel = CHANNEL_HEARTBEAT)
- beat = BEAT_FAST
+ if(H.jitteriness && H.health > HEALTH_THRESHOLD_FULLCRIT && (!beat || beat == BEAT_SLOW))
+ H.playsound_local(get_turf(H),fastbeat,40,0, channel = CHANNEL_HEARTBEAT)
+ beat = BEAT_FAST
/obj/item/organ/heart/cursed
name = "cursed heart"
diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm
index eae5e8aee8..352958d9b8 100755
--- a/code/modules/surgery/organs/liver.dm
+++ b/code/modules/surgery/organs/liver.dm
@@ -8,7 +8,7 @@
origin_tech = "biotech=3"
w_class = WEIGHT_CLASS_NORMAL
zone = "chest"
- slot = "liver"
+ slot = ORGAN_SLOT_LIVER
desc = "Pairing suggestion: chianti and fava beans."
var/damage = 0 //liver damage, 0 is no damage, damage=maxHealth causes liver failure
var/alcohol_tolerance = ALCOHOL_RATE//affects how much damage the liver takes from alcohol
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index 12ab61aaec..65c1e3e1fb 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -12,7 +12,7 @@
name = "lungs"
icon_state = "lungs"
zone = "chest"
- slot = "lungs"
+ slot = ORGAN_SLOT_LUNGS
gender = PLURAL
w_class = WEIGHT_CLASS_NORMAL
@@ -95,10 +95,10 @@
var/list/breath_gases = breath.gases
- breath.assert_gases(/datum/gas/oxygen, /datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz, /datum/gas/nitrogen)
+ breath.assert_gases(/datum/gas/oxygen, /datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz, /datum/gas/nitrogen, /datum/gas/tritium, /datum/gas/brown_gas, /datum/gas/pluoxium, /datum/gas/stimulum)
//Partial pressures in our breath
- var/O2_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/oxygen][MOLES])
+ var/O2_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/oxygen][MOLES])+(8*breath.get_breath_partial_pressure(breath_gases[/datum/gas/pluoxium][MOLES]))
var/N2_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/nitrogen][MOLES])
var/Toxins_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/plasma][MOLES])
var/CO2_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/carbon_dioxide][MOLES])
@@ -252,9 +252,40 @@
H.adjustBrainLoss(3)
else if(bz_pp > 0.01)
H.hallucination += 5//Removed at 2 per tick so this will slowly build up
+
+
+ // Tritium
+ var/trit_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/tritium][MOLES])
+ if (trit_pp > 50)
+ H.radiation += trit_pp/2 //If you're breathing in half an atmosphere of radioactive gas, you fucked up.
+ else
+ H.radiation += trit_pp/10
+
+ //Brown Gas
+ var/brown_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/brown_gas][MOLES])
+ if (prob(brown_pp))
+ to_chat(H, "Your mouth feels like it's burning!")
+ if (brown_pp >40)
+ H.emote("gasp")
+ H.adjustFireLoss(10)
+ if (prob(brown_pp/2))
+ to_chat(H, "Your throat closes up!")
+ H.silent = max(H.silent, 3)
+ else
+ H.adjustFireLoss(brown_pp/4)
+ gas_breathed = breath_gases[/datum/gas/brown_gas][MOLES]
+ if (gas_breathed > GAS_STIM_MINIMUM)
+ H.reagents.add_reagent("brown_gas",1)
+
+ breath_gases[/datum/gas/brown_gas][MOLES]-=gas_breathed
+ gas_breathed = 0
+ //Stimulum
+ gas_breathed = breath_gases[/datum/gas/stimulum][MOLES]
+ if (gas_breathed > GAS_STIM_MINIMUM)
+ H.reagents.add_reagent("stimulum",1)
+ breath_gases[/datum/gas/stimulum][MOLES]-=gas_breathed
handle_breath_temperature(breath, H)
breath.garbage_collect()
-
return TRUE
@@ -332,7 +363,7 @@
/obj/item/organ/lungs/cybernetic/upgraded
name = "upgraded cybernetic lungs"
- desc = "A more advanced version of the stock cybernetic lungs. They are capable of filtering out lower levels of toxins and carbon-dioxide."
+ desc = "A more advanced version of the stock cybernetic lungs. They are capable of filtering out lower levels of toxins and carbon dioxide."
icon_state = "lungs-c-u"
origin_tech = "biotech=5"
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 681dcb21cf..85a6b098e1 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -22,7 +22,7 @@
if(replaced)
replaced.Remove(M, special = 1)
if(drop_if_replaced)
- replaced.forceMove(get_turf(src))
+ replaced.forceMove(get_turf(M))
else
qdel(replaced)
@@ -118,7 +118,7 @@
var/has_liver = (!(NOLIVER in dna.species.species_traits))
var/has_stomach = (!(NOSTOMACH in dna.species.species_traits))
- if(has_liver && !getorganslot("liver"))
+ if(has_liver && !getorganslot(ORGAN_SLOT_LIVER))
var/obj/item/organ/liver/LI
if(dna.species.mutantliver)
@@ -127,7 +127,7 @@
LI = new()
LI.Insert(src)
- if(has_stomach && !getorganslot("stomach"))
+ if(has_stomach && !getorganslot(ORGAN_SLOT_STOMACH))
var/obj/item/organ/stomach/S
if(dna.species.mutantstomach)
@@ -136,15 +136,15 @@
S = new()
S.Insert(src)
- if(breathes && !getorganslot("lungs"))
+ if(breathes && !getorganslot(ORGAN_SLOT_LUNGS))
var/obj/item/organ/lungs/L = new()
L.Insert(src)
- if(blooded && !getorganslot("heart"))
+ if(blooded && !getorganslot(ORGAN_SLOT_HEART))
var/obj/item/organ/heart/H = new()
H.Insert(src)
- if(!getorganslot("tongue"))
+ if(!getorganslot(ORGAN_SLOT_TONGUE))
var/obj/item/organ/tongue/T
if(dna && dna.species && dna.species.mutanttongue)
@@ -155,7 +155,7 @@
// if they have no mutant tongues, give them a regular one
T.Insert(src)
- if(!getorganslot("eye_sight"))
+ if(!getorganslot(ORGAN_SLOT_EYES))
var/obj/item/organ/eyes/E
if(dna && dna.species && dna.species.mutanteyes)
@@ -165,7 +165,7 @@
E = new()
E.Insert(src)
- if(!getorganslot("ears"))
+ if(!getorganslot(ORGAN_SLOT_EARS))
var/obj/item/organ/ears/ears
if(dna && dna.species && dna.species.mutantears)
ears = new dna.species.mutantears
diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm
index 36cd28ac98..2bf34334f4 100755
--- a/code/modules/surgery/organs/stomach.dm
+++ b/code/modules/surgery/organs/stomach.dm
@@ -4,7 +4,7 @@
origin_tech = "biotech=4"
w_class = WEIGHT_CLASS_NORMAL
zone = "chest"
- slot = "stomach"
+ slot = ORGAN_SLOT_STOMACH
attack_verb = list("gored", "squished", "slapped", "digested")
desc = "Onaka ga suite imasu."
var/disgust_metabolism = 1
diff --git a/code/modules/surgery/organs/tails.dm b/code/modules/surgery/organs/tails.dm
index 99d1ed2442..a909463585 100644
--- a/code/modules/surgery/organs/tails.dm
+++ b/code/modules/surgery/organs/tails.dm
@@ -2,7 +2,7 @@
name = "tail"
desc = "What did you cut this off of?"
zone = "groin"
- slot = "tail"
+ slot = ORGAN_SLOT_TAIL
/obj/item/organ/tail/cat
name = "cat tail"
diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index 5e67e73a8a..6420d8610e 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -3,15 +3,12 @@
desc = "A fleshy muscle mostly used for lying."
icon_state = "tonguenormal"
zone = "mouth"
- slot = "tongue"
+ slot = ORGAN_SLOT_TONGUE
attack_verb = list("licked", "slobbered", "slapped", "frenched", "tongued")
var/list/languages_possible
var/say_mod = null
var/taste_sensitivity = 15 // lower is more sensitive.
-
-/obj/item/organ/tongue/Initialize(mapload)
- . = ..()
- languages_possible = typecacheof(list(
+ var/static/list/languages_possible_base = typecacheof(list(
/datum/language/common,
/datum/language/draconic,
/datum/language/codespeak,
@@ -21,6 +18,10 @@
/datum/language/ratvar
))
+/obj/item/organ/tongue/Initialize(mapload)
+ . = ..()
+ languages_possible = languages_possible_base
+
/obj/item/organ/tongue/get_spans()
return list()
@@ -82,7 +83,7 @@
var/mob/living/carbon/human/user = usr
var/rendered = "[user.name]: [message]"
for(var/mob/living/carbon/human/H in GLOB.living_mob_list)
- var/obj/item/organ/tongue/T = H.getorganslot("tongue")
+ var/obj/item/organ/tongue/T = H.getorganslot(ORGAN_SLOT_TONGUE)
if(!T || T.type != type)
continue
if(H.dna && H.dna.species.id == "abductor" && user.dna && user.dna.species.id == "abductor")
@@ -124,16 +125,17 @@
icon_state = "tonguexeno"
say_mod = "hisses"
taste_sensitivity = 10 // LIZARDS ARE ALIENS CONFIRMED
-
-/obj/item/organ/tongue/alien/Initialize(mapload)
- . = ..()
- languages_possible = typecacheof(list(
+ var/static/list/languages_possible_alien = typecacheof(list(
/datum/language/xenocommon,
/datum/language/common,
/datum/language/draconic,
/datum/language/ratvar,
/datum/language/monkey))
+/obj/item/organ/tongue/alien/Initialize(mapload)
+ . = ..()
+ languages_possible = languages_possible_alien
+
/obj/item/organ/tongue/alien/TongueSpeech(var/message)
playsound(owner, "hiss", 25, 1, 1)
return message
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index aa77370ea2..85dc2ae1c3 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -7,7 +7,7 @@
name = "vocal cords"
icon_state = "appendix"
zone = "mouth"
- slot = "vocal_cords"
+ slot = ORGAN_SLOT_VOICE
gender = PLURAL
var/list/spans = null
@@ -22,17 +22,15 @@
/obj/item/organ/adamantine_resonator
name = "adamantine resonator"
- desc = "Fragments of adamantine exists in all golems, stemming from their origins as purely magical constructs. These are used to \"hear\" messages from their leaders."
+ 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 = "head"
- slot = "adamantine_resonator"
+ 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)
- zone = "mouth"
- slot = "vocal_cords"
icon_state = "adamantine_cords"
/datum/action/item_action/organ_action/use/adamantine_vocal_cords/Trigger()
@@ -48,7 +46,7 @@
for(var/m in GLOB.player_list)
if(iscarbon(m))
var/mob/living/carbon/C = m
- if(C.getorganslot("adamantine_resonator"))
+ if(C.getorganslot(ORGAN_SLOT_ADAMANTINE_RESONATOR))
to_chat(C, msg)
if(isobserver(m))
var/link = FOLLOW_LINK(m, owner)
@@ -59,8 +57,6 @@
name = "divine vocal cords"
desc = "They carry the voice of an ancient god."
icon_state = "voice_of_god"
- zone = "mouth"
- slot = "vocal_cords"
actions_types = list(/datum/action/item_action/organ_action/colossus)
var/next_command = 0
var/cooldown_mod = 1
diff --git a/code/modules/surgery/prosthetic_replacement.dm b/code/modules/surgery/prosthetic_replacement.dm
index 2dddb95872..e55f3af009 100644
--- a/code/modules/surgery/prosthetic_replacement.dm
+++ b/code/modules/surgery/prosthetic_replacement.dm
@@ -4,6 +4,7 @@
species = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
possible_locs = list("r_arm", "l_arm", "l_leg", "r_leg", "head")
requires_bodypart = FALSE //need a missing limb
+ requires_bodypart_type = 0
/datum/surgery/prosthetic_replacement/can_start(mob/user, mob/living/carbon/target)
if(!iscarbon(target))
@@ -84,4 +85,3 @@
var/obj/item/melee/arm_blade/new_arm = new(target,TRUE,TRUE)
target_zone == "r_arm" ? target.put_in_r_hand(new_arm) : target.put_in_l_hand(new_arm)
return 1
-
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index 03beacf27b..e5c046fac1 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -6,7 +6,7 @@
var/can_cancel = 1 //Can cancel this surgery after step 1 with cautery
var/list/species = list(/mob/living/carbon/human) //Acceptable Species
var/location = "chest" //Surgery location
- var/requires_organic_bodypart = 1 //Prevents you from performing an operation on robotic limbs
+ var/requires_bodypart_type = BODYPART_ORGANIC //Prevents you from performing an operation on robotic limbs
var/list/possible_locs = list() //Multiple locations
var/ignore_clothes = 0 //This surgery ignores clothes
var/mob/living/carbon/target //Operation target mob
@@ -53,6 +53,13 @@
var/step_type = steps[status]
return new step_type
+/datum/surgery/proc/get_surgery_next_step()
+ if(status < steps.len)
+ var/step_type = steps[status + 1]
+ return new step_type
+ else
+ return null
+
/datum/surgery/proc/complete()
SSblackbox.add_details("surgeries_completed", "[type]")
qdel(src)
diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm
index 7047c50084..577dc6547b 100644
--- a/code/modules/surgery/surgery_step.dm
+++ b/code/modules/surgery/surgery_step.dm
@@ -5,6 +5,7 @@
var/accept_hand = 0 //does the surgery step require an open hand? If true, ignores implements. Compatible with accept_any_item.
var/accept_any_item = 0 //does the surgery step accept any item? If true, ignores implements. Compatible with require_hand.
var/time = 10 //how long does the step take?
+ var/repeatable = 0
/datum/surgery_step/proc/try_op(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -31,8 +32,19 @@
else
to_chat(user, "You need to expose [target]'s [parse_zone(target_zone)] to perform surgery on it!")
return 1 //returns 1 so we don't stab the guy in the dick or wherever.
+
+ if(repeatable)
+ var/datum/surgery_step/next_step = surgery.get_surgery_next_step()
+ if(next_step)
+ surgery.status++
+ if(next_step.try_op(user, target, user.zone_selected, user.get_active_held_item(), surgery))
+ return 1
+ else
+ surgery.status--
+
if(iscyborg(user) && user.a_intent != INTENT_HARM) //to save asimov borgs a LOT of heartache
return 1
+
return 0
@@ -63,7 +75,7 @@
if(failure(user, target, target_zone, tool, surgery))
advance = 1
- if(advance)
+ if(advance && !repeatable)
surgery.status++
if(surgery.status > surgery.steps.len)
surgery.complete()
diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm
index 4cf6700544..6aad347e2a 100644
--- a/code/modules/uplink/uplink_item.dm
+++ b/code/modules/uplink/uplink_item.dm
@@ -375,6 +375,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
organic host as a home base and source of fuel."
item = /obj/item/storage/box/syndie_kit/guardian
cost = 18
+ surplus = 0
exclude_modes = list(/datum/game_mode/nuclear)
player_minimum = 25
diff --git a/code/modules/vehicles/atv.dm b/code/modules/vehicles/atv.dm
index c8c5ed0af9..504e4753df 100644
--- a/code/modules/vehicles/atv.dm
+++ b/code/modules/vehicles/atv.dm
@@ -1,7 +1,7 @@
/obj/vehicle/atv
name = "all-terrain vehicle"
- desc = "An all-terrain vehicle built for traversing rough terrain with ease. One of the few old-earth technologies that are still relevant on most planet-bound outposts."
+ desc = "An all-terrain vehicle built for traversing rough terrain with ease. One of the few old-Earth technologies that are still relevant on most planet-bound outposts."
icon_state = "atv"
var/static/mutable_appearance/atvcover
diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm
index b26a8054aa..02d896613b 100644
--- a/code/modules/vehicles/vehicle.dm
+++ b/code/modules/vehicles/vehicle.dm
@@ -1,7 +1,7 @@
/obj/vehicle
name = "vehicle"
- desc = "A basic vehicle, vroom"
+ desc = "A basic vehicle, vroom."
icon = 'icons/obj/vehicles.dmi'
icon_state = "fuckyou"
density = TRUE
diff --git a/code/modules/vore/eating/belly_vr.dm b/code/modules/vore/eating/belly_vr.dm
index 4262d9fecd..986e6aad5a 100644
--- a/code/modules/vore/eating/belly_vr.dm
+++ b/code/modules/vore/eating/belly_vr.dm
@@ -137,6 +137,7 @@
M.forceMove(owner.loc) // Move the belly contents into the same location as belly's owner.
M << sound(null, repeat = 0, wait = 0, volume = 80, channel = CHANNEL_PREYLOOP)
src.internal_contents.Remove(M) // Remove from the belly contents
+
var/datum/belly/B = check_belly(owner)
if(B)
B.internal_contents.Add(M)
@@ -394,6 +395,19 @@
if(!silent)
for(var/mob/hearer in range(1,owner))
hearer << sound(target.vore_sound,volume=80)
+/*
+//Handles creation of temporary 'vore chest' upon digestion
+/datum/belly/proc/slimy_mass(var/obj/item/content, var/mob/living/M)
+ if(!content in internal_contents)
+ return
+ internal_contents += new /obj/structure/closet/crate/vore(src)
+ internal_contents.Remove(content)
+ M.transferItemToLoc(content, /obj/structure/closet/crate/vore)
+ if(!M.transferItemToLoc(W))
+ qdel(W)
+
+/datum/belly/proc/regurgitate_items(var/obj/structure/closet/crate/vore/C)
+ */
// Belly copies and then returns the copy
// Needs to be updated for any var changes
diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm
index d50cdebf45..b7ace801cd 100644
--- a/code/modules/vore/eating/living_vr.dm
+++ b/code/modules/vore/eating/living_vr.dm
@@ -149,7 +149,7 @@
// If we got this far, nom successful! Announce it!
user.visible_message(success_msg)
- playsound(user, belly_target.vore_sound, 100, 1)
+ playsound(get_turf(user), belly_target.vore_sound,75,0,-6,0)
// Actually shove prey into the belly.
belly_target.nom_mob(prey, user)
@@ -191,7 +191,7 @@
// If we got this far, nom successful! Announce it!
user.visible_message(success_msg)
- playsound(user, belly_target.vore_sound, 100, 1)
+ playsound(get_turf(user), belly_target.vore_sound,75,0,-6,0)
// Actually shove prey into the belly.
belly_target.nom_mob(prey, user)
@@ -243,7 +243,7 @@
I.loc = src
B.internal_contents += I
src.visible_message("[src] is fed the beacon!","You're fed the beacon!")
- playsound(src, B.vore_sound, 100, 1)
+ playsound(get_turf(src), B.vore_sound,50,0,-6,0)
return 1
else
return 1 //You don't get to hit someone 'later'
@@ -407,4 +407,4 @@
if(H.touching.reagent_list.len) //Just the first one otherwise I'll go insane.
var/datum/reagent/R = H.touching.reagent_list[1]
taste_message += " You also get the flavor of [R.taste_description] from something on them"*/
- return taste_message
\ No newline at end of file
+ return taste_message
diff --git a/code/modules/vore/eating/voreitems.dm b/code/modules/vore/eating/voreitems.dm
new file mode 100644
index 0000000000..1215605eac
--- /dev/null
+++ b/code/modules/vore/eating/voreitems.dm
@@ -0,0 +1,22 @@
+/obj/item/restraints/handcuffs/cable/vorecuffs
+ name = "vorecuffs"
+ desc = "Because Poojawa is at a loss for actually making people stop being muppets during vore."
+ icon_state = "vorecuffs"
+ lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
+ materials = list()
+ breakouttime = 20 //Deciseconds = 2s
+ trashtype = /obj/item/restraints/handcuffs/cable/vorecuffs/used
+
+/obj/item/restraints/handcuffs/cable/vorecuffs/used
+ desc = "You don't see this coder related vore trick."
+ icon_state = "vorecuffs_used"
+ item_state = "vorecuffs"
+
+/obj/item/restraints/handcuffs/cable/vorecuffs/used/attack()
+ return
+
+/obj/structure/closet/crate/vore
+ name = "Slimy ooze"
+ desc = "A mass of ooze, with something within"
+ icon_state = "vore_ooze"
diff --git a/code/modules/zombie/items.dm b/code/modules/zombie/items.dm
index 8db4e492e4..f203af610a 100644
--- a/code/modules/zombie/items.dm
+++ b/code/modules/zombie/items.dm
@@ -44,7 +44,7 @@
return
var/obj/item/organ/zombie_infection/infection
- infection = target.getorganslot("zombie_infection")
+ infection = target.getorganslot(ORGAN_SLOT_ZOMBIE)
if(!infection)
infection = new()
infection.Insert(target)
diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm
index d089204fc8..0b7a54ee1f 100644
--- a/code/modules/zombie/organs.dm
+++ b/code/modules/zombie/organs.dm
@@ -2,7 +2,7 @@
name = "festering ooze"
desc = "A black web of pus and viscera."
zone = "head"
- slot = "zombie_infection"
+ slot = ORGAN_SLOT_ZOMBIE
icon_state = "blacktumor"
origin_tech = "biotech=5"
var/datum/species/old_species = /datum/species/human
@@ -37,7 +37,7 @@
/obj/item/organ/zombie_infection/on_find(mob/living/finder)
to_chat(finder, "Inside the head is a disgusting black \
- web of pus and vicera, bound tightly around the brain like some \
+ web of pus and viscera, bound tightly around the brain like some \
biological harness.")
/obj/item/organ/zombie_infection/process()
diff --git a/config/game_options.txt b/config/game_options.txt
index d577756061..d3fa274ed8 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -85,8 +85,6 @@ PROBABILITY REVOLUTION 2
PROBABILITY CULT 2
PROBABILITY CHANGELING 2
PROBABILITY WIZARD 4
-PROBABILITY BLOB 2
-PROBABILITY RAGINMAGES 2
PROBABILITY MONKEY 0
PROBABILITY METEOR 0
PROBABILITY EXTENDED 0
@@ -397,6 +395,13 @@ JOIN_WITH_MUTANT_RACE
## You probably want humans on your space station, but technically speaking you can turn them off without any ill effect
ROUNDSTART_RACES human
+ROUNDSTART_RACES mammal
+ROUNDSTART_RACES avian
+ROUNDSTART_RACES aquatic
+ROUNDSTART_RACES insect
+ROUNDSTART_RACES xeno
+ROUNDSTART_RACES datashark
+ROUNDSTART_RACES guilmon
## Races that are strictly worse than humans that could probably be turned on without balance concerns
ROUNDSTART_RACES lizard
diff --git a/html/changelogs/AutoChangeLog-pr-3432.yml b/html/changelogs/AutoChangeLog-pr-3432.yml
new file mode 100644
index 0000000000..8a1de4739e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3432.yml
@@ -0,0 +1,12 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - balance: "Sec doggos have a disabler again"
+ - balance: "Sec doggos need 1 more second for their leg actuators to recharge after a pounce."
+ - balance: "Sec doggos no longer have a nuke pinpointer when emagged"
+ - balance: "Sechounds stun for half a second longer"
+ - balance: "Sechound pounce spoolup has been reduced from 0.5 seconds to 0.3 seconds."
+ - balance: "Scrubpups now have actual working mops on their feet instead of cheap plastic imitations"
+ - balance: "Scrubpups can eat normal-sized items again"
+ - balance: "Scrubpups can only carry 20 items now"
+ - balance: "Scrubpups no longer have flashes"
diff --git a/html/changelogs/AutoChangeLog-pr-3462.yml b/html/changelogs/AutoChangeLog-pr-3462.yml
new file mode 100644
index 0000000000..f3344006f9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3462.yml
@@ -0,0 +1,10 @@
+author: "Poojawa"
+delete-after: True
+changes:
+ - bugfix: "fixed medihound having to respect devourable settings."
+ - bugfix: "fixed other borg sleepers to not inject any regents."
+ - rscadd: "Tgui menus for borg sleepers. Is pretty."
+ - bugfix: "Fixed analyzer nose to work as intended."
+ - bugfix: "infinite energy loop is gone."
+ - tweak: "Removed borg hypo from Medihound. The sleeper works now."
+ - balance: "Medihound sleeper will swap from anti-tox to pure toxin if the patient is a slime."
diff --git a/html/changelogs/AutoChangeLog-pr-3492.yml b/html/changelogs/AutoChangeLog-pr-3492.yml
new file mode 100644
index 0000000000..bcae1670b8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3492.yml
@@ -0,0 +1,9 @@
+author: "Kor"
+delete-after: True
+changes:
+ - rscadd: "Blob is now a side antagonist."
+ - rscadd: "Event and admin blobs will now be able to choose their spawn location."
+ - rscadd: "Blob can now win in any mode by gaining enough tiles to reach Critical Mass."
+ - rscadd: "Blobs that have Critical Mass have unlimited points, and a minute after achieving critical mass, they will spread to every tile on station, killing anyone still on board and ending the round."
+ - rscadd: "Using an analyzer on a blob will now reveal its progress towards Critical Mass."
+ - rscadd: "The blob event is now more common."
diff --git a/html/changelogs/AutoChangeLog-pr-3518.yml b/html/changelogs/AutoChangeLog-pr-3518.yml
new file mode 100644
index 0000000000..ecf1879613
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3518.yml
@@ -0,0 +1,4 @@
+author: "Robustin"
+delete-after: True
+changes:
+ - bugfix: "Fixed a bug where detonating maxcaps, especially multiple maxcaps, on Reebe guaranteed that everyone would die and thus the Clock Cult would immediately lose; Reebe maxcap is now 2/5/10."
diff --git a/html/changelogs/AutoChangeLog-pr-3522.yml b/html/changelogs/AutoChangeLog-pr-3522.yml
new file mode 100644
index 0000000000..77d272d363
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3522.yml
@@ -0,0 +1,5 @@
+author: "ShizCalev"
+delete-after: True
+changes:
+ - tweak: "Changelings using biodegrade to escape restraints will now leave a pile of goop."
+ - bugfix: "Fixed messages related to changelings using biodegrade not appearing."
diff --git a/html/changelogs/AutoChangeLog-pr-3528.yml b/html/changelogs/AutoChangeLog-pr-3528.yml
new file mode 100644
index 0000000000..7beef20cca
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3528.yml
@@ -0,0 +1,4 @@
+author: "Robustin"
+delete-after: True
+changes:
+ - balance: "Spray tan no longer stuns when ingested."
diff --git a/html/changelogs/AutoChangeLog-pr-3529.yml b/html/changelogs/AutoChangeLog-pr-3529.yml
new file mode 100644
index 0000000000..02a915824f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3529.yml
@@ -0,0 +1,7 @@
+author: "Toriate"
+delete-after: True
+changes:
+ - balance: "OP foam stuff now cost slightly more to build from autolathes"
+ - balance: "OP foam stuff now turned into total memes instead of practical weapons, all burst firing foam guns have at least 60 spread. Stealth pistol also has 60 spread."
+ - balance: "Foam X9 and Mag Rifle now requires two hands to fire"
+ - bugfix: "Foam Force X9 and Mag Rifle now has its correct weight class of NOT FITTING IN FUCKING BACKPACKS"
diff --git a/html/changelogs/AutoChangeLog-pr-3530.yml b/html/changelogs/AutoChangeLog-pr-3530.yml
new file mode 100644
index 0000000000..d775eb8c52
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3530.yml
@@ -0,0 +1,4 @@
+author: "Thunder12345"
+delete-after: True
+changes:
+ - bugfix: "Sentient cats no longer forget to fall over when they die"
diff --git a/html/changelogs/AutoChangeLog-pr-3546.yml b/html/changelogs/AutoChangeLog-pr-3546.yml
new file mode 100644
index 0000000000..3ce8ca350c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3546.yml
@@ -0,0 +1,4 @@
+author: "More Robust Than You"
+delete-after: True
+changes:
+ - bugfix: "Blood Brother now properly shows up in player panel"
diff --git a/html/changelogs/AutoChangeLog-pr-3547.yml b/html/changelogs/AutoChangeLog-pr-3547.yml
new file mode 100644
index 0000000000..402f30bd11
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3547.yml
@@ -0,0 +1,4 @@
+author: "ninjanomnom"
+delete-after: True
+changes:
+ - bugfix: "Contents of silicon mobs are no longer considered for targets of radiation. This blocks them from being contaminated."
diff --git a/html/changelogs/AutoChangeLog-pr-3549.yml b/html/changelogs/AutoChangeLog-pr-3549.yml
new file mode 100644
index 0000000000..0f14e8726a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3549.yml
@@ -0,0 +1,4 @@
+author: "Robustin"
+delete-after: True
+changes:
+ - balance: "Medical biosuits (and hardsuits) now offer heavy, but not complete, radiation resistance."
diff --git a/html/changelogs/AutoChangeLog-pr-3557.yml b/html/changelogs/AutoChangeLog-pr-3557.yml
new file mode 100644
index 0000000000..9bf16022d7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3557.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - rscadd: "Wizards may now shapeshift into viper spiders."
diff --git a/html/changelogs/AutoChangeLog-pr-3559.yml b/html/changelogs/AutoChangeLog-pr-3559.yml
new file mode 100644
index 0000000000..252225cc5f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3559.yml
@@ -0,0 +1,4 @@
+author: "More Robust Than You"
+delete-after: True
+changes:
+ - bugfix: "Fixes champrojector camera bugs"
diff --git a/html/changelogs/AutoChangeLog-pr-3567.yml b/html/changelogs/AutoChangeLog-pr-3567.yml
new file mode 100644
index 0000000000..746a23b1e6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3567.yml
@@ -0,0 +1,4 @@
+author: "Toriate"
+delete-after: True
+changes:
+ - bugfix: "fixed Otusian, Wolf, Skunk, and Big Cat ears"
diff --git a/html/changelogs/AutoChangeLog-pr-3570.yml b/html/changelogs/AutoChangeLog-pr-3570.yml
new file mode 100644
index 0000000000..5399805908
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3570.yml
@@ -0,0 +1,4 @@
+author: "Naksu"
+delete-after: True
+changes:
+ - bugfix: "Grinders will now grind grown items like cocoa pods again"
diff --git a/html/changelogs/AutoChangeLog-pr-3575.yml b/html/changelogs/AutoChangeLog-pr-3575.yml
new file mode 100644
index 0000000000..1c9c3fbd31
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3575.yml
@@ -0,0 +1,13 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - tweak: "All maps have been hard synced with upstream. Thank upstream for messing with the cables. Refer to upstream map changelogs for details."
+ - tweak: "Map changes from prior to the sync have been re-added."
+ - tweak: "Boxstation security's equipment room is now two tiles larger. The security vendor, biohazard locker, and bomb suit locker are now on the same wall as the rest of the sec equipment lockers."
+ - tweak: "Boxstation's security equipment room is now equipped with two secways."
+ - tweak: "Security on all maps no longer contain chem dispensers or chemmasters."
+ - tweak: "All maps now share the same vulnerability involving the security desk that Boxstation does."
+ - tweak: "Deltastation's map changes have been restored after the previous sync."
+ - tweak: "Boxstation's security lobby disposals has been fixed"
+ - tweak: "Fixed stray r-wall between the evidence room and cell 1 in Boxstation."
+ - tweak: "Replaced the blast doors in Boxstation's security lobby with shutters."
diff --git a/html/changelogs/AutoChangeLog-pr-3581.yml b/html/changelogs/AutoChangeLog-pr-3581.yml
new file mode 100644
index 0000000000..be4fb833f3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3581.yml
@@ -0,0 +1,4 @@
+author: "Improvedname"
+delete-after: True
+changes:
+ - tweak: "Blacklists holoparasite's from surplus crates"
diff --git a/html/changelogs/AutoChangeLog-pr-3582.yml b/html/changelogs/AutoChangeLog-pr-3582.yml
new file mode 100644
index 0000000000..f9ebb4cecc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3582.yml
@@ -0,0 +1,4 @@
+author: "ShizCalev"
+delete-after: True
+changes:
+ - bugfix: "Creatures made via gold slime cores will now be given the proper name of their master."
diff --git a/html/changelogs/AutoChangeLog-pr-3594.yml b/html/changelogs/AutoChangeLog-pr-3594.yml
new file mode 100644
index 0000000000..bc014626a2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3594.yml
@@ -0,0 +1,4 @@
+author: "JJRcop"
+delete-after: True
+changes:
+ - rscadd: "The heart of darkness revives you as a shadowperson if you aren't one already."
diff --git a/html/changelogs/AutoChangeLog-pr-3596.yml b/html/changelogs/AutoChangeLog-pr-3596.yml
new file mode 100644
index 0000000000..91534c5dae
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3596.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - rscadd: "Shuttle navigation computers can now place new transit locations over the shuttle's current position."
diff --git a/html/changelogs/AutoChangeLog-pr-3599.yml b/html/changelogs/AutoChangeLog-pr-3599.yml
new file mode 100644
index 0000000000..19444ff4b3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3599.yml
@@ -0,0 +1,4 @@
+author: "ShizCalev"
+delete-after: True
+changes:
+ - bugfix: "Shades will no longer always hear a heartbeat."
diff --git a/html/changelogs/AutoChangeLog-pr-3600.yml b/html/changelogs/AutoChangeLog-pr-3600.yml
new file mode 100644
index 0000000000..638233d23f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3600.yml
@@ -0,0 +1,4 @@
+author: "ShizCalev"
+delete-after: True
+changes:
+ - bugfix: "Golem abilities will now be start on cooldown when they are made."
diff --git a/html/changelogs/AutoChangeLog-pr-3603.yml b/html/changelogs/AutoChangeLog-pr-3603.yml
new file mode 100644
index 0000000000..502e536684
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3603.yml
@@ -0,0 +1,4 @@
+author: "Xhuis"
+delete-after: True
+changes:
+ - bugfix: "You can no longer stack infinitely many stargazers on one tile."
diff --git a/html/changelogs/AutoChangeLog-pr-3604.yml b/html/changelogs/AutoChangeLog-pr-3604.yml
new file mode 100644
index 0000000000..d4bbd36f07
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3604.yml
@@ -0,0 +1,4 @@
+author: "Xhuis"
+delete-after: True
+changes:
+ - bugfix: "Cogscarab shells and marauder armor now appear in the spawners menu."
diff --git a/html/changelogs/AutoChangeLog-pr-3606.yml b/html/changelogs/AutoChangeLog-pr-3606.yml
new file mode 100644
index 0000000000..74fb1e3772
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3606.yml
@@ -0,0 +1,6 @@
+author: "ninjanomnom & Wjohn"
+delete-after: True
+changes:
+ - bugfix: "Cable cuffs now inherit the color of the cables used to make them."
+ - bugfix: "Split cable stacks keep their color."
+ - tweak: "The blue cable color is now a better blue."
diff --git a/html/changelogs/AutoChangeLog-pr-3610.yml b/html/changelogs/AutoChangeLog-pr-3610.yml
new file mode 100644
index 0000000000..4d7996fd0c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3610.yml
@@ -0,0 +1,4 @@
+author: "nicbn"
+delete-after: True
+changes:
+ - imageadd: "Chemical heater and smoke machine resprited."
diff --git a/html/changelogs/AutoChangeLog-pr-3611.yml b/html/changelogs/AutoChangeLog-pr-3611.yml
new file mode 100644
index 0000000000..4cf47effae
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3611.yml
@@ -0,0 +1,5 @@
+author: "ninjanomnom"
+delete-after: True
+changes:
+ - soundadd: "Portable generators have a sound while active."
+ - soundadd: "The supermatter has a sound that scales with stored energy."
diff --git a/html/changelogs/AutoChangeLog-pr-3614.yml b/html/changelogs/AutoChangeLog-pr-3614.yml
new file mode 100644
index 0000000000..f14c2f29a5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3614.yml
@@ -0,0 +1,4 @@
+author: "ShizCalev"
+delete-after: True
+changes:
+ - bugfix: "You can no longer teleport past the ticket stands of the Luxury Emergency Shuttle."
diff --git a/html/changelogs/AutoChangeLog-pr-3615.yml b/html/changelogs/AutoChangeLog-pr-3615.yml
new file mode 100644
index 0000000000..ce963f647e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3615.yml
@@ -0,0 +1,4 @@
+author: "ShizCalev"
+delete-after: True
+changes:
+ - tweak: "The Staff of Change will now randomly assign a cyborg module when transforming a mob into a cyborg."
diff --git a/html/changelogs/AutoChangeLog-pr-3617.yml b/html/changelogs/AutoChangeLog-pr-3617.yml
new file mode 100644
index 0000000000..23c34fe480
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3617.yml
@@ -0,0 +1,4 @@
+author: "ShizCalev"
+delete-after: True
+changes:
+ - bugfix: "You will no longer be prompted to reenter your body while being defibbed if you can't actually be revived."
diff --git a/html/changelogs/AutoChangeLog-pr-3618.yml b/html/changelogs/AutoChangeLog-pr-3618.yml
new file mode 100644
index 0000000000..3b90caf60e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3618.yml
@@ -0,0 +1,4 @@
+author: "ShizCalev"
+delete-after: True
+changes:
+ - bugfix: "Lightgeists can now -actually- be spawned with gold slime cores."
diff --git a/html/changelogs/AutoChangeLog-pr-3623.yml b/html/changelogs/AutoChangeLog-pr-3623.yml
new file mode 100644
index 0000000000..5e385f17f4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3623.yml
@@ -0,0 +1,4 @@
+author: "ShizCalev"
+delete-after: True
+changes:
+ - bugfix: "Reflectors will no longer drop more materials than they took to make when deconstructed."
diff --git a/html/changelogs/AutoChangeLog-pr-3624.yml b/html/changelogs/AutoChangeLog-pr-3624.yml
new file mode 100644
index 0000000000..c98047a04c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3624.yml
@@ -0,0 +1,6 @@
+author: "Xhuis"
+delete-after: True
+changes:
+ - balance: "Clockwork marauders now move more slowly below 40% health."
+ - balance: "Instead of a 40% chance (or more) chance to block projectiles, clockwork marauders now have three fixed 100% blocks; after using those three, they cannot block anymore without avoiding projectiles for ten seconds. This number increases to four if war is declared."
+ - balance: "Projectiles that deal no damage DO reduce marauders' shield health. Use disabler shots to open them up, then use lasers to go for the kill!"
diff --git a/html/changelogs/AutoChangeLog-pr-3630.yml b/html/changelogs/AutoChangeLog-pr-3630.yml
new file mode 100644
index 0000000000..0c69e04f40
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3630.yml
@@ -0,0 +1,4 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - rscadd: "Admins are now able to mark open tickets as being handled. This makes it easier for staff members to provide feedback to players reporting issues via the admin help button."
diff --git a/html/changelogs/AutoChangeLog-pr-3634.yml b/html/changelogs/AutoChangeLog-pr-3634.yml
new file mode 100644
index 0000000000..3345c5ba6b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3634.yml
@@ -0,0 +1,4 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - bugfix: "The vore panel and other vore-related commands are now operational again."
diff --git a/html/changelogs/AutoChangeLog-pr-3635.yml b/html/changelogs/AutoChangeLog-pr-3635.yml
new file mode 100644
index 0000000000..99fb1d5289
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3635.yml
@@ -0,0 +1,4 @@
+author: "ktccd"
+delete-after: True
+changes:
+ - rscdel: "Removed borer-HUDs"
diff --git a/html/changelogs/AutoChangeLog-pr-3637.yml b/html/changelogs/AutoChangeLog-pr-3637.yml
new file mode 100644
index 0000000000..b9dfcaecb8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3637.yml
@@ -0,0 +1,4 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - bugfix: "Fixed LOOC error messages not appearing in goonchat"
diff --git a/html/changelogs/AutoChangeLog-pr-3638.yml b/html/changelogs/AutoChangeLog-pr-3638.yml
new file mode 100644
index 0000000000..d661f94d61
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3638.yml
@@ -0,0 +1,4 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - bugfix: "Miscreants will now generate properly."
diff --git a/html/changelogs/AutoChangeLog-pr-3641.yml b/html/changelogs/AutoChangeLog-pr-3641.yml
new file mode 100644
index 0000000000..004acb1aaa
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3641.yml
@@ -0,0 +1,19 @@
+author: "as334"
+delete-after: True
+changes:
+ - rscadd: "Massively Expands Atmospherics."
+ - rscadd: "New gases have been added:Brown Gas, Pluoxium, Stimulum, Hyper-Noblium and Tritium"
+ - rscadd: "Brown gas is acidic to breath, but mildly stimulation."
+ - rscadd: "Stimulum is more stimulating and much safer."
+ - rscadd: "Pluoxium is a non-reactive form of oxygen that delivers more oxygen into the bloodstream."
+ - rscadd: "Hyper-Noblium is an extremely noble gas, and stops gases from reacting."
+ - rscadd: "Tritium is radioactive and flammable."
+ - rscadd: "New reactions have also been added."
+ - rscadd: "Fusion. Plasma will fuse when heated to a high thermal energy, with tritium as a catalyst. Make
+sure to manage the waste products."
+ - rscadd: "Brown gas formation: Heat oxygen and nitrogen."
+ - rscadd: "BZ fixation: Heat Tritium and Plasma."
+ - rscadd: "Stimulum formation: Heated tritium,plasma,bz and browns."
+ - rscadd: "Hyper-Noblium condensation: Needs nitrogen and tritium at a high heat. Cools rapidly."
+ - rscdel: "Freon has been removed."
+ - rscadd: "Water vapor now freezes the tile it is on when it is cooled heavily."
diff --git a/html/changelogs/AutoChangeLog-pr-3649.yml b/html/changelogs/AutoChangeLog-pr-3649.yml
new file mode 100644
index 0000000000..04a9765da6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3649.yml
@@ -0,0 +1,4 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - bugfix: "Cable coils will no longer appear as weirdly colored APCs"
diff --git a/html/changelogs/AutoChangeLog-pr-3663.yml b/html/changelogs/AutoChangeLog-pr-3663.yml
new file mode 100644
index 0000000000..7fe666a739
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3663.yml
@@ -0,0 +1,4 @@
+author: "Mark9013100"
+delete-after: True
+changes:
+ - tweak: "The Medical Cloning manual has been updated."
diff --git a/icons/effects/tile_effects.dmi b/icons/effects/tile_effects.dmi
index 0bd03133ea..8111fef6db 100644
Binary files a/icons/effects/tile_effects.dmi and b/icons/effects/tile_effects.dmi differ
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
index 2eab8fa78e..de8587dba5 100644
Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ
diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi
index 92a74b0afa..3854f252eb 100644
Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ
diff --git a/icons/mob/underwear.dmi b/icons/mob/underwear.dmi
index 8f60f70556..483883b94c 100644
Binary files a/icons/mob/underwear.dmi and b/icons/mob/underwear.dmi differ
diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi
index fe9e9eed05..3507d9db53 100644
Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index dfb51a9caa..786a8c7fd0 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index 77b62691d2..2cf675c571 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/custom.dmi b/icons/obj/custom.dmi
index 41ebe61b53..cca6f3fa79 100644
Binary files a/icons/obj/custom.dmi and b/icons/obj/custom.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index b5ac65c2a8..636d895450 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ
diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi
index e1604715ac..5482873c8a 100644
Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ
diff --git a/icons/obj/power_cond/cables.dmi b/icons/obj/power_cond/cables.dmi
new file mode 100644
index 0000000000..523947a3e7
Binary files /dev/null and b/icons/obj/power_cond/cables.dmi differ
diff --git a/icons/obj/power_cond/power_cond_blue.dmi b/icons/obj/power_cond/power_cond_blue.dmi
deleted file mode 100644
index 5cd500c4f1..0000000000
Binary files a/icons/obj/power_cond/power_cond_blue.dmi and /dev/null differ
diff --git a/icons/obj/power_cond/power_cond_cyan.dmi b/icons/obj/power_cond/power_cond_cyan.dmi
deleted file mode 100644
index 742d1f76ea..0000000000
Binary files a/icons/obj/power_cond/power_cond_cyan.dmi and /dev/null differ
diff --git a/icons/obj/power_cond/power_cond_green.dmi b/icons/obj/power_cond/power_cond_green.dmi
deleted file mode 100644
index d7a391d505..0000000000
Binary files a/icons/obj/power_cond/power_cond_green.dmi and /dev/null differ
diff --git a/icons/obj/power_cond/power_cond_orange.dmi b/icons/obj/power_cond/power_cond_orange.dmi
deleted file mode 100644
index 4777ddd665..0000000000
Binary files a/icons/obj/power_cond/power_cond_orange.dmi and /dev/null differ
diff --git a/icons/obj/power_cond/power_cond_pink.dmi b/icons/obj/power_cond/power_cond_pink.dmi
deleted file mode 100644
index 5ebda7c989..0000000000
Binary files a/icons/obj/power_cond/power_cond_pink.dmi and /dev/null differ
diff --git a/icons/obj/power_cond/power_cond_red.dmi b/icons/obj/power_cond/power_cond_red.dmi
deleted file mode 100644
index ffa8eb2405..0000000000
Binary files a/icons/obj/power_cond/power_cond_red.dmi and /dev/null differ
diff --git a/icons/obj/power_cond/power_cond_white.dmi b/icons/obj/power_cond/power_cond_white.dmi
deleted file mode 100644
index 313348dc85..0000000000
Binary files a/icons/obj/power_cond/power_cond_white.dmi and /dev/null differ
diff --git a/icons/obj/power_cond/power_cond_yellow.dmi b/icons/obj/power_cond/power_cond_yellow.dmi
deleted file mode 100644
index 908e22b778..0000000000
Binary files a/icons/obj/power_cond/power_cond_yellow.dmi and /dev/null differ
diff --git a/sound/machines/generator/generator_end.ogg b/sound/machines/generator/generator_end.ogg
new file mode 100644
index 0000000000..4397991167
Binary files /dev/null and b/sound/machines/generator/generator_end.ogg differ
diff --git a/sound/machines/generator/generator_mid1.ogg b/sound/machines/generator/generator_mid1.ogg
new file mode 100644
index 0000000000..10a0d01a7e
Binary files /dev/null and b/sound/machines/generator/generator_mid1.ogg differ
diff --git a/sound/machines/generator/generator_mid2.ogg b/sound/machines/generator/generator_mid2.ogg
new file mode 100644
index 0000000000..77656772cc
Binary files /dev/null and b/sound/machines/generator/generator_mid2.ogg differ
diff --git a/sound/machines/generator/generator_mid3.ogg b/sound/machines/generator/generator_mid3.ogg
new file mode 100644
index 0000000000..812a10e6fc
Binary files /dev/null and b/sound/machines/generator/generator_mid3.ogg differ
diff --git a/sound/machines/generator/generator_start.ogg b/sound/machines/generator/generator_start.ogg
new file mode 100644
index 0000000000..53f734388e
Binary files /dev/null and b/sound/machines/generator/generator_start.ogg differ
diff --git a/sound/machines/sm/supermatter1.ogg b/sound/machines/sm/supermatter1.ogg
new file mode 100644
index 0000000000..1860e78800
Binary files /dev/null and b/sound/machines/sm/supermatter1.ogg differ
diff --git a/sound/machines/sm/supermatter2.ogg b/sound/machines/sm/supermatter2.ogg
new file mode 100644
index 0000000000..fb2d39fe26
Binary files /dev/null and b/sound/machines/sm/supermatter2.ogg differ
diff --git a/sound/machines/sm/supermatter3.ogg b/sound/machines/sm/supermatter3.ogg
new file mode 100644
index 0000000000..93ac3d505b
Binary files /dev/null and b/sound/machines/sm/supermatter3.ogg differ
diff --git a/tgstation.dme b/tgstation.dme
index a656ffb187..912f3cc89e 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -447,8 +447,6 @@
#include "code\game\gamemodes\objective.dm"
#include "code\game\gamemodes\objective_items.dm"
#include "code\game\gamemodes\objective_team.dm"
-#include "code\game\gamemodes\blob\blob.dm"
-#include "code\game\gamemodes\blob\blob_finish.dm"
#include "code\game\gamemodes\blob\blob_report.dm"
#include "code\game\gamemodes\blob\overmind.dm"
#include "code\game\gamemodes\blob\powers.dm"
@@ -1262,15 +1260,17 @@
#include "code\modules\client\verbs\who.dm"
#include "code\modules\clothing\chameleon.dm"
#include "code\modules\clothing\clothing.dm"
-#include "code\modules\clothing\ears\ears.dm"
+#include "code\modules\clothing\ears\_ears.dm"
+#include "code\modules\clothing\glasses\_glasses.dm"
#include "code\modules\clothing\glasses\engine_goggles.dm"
-#include "code\modules\clothing\glasses\glasses.dm"
#include "code\modules\clothing\glasses\hud.dm"
#include "code\modules\clothing\glasses\vg_glasses.dm"
+#include "code\modules\clothing\gloves\_gloves.dm"
#include "code\modules\clothing\gloves\boxing.dm"
#include "code\modules\clothing\gloves\color.dm"
#include "code\modules\clothing\gloves\miscellaneous.dm"
#include "code\modules\clothing\gloves\vg_gloves.dm"
+#include "code\modules\clothing\head\_head.dm"
#include "code\modules\clothing\head\beanie.dm"
#include "code\modules\clothing\head\cit_hats.dm"
#include "code\modules\clothing\head\collectable.dm"
@@ -1281,21 +1281,24 @@
#include "code\modules\clothing\head\misc_special.dm"
#include "code\modules\clothing\head\soft_caps.dm"
#include "code\modules\clothing\head\vg_hats.dm"
+#include "code\modules\clothing\masks\_masks.dm"
#include "code\modules\clothing\masks\boxing.dm"
#include "code\modules\clothing\masks\breath.dm"
#include "code\modules\clothing\masks\gasmask.dm"
#include "code\modules\clothing\masks\hailer.dm"
#include "code\modules\clothing\masks\miscellaneous.dm"
#include "code\modules\clothing\masks\vg_masks.dm"
-#include "code\modules\clothing\neck\neck.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\standard.dm"
+#include "code\modules\clothing\shoes\_shoes.dm"
#include "code\modules\clothing\shoes\bananashoes.dm"
#include "code\modules\clothing\shoes\colour.dm"
#include "code\modules\clothing\shoes\magboots.dm"
#include "code\modules\clothing\shoes\miscellaneous.dm"
#include "code\modules\clothing\shoes\vg_shoes.dm"
+#include "code\modules\clothing\spacesuits\_spacesuits.dm"
#include "code\modules\clothing\spacesuits\chronosuit.dm"
#include "code\modules\clothing\spacesuits\flightsuit.dm"
#include "code\modules\clothing\spacesuits\hardsuit.dm"
@@ -1303,6 +1306,7 @@
#include "code\modules\clothing\spacesuits\plasmamen.dm"
#include "code\modules\clothing\spacesuits\syndi.dm"
#include "code\modules\clothing\spacesuits\vg_spess.dm"
+#include "code\modules\clothing\suits\_suits.dm"
#include "code\modules\clothing\suits\armor.dm"
#include "code\modules\clothing\suits\bio.dm"
#include "code\modules\clothing\suits\cloaks.dm"
@@ -1313,6 +1317,7 @@
#include "code\modules\clothing\suits\utility.dm"
#include "code\modules\clothing\suits\vg_suits.dm"
#include "code\modules\clothing\suits\wiz_robe.dm"
+#include "code\modules\clothing\under\_under.dm"
#include "code\modules\clothing\under\accessories.dm"
#include "code\modules\clothing\under\color.dm"
#include "code\modules\clothing\under\miscellaneous.dm"
@@ -2169,6 +2174,7 @@
#include "code\modules\ruins\spaceruin_code\originalcontent.dm"
#include "code\modules\ruins\spaceruin_code\spacehotel.dm"
#include "code\modules\ruins\spaceruin_code\TheDerelict.dm"
+#include "code\modules\ruins\spaceruin_code\whiteshipruin_box.dm"
#include "code\modules\security_levels\keycard_authentication.dm"
#include "code\modules\security_levels\security_levels.dm"
#include "code\modules\server_tools\st_commands.dm"
@@ -2244,12 +2250,13 @@
#include "code\modules\surgery\core_removal.dm"
#include "code\modules\surgery\dental_implant.dm"
#include "code\modules\surgery\eye_surgery.dm"
-#include "code\modules\surgery\generic_steps.dm"
#include "code\modules\surgery\helpers.dm"
#include "code\modules\surgery\implant_removal.dm"
#include "code\modules\surgery\limb_augmentation.dm"
#include "code\modules\surgery\lipoplasty.dm"
+#include "code\modules\surgery\mechanic_steps.dm"
#include "code\modules\surgery\organ_manipulation.dm"
+#include "code\modules\surgery\organic_steps.dm"
#include "code\modules\surgery\plastic_surgery.dm"
#include "code\modules\surgery\prosthetic_replacement.dm"
#include "code\modules\surgery\remove_embedded_object.dm"
diff --git a/tgui/assets/tgui.js b/tgui/assets/tgui.js
index 47232862f4..abe6393744 100644
--- a/tgui/assets/tgui.js
+++ b/tgui/assets/tgui.js
@@ -1,17 +1,17 @@
-require=function t(e,n,a){function r(o,s){if(!n[o]){if(!e[o]){var u="function"==typeof require&&require;if(!s&&u)return u(o,!0);if(i)return i(o,!0);var p=Error("Cannot find module '"+o+"'");throw p.code="MODULE_NOT_FOUND",p}var c=n[o]={exports:{}};e[o][0].call(c.exports,function(t){var n=e[o][1][t];return r(n?n:t)},c,c.exports,t,e,n,a)}return n[o].exports}for(var i="function"==typeof require&&require,o=0;o2?p[2]:void 0,l=Math.min((void 0===c?o:r(c,o))-u,o-s),f=1;for(s>u&&u+l>s&&(f=-1,u+=l-1,s+=l-1);l-- >0;)u in n?n[s]=n[u]:delete n[s],s+=f,u+=f;return n}},{76:76,79:79,80:80}],6:[function(t,e,n){"use strict";var a=t(80),r=t(76),i=t(79);e.exports=[].fill||function(t){for(var e=a(this),n=i(e.length),o=arguments,s=o.length,u=r(s>1?o[1]:void 0,n),p=s>2?o[2]:void 0,c=void 0===p?n:r(p,n);c>u;)e[u++]=t;return e}},{76:76,79:79,80:80}],7:[function(t,e,n){var a=t(78),r=t(79),i=t(76);e.exports=function(t){return function(e,n,o){var s,u=a(e),p=r(u.length),c=i(o,p);if(t&&n!=n){for(;p>c;)if(s=u[c++],s!=s)return!0}else for(;p>c;c++)if((t||c in u)&&u[c]===n)return t||c;return!t&&-1}}},{76:76,78:78,79:79}],8:[function(t,e,n){var a=t(17),r=t(34),i=t(80),o=t(79),s=t(9);e.exports=function(t){var e=1==t,n=2==t,u=3==t,p=4==t,c=6==t,l=5==t||c;return function(f,d,h){for(var m,v,g=i(f),b=r(g),y=a(d,h,3),x=o(b.length),_=0,w=e?s(f,x):n?s(f,0):void 0;x>_;_++)if((l||_ in b)&&(m=b[_],v=y(m,_,g),t))if(e)w[_]=v;else if(v)switch(t){case 3:return!0;case 5:return m;case 6:return _;case 2:w.push(m)}else if(p)return!1;return c?-1:u||p?p:w}}},{17:17,34:34,79:79,80:80,9:9}],9:[function(t,e,n){var a=t(38),r=t(36),i=t(83)("species");e.exports=function(t,e){var n;return r(t)&&(n=t.constructor,"function"!=typeof n||n!==Array&&!r(n.prototype)||(n=void 0),a(n)&&(n=n[i],null===n&&(n=void 0))),new(void 0===n?Array:n)(e)}},{36:36,38:38,83:83}],10:[function(t,e,n){var a=t(11),r=t(83)("toStringTag"),i="Arguments"==a(function(){return arguments}());e.exports=function(t){var e,n,o;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(n=(e=Object(t))[r])?n:i?a(e):"Object"==(o=a(e))&&"function"==typeof e.callee?"Arguments":o}},{11:11,83:83}],11:[function(t,e,n){var a={}.toString;e.exports=function(t){return a.call(t).slice(8,-1)}},{}],12:[function(t,e,n){"use strict";var a=t(46),r=t(31),i=t(60),o=t(17),s=t(69),u=t(18),p=t(27),c=t(42),l=t(44),f=t(82)("id"),d=t(30),h=t(38),m=t(65),v=t(19),g=Object.isExtensible||h,b=v?"_s":"size",y=0,x=function(t,e){if(!h(t))return"symbol"==typeof t?t:("string"==typeof t?"S":"P")+t;if(!d(t,f)){if(!g(t))return"F";if(!e)return"E";r(t,f,++y)}return"O"+t[f]},_=function(t,e){var n,a=x(e);if("F"!==a)return t._i[a];for(n=t._f;n;n=n.n)if(n.k==e)return n};e.exports={getConstructor:function(t,e,n,r){var c=t(function(t,i){s(t,c,e),t._i=a.create(null),t._f=void 0,t._l=void 0,t[b]=0,void 0!=i&&p(i,n,t[r],t)});return i(c.prototype,{clear:function(){for(var t=this,e=t._i,n=t._f;n;n=n.n)n.r=!0,n.p&&(n.p=n.p.n=void 0),delete e[n.i];t._f=t._l=void 0,t[b]=0},"delete":function(t){var e=this,n=_(e,t);if(n){var a=n.n,r=n.p;delete e._i[n.i],n.r=!0,r&&(r.n=a),a&&(a.p=r),e._f==n&&(e._f=a),e._l==n&&(e._l=r),e[b]--}return!!n},forEach:function(t){for(var e,n=o(t,arguments.length>1?arguments[1]:void 0,3);e=e?e.n:this._f;)for(n(e.v,e.k,this);e&&e.r;)e=e.p},has:function(t){return!!_(this,t)}}),v&&a.setDesc(c.prototype,"size",{get:function(){return u(this[b])}}),c},def:function(t,e,n){var a,r,i=_(t,e);return i?i.v=n:(t._l=i={i:r=x(e,!0),k:e,v:n,p:a=t._l,n:void 0,r:!1},t._f||(t._f=i),a&&(a.n=i),t[b]++,"F"!==r&&(t._i[r]=i)),t},getEntry:_,setStrong:function(t,e,n){c(t,e,function(t,e){this._t=t,this._k=e,this._l=void 0},function(){for(var t=this,e=t._k,n=t._l;n&&n.r;)n=n.p;return t._t&&(t._l=n=n?n.n:t._t._f)?"keys"==e?l(0,n.k):"values"==e?l(0,n.v):l(0,[n.k,n.v]):(t._t=void 0,l(1))},n?"entries":"values",!n,!0),m(e)}}},{17:17,18:18,19:19,27:27,30:30,31:31,38:38,42:42,44:44,46:46,60:60,65:65,69:69,82:82}],13:[function(t,e,n){var a=t(27),r=t(10);e.exports=function(t){return function(){if(r(this)!=t)throw TypeError(t+"#toJSON isn't generic");var e=[];return a(this,!1,e.push,e),e}}},{10:10,27:27}],14:[function(t,e,n){"use strict";var a=t(31),r=t(60),i=t(4),o=t(38),s=t(69),u=t(27),p=t(8),c=t(30),l=t(82)("weak"),f=Object.isExtensible||o,d=p(5),h=p(6),m=0,v=function(t){return t._l||(t._l=new g)},g=function(){this.a=[]},b=function(t,e){return d(t.a,function(t){return t[0]===e})};g.prototype={get:function(t){var e=b(this,t);return e?e[1]:void 0},has:function(t){return!!b(this,t)},set:function(t,e){var n=b(this,t);n?n[1]=e:this.a.push([t,e])},"delete":function(t){var e=h(this.a,function(e){return e[0]===t});return~e&&this.a.splice(e,1),!!~e}},e.exports={getConstructor:function(t,e,n,a){var i=t(function(t,r){s(t,i,e),t._i=m++,t._l=void 0,void 0!=r&&u(r,n,t[a],t)});return r(i.prototype,{"delete":function(t){return o(t)?f(t)?c(t,l)&&c(t[l],this._i)&&delete t[l][this._i]:v(this)["delete"](t):!1},has:function(t){return o(t)?f(t)?c(t,l)&&c(t[l],this._i):v(this).has(t):!1}}),i},def:function(t,e,n){return f(i(e))?(c(e,l)||a(e,l,{}),e[l][t._i]=n):v(t).set(e,n),t},frozenStore:v,WEAK:l}},{27:27,30:30,31:31,38:38,4:4,60:60,69:69,8:8,82:82}],15:[function(t,e,n){"use strict";var a=t(29),r=t(22),i=t(61),o=t(60),s=t(27),u=t(69),p=t(38),c=t(24),l=t(43),f=t(66);e.exports=function(t,e,n,d,h,m){var v=a[t],g=v,b=h?"set":"add",y=g&&g.prototype,x={},_=function(t){var e=y[t];i(y,t,"delete"==t?function(t){return m&&!p(t)?!1:e.call(this,0===t?0:t)}:"has"==t?function(t){return m&&!p(t)?!1:e.call(this,0===t?0:t)}:"get"==t?function(t){return m&&!p(t)?void 0:e.call(this,0===t?0:t)}:"add"==t?function(t){return e.call(this,0===t?0:t),this}:function(t,n){return e.call(this,0===t?0:t,n),this})};if("function"==typeof g&&(m||y.forEach&&!c(function(){(new g).entries().next()}))){var w,k=new g,E=k[b](m?{}:-0,1)!=k,S=c(function(){k.has(1)}),C=l(function(t){new g(t)});C||(g=e(function(e,n){u(e,g,t);var a=new v;return void 0!=n&&s(n,h,a[b],a),a}),g.prototype=y,y.constructor=g),m||k.forEach(function(t,e){w=1/e===-(1/0)}),(S||w)&&(_("delete"),_("has"),h&&_("get")),(w||E)&&_(b),m&&y.clear&&delete y.clear}else g=d.getConstructor(e,t,h,b),o(g.prototype,n);return f(g,t),x[t]=g,r(r.G+r.W+r.F*(g!=v),x),m||d.setStrong(g,t,h),g}},{22:22,24:24,27:27,29:29,38:38,43:43,60:60,61:61,66:66,69:69}],16:[function(t,e,n){var a=e.exports={version:"1.2.6"};"number"==typeof __e&&(__e=a)},{}],17:[function(t,e,n){var a=t(2);e.exports=function(t,e,n){if(a(t),void 0===e)return t;switch(n){case 1:return function(n){return t.call(e,n)};case 2:return function(n,a){return t.call(e,n,a)};case 3:return function(n,a,r){return t.call(e,n,a,r)}}return function(){return t.apply(e,arguments)}}},{2:2}],18:[function(t,e,n){e.exports=function(t){if(void 0==t)throw TypeError("Can't call method on "+t);return t}},{}],19:[function(t,e,n){e.exports=!t(24)(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},{24:24}],20:[function(t,e,n){var a=t(38),r=t(29).document,i=a(r)&&a(r.createElement);e.exports=function(t){return i?r.createElement(t):{}}},{29:29,38:38}],21:[function(t,e,n){var a=t(46);e.exports=function(t){var e=a.getKeys(t),n=a.getSymbols;if(n)for(var r,i=n(t),o=a.isEnum,s=0;i.length>s;)o.call(t,r=i[s++])&&e.push(r);return e}},{46:46}],22:[function(t,e,n){var a=t(29),r=t(16),i=t(31),o=t(61),s=t(17),u="prototype",p=function(t,e,n){var c,l,f,d,h=t&p.F,m=t&p.G,v=t&p.S,g=t&p.P,b=t&p.B,y=m?a:v?a[e]||(a[e]={}):(a[e]||{})[u],x=m?r:r[e]||(r[e]={}),_=x[u]||(x[u]={});m&&(n=e);for(c in n)l=!h&&y&&c in y,f=(l?y:n)[c],d=b&&l?s(f,a):g&&"function"==typeof f?s(Function.call,f):f,y&&!l&&o(y,c,f),x[c]!=f&&i(x,c,d),g&&_[c]!=f&&(_[c]=f)};a.core=r,p.F=1,p.G=2,p.S=4,p.P=8,p.B=16,p.W=32,e.exports=p},{16:16,17:17,29:29,31:31,61:61}],23:[function(t,e,n){var a=t(83)("match");e.exports=function(t){var e=/./;try{"/./"[t](e)}catch(n){try{return e[a]=!1,!"/./"[t](e)}catch(r){}}return!0}},{83:83}],24:[function(t,e,n){e.exports=function(t){try{return!!t()}catch(e){return!0}}},{}],25:[function(t,e,n){"use strict";var a=t(31),r=t(61),i=t(24),o=t(18),s=t(83);e.exports=function(t,e,n){var u=s(t),p=""[t];i(function(){var e={};return e[u]=function(){return 7},7!=""[t](e)})&&(r(String.prototype,t,n(o,u,p)),a(RegExp.prototype,u,2==e?function(t,e){return p.call(t,this,e)}:function(t){return p.call(t,this)}))}},{18:18,24:24,31:31,61:61,83:83}],26:[function(t,e,n){"use strict";var a=t(4);e.exports=function(){var t=a(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e}},{4:4}],27:[function(t,e,n){var a=t(17),r=t(40),i=t(35),o=t(4),s=t(79),u=t(84);e.exports=function(t,e,n,p){var c,l,f,d=u(t),h=a(n,p,e?2:1),m=0;if("function"!=typeof d)throw TypeError(t+" is not iterable!");if(i(d))for(c=s(t.length);c>m;m++)e?h(o(l=t[m])[0],l[1]):h(t[m]);else for(f=d.call(t);!(l=f.next()).done;)r(f,h,l.value,e)}},{17:17,35:35,4:4,40:40,79:79,84:84}],28:[function(t,e,n){var a=t(78),r=t(46).getNames,i={}.toString,o="object"==typeof window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],s=function(t){try{return r(t)}catch(e){return o.slice()}};e.exports.get=function(t){return o&&"[object Window]"==i.call(t)?s(t):r(a(t))}},{46:46,78:78}],29:[function(t,e,n){var a=e.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=a)},{}],30:[function(t,e,n){var a={}.hasOwnProperty;e.exports=function(t,e){return a.call(t,e)}},{}],31:[function(t,e,n){var a=t(46),r=t(59);e.exports=t(19)?function(t,e,n){return a.setDesc(t,e,r(1,n))}:function(t,e,n){return t[e]=n,t}},{19:19,46:46,59:59}],32:[function(t,e,n){e.exports=t(29).document&&document.documentElement},{29:29}],33:[function(t,e,n){e.exports=function(t,e,n){var a=void 0===n;switch(e.length){case 0:return a?t():t.call(n);case 1:return a?t(e[0]):t.call(n,e[0]);case 2:return a?t(e[0],e[1]):t.call(n,e[0],e[1]);case 3:return a?t(e[0],e[1],e[2]):t.call(n,e[0],e[1],e[2]);case 4:return a?t(e[0],e[1],e[2],e[3]):t.call(n,e[0],e[1],e[2],e[3])}return t.apply(n,e)}},{}],34:[function(t,e,n){var a=t(11);e.exports=Object("z").propertyIsEnumerable(0)?Object:function(t){return"String"==a(t)?t.split(""):Object(t)}},{11:11}],35:[function(t,e,n){var a=t(45),r=t(83)("iterator"),i=Array.prototype;e.exports=function(t){return void 0!==t&&(a.Array===t||i[r]===t)}},{45:45,83:83}],36:[function(t,e,n){var a=t(11);e.exports=Array.isArray||function(t){return"Array"==a(t)}},{11:11}],37:[function(t,e,n){var a=t(38),r=Math.floor;e.exports=function(t){return!a(t)&&isFinite(t)&&r(t)===t}},{38:38}],38:[function(t,e,n){e.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},{}],39:[function(t,e,n){var a=t(38),r=t(11),i=t(83)("match");e.exports=function(t){var e;return a(t)&&(void 0!==(e=t[i])?!!e:"RegExp"==r(t))}},{11:11,38:38,83:83}],40:[function(t,e,n){var a=t(4);e.exports=function(t,e,n,r){try{return r?e(a(n)[0],n[1]):e(n)}catch(i){var o=t["return"];throw void 0!==o&&a(o.call(t)),i}}},{4:4}],41:[function(t,e,n){"use strict";var a=t(46),r=t(59),i=t(66),o={};t(31)(o,t(83)("iterator"),function(){return this}),e.exports=function(t,e,n){t.prototype=a.create(o,{next:r(1,n)}),i(t,e+" Iterator")}},{31:31,46:46,59:59,66:66,83:83}],42:[function(t,e,n){"use strict";var a=t(48),r=t(22),i=t(61),o=t(31),s=t(30),u=t(45),p=t(41),c=t(66),l=t(46).getProto,f=t(83)("iterator"),d=!([].keys&&"next"in[].keys()),h="@@iterator",m="keys",v="values",g=function(){return this};e.exports=function(t,e,n,b,y,x,_){p(n,e,b);var w,k,E=function(t){if(!d&&t in A)return A[t];switch(t){case m:return function(){return new n(this,t)};case v:return function(){return new n(this,t)}}return function(){return new n(this,t)}},S=e+" Iterator",C=y==v,P=!1,A=t.prototype,O=A[f]||A[h]||y&&A[y],T=O||E(y);if(O){var R=l(T.call(new t));c(R,S,!0),!a&&s(A,h)&&o(R,f,g),C&&O.name!==v&&(P=!0,T=function(){return O.call(this)})}if(a&&!_||!d&&!P&&A[f]||o(A,f,T),u[e]=T,u[S]=g,y)if(w={values:C?T:E(v),keys:x?T:E(m),entries:C?E("entries"):T},_)for(k in w)k in A||i(A,k,w[k]);else r(r.P+r.F*(d||P),e,w);return w}},{22:22,30:30,31:31,41:41,45:45,46:46,48:48,61:61,66:66,83:83}],43:[function(t,e,n){var a=t(83)("iterator"),r=!1;try{var i=[7][a]();i["return"]=function(){r=!0},Array.from(i,function(){throw 2})}catch(o){}e.exports=function(t,e){if(!e&&!r)return!1;var n=!1;try{var i=[7],o=i[a]();o.next=function(){return{done:n=!0}},i[a]=function(){return o},t(i)}catch(s){}return n}},{83:83}],44:[function(t,e,n){e.exports=function(t,e){return{value:e,done:!!t}}},{}],45:[function(t,e,n){e.exports={}},{}],46:[function(t,e,n){var a=Object;e.exports={create:a.create,getProto:a.getPrototypeOf,isEnum:{}.propertyIsEnumerable,getDesc:a.getOwnPropertyDescriptor,setDesc:a.defineProperty,setDescs:a.defineProperties,getKeys:a.keys,getNames:a.getOwnPropertyNames,getSymbols:a.getOwnPropertySymbols,each:[].forEach}},{}],47:[function(t,e,n){var a=t(46),r=t(78);e.exports=function(t,e){for(var n,i=r(t),o=a.getKeys(i),s=o.length,u=0;s>u;)if(i[n=o[u++]]===e)return n}},{46:46,78:78}],48:[function(t,e,n){e.exports=!1},{}],49:[function(t,e,n){e.exports=Math.expm1||function(t){return 0==(t=+t)?t:t>-1e-6&&1e-6>t?t+t*t/2:Math.exp(t)-1}},{}],50:[function(t,e,n){e.exports=Math.log1p||function(t){return(t=+t)>-1e-8&&1e-8>t?t-t*t/2:Math.log(1+t)}},{}],51:[function(t,e,n){e.exports=Math.sign||function(t){return 0==(t=+t)||t!=t?t:0>t?-1:1}},{}],52:[function(t,e,n){var a,r,i,o=t(29),s=t(75).set,u=o.MutationObserver||o.WebKitMutationObserver,p=o.process,c=o.Promise,l="process"==t(11)(p),f=function(){var t,e,n;for(l&&(t=p.domain)&&(p.domain=null,t.exit());a;)e=a.domain,n=a.fn,e&&e.enter(),n(),e&&e.exit(),a=a.next;r=void 0,t&&t.enter()};if(l)i=function(){p.nextTick(f)};else if(u){var d=1,h=document.createTextNode("");new u(f).observe(h,{characterData:!0}),i=function(){h.data=d=-d}}else i=c&&c.resolve?function(){c.resolve().then(f)}:function(){s.call(o,f)};e.exports=function(t){var e={fn:t,next:void 0,domain:l&&p.domain};r&&(r.next=e),a||(a=e,i()),r=e}},{11:11,29:29,75:75}],53:[function(t,e,n){var a=t(46),r=t(80),i=t(34);e.exports=t(24)(function(){var t=Object.assign,e={},n={},a=Symbol(),r="abcdefghijklmnopqrst";return e[a]=7,r.split("").forEach(function(t){n[t]=t}),7!=t({},e)[a]||Object.keys(t({},n)).join("")!=r})?function(t,e){for(var n=r(t),o=arguments,s=o.length,u=1,p=a.getKeys,c=a.getSymbols,l=a.isEnum;s>u;)for(var f,d=i(o[u++]),h=c?p(d).concat(c(d)):p(d),m=h.length,v=0;m>v;)l.call(d,f=h[v++])&&(n[f]=d[f]);return n}:Object.assign},{24:24,34:34,46:46,80:80}],54:[function(t,e,n){var a=t(22),r=t(16),i=t(24);e.exports=function(t,e){var n=(r.Object||{})[t]||Object[t],o={};o[t]=e(n),a(a.S+a.F*i(function(){n(1)}),"Object",o)}},{16:16,22:22,24:24}],55:[function(t,e,n){var a=t(46),r=t(78),i=a.isEnum;e.exports=function(t){return function(e){for(var n,o=r(e),s=a.getKeys(o),u=s.length,p=0,c=[];u>p;)i.call(o,n=s[p++])&&c.push(t?[n,o[n]]:o[n]);return c}}},{46:46,78:78}],56:[function(t,e,n){var a=t(46),r=t(4),i=t(29).Reflect;e.exports=i&&i.ownKeys||function(t){var e=a.getNames(r(t)),n=a.getSymbols;return n?e.concat(n(t)):e}},{29:29,4:4,46:46}],57:[function(t,e,n){"use strict";var a=t(58),r=t(33),i=t(2);e.exports=function(){for(var t=i(this),e=arguments.length,n=Array(e),o=0,s=a._,u=!1;e>o;)(n[o]=arguments[o++])===s&&(u=!0);return function(){var a,i=this,o=arguments,p=o.length,c=0,l=0;if(!u&&!p)return r(t,n,i);if(a=n.slice(),u)for(;e>c;c++)a[c]===s&&(a[c]=o[l++]);for(;p>l;)a.push(o[l++]);return r(t,a,i)}}},{2:2,33:33,58:58}],58:[function(t,e,n){e.exports=t(29)},{29:29}],59:[function(t,e,n){e.exports=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}}},{}],60:[function(t,e,n){var a=t(61);e.exports=function(t,e){for(var n in e)a(t,n,e[n]);return t}},{61:61}],61:[function(t,e,n){var a=t(29),r=t(31),i=t(82)("src"),o="toString",s=Function[o],u=(""+s).split(o);t(16).inspectSource=function(t){return s.call(t)},(e.exports=function(t,e,n,o){"function"==typeof n&&(n.hasOwnProperty(i)||r(n,i,t[e]?""+t[e]:u.join(e+"")),n.hasOwnProperty("name")||r(n,"name",e)),t===a?t[e]=n:(o||delete t[e],r(t,e,n))})(Function.prototype,o,function(){return"function"==typeof this&&this[i]||s.call(this)})},{16:16,29:29,31:31,82:82}],62:[function(t,e,n){e.exports=function(t,e){var n=e===Object(e)?function(t){return e[t]}:e;return function(e){return(e+"").replace(t,n)}}},{}],63:[function(t,e,n){e.exports=Object.is||function(t,e){return t===e?0!==t||1/t===1/e:t!=t&&e!=e}},{}],64:[function(t,e,n){var a=t(46).getDesc,r=t(38),i=t(4),o=function(t,e){if(i(t),!r(e)&&null!==e)throw TypeError(e+": can't set as prototype!")};e.exports={set:Object.setPrototypeOf||("__proto__"in{}?function(e,n,r){try{r=t(17)(Function.call,a(Object.prototype,"__proto__").set,2),r(e,[]),n=!(e instanceof Array)}catch(i){n=!0}return function(t,e){return o(t,e),n?t.__proto__=e:r(t,e),t}}({},!1):void 0),check:o}},{17:17,38:38,4:4,46:46}],65:[function(t,e,n){"use strict";var a=t(29),r=t(46),i=t(19),o=t(83)("species");e.exports=function(t){var e=a[t];i&&e&&!e[o]&&r.setDesc(e,o,{configurable:!0,get:function(){return this}})}},{19:19,29:29,46:46,83:83}],66:[function(t,e,n){var a=t(46).setDesc,r=t(30),i=t(83)("toStringTag");e.exports=function(t,e,n){t&&!r(t=n?t:t.prototype,i)&&a(t,i,{configurable:!0,value:e})}},{30:30,46:46,83:83}],67:[function(t,e,n){var a=t(29),r="__core-js_shared__",i=a[r]||(a[r]={});e.exports=function(t){return i[t]||(i[t]={})}},{29:29}],68:[function(t,e,n){var a=t(4),r=t(2),i=t(83)("species");e.exports=function(t,e){var n,o=a(t).constructor;return void 0===o||void 0==(n=a(o)[i])?e:r(n)}},{2:2,4:4,83:83}],69:[function(t,e,n){e.exports=function(t,e,n){if(!(t instanceof e))throw TypeError(n+": use the 'new' operator!");return t}},{}],70:[function(t,e,n){var a=t(77),r=t(18);e.exports=function(t){return function(e,n){var i,o,s=r(e)+"",u=a(n),p=s.length;return 0>u||u>=p?t?"":void 0:(i=s.charCodeAt(u),55296>i||i>56319||u+1===p||(o=s.charCodeAt(u+1))<56320||o>57343?t?s.charAt(u):i:t?s.slice(u,u+2):(i-55296<<10)+(o-56320)+65536)}}},{18:18,77:77}],71:[function(t,e,n){var a=t(39),r=t(18);e.exports=function(t,e,n){if(a(e))throw TypeError("String#"+n+" doesn't accept regex!");return r(t)+""}},{18:18,39:39}],72:[function(t,e,n){var a=t(79),r=t(73),i=t(18);e.exports=function(t,e,n,o){var s=i(t)+"",u=s.length,p=void 0===n?" ":n+"",c=a(e);if(u>=c)return s;""==p&&(p=" ");var l=c-u,f=r.call(p,Math.ceil(l/p.length));return f.length>l&&(f=f.slice(0,l)),o?f+s:s+f}},{18:18,73:73,79:79}],73:[function(t,e,n){"use strict";var a=t(77),r=t(18);e.exports=function(t){var e=r(this)+"",n="",i=a(t);if(0>i||i==1/0)throw RangeError("Count can't be negative");for(;i>0;(i>>>=1)&&(e+=e))1&i&&(n+=e);return n}},{18:18,77:77}],74:[function(t,e,n){var a=t(22),r=t(18),i=t(24),o=" \n\x0B\f\r \u2028\u2029\ufeff",s="["+o+"]",u="
",p=RegExp("^"+s+s+"*"),c=RegExp(s+s+"*$"),l=function(t,e){var n={};n[t]=e(f),a(a.P+a.F*i(function(){return!!o[t]()||u[t]()!=u}),"String",n)},f=l.trim=function(t,e){return t=r(t)+"",1&e&&(t=t.replace(p,"")),2&e&&(t=t.replace(c,"")),t};e.exports=l},{18:18,22:22,24:24}],75:[function(t,e,n){var a,r,i,o=t(17),s=t(33),u=t(32),p=t(20),c=t(29),l=c.process,f=c.setImmediate,d=c.clearImmediate,h=c.MessageChannel,m=0,v={},g="onreadystatechange",b=function(){var t=+this;if(v.hasOwnProperty(t)){var e=v[t];delete v[t],e()}},y=function(t){b.call(t.data)};f&&d||(f=function(t){for(var e=[],n=1;arguments.length>n;)e.push(arguments[n++]);return v[++m]=function(){s("function"==typeof t?t:Function(t),e)},a(m),m},d=function(t){delete v[t]},"process"==t(11)(l)?a=function(t){l.nextTick(o(b,t,1))}:h?(r=new h,i=r.port2,r.port1.onmessage=y,a=o(i.postMessage,i,1)):c.addEventListener&&"function"==typeof postMessage&&!c.importScripts?(a=function(t){c.postMessage(t+"","*")},c.addEventListener("message",y,!1)):a=g in p("script")?function(t){u.appendChild(p("script"))[g]=function(){u.removeChild(this),b.call(t)}}:function(t){setTimeout(o(b,t,1),0)}),e.exports={set:f,clear:d}},{11:11,17:17,20:20,29:29,32:32,33:33}],76:[function(t,e,n){var a=t(77),r=Math.max,i=Math.min;e.exports=function(t,e){return t=a(t),0>t?r(t+e,0):i(t,e)}},{77:77}],77:[function(t,e,n){var a=Math.ceil,r=Math.floor;e.exports=function(t){return isNaN(t=+t)?0:(t>0?r:a)(t)}},{}],78:[function(t,e,n){var a=t(34),r=t(18);e.exports=function(t){return a(r(t))}},{18:18,34:34}],79:[function(t,e,n){var a=t(77),r=Math.min;e.exports=function(t){return t>0?r(a(t),9007199254740991):0}},{77:77}],80:[function(t,e,n){var a=t(18);e.exports=function(t){return Object(a(t))}},{18:18}],81:[function(t,e,n){var a=t(38);e.exports=function(t,e){if(!a(t))return t;var n,r;if(e&&"function"==typeof(n=t.toString)&&!a(r=n.call(t)))return r;if("function"==typeof(n=t.valueOf)&&!a(r=n.call(t)))return r;if(!e&&"function"==typeof(n=t.toString)&&!a(r=n.call(t)))return r;throw TypeError("Can't convert object to primitive value")}},{38:38}],82:[function(t,e,n){var a=0,r=Math.random();e.exports=function(t){return"Symbol(".concat(void 0===t?"":t,")_",(++a+r).toString(36))}},{}],83:[function(t,e,n){var a=t(67)("wks"),r=t(82),i=t(29).Symbol;e.exports=function(t){return a[t]||(a[t]=i&&i[t]||(i||r)("Symbol."+t))}},{29:29,67:67,82:82}],84:[function(t,e,n){var a=t(10),r=t(83)("iterator"),i=t(45);e.exports=t(16).getIteratorMethod=function(t){return void 0!=t?t[r]||t["@@iterator"]||i[a(t)]:void 0}},{10:10,16:16,45:45,83:83}],85:[function(t,e,n){"use strict";var a,r=t(46),i=t(22),o=t(19),s=t(59),u=t(32),p=t(20),c=t(30),l=t(11),f=t(33),d=t(24),h=t(4),m=t(2),v=t(38),g=t(80),b=t(78),y=t(77),x=t(76),_=t(79),w=t(34),k=t(82)("__proto__"),E=t(8),S=t(7)(!1),C=Object.prototype,P=Array.prototype,A=P.slice,O=P.join,T=r.setDesc,R=r.getDesc,j=r.setDescs,M={};o||(a=!d(function(){return 7!=T(p("div"),"a",{get:function(){return 7}}).a}),r.setDesc=function(t,e,n){if(a)try{return T(t,e,n)}catch(r){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(h(t)[e]=n.value),t},r.getDesc=function(t,e){if(a)try{return R(t,e)}catch(n){}return c(t,e)?s(!C.propertyIsEnumerable.call(t,e),t[e]):void 0},r.setDescs=j=function(t,e){h(t);for(var n,a=r.getKeys(e),i=a.length,o=0;i>o;)r.setDesc(t,n=a[o++],e[n]);return t}),i(i.S+i.F*!o,"Object",{getOwnPropertyDescriptor:r.getDesc,defineProperty:r.setDesc,defineProperties:j});var L="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(","),D=L.concat("length","prototype"),N=L.length,F=function(){var t,e=p("iframe"),n=N,a=">";for(e.style.display="none",u.appendChild(e),e.src="javascript:",t=e.contentWindow.document,t.open(),t.write("