Current regime: [regime_set] "
- data += "Current target: [(!target) ? "None" : "[get_area(target)] [(regime_set != "Gate") ? "" : "Teleporter"]"] "
- if(calibrating)
- data += "Calibration: In Progress"
- else if(power_station.teleporter_hub.calibrated || power_station.teleporter_hub.accuracy >= 3)
- data += "Calibration: Optimal"
- else
- data += "Calibration: Sub-Optimal"
- data += "
"
+ data["calibrated"] = FALSE
- data += "Change regime "
- data += "Set target "
+ return data
- data += " Calibrate Hub"
-
- var/datum/browser/popup = new(user, "teleporter", name, 400, 400)
- popup.set_content(data)
- popup.open()
-
-/obj/machinery/computer/teleporter/Topic(href, href_list)
+/obj/machinery/computer/teleporter/ui_act(action, params)
if(..())
return
@@ -69,38 +66,39 @@
say("Error: Calibration in progress. Stand by.")
return
- if(href_list["regimeset"])
- power_station.engaged = 0
- power_station.teleporter_hub.update_icon()
- power_station.teleporter_hub.calibrated = 0
- reset_regime()
- if(href_list["settarget"])
- power_station.engaged = 0
- power_station.teleporter_hub.update_icon()
- power_station.teleporter_hub.calibrated = 0
- set_target(usr)
- if(href_list["calibrate"])
- if(!target)
- say("Error: No target set to calibrate to.")
- return
- if(power_station.teleporter_hub.calibrated || power_station.teleporter_hub.accuracy >= 3)
- say("Hub is already calibrated!")
- return
- say("Processing hub calibration to target...")
+ switch(action)
+ if("regimeset")
+ power_station.engaged = FALSE
+ power_station.teleporter_hub.update_icon()
+ power_station.teleporter_hub.calibrated = FALSE
+ reset_regime()
+ . = TRUE
+ if("settarget")
+ power_station.engaged = FALSE
+ power_station.teleporter_hub.update_icon()
+ power_station.teleporter_hub.calibrated = FALSE
+ set_target(usr)
+ . = TRUE
+ if("calibrate")
+ if(!target)
+ say("Error: No target set to calibrate to.")
+ return
+ if(power_station.teleporter_hub.calibrated || power_station.teleporter_hub.accuracy >= 3)
+ say("Hub is already calibrated!")
+ return
- calibrating = 1
- power_station.update_icon()
- spawn(50 * (3 - power_station.teleporter_hub.accuracy)) //Better parts mean faster calibration
- calibrating = 0
- if(check_hub_connection())
- power_station.teleporter_hub.calibrated = 1
- say("Calibration complete.")
- else
- say("Error: Unable to detect hub.")
+ say("Processing hub calibration to target...")
+ calibrating = TRUE
power_station.update_icon()
- updateDialog()
-
- updateDialog()
+ spawn(50 * (3 - power_station.teleporter_hub.accuracy)) //Better parts mean faster calibration
+ calibrating = FALSE
+ if(check_hub_connection())
+ power_station.teleporter_hub.calibrated = TRUE
+ say("Calibration complete.")
+ else
+ say("Error: Unable to detect hub.")
+ power_station.update_icon()
+ . = TRUE
/obj/machinery/computer/teleporter/proc/check_hub_connection()
if(!power_station)
diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm
index 1a2553eaeb7..7eda6a94d16 100644
--- a/code/game/machinery/magnet.dm
+++ b/code/game/machinery/magnet.dm
@@ -305,7 +305,7 @@
if(speed <= 0)
speed = 1
if("setpath")
- var/newpath = copytext(sanitize(input(usr, "Please define a new path!",,path) as text|null),1,MAX_MESSAGE_LEN)
+ var/newpath = stripped_input(usr, "Please define a new path!", "New Path", path, MAX_MESSAGE_LEN)
if(newpath && newpath != "")
moving = 0 // stop moving
path = newpath
@@ -366,13 +366,19 @@
// Generates the rpath variable using the path string, think of this as "string2list"
// Doesn't use params2list() because of the akward way it stacks entities
rpath = list() // clear rpath
- var/maximum_character = min( 50, length(path) ) // chooses the maximum length of the iterator. 50 max length
+ var/maximum_characters = 50
+ var/lentext = length(path)
+ var/nextchar = ""
+ var/charcount = 0
- for(var/i=1, i<=maximum_character, i++) // iterates through all characters in path
+ for(var/i = 1, i <= lentext, i += length(nextchar)) // iterates through all characters in path
+ nextchar = path[i] // find next character
- var/nextchar = copytext(path, i, i+1) // find next character
-
- if(!(nextchar in list(";", "&", "*", " "))) // if char is a separator, ignore
- rpath += copytext(path, i, i+1) // else, add to list
+ if(nextchar in list(";", "&", "*", " ")) // if char is a separator, ignore
+ continue
+ rpath += nextchar // else, add to list
// there doesn't HAVE to be separators but it makes paths syntatically visible
+ charcount++
+ if(charcount >= maximum_characters)
+ break
diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm
index 1e4bcdcbbcd..4cb33e4d1a1 100644
--- a/code/game/machinery/navbeacon.dm
+++ b/code/game/machinery/navbeacon.dm
@@ -65,7 +65,7 @@
var/index = findtext(e, "=") // format is "key=value"
if(index)
var/key = copytext(e, 1, index)
- var/val = copytext(e, index+1)
+ var/val = copytext(e, index + length(e[index]))
codes[key] = val
else
codes[e] = "1"
@@ -189,7 +189,7 @@ Transponder Codes:
"}
usr.set_machine(src)
if(href_list["locedit"])
- var/newloc = copytext(sanitize(input("Enter New Location", "Navigation Beacon", location) as text|null),1,MAX_MESSAGE_LEN)
+ var/newloc = stripped_input(usr, "Enter New Location", "Navigation Beacon", location, MAX_MESSAGE_LEN)
if(newloc)
location = newloc
glob_lists_register()
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index ab7337e19b0..14b0c46d803 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -162,7 +162,7 @@ GLOBAL_LIST_EMPTY(allCasters)
NEWSCASTER.update_icon()
/datum/newscaster/feed_network/proc/save_photo(icon/photo)
- var/photo_file = copytext(md5("\icon[photo]"), 1, 6)
+ var/photo_file = copytext_char(md5("\icon[photo]"), 1, 6)
if(!fexists("[GLOB.log_directory]/photos/[photo_file].png"))
//Clean up repeated frames
var/icon/clean = new /icon()
@@ -506,8 +506,6 @@ GLOBAL_LIST_EMPTY(allCasters)
scan_user(usr)
if(href_list["set_channel_name"])
channel_name = stripped_input(usr, "Provide a Feed Channel Name", "Network Channel Handler", "", MAX_NAME_LEN)
- while (findtext(channel_name," ") == 1)
- channel_name = copytext(channel_name,2,length(channel_name)+1)
updateUsrDialog()
else if(href_list["set_channel_lock"])
c_locked = !c_locked
@@ -682,7 +680,7 @@ GLOBAL_LIST_EMPTY(allCasters)
updateUsrDialog()
else if(href_list["new_comment"])
var/datum/newscaster/feed_message/FM = locate(href_list["new_comment"]) in viewing_channel.messages
- var/cominput = copytext(stripped_input(usr, "Write your message:", "New comment", null),1,141)
+ var/cominput = stripped_input(usr, "Write your message:", "New comment", null, 140)
if(cominput)
scan_user(usr)
var/datum/newscaster/feed_comment/FC = new/datum/newscaster/feed_comment
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 69379bd0dc8..3ee4c84c67a 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -237,10 +237,10 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments)
usr.set_machine(src)
add_fingerprint(usr)
- if(reject_bad_text(href_list["write"]))
- to_department = ckey(href_list["write"]) //write contains the string of the receiving department's name
+ if(href_list["write"])
+ to_department = ckey(reject_bad_text(href_list["write"])) //write contains the string of the receiving department's name
- var/new_message = (to_department in GLOB.req_console_ckey_departments) && copytext(reject_bad_text(input(usr, "Write your message:", "Awaiting Input", "")),1,MAX_MESSAGE_LEN)
+ var/new_message = (to_department in GLOB.req_console_ckey_departments) && stripped_input(usr, "Write your message:", "Awaiting Input", "", MAX_MESSAGE_LEN)
if(new_message)
to_department = GLOB.req_console_ckey_departments[to_department]
message = new_message
@@ -248,7 +248,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments)
priority = CLAMP(text2num(href_list["priority"]), REQ_NORMAL_MESSAGE_PRIORITY, REQ_EXTREME_MESSAGE_PRIORITY)
if(href_list["writeAnnouncement"])
- var/new_message = copytext(reject_bad_text(input(usr, "Write your message:", "Awaiting Input", "")),1,MAX_MESSAGE_LEN)
+ var/new_message = reject_bad_text(stripped_input(usr, "Write your message:", "Awaiting Input", "", MAX_MESSAGE_LEN))
if(new_message)
message = new_message
priority = CLAMP(text2num(href_list["priority"]) || REQ_NORMAL_MESSAGE_PRIORITY, REQ_NORMAL_MESSAGE_PRIORITY, REQ_EXTREME_MESSAGE_PRIORITY)
@@ -344,9 +344,8 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments)
updateUsrDialog()
/obj/machinery/requests_console/say_mod(input, message_mode)
- var/ending = copytext(input, length(input) - 2)
- if (ending == "!!!")
- . = "blares"
+ if(spantext_char(input, "!", -3))
+ return "blares"
else
. = ..()
diff --git a/code/game/machinery/scan_gate.dm b/code/game/machinery/scan_gate.dm
index 7f851f64335..2b7807a76e3 100644
--- a/code/game/machinery/scan_gate.dm
+++ b/code/game/machinery/scan_gate.dm
@@ -229,7 +229,7 @@
"Starving",
"Obese"
)
- if(new_nutrition && new_nutrition in nutrition_list)
+ if(new_nutrition && (new_nutrition in nutrition_list))
switch(new_nutrition)
if("Starving")
detect_nutrition = NUTRITION_LEVEL_STARVING
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index 8b4d3a65fd7..3ca2627d194 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -225,8 +225,6 @@
active_power_usage = 50
max_integrity = 300
var/active = FALSE
- var/power = 0
- var/maximum_stored_power = 500
var/locked = TRUE
var/shield_range = 8
var/obj/structure/cable/attached // the attached cable
@@ -236,6 +234,9 @@
desc = "A shield generator meant for use in xenobiology."
req_access = list(ACCESS_XENOBIOLOGY)
+/obj/machinery/power/shieldwallgen/anchored
+ anchored = TRUE
+
/obj/machinery/power/shieldwallgen/Initialize()
. = ..()
if(anchored)
diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index def84dbac7c..66bedaa32a2 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -58,14 +58,14 @@
/// Call with no arguments to disable.
/obj/machinery/status_display/proc/set_message(m1, m2)
if(m1)
- index1 = (length(m1) > CHARS_PER_LINE)
+ index1 = (length_char(m1) > CHARS_PER_LINE)
message1 = m1
else
message1 = ""
index1 = 0
if(m2)
- index2 = (length(m2) > CHARS_PER_LINE)
+ index2 = (length_char(m2) > CHARS_PER_LINE)
message2 = m2
else
message2 = ""
@@ -80,19 +80,19 @@
var/line1 = message1
if(index1)
- line1 = copytext("[message1]|[message1]", index1, index1+CHARS_PER_LINE)
- var/message1_len = length(message1)
+ line1 = copytext_char("[message1]|[message1]", index1, index1 + CHARS_PER_LINE)
+ var/message1_len = length_char(message1)
index1 += SCROLL_SPEED
- if(index1 > message1_len)
- index1 -= message1_len
+ if(index1 > message1_len + 1)
+ index1 -= (message1_len + 1)
var/line2 = message2
if(index2)
- line2 = copytext("[message2]|[message2]", index2, index2+CHARS_PER_LINE)
- var/message2_len = length(message2)
+ line2 = copytext_char("[message2]|[message2]", index2, index2 + CHARS_PER_LINE)
+ var/message2_len = length_char(message2)
index2 += SCROLL_SPEED
- if(index2 > message2_len)
- index2 -= message2_len
+ if(index2 > message2_len + 1)
+ index2 -= (message2_len + 1)
update_display(line1, line2)
if (!index1 && !index2)
@@ -133,7 +133,7 @@
var/line1 = "-[shuttle.getModeStr()]-"
var/line2 = shuttle.getTimerStr()
- if(length(line2) > CHARS_PER_LINE)
+ if(length_char(line2) > CHARS_PER_LINE)
line2 = "error"
update_display(line1, line2)
else
@@ -245,7 +245,7 @@
else
line1 = "CARGO"
line2 = SSshuttle.supply.getTimerStr()
- if(length(line2) > CHARS_PER_LINE)
+ if(length_char(line2) > CHARS_PER_LINE)
line2 = "Error"
update_display(line1, line2)
diff --git a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm
index d8321a42435..17a94726560 100644
--- a/code/game/machinery/telecomms/broadcasting.dm
+++ b/code/game/machinery/telecomms/broadcasting.dm
@@ -132,7 +132,7 @@
set waitfor = FALSE
// Perform final composition steps on the message.
- var/message = copytext(data["message"], 1, MAX_BROADCAST_LEN)
+ var/message = copytext_char(data["message"], 1, MAX_BROADCAST_LEN)
if(!message)
return
var/compression = data["compression"]
diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm
index 1205bc17d70..569b6ef534a 100644
--- a/code/game/machinery/telecomms/machine_interactions.dm
+++ b/code/game/machinery/telecomms/machine_interactions.dm
@@ -179,7 +179,7 @@
if("id")
- var/newid = copytext(reject_bad_text(input(usr, "Specify the new ID for this machine", src, id) as null|text),1,MAX_MESSAGE_LEN)
+ var/newid = reject_bad_text(stripped_input(usr, "Specify the new ID for this machine", src, id, MAX_MESSAGE_LEN))
if(newid && canAccess(usr))
id = newid
temp = "-% New ID assigned: \"[id]\" %-"
diff --git a/code/game/machinery/telecomms/machines/receiver.dm b/code/game/machinery/telecomms/machines/receiver.dm
index 0fd3aec012b..4dd3af036cd 100644
--- a/code/game/machinery/telecomms/machines/receiver.dm
+++ b/code/game/machinery/telecomms/machines/receiver.dm
@@ -33,7 +33,7 @@
for(var/obj/machinery/telecomms/hub/H in links)
for(var/obj/machinery/telecomms/relay/R in H.links)
- if(R.can_receive(signal) && R.z in signal.levels)
+ if(R.can_receive(signal) && (R.z in signal.levels))
return TRUE
return FALSE
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 26e96323b41..53322c275b8 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -926,7 +926,7 @@
return
/obj/mecha/proc/moved_inside(mob/living/carbon/human/H)
- if(H && H.client && H in range(1))
+ if(H && H.client && (H in range(1)))
occupant = H
H.forceMove(src)
H.update_mouse_pointer()
diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm
index ac3e281d18c..e4aa420a802 100644
--- a/code/game/mecha/mecha_topic.dm
+++ b/code/game/mecha/mecha_topic.dm
@@ -345,12 +345,10 @@
//Changes the exosuit name.
if(href_list["change_name"])
- var/userinput = input(usr, "Choose a new exosuit name.", "Rename exosuit", "") as null|text
- if(usr != occupant || usr.incapacitated())
+ var/userinput = stripped_input(usr, "Choose a new exosuit name.", "Rename exosuit", "", MAX_NAME_LEN)
+ if(!userinput || usr != occupant || usr.incapacitated())
return
- if(!isnull(userinput))
- var/newname = copytext(sanitize_name(userinput),1,MAX_NAME_LEN)
- name = newname ? newname : initial(name)
+ name = userinput
return
//Toggles ID upload.
diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm
index 706599a3152..841777c704a 100644
--- a/code/game/objects/effects/contraband.dm
+++ b/code/game/objects/effects/contraband.dm
@@ -130,7 +130,7 @@
if (smooth & SMOOTH_DIAGONAL)
for (var/O in overlays)
var/image/I = O
- if (copytext(I.icon_state, 1, 3) == "d-")
+ if(copytext(I.icon_state, 1, 3) == "d-") //3 == length("d-") + 1
return
var/stuff_on_wall = 0
diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm
index b4c26028f91..de7f7984847 100644
--- a/code/game/objects/items/RPD.dm
+++ b/code/game/objects/items/RPD.dm
@@ -178,6 +178,8 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
desc = "A device used to rapidly pipe things."
icon = 'icons/obj/tools.dmi'
icon_state = "rpd"
+ lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
flags_1 = CONDUCT_1
force = 10
throwforce = 10
diff --git a/code/game/objects/items/RSF.dm b/code/game/objects/items/RSF.dm
index 1c497b94a7c..426d3ea61da 100644
--- a/code/game/objects/items/RSF.dm
+++ b/code/game/objects/items/RSF.dm
@@ -7,7 +7,7 @@ RSF
name = "\improper Rapid-Service-Fabricator"
desc = "A device used to rapidly deploy service items."
icon = 'icons/obj/tools.dmi'
- icon_state = "rcd"
+ icon_state = "rsf"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
opacity = 0
@@ -35,6 +35,7 @@ RSF
matter += 10
playsound(src.loc, 'sound/machines/click.ogg', 10, TRUE)
to_chat(user, "The RSF now holds [matter]/30 fabrication-units.")
+ icon_state = "rsf"
else
return ..()
@@ -69,9 +70,11 @@ RSF
var/mob/living/silicon/robot/R = user
if(!R.cell || R.cell.charge < 200)
to_chat(user, "You do not have enough power to use [src].")
+ icon_state = "rsf_empty"
return
else if (matter < 1)
to_chat(user, "\The [src] doesn't have enough matter left.")
+ icon_state = "rsf_empty"
return
var/turf/T = get_turf(A)
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index 61615855f67..ccafffc363d 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -398,30 +398,18 @@ update_label()
if(user.incapacitated())
return
if(popup_input == "Forge/Reset" && !forged)
- var/input_text = input(user, "What name would you like to put on this card? Leave blank to randomise.", "Agent card name", registered_name ? registered_name : (ishuman(user) ? user.real_name : user.name))as text | null
-
- if (isnull(input_text))
- return
-
- var/target_name = copytext(sanitize(input_text), 1, 26)
- if(!target_name || target_name == "Unknown" || target_name == "floor" || target_name == "wall" || target_name == "r-wall") //Same as mob/dead/new_player/preferences.dm
- if (ishuman(user))
- var/mob/living/carbon/human/human_agent = user
-
- // Invalid/blank names give a randomly generated one.
- if (human_agent.gender == "male")
- registered_name = "[pick(GLOB.first_names_male)] [pick(GLOB.last_names)]"
- else if (human_agent.gender == "female")
- registered_name = "[pick(GLOB.first_names_female)] [pick(GLOB.last_names)]"
- else
- registered_name = "[pick(GLOB.first_names)] [pick(GLOB.last_names)]"
+ var/input_name = stripped_input(user, "What name would you like to put on this card? Leave blank to randomise.", "Agent card name", registered_name ? registered_name : (ishuman(user) ? user.real_name : user.name), MAX_NAME_LEN)
+ input_name = reject_bad_name(input_name)
+ if(!input_name)
+ // Invalid/blank names give a randomly generated one.
+ if(user.gender == MALE)
+ input_name = "[pick(GLOB.first_names_male)] [pick(GLOB.last_names)]"
+ else if(user.gender == FEMALE)
+ input_name = "[pick(GLOB.first_names_female)] [pick(GLOB.last_names)]"
else
- alert ("Invalid name.")
- return
- else
- registered_name = target_name
+ input_name = "[pick(GLOB.first_names)] [pick(GLOB.last_names)]"
- var/target_occupation = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", assignment ? assignment : "Assistant") as text | null),1,MAX_MESSAGE_LEN)
+ var/target_occupation = stripped_input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", assignment ? assignment : "Assistant", MAX_MESSAGE_LEN)
if(!target_occupation)
registered_name = ""
return
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index fe86c92e21e..9ee249af734 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -217,7 +217,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/cigarette/extinguish()
if(!lit)
return
- name = copytext(name,5,length(name)+1)
+ name = copytext_char(name, 5) //5 == length_char("lit ") + 1
attack_verb = null
hitsound = null
damtype = BRUTE
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 1d19afb9103..5219a3032fd 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -390,7 +390,7 @@
to_chat(user, "You spray a [temp] on \the [target.name]")
if(length(text_buffer) > 1)
- text_buffer = copytext(text_buffer,2)
+ text_buffer = copytext(text_buffer, length(text_buffer[1]) + 1)
SStgui.update_uis(src)
if(post_noise)
diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
index 60c1e96c7cf..e380eca39de 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -306,7 +306,6 @@
var/req_defib = TRUE
var/combat = FALSE //If it penetrates armor and gives additional functionality
var/grab_ghost = FALSE
- var/tlimit = DEFIB_TIME_LIMIT * 10
var/base_icon_state = "defibpaddles"
/obj/item/twohanded/shockpaddles/ComponentInitialize()
@@ -356,13 +355,16 @@
cooldown = FALSE
update_icon()
-/obj/item/twohanded/shockpaddles/New(mainunit)
- ..()
- if(check_defib_exists(mainunit, src) && req_defib)
- defib = mainunit
- forceMove(defib)
- busy = FALSE
- update_icon()
+/obj/item/twohanded/shockpaddles/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NO_STORAGE_INSERT, GENERIC_ITEM_TRAIT) //stops shockpaddles from being inserted in BoH
+ if(!req_defib)
+ return //If it doesn't need a defib, just say it exists
+ if (!loc || !istype(loc, /obj/item/defibrillator)) //To avoid weird issues from admin spawns
+ return INITIALIZE_HINT_QDEL
+ defib = loc
+ busy = FALSE
+ update_icon()
/obj/item/twohanded/shockpaddles/update_icon_state()
icon_state = "[base_icon_state][wielded]"
@@ -397,15 +399,6 @@
forceMove(defib)
defib.update_power()
-/obj/item/twohanded/shockpaddles/proc/check_defib_exists(mainunit, mob/living/carbon/M, obj/O)
- if(!req_defib)
- return TRUE //If it doesn't need a defib, just say it exists
- if (!mainunit || !istype(mainunit, /obj/item/defibrillator)) //To avoid weird issues from admin spawns
- qdel(O)
- return FALSE
- else
- return TRUE
-
/obj/item/twohanded/shockpaddles/attack(mob/M, mob/user)
if(busy)
@@ -460,8 +453,6 @@
var/obj/item/organ/heart = H.getorgan(/obj/item/organ/heart)
if(H.suiciding || H.hellbound || HAS_TRAIT(H, TRAIT_HUSK))
return
- if((world.time - H.timeofdeath) > tlimit)
- return
if((H.getBruteLoss() >= MAX_REVIVE_BRUTE_DAMAGE) || (H.getFireLoss() >= MAX_REVIVE_FIRE_DAMAGE))
return
if(!heart || (heart.organ_flags & ORGAN_FAILING))
@@ -568,7 +559,6 @@
playsound(src, 'sound/machines/defib_charge.ogg', 75, FALSE)
var/total_burn = 0
var/total_brute = 0
- var/tplus = world.time - H.timeofdeath //length of time spent dead
var/obj/item/organ/heart = H.getorgan(/obj/item/organ/heart)
if(do_after(user, 20, target = H)) //placed on chest and short delay to shock for dramatic effect, revive time is 5sec total
for(var/obj/item/carried_item in H.contents)
@@ -592,8 +582,6 @@
failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Recovery of patient impossible. Further attempts futile."
else if (H.hellbound)
failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's soul appears to be on another plane of existence. Further attempts futile."
- else if (tplus > tlimit)
- failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Body has decayed for too long. Further attempts futile."
else if (!heart)
failed = "[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - Patient's heart is missing."
else if (heart.organ_flags & ORGAN_FAILING)
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 3b2d22973d0..78d7bd6fd07 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -533,13 +533,13 @@ GLOBAL_LIST_EMPTY(PDAs)
if("Clear")//Clears messages
tnote = null
if("Ringtone")
- var/t = input(U, "Please enter new ringtone", name, ttone) as text|null
+ var/t = stripped_input(U, "Please enter new ringtone", name, ttone, 20)
if(in_range(src, U) && loc == U && t)
if(SEND_SIGNAL(src, COMSIG_PDA_CHANGE_RINGTONE, U, t) & COMPONENT_STOP_RINGTONE_CHANGE)
U << browse(null, "window=pda")
return
else
- ttone = copytext(sanitize(t), 1, 20)
+ ttone = t
else
U << browse(null, "window=pda")
return
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 3c893760a9a..8fe7c4b711b 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -50,7 +50,7 @@
/obj/item/flashlight/attack(mob/living/carbon/M, mob/living/carbon/human/user)
add_fingerprint(user)
- if(istype(M) && on && user.zone_selected in list(BODY_ZONE_PRECISE_EYES, BODY_ZONE_PRECISE_MOUTH))
+ if(istype(M) && on && (user.zone_selected in list(BODY_ZONE_PRECISE_EYES, BODY_ZONE_PRECISE_MOUTH)))
if((HAS_TRAIT(user, TRAIT_CLUMSY) || HAS_TRAIT(user, TRAIT_DUMB)) && prob(50)) //too dumb to use flashlight properly
return ..() //just hit them in the head
@@ -388,7 +388,7 @@
return TRUE
/obj/item/flashlight/emp/attack(mob/living/M, mob/living/user)
- if(on && user.zone_selected in list(BODY_ZONE_PRECISE_EYES, BODY_ZONE_PRECISE_MOUTH)) // call original attack when examining organs
+ if(on && (user.zone_selected in list(BODY_ZONE_PRECISE_EYES, BODY_ZONE_PRECISE_MOUTH))) // call original attack when examining organs
..()
return
diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index 004810a2a60..b7d71fc006d 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -109,7 +109,7 @@
to_chat(usr,"You [transmit_holder ? "enable" : "disable"] your pAI's [transmitting ? "outgoing" : "incoming"] radio transmissions!")
to_chat(pai,"Your owner has [transmit_holder ? "enabled" : "disabled"] your [transmitting ? "outgoing" : "incoming"] radio transmissions!")
if(href_list["setlaws"])
- var/newlaws = copytext(sanitize(input("Enter any additional directives you would like your pAI personality to follow. Note that these directives will not override the personality's allegiance to its imprinted master. Conflicting directives will be ignored.", "pAI Directive Configuration", pai.laws.supplied[1]) as message|null),1,MAX_MESSAGE_LEN)
+ var/newlaws = stripped_multiline_input("Enter any additional directives you would like your pAI personality to follow. Note that these directives will not override the personality's allegiance to its imprinted master. Conflicting directives will be ignored.", "pAI Directive Configuration", pai.laws.supplied[1], MAX_MESSAGE_LEN)
if(newlaws && pai)
pai.add_supplied_law(0,newlaws)
if(href_list["toggle_holo"])
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index e786aef5402..a9dd5fd778d 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -27,6 +27,7 @@
/obj/item/radio/intercom/examine(mob/user)
. = ..()
+ . += "Use [MODE_TOKEN_INTERCOM] when nearby to speak into it."
if(!unfastened)
. += "It's screwed and secured to the wall."
else
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 48ce5016c20..e99195e8261 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -37,7 +37,7 @@ GENE SCANNER
/obj/item/t_scanner/proc/toggle_on()
on = !on
- icon_state = copytext(icon_state, 1, length(icon_state))+"[on]"
+ icon_state = copytext_char(icon_state, 1, -1) + "[on]"
if(on)
START_PROCESSING(SSobj, src)
else
@@ -320,8 +320,7 @@ GENE SCANNER
if(M.tod && (M.stat == DEAD || ((HAS_TRAIT(M, TRAIT_FAKEDEATH)) && !advanced)))
render_list += "Time of Death: [M.tod]\n"
var/tdelta = round(world.time - M.timeofdeath)
- if(tdelta < (DEFIB_TIME_LIMIT * 10))
- render_list += "Subject died [DisplayTimeText(tdelta)] ago, defibrillation may be possible!\n"
+ render_list += "Subject died [DisplayTimeText(tdelta)] ago.\n"
for(var/thing in M.diseases)
var/datum/disease/D = thing
@@ -734,10 +733,10 @@ GENE SCANNER
if(sequence)
var/display
- for(var/i in 0 to length(sequence) / DNA_MUTATION_BLOCKS-1)
+ for(var/i in 0 to length_char(sequence) / DNA_MUTATION_BLOCKS-1)
if(i)
display += "-"
- display += copytext(sequence, 1 + i*DNA_MUTATION_BLOCKS, DNA_MUTATION_BLOCKS*(1+i) + 1)
+ display += copytext_char(sequence, 1 + i*DNA_MUTATION_BLOCKS, DNA_MUTATION_BLOCKS*(1+i) + 1)
to_chat(user, "[display] ")
diff --git a/code/game/objects/items/devices/sensor_device.dm b/code/game/objects/items/devices/sensor_device.dm
index 07b975f1338..b934ba5fa2a 100644
--- a/code/game/objects/items/devices/sensor_device.dm
+++ b/code/game/objects/items/devices/sensor_device.dm
@@ -6,6 +6,7 @@
w_class = WEIGHT_CLASS_SMALL
slot_flags = ITEM_SLOT_BELT
custom_price = 1750
+ custom_premium_price = 1750
/obj/item/sensor_device/attack_self(mob/user)
GLOB.crewmonitor.show(user,src) //Proc already exists, just had to call it
diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm
index 3932a410314..32f280b385d 100644
--- a/code/game/objects/items/miscellaneous.dm
+++ b/code/game/objects/items/miscellaneous.dm
@@ -120,8 +120,8 @@
/obj/item/organ/cyberimp/arm/toolset,
/obj/item/organ/cyberimp/arm/surgery,
/obj/item/organ/cyberimp/chest/thrusters,
- /obj/item/organ/lungs/cybernetic/upgraded,
- /obj/item/organ/liver/cybernetic/upgraded) //cyberimplants range from a nice bonus to fucking broken bullshit so no subtypesof
+ /obj/item/organ/lungs/cybernetic/tier3,
+ /obj/item/organ/liver/cybernetic/tier3) //cyberimplants range from a nice bonus to fucking broken bullshit so no subtypesof
for(var/V in templist)
var/atom/A = V
augment_list[initial(A.name)] = A
diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm
index aa91c2870c8..9c34fb76965 100644
--- a/code/game/objects/items/pinpointer.dm
+++ b/code/game/objects/items/pinpointer.dm
@@ -17,7 +17,6 @@
var/active = FALSE
var/atom/movable/target //The thing we're searching for
var/minimum_range = 0 //at what range the pinpointer declares you to be at your destination
- var/ignore_suit_sensor_level = FALSE // Do we find people even if their suit sensors are turned off
var/alert = FALSE // TRUE to display things more seriously
var/process_scan = TRUE // some pinpointers change target every time they scan, which means we can't have it change very process but instead when it turns on.
var/icon_suffix = "" // for special pinpointer icons
@@ -70,25 +69,31 @@
if(here.z != there.z)
. += "pinon[alert ? "alert" : ""]null[icon_suffix]"
return
+ . += get_direction_icon(here, there)
+
+///Called by update_icon after sanity. There is a target
+/obj/item/pinpointer/proc/get_direction_icon(here, there)
if(get_dist_euclidian(here,there) <= minimum_range)
- . += "pinon[alert ? "alert" : ""]direct[icon_suffix]"
+ return "pinon[alert ? "alert" : ""]direct[icon_suffix]"
else
setDir(get_dir(here, there))
switch(get_dist(here, there))
if(1 to 8)
- . += "pinon[alert ? "alert" : "close"][icon_suffix]"
+ return "pinon[alert ? "alert" : "close"][icon_suffix]"
if(9 to 16)
- . += "pinon[alert ? "alert" : "medium"][icon_suffix]"
+ return "pinon[alert ? "alert" : "medium"][icon_suffix]"
if(16 to INFINITY)
- . += "pinon[alert ? "alert" : "far"][icon_suffix]"
+ return "pinon[alert ? "alert" : "far"][icon_suffix]"
/obj/item/pinpointer/crew // A replacement for the old crew monitoring consoles
name = "crew pinpointer"
desc = "A handheld tracking device that points to crew suit sensors."
icon_state = "pinpointer_crew"
- custom_price = 1000
+ custom_price = 900
+ custom_premium_price = 900
var/has_owner = FALSE
var/pinpointer_owner = null
+ var/ignore_suit_sensor_level = FALSE /// Do we find people even if their suit sensors are turned off
/obj/item/pinpointer/crew/proc/trackable(mob/living/carbon/human/H)
var/turf/here = get_turf(src)
@@ -158,6 +163,26 @@
if(!target) //target can be set to null from above code, or elsewhere
active = FALSE
+/obj/item/pinpointer/crew/prox //Weaker version of crew monitor primarily for EMT
+ name = "proximity crew pinpointer"
+ desc = "A handheld tracking device that displays its proximity to crew suit sensors."
+ icon_state = "pinpointer_crewprox"
+ custom_price = 300
+
+/obj/item/pinpointer/crew/prox/get_direction_icon(here, there)
+ var/size = ""
+ if(here == there)
+ size = "small"
+ else
+ switch(get_dist(here, there))
+ if(1 to 4)
+ size = "xtrlarge"
+ if(5 to 16)
+ size = "large"
+ //17 through 28 use the normal pinion, "pinondirect"
+ if(29 to INFINITY)
+ size = "small"
+ return "pinondirect[size]"
/obj/item/pinpointer/pair
name = "pair pinpointer"
diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index 15a91627886..dbdddf4eade 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -216,6 +216,7 @@
else if(Kisser.partner == src && !plush_child) //the one advancing does not take ownership of the child and we have a one child policy in the toyshop
user.visible_message("[user] is going to break [Kisser] and [src] by bashing them like that.",
"[Kisser] passionately embraces [src] in your hands. Look away you perv!")
+ user.client.give_award(/datum/award/achievement/misc/rule8, user)
if(plop(Kisser))
user.visible_message("Something drops at the feet of [user].",
"The miracle of oh god did that just come out of [src]?!")
diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm
index d21ffbcaeca..eee6bc44679 100644
--- a/code/game/objects/items/religion.dm
+++ b/code/game/objects/items/religion.dm
@@ -44,9 +44,9 @@
if(H.stat == DEAD || H == user)
continue
if(H.mind && (has_job_loyalties || has_role_loyalties))
- if(has_job_loyalties && H.mind.assigned_role in job_loyalties)
+ if(has_job_loyalties && (H.mind.assigned_role in job_loyalties))
inspired += H
- else if(has_role_loyalties && H.mind.special_role in role_loyalties)
+ else if(has_role_loyalties && (H.mind.special_role in role_loyalties))
inspired += H
else if(check_inspiration(H))
inspired += H
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index bfcbeeae414..32a21c2a1f5 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -89,3 +89,19 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
/obj/item/stack/rods/fifty
amount = 50
+
+/obj/item/stack/rods/lava
+ name = "heat resistant rod"
+ desc = "Treated, specialized metal rods. When exposed to the vaccum of space their coating breaks off, but they can hold up against the extreme heat of active lava."
+ singular_name = "heat resistant rod"
+ icon_state = "rods"
+ item_state = "rods"
+ color = "#5286b9ff"
+ flags_1 = CONDUCT_1
+ w_class = WEIGHT_CLASS_NORMAL
+ custom_materials = list(/datum/material/iron=1000, /datum/material/plasma=500, /datum/material/titanium=2000)
+ max_amount = 30
+ resistance_flags = FIRE_PROOF | LAVA_PROOF
+
+/obj/item/stack/rods/lava/thirty
+ amount = 30
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 6e014a5681e..a0cff19ddf9 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -45,7 +45,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
new/datum/stack_recipe("floor tile", /obj/item/stack/tile/plasteel, 1, 4, 20), \
new/datum/stack_recipe("metal rod", /obj/item/stack/rods, 1, 2, 60), \
null, \
- new/datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 40, one_per_turf = TRUE, on_floor = TRUE), \
+ new/datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 40, one_per_turf = TRUE, on_floor = TRUE, trait_booster = TRAIT_QUICK_BUILD, trait_modifier = 0.75), \
null, \
new/datum/stack_recipe("computer frame", /obj/structure/frame/computer, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("modular console", /obj/machinery/modular_computer/console/buildable/, 10, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
@@ -196,6 +196,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new/datum/stack_recipe("dog bed", /obj/structure/bed/dogbed, 10, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("dresser", /obj/structure/dresser, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("picture frame", /obj/item/wallframe/picture, 1, time = 10),\
+ new/datum/stack_recipe("painting frame", /obj/item/wallframe/painting, 1, time = 10),\
new/datum/stack_recipe("display case chassis", /obj/structure/displaycase_chassis, 5, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \
new/datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),\
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 9981e8deec8..4d024f1ee25 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -208,8 +208,13 @@
if(!building_checks(R, multiplier))
return
if (R.time)
+ var/adjusted_time = 0
usr.visible_message("[usr] starts building \a [R.title].", "You start building \a [R.title]...")
- if (!do_after(usr, R.time, target = usr))
+ if(HAS_TRAIT(usr, R.trait_booster))
+ adjusted_time = (R.time * R.trait_modifier)
+ else
+ adjusted_time = R.time
+ if (!do_after(usr, adjusted_time, target = usr))
return
if(!building_checks(R, multiplier))
return
@@ -460,8 +465,10 @@
var/window_checks = FALSE
var/placement_checks = FALSE
var/applies_mats = FALSE
+ var/trait_booster = null
+ var/trait_modifier = 1
-/datum/stack_recipe/New(title, result_type, req_amount = 1, res_amount = 1, max_res_amount = 1,time = 0, one_per_turf = FALSE, on_floor = FALSE, window_checks = FALSE, placement_checks = FALSE, applies_mats = FALSE)
+/datum/stack_recipe/New(title, result_type, req_amount = 1, res_amount = 1, max_res_amount = 1,time = 0, one_per_turf = FALSE, on_floor = FALSE, window_checks = FALSE, placement_checks = FALSE, applies_mats = FALSE, trait_booster = null, trait_modifier = 1)
src.title = title
@@ -475,6 +482,8 @@
src.window_checks = window_checks
src.placement_checks = placement_checks
src.applies_mats = applies_mats
+ src.trait_booster = trait_booster
+ src.trait_modifier = trait_modifier
/*
* Recipe list datum
*/
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 142acc8ece6..618c33c9f87 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -170,7 +170,9 @@
/obj/item/pinpointer/crew,
/obj/item/holosign_creator/medical,
/obj/item/construction/plumbing,
- /obj/item/plunger
+ /obj/item/plunger,
+ /obj/item/reagent_containers/spray,
+ /obj/item/shears
))
/obj/item/storage/belt/medical/paramedic/PopulateContents()
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index d3e69d151f2..a3267218453 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -35,9 +35,9 @@
wielded = 0
if(!isnull(force_unwielded))
force = force_unwielded
- var/sf = findtext(name," (Wielded)")
+ var/sf = findtext(name, " (Wielded)", -10)//10 == length(" (Wielded)")
if(sf)
- name = copytext(name,1,sf)
+ name = copytext(name, 1, sf)
else //something wrong
name = "[initial(name)]"
update_icon()
diff --git a/code/game/objects/items/wayfinding.dm b/code/game/objects/items/wayfinding.dm
index f223d3fb338..1bd0d1c13f2 100644
--- a/code/game/objects/items/wayfinding.dm
+++ b/code/game/objects/items/wayfinding.dm
@@ -1,32 +1,135 @@
/obj/machinery/pinpointer_dispenser
- name = "wayfinding pinpointer dispenser"
- icon = 'icons/obj/bureaucracy.dmi'
- icon_state = "ticketmachine"
- desc = "Having trouble finding your way? This machine dispenses pinpointers that point to common locations."
+ name = "wayfinding pinpointer synthesizer"
+ icon = 'icons/obj/machines/wayfinding.dmi'
+ icon_state = "pinpointersynth"
+ desc = "Having trouble finding your way? This machine synthesizes pinpointers that point to common locations."
density = FALSE
layer = HIGH_OBJ_LAYER
- var/list/obj/item/pinpointer/wayfinding/pinpointers = list()
- var/spawn_cooldown = 1200 //deciseconds per person to spawn another pinpointer
+ var/list/user_spawn_cooldowns = list()
+ var/list/user_interact_cooldowns = list()
+ var/spawn_cooldown = 5 MINUTES //time per person to spawn another pinpointer
+ var/interact_cooldown = 20 SECONDS //time per person for subsequent interactions
+ var/start_bal = 200 //how much money it starts with to cover wayfinder refunds
+ var/refund_amt = 40 //how much money recycling a pinpointer rewards you
+ var/datum/bank_account/synth_acc = new /datum/bank_account/remote
+ var/ppt_cost = 65 //Jan 6 '20: Assistant can buy one roundstart (125 cr starting)
+ var/expression_timer
+
+/obj/machinery/pinpointer_dispenser/Initialize(mapload)
+ ..()
+ var/datum/bank_account/civ_acc = SSeconomy.get_dep_account(ACCOUNT_CIV)
+ if(civ_acc)
+ synth_acc.transfer_money(civ_acc, start_bal) //float has to come from somewhere, right?
+
+ synth_acc.account_holder = name
+
+ desc += " Only [ppt_cost] credits! It also likes making costumes..."
+
+ set_expression("neutral")
/obj/machinery/pinpointer_dispenser/attack_hand(mob/living/carbon/user)
- if(world.time < pinpointers[user.real_name])
- var/secsleft = (pinpointers[user.real_name] - world.time) / 10
- to_chat(user, "You need to wait [secsleft/60 > 1 ? "[round(secsleft/60)] minute\s" : "[round(secsleft)] second\s"].")
+ if(world.time < user_interact_cooldowns[user.real_name])
+ to_chat(user, "It doesn't respond.")
return
- to_chat(user, "You take a pinpointer from [src].")
+ user_interact_cooldowns[user.real_name] = world.time + interact_cooldown
- var/obj/item/pinpointer/wayfinding/P = new /obj/item/pinpointer/wayfinding(get_turf(src))
- user.put_in_hands(P)
- P.owner = user.real_name
- pinpointers[user.real_name] = world.time + spawn_cooldown
+ for(var/obj/item/pinpointer/wayfinding/WP in user.GetAllContents())
+ set_expression("unsure", 2 SECONDS)
+ say("I can detect the pinpointer on you, [user.first_name()].")
+ user_spawn_cooldowns[user.real_name] = world.time + spawn_cooldown //spawn timer resets for trickers
+ return
-/obj/item/pinpointer/wayfinding //For new players or new stations to help players find their way around
+ var/msg
+ var/dispense = TRUE
+ var/obj/item/pinpointer/wayfinding/pointat
+ for(var/obj/item/pinpointer/wayfinding/WP in range(7, user))
+ if(WP.Adjacent(user))
+ set_expression("facepalm", 2 SECONDS)
+ say("[WP.owner == user.real_name ? "Your" : "A"] pinpointer is right there.")
+ pointat(WP)
+ user_spawn_cooldowns[user.real_name] = world.time + spawn_cooldown
+ return
+ else if(WP in oview(7, user))
+ pointat = WP
+ break
+
+ if(world.time < user_spawn_cooldowns[user.real_name])
+ var/secsleft = (user_spawn_cooldowns[user.real_name] - world.time) / 10
+ msg += "to wait another [secsleft/60 > 1 ? "[round(secsleft/60,1)] minute\s" : "[round(secsleft)] second\s"]"
+ dispense = FALSE
+
+ var/datum/bank_account/cust_acc = null
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ if(H.get_bank_account())
+ cust_acc = H.get_bank_account()
+
+ if(cust_acc)
+ if(!cust_acc.has_money(ppt_cost))
+ msg += "[!msg ? "to find [ppt_cost-cust_acc.account_balance] more credit\s" : " and find [ppt_cost-cust_acc.account_balance] more credit\s"]"
+ dispense = FALSE
+
+ if(!dispense)
+ set_expression("sad", 2 SECONDS)
+ if(pointat)
+ msg += ". I suggest you get [pointat.owner == user.real_name ? "your" : "that"] pinpointer over there instead"
+ pointat(pointat)
+ say("You will need [msg], [user.first_name()].")
+ return
+
+ if(synth_acc.transfer_money(cust_acc, ppt_cost))
+ set_expression("veryhappy", 2 SECONDS)
+ say("That is [ppt_cost] credits. Here is your pinpointer.")
+ var/obj/item/pinpointer/wayfinding/P = new /obj/item/pinpointer/wayfinding(get_turf(src))
+ user_spawn_cooldowns[user.real_name] = world.time + spawn_cooldown
+ user.put_in_hands(P)
+ P.owner = user.real_name
+
+/obj/machinery/pinpointer_dispenser/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/pinpointer/wayfinding))
+ var/obj/item/pinpointer/wayfinding/WP = I
+ to_chat(user, "You put \the [WP] in the return slot.")
+ var/rfnd_amt
+ if((!WP.roundstart || WP.owner != user.real_name) && synth_acc.has_money(TRUE)) //can't recycle own pinpointer for money if not bought; given by a neutral quirk
+ if(synth_acc.has_money(refund_amt))
+ rfnd_amt = refund_amt
+ else
+ rfnd_amt = synth_acc.account_balance
+ synth_acc._adjust_money(-rfnd_amt)
+ var/obj/item/holochip/HC = new /obj/item/holochip(user.loc)
+ HC.credits = rfnd_amt
+ HC.name = "[HC.credits] credit holochip"
+ if(istype(user, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = user
+ H.put_in_hands(HC)
+ else
+ var/crap = pick(subtypesof(/obj/effect/spawner/bundle/costume)) //harmless garbage some people may appreciate
+ new crap(user.loc)
+ qdel(WP)
+ set_expression("happy", 2 SECONDS)
+ say("Thank you for recycling, [user.first_name()]! Here is [rfnd_amt ? "[rfnd_amt] credits." : "a freshly synthesized costume!"]")
+
+/obj/machinery/pinpointer_dispenser/proc/set_expression(type, duration)
+ cut_overlays()
+ deltimer(expression_timer)
+ add_overlay(type)
+ if(duration)
+ expression_timer = addtimer(CALLBACK(src, .proc/set_expression, "neutral"), duration, TIMER_STOPPABLE)
+
+/obj/machinery/pinpointer_dispenser/proc/pointat(atom)
+ visible_message("[src] points at [atom].")
+ new /obj/effect/temp_visual/point(atom,invisibility)
+
+//Pinpointer itself
+/obj/item/pinpointer/wayfinding //Help players new to a station find their way around
name = "wayfinding pinpointer"
desc = "A handheld tracking device that points to useful places."
- icon_state = "pinpointer_crew"
+ icon_state = "pinpointer_way"
+ resistance_flags = NONE
var/owner = null
var/list/beacons = list()
+ var/roundstart = FALSE
/obj/item/pinpointer/wayfinding/attack_self(mob/living/user)
if(active)
@@ -70,6 +173,6 @@
if(!target) //target can be set to null from above code, or elsewhere
active = FALSE
+//Navbeacon that initialises with wayfinding codes
/obj/machinery/navbeacon/wayfinding
wayfinding = TRUE
-
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index b70e418a7d5..37cee6addf7 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -63,8 +63,8 @@
var/flagslist = splittext(set_obj_flags,";")
var/list/string_to_objflag = GLOB.bitfields["obj_flags"]
for (var/flag in flagslist)
- if (findtext(flag,"!",1,2))
- flag = copytext(flag,1-(length(flag))) // Get all but the initial !
+ if(flag[1] == "!")
+ flag = copytext(flag, length(flag[1]) + 1) // Get all but the initial !
obj_flags &= ~string_to_objflag[flag]
else
obj_flags |= string_to_objflag[flag]
diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm
index b8320c80fbd..ffa9d4d1107 100644
--- a/code/game/objects/structures/artstuff.dm
+++ b/code/game/objects/structures/artstuff.dm
@@ -35,101 +35,212 @@
else
painting = null
-
-//////////////
-// CANVASES //
-//////////////
-
-#define AMT_OF_CANVASES 4 //Keep this up to date or shit will break.
-
-//To safe memory on making /icons we cache the blanks..
-GLOBAL_LIST_INIT(globalBlankCanvases, new(AMT_OF_CANVASES))
-
/obj/item/canvas
name = "canvas"
desc = "Draw out your soul on this canvas!"
icon = 'icons/obj/artstuff.dmi'
- icon_state = "11x11"
+ icon_state = "square"
resistance_flags = FLAMMABLE
- var/whichGlobalBackup = 1 //List index
+ var/width = 11
+ var/height = 11
+ var/list/grid
+ var/list/top_colors
+ var/canvas_color = "#ffffff" //empty canvas color
+ var/ui_x = 400
+ var/ui_y = 400
+ var/painting_name //Painting name, this is set after framing.
+ var/framed = FALSE //Blocks edits, set on framing
-/obj/item/canvas/nineteenXnineteen
- icon_state = "19x19"
- whichGlobalBackup = 2
-
-/obj/item/canvas/twentythreeXnineteen
- icon_state = "23x19"
- whichGlobalBackup = 3
-
-/obj/item/canvas/twentythreeXtwentythree
- icon_state = "23x23"
- whichGlobalBackup = 4
-
-//HEY YOU
-//ARE YOU READING THE CODE FOR CANVASES?
-//ARE YOU AWARE THEY CRASH HALF THE SERVER WHEN SOMEONE DRAWS ON THEM...
-//...AND NOBODY CAN FIGURE OUT WHY?
-//THEN GO ON BRAVE TRAVELER
-//TRY TO FIX THEM AND REMOVE THIS CODE
/obj/item/canvas/Initialize()
- ..()
- return INITIALIZE_HINT_QDEL //Delete on creation
+ . = ..()
+ top_colors = list()
+ reset_grid()
-//Find the right size blank canvas
-/obj/item/canvas/proc/getGlobalBackup()
- . = null
- if(GLOB.globalBlankCanvases[whichGlobalBackup])
- . = GLOB.globalBlankCanvases[whichGlobalBackup]
- else
- var/icon/I = icon(initial(icon),initial(icon_state))
- GLOB.globalBlankCanvases[whichGlobalBackup] = I
- . = I
+/obj/item/canvas/proc/reset_grid()
+ grid = new/list(width,height)
+ for(var/x in 1 to width)
+ for(var/y in 1 to height)
+ grid[x][y] = canvas_color
+/obj/item/canvas/attack_self(mob/user)
+ . = ..()
+ ui_interact(user)
+/obj/item/canvas/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+ datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
-//One pixel increments
-/obj/item/canvas/attackby(obj/item/I, mob/user, params)
- //Click info
- var/list/click_params = params2list(params)
- var/pixX = text2num(click_params["icon-x"])
- var/pixY = text2num(click_params["icon-y"])
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ ui = new(user, src, ui_key, "canvas", name, ui_x, ui_y, master_ui, state)
+ ui.set_autoupdate(FALSE)
+ ui.open()
- //Should always be true, otherwise you didn't click the object, but let's check because SS13~
- if(!click_params || !click_params["icon-x"] || !click_params["icon-y"])
- return
-
- //Cleaning one pixel with a soap or rag
- if(istype(I, /obj/item/soap) || istype(I, /obj/item/reagent_containers/glass/rag))
- //Pixel info created only when needed
- var/icon/masterpiece = icon(icon,icon_state)
- var/thePix = masterpiece.GetPixel(pixX,pixY)
- var/icon/Ico = getGlobalBackup()
- if(!Ico)
- qdel(masterpiece)
- return
-
- var/theOriginalPix = Ico.GetPixel(pixX,pixY)
- if(thePix != theOriginalPix) //colour changed
- DrawPixelOn(theOriginalPix,pixX,pixY)
- qdel(masterpiece)
-
- //Drawing one pixel with a crayon
- else if(istype(I, /obj/item/toy/crayon))
- var/obj/item/toy/crayon/C = I
- DrawPixelOn(C.paint_color, pixX, pixY)
+/obj/item/canvas/attackby(obj/item/I, mob/living/user, params)
+ if(user.a_intent == INTENT_HELP)
+ ui_interact(user)
else
return ..()
+/obj/item/canvas/ui_data(mob/user)
+ . = ..()
+ .["grid"] = grid
+ .["name"] = painting_name
-//Clean the whole canvas
-/obj/item/canvas/attack_self(mob/user)
- if(!user)
+/obj/item/canvas/examine(mob/user)
+ . = ..()
+ ui_interact(user)
+
+/obj/item/canvas/ui_act(action, params)
+ . = ..()
+ if(. || framed)
return
- var/icon/blank = getGlobalBackup()
- if(blank)
- //it's basically a giant etch-a-sketch
- icon = blank
- user.visible_message("[user] cleans the canvas.","You clean the canvas.")
+ var/mob/user = usr
+ switch(action)
+ if("paint")
+ var/obj/item/I = user.get_active_held_item()
+ var/color = get_paint_tool_color(I)
+ if(!color)
+ return FALSE
+ var/x = text2num(params["x"])
+ var/y = text2num(params["y"])
+ grid[x][y] = color
+ top_colors = get_most_common_colors(3)
+ update_icon()
+ . = TRUE
+
+/obj/item/canvas/update_overlays()
+ . = ..()
+ for(var/i in 2 to top_colors.len) //first is used as base color
+ var/mutable_appearance/detail = mutable_appearance(icon, "[icon_state]_detail_[i-1]")
+ detail.appearance_flags |= RESET_COLOR
+ detail.color = top_colors[i]
+ . += detail
+
+/obj/item/canvas/update_icon_state()
+ . = ..()
+ if(top_colors.len)
+ color = top_colors[1]
+
+/obj/item/canvas/proc/get_most_common_colors(count)
+ var/list/tally = list()
+ for(var/x in 1 to width)
+ for(var/y in 1 to height)
+ tally[grid[x][y]] += 1
+ sortTim(tally,/proc/cmp_numeric_dsc,associative=TRUE)
+ . = list()
+ for(var/result in tally)
+ . += result
+ if(length(.) >= count)
+ break
+
+//Todo make this element ?
+/obj/item/canvas/proc/get_paint_tool_color(obj/item/I)
+ if(!I)
+ return
+ if(istype(I, /obj/item/toy/crayon))
+ var/obj/item/toy/crayon/C = I
+ return C.paint_color
+ else if(istype(I, /obj/item/pen))
+ var/obj/item/pen/P = I
+ switch(P.colour)
+ if("black")
+ return "#000000"
+ if("blue")
+ return "#0000ff"
+ if("red")
+ return "#ff0000"
+ return P.colour
+ else if(istype(I, /obj/item/soap) || istype(I, /obj/item/reagent_containers/glass/rag))
+ return canvas_color
+
+/obj/item/canvas/nineteenXnineteen
+ icon_state = "square"
+ width = 19
+ height = 19
+ ui_x = 600
+ ui_y = 600
+
+/obj/item/canvas/twentythreeXnineteen
+ icon_state = "wide"
+ width = 23
+ height = 19
+ ui_x = 800
+ ui_y = 600
+
+/obj/item/canvas/twentythreeXtwentythree
+ icon_state = "square"
+ width = 23
+ height = 23
+ ui_x = 800
+ ui_y = 800
-#undef AMT_OF_CANVASES
+/obj/item/wallframe/painting
+ name = "painting frame"
+ desc = "The perfect showcase for your favorite deathtrap memories."
+ icon = 'icons/obj/decals.dmi'
+ custom_materials = null
+ flags_1 = 0
+ icon_state = "frame-empty"
+ result_path = /obj/structure/sign/painting
+
+/obj/structure/sign/painting
+ name = "Painting"
+ desc = "Art or \"Art\"? You decide."
+ icon = 'icons/obj/decals.dmi'
+ icon_state = "frame-empty"
+ buildable_sign = FALSE
+ var/obj/item/canvas/C
+
+/obj/structure/sign/painting/Initialize(mapload, dir, building)
+ . = ..()
+ AddComponent(/datum/component/art, 20)
+ if(dir)
+ setDir(dir)
+ if(building)
+ pixel_x = (dir & 3)? 0 : (dir == 4 ? -30 : 30)
+ pixel_y = (dir & 3)? (dir ==1 ? -30 : 30) : 0
+
+/obj/structure/sign/painting/attackby(obj/item/I, mob/user, params)
+ if(!C && istype(I, /obj/item/canvas))
+ frame_canvas(user,I)
+ else if(C && !C.painting_name && istype(I,/obj/item/pen))
+ try_rename(user)
+ else
+ return ..()
+
+/obj/structure/sign/painting/examine(mob/user)
+ . = ..()
+ if(C)
+ C.ui_interact(user,state = GLOB.physical_obscured_state)
+
+/obj/structure/sign/painting/wirecutter_act(mob/living/user, obj/item/I)
+ . = ..()
+ if(C)
+ C.framed = FALSE
+ C.forceMove(drop_location())
+ C = null
+ to_chat(user, "You remove the painting from the frame.")
+ update_icon()
+ return TRUE
+
+/obj/structure/sign/painting/proc/frame_canvas(mob/user,obj/item/canvas/new_canvas)
+ if(user.transferItemToLoc(new_canvas,src))
+ C = new_canvas
+ C.framed = TRUE
+ to_chat(user,"You frame [C].")
+ update_icon()
+
+/obj/structure/sign/painting/proc/try_rename(mob/user)
+ var/new_name = stripped_input(user,"What do you want to name the painting?")
+ if(C && !C.painting_name && new_name && user.canUseTopic(src,BE_CLOSE))
+ C.painting_name = new_name
+ SStgui.update_uis(C)
+
+/obj/structure/sign/painting/update_overlays()
+ . = ..()
+ if(C && C.top_colors.len)
+ var/mutable_appearance/MA = mutable_appearance(icon, "frame-content-overlay")
+ MA.appearance_flags |= RESET_COLOR
+ MA.color = C.top_colors[1]
+ . += MA
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index fefde61a586..e31a7333f1f 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -7,6 +7,7 @@
var/state = GIRDER_NORMAL
var/girderpasschance = 20 // percentage chance that a projectile passes through the girder.
var/can_displace = TRUE //If the girder can be moved around by wrenching it
+ var/next_beep = 0 //Prevents spamming of the construction sound
max_integrity = 200
rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
rad_insulation = RAD_VERY_LIGHT_INSULATION
@@ -27,6 +28,12 @@
. += "[src] is disassembled! You probably shouldn't be able to see this examine message."
/obj/structure/girder/attackby(obj/item/W, mob/user, params)
+ var/platingmodifier = 1
+ if(HAS_TRAIT(user, TRAIT_QUICK_BUILD))
+ platingmodifier = 0.7
+ if(next_beep <= world.time)
+ next_beep = world.time + 10
+ playsound(src, 'sound/machines/clockcult/integration_cog_install.ogg', 50, TRUE)
add_fingerprint(user)
if(istype(W, /obj/item/gun/energy/plasmacutter))
@@ -89,7 +96,7 @@
to_chat(user, "You need two sheets of metal to create a false wall!")
return
to_chat(user, "You start building a false wall...")
- if(do_after(user, 20, target = src))
+ if(do_after(user, 20*platingmodifier, target = src))
if(S.get_amount() < 2)
return
S.use(2)
@@ -102,7 +109,7 @@
to_chat(user, "You need two sheets of metal to finish a wall!")
return
to_chat(user, "You start adding plating...")
- if (do_after(user, 40, target = src))
+ if (do_after(user, 40*platingmodifier, target = src))
if(S.get_amount() < 2)
return
S.use(2)
@@ -132,7 +139,7 @@
if(S.get_amount() < 1)
return
to_chat(user, "You start finalizing the reinforced wall...")
- if(do_after(user, 50, target = src))
+ if(do_after(user, 50*platingmodifier, target = src))
if(S.get_amount() < 1)
return
S.use(1)
@@ -146,7 +153,7 @@
if(S.get_amount() < 1)
return
to_chat(user, "You start reinforcing the girder...")
- if(do_after(user, 60, target = src))
+ if(do_after(user, 60*platingmodifier, target = src))
if(S.get_amount() < 1)
return
S.use(1)
diff --git a/code/game/objects/structures/headpike.dm b/code/game/objects/structures/headpike.dm
index 99501c9486d..01071a3de72 100644
--- a/code/game/objects/structures/headpike.dm
+++ b/code/game/objects/structures/headpike.dm
@@ -41,8 +41,9 @@
if(.)
return
to_chat(user, "You take down [src].")
- victim.forceMove(drop_location())
- victim = null
+ if(victim)
+ victim.forceMove(drop_location())
+ victim = null
spear.forceMove(drop_location())
spear = null
qdel(src)
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index f28a0ec9345..1bff30a0d79 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -74,7 +74,7 @@
number_of_rods = 2
smooth = SMOOTH_TRUE
canSmoothWith = null
- obj_flags = CAN_BE_HIT | BLOCK_Z_FALL
+ obj_flags = CAN_BE_HIT | BLOCK_Z_FALL
/obj/structure/lattice/catwalk/deconstruction_hints(mob/user)
return "The supporting rods look like they could be cut."
@@ -90,3 +90,30 @@
for(var/obj/structure/cable/C in T)
C.deconstruct()
..()
+
+/obj/structure/lattice/lava
+ name = "heatproof support lattice"
+ desc = "A specialized support beam for building across lava. Watch your step."
+ icon = 'icons/obj/smooth_structures/catwalk.dmi'
+ icon_state = "catwalk"
+ number_of_rods = 1
+ color = "#5286b9ff"
+ smooth = SMOOTH_TRUE
+ canSmoothWith = null
+ obj_flags = CAN_BE_HIT | BLOCK_Z_FALL
+ resistance_flags = FIRE_PROOF | LAVA_PROOF
+
+/obj/structure/lattice/lava/deconstruction_hints(mob/user)
+ return "The rods look like they could be cut, but the heat treatment will shatter off. There's space for a tile."
+
+/obj/structure/lattice/lava/attackby(obj/item/C, mob/user, params)
+ . = ..()
+ if(istype(C, /obj/item/stack/tile/plasteel))
+ var/obj/item/stack/tile/plasteel/P = C
+ if(P.use(1))
+ to_chat(user, "You construct a floor plating, as lava settles around the rods.")
+ playsound(src, 'sound/weapons/genhit.ogg', 50, TRUE)
+ new /turf/open/floor/plating(locate(x, y, z))
+ else
+ to_chat(user, "You need one floor tile to build atop [src].")
+ return
diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm
index 8a74e668b7d..22f3d56c62e 100644
--- a/code/game/objects/structures/mirror.dm
+++ b/code/game/objects/structures/mirror.dm
@@ -136,8 +136,7 @@
switch(choice)
if("name")
- var/newname = copytext(sanitize_name(reject_bad_text(input(H, "Who are we again?", "Name change", H.name) as null|text)),1,MAX_NAME_LEN)
-
+ var/newname = sanitize_name(reject_bad_text(stripped_input(H, "Who are we again?", "Name change", H.name, MAX_NAME_LEN)))
if(!newname)
return
if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index ce6706d5717..27124c24671 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -181,7 +181,7 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an
icon_state = "morgue1"
else
icon_state = "morgue2" // Dead, brainded mob.
- var/list/compiled = recursive_mob_check(src, 0, 0) // Search for mobs in all contents.
+ var/list/compiled = GetAllContents(/mob/living) // Search for mobs in all contents.
if(!length(compiled)) // No mobs?
icon_state = "morgue3"
return
diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm
index 1d557cffbbc..fa49049e603 100644
--- a/code/game/objects/structures/musician.dm
+++ b/code/game/objects/structures/musician.dm
@@ -112,8 +112,10 @@
var/cur_note = text2ascii(note) - 96
if(cur_note < 1 || cur_note > 7)
continue
- for(var/i=2 to length(note))
- var/ni = copytext(note,i,i+1)
+ var/notelen = length(note)
+ var/ni = ""
+ for(var/i = length(note[1]) + 1, i <= notelen, i += length(ni))
+ ni = note[i]
if(!text2num(ni))
if(ni == "#" || ni == "b" || ni == "n")
cur_acc[cur_note] = ni
@@ -202,9 +204,10 @@
//split into lines
lines = splittext(text, "\n")
if(lines.len)
- if(copytext(lines[1],1,6) == "BPM: ")
- tempo = sanitize_tempo(600 / text2num(copytext(lines[1],6)))
- lines.Cut(1,2)
+ var/bpm_string = "BPM: "
+ if(findtext(lines[1], bpm_string, 1, length(bpm_string) + 1))
+ tempo = sanitize_tempo(600 / text2num(copytext(lines[1], length(bpm_string) + 1)))
+ lines.Cut(1, 2)
else
tempo = sanitize_tempo(5) // default 120 BPM
if(lines.len > MUSIC_MAXLINES)
@@ -212,7 +215,7 @@
lines.Cut(MUSIC_MAXLINES + 1)
var/linenum = 1
for(var/l in lines)
- if(length(l) > MUSIC_MAXLINECHARS)
+ if(length_char(l) > MUSIC_MAXLINECHARS)
to_chat(usr, "Line [linenum] too long!")
lines.Remove(l)
else
@@ -276,8 +279,8 @@
return
if(lines.len > MUSIC_MAXLINES)
return
- if(length(newline) > MUSIC_MAXLINECHARS)
- newline = copytext(newline, 1, MUSIC_MAXLINECHARS)
+ if(length_char(newline) > MUSIC_MAXLINECHARS)
+ newline = copytext_char(newline, 1, MUSIC_MAXLINECHARS)
lines.Add(newline)
else if(href_list["deleteline"])
@@ -288,11 +291,9 @@
else if(href_list["modifyline"])
var/num = round(text2num(href_list["modifyline"]),1)
- var/content = html_encode(input("Enter your line: ", instrumentObj.name, lines[num]) as text|null)
+ var/content = stripped_input(usr, "Enter your line: ", instrumentObj.name, lines[num], MUSIC_MAXLINECHARS)
if(!content || !usr.canUseTopic(instrumentObj, BE_CLOSE, FALSE, NO_TK))
return
- if(length(content) > MUSIC_MAXLINECHARS)
- content = copytext(content, 1, MUSIC_MAXLINECHARS)
if(num > lines.len || num < 1)
return
lines[num] = content
diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm
index 9febf7704ff..f3013cda82a 100644
--- a/code/game/objects/structures/traps.dm
+++ b/code/game/objects/structures/traps.dm
@@ -39,7 +39,7 @@
. = ..()
if(!isliving(user))
return
- if(user.mind && user.mind in immune_minds)
+ if(user.mind && (user.mind in immune_minds))
return
if(get_dist(user, src) <= 1)
. += "You reveal [src]!"
diff --git a/code/game/say.dm b/code/game/say.dm
index 626e7a9627d..81d33a03596 100644
--- a/code/game/say.dm
+++ b/code/game/say.dm
@@ -73,8 +73,8 @@ GLOBAL_LIST_INIT(freqtospan, list(
return ""
/atom/movable/proc/say_mod(input, message_mode)
- var/ending = copytext(input, length(input))
- if(copytext(input, length(input) - 1) == "!!")
+ var/ending = copytext_char(input, -1)
+ if(copytext_char(input, -2) == "!!")
return verb_yell
else if(ending == "?")
return verb_ask
@@ -87,7 +87,7 @@ GLOBAL_LIST_INIT(freqtospan, list(
if(!input)
input = "..."
- if(copytext(input, length(input) - 1) == "!!")
+ if(copytext_char(input, -2) == "!!")
spans |= SPAN_YELL
var/spanned = attach_spans(input, spans)
@@ -121,7 +121,7 @@ GLOBAL_LIST_INIT(freqtospan, list(
var/returntext = GLOB.reverseradiochannels["[freq]"]
if(returntext)
return returntext
- return "[copytext("[freq]", 1, 4)].[copytext("[freq]", 4, 5)]"
+ return "[copytext_char("[freq]", 1, 4)].[copytext_char("[freq]", 4, 5)]"
/proc/attach_spans(input, list/spans)
return "[message_spans_start(spans)][input]"
@@ -134,7 +134,7 @@ GLOBAL_LIST_INIT(freqtospan, list(
return output
/proc/say_test(text)
- var/ending = copytext(text, length(text))
+ var/ending = copytext_char(text, -1)
if (ending == "?")
return "1"
else if (ending == "!")
diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm
index 590bc2a6f44..9edef593c18 100644
--- a/code/game/turfs/closed/minerals.dm
+++ b/code/game/turfs/closed/minerals.dm
@@ -558,6 +558,7 @@
if(!(H.mind.get_skill_level(/datum/skill/mining) >= SKILL_LEVEL_MASTER))
return
drop_ores()
+ H.client.give_award(/datum/award/achievement/skill/legendary_miner, H)
var/flags = NONE
if(defer_change) // TODO: make the defer change var a var for any changeturf flag
flags = CHANGETURF_DEFER_CHANGE
diff --git a/code/game/turfs/open/lava.dm b/code/game/turfs/open/lava.dm
index 67b88731a25..6a1e793f711 100644
--- a/code/game/turfs/open/lava.dm
+++ b/code/game/turfs/open/lava.dm
@@ -88,10 +88,25 @@
/turf/open/lava/TakeTemperature(temp)
+/turf/open/lava/attackby(obj/item/C, mob/user, params)
+ ..()
+ if(istype(C, /obj/item/stack/rods/lava))
+ var/obj/item/stack/rods/lava/R = C
+ var/obj/structure/lattice/lava/H = locate(/obj/structure/lattice/lava, src)
+ if(H)
+ to_chat(user, "There is already a lattice here!")
+ return
+ if(R.use(1))
+ to_chat(user, "You construct a lattice.")
+ playsound(src, 'sound/weapons/genhit.ogg', 50, TRUE)
+ new /obj/structure/lattice/lava(locate(x, y, z))
+ else
+ to_chat(user, "You need one rod to build a heatproof lattice.")
+ return
/turf/open/lava/proc/is_safe()
//if anything matching this typecache is found in the lava, we don't burn things
- var/static/list/lava_safeties_typecache = typecacheof(list(/obj/structure/lattice/catwalk, /obj/structure/stone_tile))
+ var/static/list/lava_safeties_typecache = typecacheof(list(/obj/structure/lattice/catwalk, /obj/structure/stone_tile, /obj/structure/lattice/lava))
var/list/found_safeties = typecache_filter_list(contents, lava_safeties_typecache)
for(var/obj/structure/stone_tile/S in found_safeties)
if(S.fallen)
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index d037bc0bb6b..6c908335668 100755
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -510,7 +510,7 @@
/turf/AllowDrop()
return TRUE
-/turf/proc/add_vomit_floor(mob/living/M, toxvomit = NONE)
+/turf/proc/add_vomit_floor(mob/living/M, toxvomit = NONE, purge = FALSE)
var/obj/effect/decal/cleanable/vomit/V = new /obj/effect/decal/cleanable/vomit(src, M.get_static_viruses())
@@ -527,12 +527,15 @@
if (iscarbon(M))
var/mob/living/carbon/C = M
if(C.reagents)
- clear_reagents_to_vomit_pool(C,V)
+ clear_reagents_to_vomit_pool(C,V, purge)
-/proc/clear_reagents_to_vomit_pool(mob/living/carbon/M, obj/effect/decal/cleanable/vomit/V)
- M.reagents.trans_to(V, M.reagents.total_volume / 10, transfered_by = M)
+/proc/clear_reagents_to_vomit_pool(mob/living/carbon/M, obj/effect/decal/cleanable/vomit/V, purge = FALSE)
+ var/chemicals_lost = M.reagents.total_volume / 10
+ if(purge)
+ chemicals_lost = (2 * M.reagents.total_volume)/3 //For detoxification surgery, we're manually pumping the stomach out of chemcials, so it's far more efficient.
+ M.reagents.trans_to(V, chemicals_lost, transfered_by = M)
for(var/datum/reagent/R in M.reagents.reagent_list) //clears the stomach of anything that might be digested as food
- if(istype(R, /datum/reagent/consumable))
+ if(istype(R, /datum/reagent/consumable) || purge)
var/datum/reagent/consumable/nutri_check = R
if(nutri_check.nutriment_factor >0)
M.reagents.remove_reagent(R.type, min(R.volume, 10))
diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index f3410d06e30..90d792a2864 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -13,10 +13,17 @@
return FALSE
log_access("Failed Login (invalid data): [key] [address]-[computer_id]")
return list("reason"="invalid login data", "desc"="Error: Could not check ban status, Please try again. Error message: Your computer provided invalid or blank information to the server on connection (byond username, IP, and Computer ID.) Provided information for reference: Username:'[key]' IP:'[address]' Computer ID:'[computer_id]'. (If you continue to get this error, please restart byond or contact byond support.)")
-
+
+ if (type == "world")
+ return ..() //shunt world topic banchecks to purely to byond's internal ban system
+
var/admin = FALSE
var/ckey = ckey(key)
-
+
+ var/client/C = GLOB.directory[ckey]
+ if (C && ckey == C.ckey && computer_id == C.computer_id && address == C.address)
+ return //don't recheck connected clients.
+
//IsBanned can get re-called on a user in certain situations, this prevents that leading to repeated messages to admins.
var/static/list/checkedckeys = list()
//magic voodo to check for a key in a list while also adding that key to the list without having to do two associated lookups
@@ -25,8 +32,6 @@
if(GLOB.admin_datums[ckey] || GLOB.deadmins[ckey])
admin = TRUE
- var/client/C = GLOB.directory[ckey]
-
//Whitelist
if(!real_bans_only && !C && CONFIG_GET(flag/usewhitelist))
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index e48ff9a840e..a0043ca2b65 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -451,11 +451,9 @@ GLOBAL_PROTECT(admin_verbs_hideable)
mob.name = mob.real_name
mob.mouse_opacity = initial(mob.mouse_opacity)
else
- var/new_key = ckeyEx(input("Enter your desired display name.", "Fake Key", key) as text|null)
+ var/new_key = ckeyEx(stripped_input(usr, "Enter your desired display name.", "Fake Key", key, 26))
if(!new_key)
return
- if(length(new_key) >= 26)
- new_key = copytext(new_key, 1, 26)
holder.fakekey = new_key
createStealthKey()
if(isobserver(mob))
@@ -562,9 +560,9 @@ GLOBAL_PROTECT(admin_verbs_hideable)
set desc = "Gives a spell to a mob."
var/list/spell_list = list()
- var/type_length = length("/obj/effect/proc_holder/spell") + 2
+ var/type_length = length_char("/obj/effect/proc_holder/spell") + 2
for(var/A in GLOB.spells)
- spell_list[copytext("[A]", type_length)] = A
+ spell_list[copytext_char("[A]", type_length)] = A
var/obj/effect/proc_holder/spell/S = input("Choose the spell to give to that guy", "ABRAKADABRA") as null|anything in sortList(spell_list)
if(!S)
return
diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm
index 4ecffc5b233..cab80ed0d96 100644
--- a/code/modules/admin/secrets.dm
+++ b/code/modules/admin/secrets.dm
@@ -340,7 +340,7 @@
if(!SSticker.HasRoundStarted())
alert("The game hasn't started yet!")
return
- var/objective = copytext(sanitize(input("Enter an objective")),1,MAX_MESSAGE_LEN)
+ var/objective = stripped_input(usr, "Enter an objective")
if(!objective)
return
SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Traitor All", "[objective]"))
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 2debe036042..704f720ad9b 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1727,8 +1727,6 @@
if(!check_rights(R_ADMIN))
return
src.admincaster_feed_channel.channel_name = stripped_input(usr, "Provide a Feed Channel Name.", "Network Channel Handler", "")
- while (findtext(src.admincaster_feed_channel.channel_name," ") == 1)
- src.admincaster_feed_channel.channel_name = copytext(src.admincaster_feed_channel.channel_name,2,length(src.admincaster_feed_channel.channel_name)+1)
src.access_news_network()
else if(href_list["ac_set_channel_lock"])
@@ -1768,9 +1766,7 @@
else if(href_list["ac_set_new_message"])
if(!check_rights(R_ADMIN))
return
- src.admincaster_feed_message.body = adminscrub(input(usr, "Write your Feed story.", "Network Channel Handler", ""))
- while (findtext(src.admincaster_feed_message.returnBody(-1)," ") == 1)
- src.admincaster_feed_message.body = copytext(src.admincaster_feed_message.returnBody(-1),2,length(src.admincaster_feed_message.returnBody(-1))+1)
+ src.admincaster_feed_message.body = adminscrub(stripped_input(usr, "Write your Feed story.", "Network Channel Handler", ""))
src.access_news_network()
else if(href_list["ac_submit_new_message"])
@@ -1829,17 +1825,13 @@
else if(href_list["ac_set_wanted_name"])
if(!check_rights(R_ADMIN))
return
- src.admincaster_wanted_message.criminal = adminscrub(input(usr, "Provide the name of the Wanted person.", "Network Security Handler", ""))
- while(findtext(src.admincaster_wanted_message.criminal," ") == 1)
- src.admincaster_wanted_message.criminal = copytext(admincaster_wanted_message.criminal,2,length(admincaster_wanted_message.criminal)+1)
+ src.admincaster_wanted_message.criminal = adminscrub(stripped_input(usr, "Provide the name of the Wanted person.", "Network Security Handler", ""))
src.access_news_network()
else if(href_list["ac_set_wanted_desc"])
if(!check_rights(R_ADMIN))
return
- src.admincaster_wanted_message.body = adminscrub(input(usr, "Provide the a description of the Wanted person and any other details you deem important.", "Network Security Handler", ""))
- while (findtext(src.admincaster_wanted_message.body," ") == 1)
- src.admincaster_wanted_message.body = copytext(src.admincaster_wanted_message.body,2,length(src.admincaster_wanted_message.body)+1)
+ src.admincaster_wanted_message.body = adminscrub(stripped_input(usr, "Provide the a description of the Wanted person and any other details you deem important.", "Network Security Handler", ""))
src.access_news_network()
else if(href_list["ac_submit_wanted"])
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
index 5e2d4cc51cb..2c5283d12b7 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
@@ -99,6 +99,10 @@
Don't crash the server, OK?
+ "UPDATE /mob/living/carbon/monkey SET #null = forceMove(usr.loc)"
+
+ Writing "#null" in front of the "=" will call the proc and discard the return value.
+
A quick recommendation: before you run something like a DELETE or another query.. Run it through SELECT
first.
You'd rather not gib every player on accident.
@@ -777,6 +781,9 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
var/datum/temp = d
var/i = 0
for(var/v in sets)
+ if(v == "#null")
+ SDQL_expression(d, set_list[sets])
+ break
if(++i == sets.len)
if(superuser)
if(temp.vars.Find(v))
@@ -899,8 +906,8 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
else if(ispath(expression[i]))
val = expression[i]
- else if(copytext(expression[i], 1, 2) in list("'", "\""))
- val = copytext(expression[i], 2, length(expression[i]))
+ else if(expression[i][1] in list("'", "\""))
+ val = copytext_char(expression[i], 2, -1)
else if(expression[i] == "\[")
var/list/expressions_list = expression[++i]
@@ -1007,12 +1014,12 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
if(is_proper_datum(object))
D = object
- if (object == world && (!long || expression[start + 1] == ".") && !(expression[start] in exclude) && copytext(expression[start], 1, 3) != "SS")
+ if (object == world && (!long || expression[start + 1] == ".") && !(expression[start] in exclude) && copytext(expression[start], 1, 3) != "SS") //3 == length("SS") + 1
to_chat(usr, "World variables are not allowed to be accessed. Use global.")
return null
else if(expression [start] == "{" && long)
- if(lowertext(copytext(expression[start + 1], 1, 3)) != "0x")
+ if(lowertext(copytext(expression[start + 1], 1, 3)) != "0x") //3 == length("0x") + 1
to_chat(usr, "Invalid pointer syntax: [expression[start + 1]]")
return null
v = locate("\[[expression[start + 1]]]")
@@ -1054,8 +1061,8 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
if("CFG")
v = config
else
- if(copytext(expression[start], 1, 3) == "SS") //Subsystem
- var/SSname = copytext(expression[start], 3)
+ if(copytext(expression[start], 1, 3) == "SS") //Subsystem //3 == length("SS") + 1
+ var/SSname = copytext_char(expression[start], 3)
var/SSlength = length(SSname)
var/datum/controller/subsystem/SS
var/SSmatch
@@ -1099,9 +1106,10 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
var/word = ""
var/list/query_list = list()
var/len = length(query_text)
+ var/char = ""
- for(var/i = 1, i <= len, i++)
- var/char = copytext(query_text, i, i + 1)
+ for(var/i = 1, i <= len, i += length(char))
+ char = query_text[i]
if(char in whitespace)
if(word != "")
@@ -1120,7 +1128,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
query_list += word
word = ""
- var/char2 = copytext(query_text, i + 1, i + 2)
+ var/char2 = query_text[i + length(char)]
if(char2 in multi[char])
query_list += "[char][char2]"
@@ -1136,13 +1144,13 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
word = "'"
- for(i++, i <= len, i++)
- char = copytext(query_text, i, i + 1)
+ for(i += length(char), i <= len, i += length(char))
+ char = query_text[i]
if(char == "'")
- if(copytext(query_text, i + 1, i + 2) == "'")
+ if(query_text[i + length(char)] == "'")
word += "'"
- i++
+ i += length(query_text[i + length(char)])
else
break
@@ -1164,13 +1172,13 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
word = "\""
- for(i++, i <= len, i++)
- char = copytext(query_text, i, i + 1)
+ for(i += length(char), i <= len, i += length(char))
+ char = query_text[i]
if(char == "\"")
- if(copytext(query_text, i + 1, i + 2) == "'")
+ if(query_text[i + length(char)] == "'")
word += "\""
- i++
+ i += length(query_text[i + length(char)])
else
break
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm
index 5cbd2dd5571..32f385f8ec0 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm
@@ -260,7 +260,7 @@
node += "*"
i++
- else if (copytext(token(i), 1, 2) == "/")
+ else if(token(i)[1] == "/")
i = object_type(i, node)
else
@@ -391,7 +391,7 @@
//object_type:
/datum/SDQL_parser/proc/object_type(i, list/node)
- if (copytext(token(i), 1, 2) != "/")
+ if(token(i)[1] != "/")
return parse_error("Expected type, but it didn't begin with /")
var/path = text2path(token(i))
@@ -430,7 +430,7 @@
//string: ''' ''' | '"' '"'
/datum/SDQL_parser/proc/string(i, list/node)
- if(copytext(token(i), 1, 2) in list("'", "\""))
+ if(token(i)[1] in list("'", "\""))
node += token(i)
else
@@ -441,7 +441,7 @@
//array: '[' expression_list ']'
/datum/SDQL_parser/proc/array(i, list/node)
// Arrays get turned into this: list("[", list(exp_1a = exp_1b, ...), ...), "[" is to mark the next node as an array.
- if(copytext(token(i), 1, 2) != "\[")
+ if(token(i)[1] != "\[")
parse_error("Expected an array but found '[token(i)]'")
return i + 1
@@ -613,7 +613,7 @@
node += "null"
i++
- else if(lowertext(copytext(token(i), 1, 3)) == "0x" && isnum(hex2num(copytext(token(i), 3))))
+ else if(lowertext(copytext(token(i), 1, 3)) == "0x" && isnum(hex2num(copytext(token(i), 3))))//3 == length("0x") + 1
node += hex2num(copytext(token(i), 3))
i++
@@ -621,16 +621,16 @@
node += text2num(token(i))
i++
- else if(copytext(token(i), 1, 2) in list("'", "\""))
+ else if(token(i)[1] in list("'", "\""))
i = string(i, node)
- else if(copytext(token(i), 1, 2) == "\[") // Start a list.
+ else if(token(i)[1] == "\[") // Start a list.
i = array(i, node)
- else if(copytext(token(i), 1, 3) == "@\[")
+ else if(copytext(token(i), 1, 3) == "@\[")//3 == length("@\[") + 1
i = selectors_array(i, node)
- else if(copytext(token(i), 1, 2) == "/")
+ else if(token(i)[1] == "/")
i = object_type(i, node)
else
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 96ed1398eaa..f3bc2a38739 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -108,11 +108,13 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
if(C.current_ticket)
C.current_ticket.initiator = C
C.current_ticket.AddInteraction("Client reconnected.")
+ SSblackbox.LogAhelp(C.current_ticket.id, "Reconnected", "Client reconnected", C.ckey)
//Dissasociate ticket
/datum/admin_help_tickets/proc/ClientLogout(client/C)
if(C.current_ticket)
C.current_ticket.AddInteraction("Client disconnected.")
+ SSblackbox.LogAhelp(C.current_ticket.id, "Disconnected", "Client disconnected", C.ckey)
C.current_ticket.initiator = null
C.current_ticket = null
@@ -165,7 +167,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
//is_bwoink is TRUE if this ticket was started by an admin PM
/datum/admin_help/New(msg, client/C, is_bwoink)
//clean the input msg
- msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN))
+ msg = sanitize(copytext_char(msg, 1, MAX_MESSAGE_LEN))
if(!msg || !C || !C.mob)
qdel(src)
return
@@ -201,7 +203,6 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
if(admin_number_present <= 0)
to_chat(C, "No active admins are online, your adminhelp was sent through TGS to admins who are available. This may use IRC or Discord.")
heard_by_no_admins = TRUE
-
GLOB.ahelp_tickets.active_tickets += src
/datum/admin_help/Destroy()
@@ -269,6 +270,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
//show it to the person adminhelping too
to_chat(initiator, "PM to-Admins: [msg]")
+ SSblackbox.LogAhelp(id, "Ticket Opened", msg, null, initiator.ckey)
//Reopen a closed ticket
/datum/admin_help/proc/Reopen()
@@ -298,6 +300,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
var/msg = "Ticket [TicketHref("#[id]")] reopened by [key_name_admin(usr)]."
message_admins(msg)
log_admin_private(msg)
+ SSblackbox.LogAhelp(id, "Reopened", "Reopened by [usr.key]", usr.ckey)
SSblackbox.record_feedback("tally", "ahelp_stats", 1, "reopened")
TicketPanel() //can only be done from here, so refresh it
@@ -323,6 +326,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
SSblackbox.record_feedback("tally", "ahelp_stats", 1, "closed")
var/msg = "Ticket [TicketHref("#[id]")] closed by [key_name]."
message_admins(msg)
+ SSblackbox.LogAhelp(id, "Closed", "Closed by [usr.key]", null, usr.ckey)
log_admin_private(msg)
//Mark open ticket as resolved/legitimate, returns ahelp verb
@@ -341,6 +345,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
SSblackbox.record_feedback("tally", "ahelp_stats", 1, "resolved")
var/msg = "Ticket [TicketHref("#[id]")] resolved by [key_name]"
message_admins(msg)
+ SSblackbox.LogAhelp(id, "Resolved", "Resolved by [usr.key]", null, usr.ckey)
log_admin_private(msg)
//Close and return ahelp verb, use if ticket is incoherent
@@ -362,6 +367,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
message_admins(msg)
log_admin_private(msg)
AddInteraction("Rejected by [key_name].")
+ SSblackbox.LogAhelp(id, "Rejected", "Rejected by [usr.key]", null, usr.ckey)
Close(silent = TRUE)
//Resolve ticket with IC Issue message
@@ -380,6 +386,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
message_admins(msg)
log_admin_private(msg)
AddInteraction("Marked as IC issue by [key_name]")
+ SSblackbox.LogAhelp(id, "IC Issue", "Marked as IC issue by [usr.key]", null, usr.ckey)
Resolve(silent = TRUE)
//Show the ticket panel
@@ -577,19 +584,26 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
msg2 = replacetext(replacetext(msg2, "\proper", ""), "\improper", "")
world.TgsTargetedChatBroadcast("[msg] | [msg2]", TRUE)
-/proc/send2otherserver(source,msg,type = "Ahelp")
+//
+/proc/send2otherserver(source,msg,type = "Ahelp",target_servers)
var/comms_key = CONFIG_GET(string/comms_key)
if(!comms_key)
return
+
+ var/our_id = CONFIG_GET(string/cross_comms_name)
var/list/message = list()
message["message_sender"] = source
message["message"] = msg
- message["source"] = "([CONFIG_GET(string/cross_comms_name)])"
+ message["source"] = "([our_id])"
message["key"] = comms_key
message += type
var/list/servers = CONFIG_GET(keyed_list/cross_server)
for(var/I in servers)
+ if(I == our_id) //No sending to ourselves
+ continue
+ if(target_servers && !(I in target_servers))
+ continue
world.Export("[servers[I]]?[list2params(message)]")
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 3c6a6854d2c..ec7f2fb07ee 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -40,7 +40,7 @@
return
var/client/C
if(istext(whom))
- if(cmptext(copytext(whom,1,2),"@"))
+ if(whom[1] == "@")
whom = findStealthKey(whom)
C = GLOB.directory[whom]
else if(istype(whom, /client))
@@ -75,7 +75,7 @@
var/client/recipient
var/external = 0
if(istext(whom))
- if(cmptext(copytext(whom,1,2),"@"))
+ if(whom[1] == "@")
whom = findStealthKey(whom)
if(whom == "IRCKEY")
external = 1
@@ -132,7 +132,7 @@
//clean the message if it's not sent by a high-rank admin
if(!check_rights(R_SERVER|R_DEBUG,0)||external)//no sending html to the poor bots
- msg = trim(sanitize(copytext(msg,1,MAX_MESSAGE_LEN)))
+ msg = trim(sanitize(msg), MAX_MESSAGE_LEN)
if(!msg)
return
@@ -159,12 +159,13 @@
admin_ticket_log(src, interaction_message)
if(recipient != src) //reeee
admin_ticket_log(recipient, interaction_message)
-
+ SSblackbox.LogAhelp(current_ticket.id, "Reply", msg, recipient.ckey, src.ckey)
else //recipient is an admin but sender is not
var/replymsg = "Reply PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]"
admin_ticket_log(src, "[replymsg]")
to_chat(recipient, "[replymsg]")
to_chat(src, "PM to-Admins: [msg]")
+ SSblackbox.LogAhelp(current_ticket.id, "Reply", msg, recipient.ckey, src.ckey)
//play the receiving admin the adminhelp sound (if they have them enabled)
if(recipient.prefs.toggles & SOUND_ADMINHELP)
@@ -172,8 +173,11 @@
else
if(holder) //sender is an admin but recipient is not. Do BIG RED TEXT
+ var/already_logged = FALSE
if(!recipient.current_ticket)
new /datum/admin_help(msg, recipient, TRUE)
+ already_logged = TRUE
+ SSblackbox.LogAhelp(recipient.current_ticket.id, "Ticket Opened", msg, recipient.ckey, src.ckey)
to_chat(recipient, "-- Administrator private message --")
to_chat(recipient, "Admin PM from-[key_name(src, recipient, 0)]: [msg]")
@@ -182,6 +186,10 @@
admin_ticket_log(recipient, "PM From [key_name_admin(src)]: [keywordparsedmsg]")
+ if(!already_logged) //Reply to an existing ticket
+ SSblackbox.LogAhelp(recipient.current_ticket.id, "Reply", msg, recipient.ckey, src.ckey)
+
+
//always play non-admin recipients the adminhelp sound
SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg'))
@@ -285,7 +293,7 @@
if(!stealthkey)
stealthkey = GenTgsStealthKey()
- msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN))
+ msg = sanitize(copytext_char(msg, 1, MAX_MESSAGE_LEN))
if(!msg)
return "Error: No message"
diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm
index ee01ba77242..99347010675 100644
--- a/code/modules/admin/verbs/adminsay.dm
+++ b/code/modules/admin/verbs/adminsay.dm
@@ -5,7 +5,7 @@
if(!check_rights(0))
return
- msg = emoji_parse(copytext(sanitize(msg), 1, MAX_MESSAGE_LEN))
+ msg = emoji_parse(copytext_char(sanitize(msg), 1, MAX_MESSAGE_LEN))
if(!msg)
return
diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm
index 9b609bab9f1..37c09810ea6 100644
--- a/code/modules/admin/verbs/deadsay.dm
+++ b/code/modules/admin/verbs/deadsay.dm
@@ -14,7 +14,7 @@
if (handle_spam_prevention(msg,MUTE_DEADCHAT))
return
- msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
+ msg = copytext_char(sanitize(msg), 1, MAX_MESSAGE_LEN)
mob.log_talk(msg, LOG_DSAY)
if (!msg)
diff --git a/code/modules/admin/verbs/map_template_loadverb.dm b/code/modules/admin/verbs/map_template_loadverb.dm
index f4638172e76..0e687c8b045 100644
--- a/code/modules/admin/verbs/map_template_loadverb.dm
+++ b/code/modules/admin/verbs/map_template_loadverb.dm
@@ -33,7 +33,7 @@
var/map = input(src, "Choose a Map Template to upload to template storage","Upload Map Template") as null|file
if(!map)
return
- if(copytext("[map]",-4) != ".dmm")
+ if(copytext("[map]", -4) != ".dmm")//4 == length(".dmm")
to_chat(src, "Filename must end in '.dmm': [map]")
return
var/datum/map_template/M
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index 5ee9174a87f..cca9eebf443 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -135,7 +135,7 @@ GLOBAL_LIST_EMPTY(dirty_vars)
if(!(locate(/obj/structure/grille) in T))
var/window_check = 0
for(var/obj/structure/window/W in T)
- if (W.dir == turn(C1.dir,180) || W.dir in list(5,6,9,10) )
+ if (W.dir == turn(C1.dir,180) || (W.dir in list(NORTHEAST,SOUTHEAST,NORTHWEST,SOUTHWEST)) )
window_check = 1
break
if(!window_check)
diff --git a/code/modules/admin/verbs/maprotation.dm b/code/modules/admin/verbs/maprotation.dm
index 9e61755e4ae..71fd233fa5a 100644
--- a/code/modules/admin/verbs/maprotation.dm
+++ b/code/modules/admin/verbs/maprotation.dm
@@ -49,7 +49,7 @@
if(isnull(map_file))
return
- if(copytext("[map_file]",-4) != ".dmm")
+ if(copytext("[map_file]", -4) != ".dmm")//4 == length(".dmm")
to_chat(src, "Filename must end in '.dmm': [map_file]")
return
diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm
index c3840b1dad9..2e6c066297a 100644
--- a/code/modules/admin/verbs/pray.dm
+++ b/code/modules/admin/verbs/pray.dm
@@ -6,7 +6,7 @@
to_chat(usr, "Speech is currently admin-disabled.")
return
- msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
+ msg = copytext_char(sanitize(msg), 1, MAX_MESSAGE_LEN)
if(!msg)
return
log_prayer("[src.key]/([src.name]): [msg]")
@@ -54,21 +54,21 @@
//log_admin("HELP: [key_name(src)]: [msg]")
/proc/CentCom_announce(text , mob/Sender)
- var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
+ var/msg = copytext_char(sanitize(text), 1, MAX_MESSAGE_LEN)
msg = "CENTCOM:[ADMIN_FULLMONTY(Sender)] [ADMIN_CENTCOM_REPLY(Sender)]: [msg]"
to_chat(GLOB.admins, msg)
for(var/obj/machinery/computer/communications/C in GLOB.machines)
C.overrideCooldown()
/proc/Syndicate_announce(text , mob/Sender)
- var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
+ var/msg = copytext_char(sanitize(text), 1, MAX_MESSAGE_LEN)
msg = "SYNDICATE:[ADMIN_FULLMONTY(Sender)] [ADMIN_SYNDICATE_REPLY(Sender)]: [msg]"
to_chat(GLOB.admins, msg)
for(var/obj/machinery/computer/communications/C in GLOB.machines)
C.overrideCooldown()
/proc/Nuke_request(text , mob/Sender)
- var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
+ var/msg = copytext_char(sanitize(text), 1, MAX_MESSAGE_LEN)
msg = "NUKE CODE REQUEST:[ADMIN_FULLMONTY(Sender)] [ADMIN_CENTCOM_REPLY(Sender)] [ADMIN_SET_SD_CODE]: [msg]"
to_chat(GLOB.admins, msg)
for(var/obj/machinery/computer/communications/C in GLOB.machines)
diff --git a/code/modules/admin/view_variables/modify_variables.dm b/code/modules/admin/view_variables/modify_variables.dm
index 79ec9509088..de7d86c5e75 100644
--- a/code/modules/admin/view_variables/modify_variables.dm
+++ b/code/modules/admin/view_variables/modify_variables.dm
@@ -55,9 +55,9 @@ GLOBAL_PROTECT(VVpixelmovement)
// the type with the base type removed from the begaining
var/fancytype = types[D.type]
if (findtext(fancytype, types[type]))
- fancytype = copytext(fancytype, length(types[type])+1)
- var/shorttype = copytext("[D.type]", length("[type]")+1)
- if (length(shorttype) > length(fancytype))
+ fancytype = copytext(fancytype, length(types[type]) + 1)
+ var/shorttype = copytext("[D.type]", length("[type]") + 1)
+ if (length_char(shorttype) > length_char(fancytype))
shorttype = fancytype
if (!length(shorttype))
shorttype = "/"
diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm
index fd8ec694ba1..df501de1281 100644
--- a/code/modules/antagonists/_common/antag_datum.dm
+++ b/code/modules/antagonists/_common/antag_datum.dm
@@ -238,7 +238,7 @@ GLOBAL_LIST_EMPTY(antagonists)
return
/datum/antagonist/proc/edit_memory(mob/user)
- var/new_memo = copytext(trim(input(user,"Write new memory", "Memory", antag_memory) as null|message),1,MAX_MESSAGE_LEN)
+ var/new_memo = stripped_multiline_input(user, "Write new memory", "Memory", antag_memory, MAX_MESSAGE_LEN)
if (isnull(new_memo))
return
antag_memory = new_memo
diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm
index 78746e13fe2..ba1c90bf781 100644
--- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm
+++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm
@@ -29,6 +29,11 @@
var/stealth_armor = list("melee" = 15, "bullet" = 15, "laser" = 15, "energy" = 25, "bomb" = 15, "bio" = 15, "rad" = 15, "fire" = 70, "acid" = 70)
var/combat_armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 50, "bio" = 50, "rad" = 50, "fire" = 90, "acid" = 90)
+/obj/item/clothing/suit/armor/abductor/vest/Initialize()
+ . = ..()
+ stealth_armor = getArmor(arglist(stealth_armor))
+ combat_armor = getArmor(arglist(combat_armor))
+
/obj/item/clothing/suit/armor/abductor/vest/proc/toggle_nodrop()
if(HAS_TRAIT_FROM(src, TRAIT_NODROP, ABDUCTOR_VEST_TRAIT))
REMOVE_TRAIT(src, TRAIT_NODROP, ABDUCTOR_VEST_TRAIT)
diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm
index 9f25e7649a7..2e8bd26ad2b 100644
--- a/code/modules/antagonists/blob/overmind.dm
+++ b/code/modules/antagonists/blob/overmind.dm
@@ -222,7 +222,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
/mob/camera/blob/proc/blob_talk(message)
- message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
+ message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN))
if (!message)
return
diff --git a/code/modules/antagonists/blob/structures/_blob.dm b/code/modules/antagonists/blob/structures/_blob.dm
index 1fb738d9ee1..cc238587560 100644
--- a/code/modules/antagonists/blob/structures/_blob.dm
+++ b/code/modules/antagonists/blob/structures/_blob.dm
@@ -69,8 +69,8 @@
/obj/structure/blob/CanAllowThrough(atom/movable/mover, turf/target)
. = ..()
- if(istype(mover) && (mover.pass_flags & PASSBLOB))
- return TRUE
+ if(!(mover.pass_flags & PASSBLOB))
+ return FALSE
/obj/structure/blob/CanAtmosPass(turf/T)
return !atmosblock
diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm
index f569bbfe09c..26483160071 100644
--- a/code/modules/antagonists/cult/cult.dm
+++ b/code/modules/antagonists/cult/cult.dm
@@ -1,4 +1,7 @@
#define SUMMON_POSSIBILITIES 3
+#define CULT_VICTORY 1
+#define CULT_LOSS 0
+#define CULT_NARSIE_KILLED -1
/datum/antagonist/cult
name = "Cultist"
@@ -351,6 +354,7 @@
/datum/objective/eldergod
var/summoned = FALSE
+ var/killed = FALSE
var/list/summon_spots = list()
/datum/objective/eldergod/New()
@@ -367,18 +371,25 @@
explanation_text = "Summon Nar'Sie by invoking the rune 'Summon Nar'Sie'. The summoning can only be accomplished in [english_list(summon_spots)] - where the veil is weak enough for the ritual to begin."
/datum/objective/eldergod/check_completion()
+ if(killed)
+ return CULT_NARSIE_KILLED // You failed so hard that even the code went backwards.
return summoned || completed
/datum/team/cult/proc/check_cult_victory()
for(var/datum/objective/O in objectives)
- if(!O.check_completion())
- return FALSE
- return TRUE
+ if(O.check_completion() == CULT_NARSIE_KILLED)
+ return CULT_NARSIE_KILLED
+ else if(!O.check_completion())
+ return CULT_LOSS
+ return CULT_VICTORY
/datum/team/cult/roundend_report()
var/list/parts = list()
+ var/victory = check_cult_victory()
- if(check_cult_victory())
+ if(victory == CULT_NARSIE_KILLED) // Epic failure, you summoned your god and then someone killed it.
+ parts += "Nar'sie has been killed! The cult will haunt the universe no longer!"
+ else if(victory)
parts += "The cult has succeeded! Nar'Sie has snuffed out another torch in the void!"
else
parts += "The staff managed to stop the cult! Dark words and heresy are no match for Nanotrasen's finest!"
diff --git a/code/modules/antagonists/devil/true_devil/_true_devil.dm b/code/modules/antagonists/devil/true_devil/_true_devil.dm
index 85a1061e2aa..7b1770440c1 100644
--- a/code/modules/antagonists/devil/true_devil/_true_devil.dm
+++ b/code/modules/antagonists/devil/true_devil/_true_devil.dm
@@ -57,7 +57,7 @@
mind.announce_objectives()
/mob/living/carbon/true_devil/death(gibbed)
- stat = DEAD
+ set_stat(DEAD)
..(gibbed)
drop_all_held_items()
INVOKE_ASYNC(mind.has_antag_datum(/datum/antagonist/devil), /datum/antagonist/devil/proc/beginResurrectionCheck, src)
diff --git a/code/modules/antagonists/highlander/highlander.dm b/code/modules/antagonists/highlander/highlander.dm
index ef0e351d370..db547c0f4b1 100644
--- a/code/modules/antagonists/highlander/highlander.dm
+++ b/code/modules/antagonists/highlander/highlander.dm
@@ -8,10 +8,12 @@
/datum/antagonist/highlander/apply_innate_effects(mob/living/mob_override)
var/mob/living/L = owner.current || mob_override
ADD_TRAIT(L, TRAIT_NOGUNS, "highlander")
+ ADD_TRAIT(L, TRAIT_NODISMEMBER, "highlander")
/datum/antagonist/highlander/remove_innate_effects(mob/living/mob_override)
var/mob/living/L = owner.current || mob_override
REMOVE_TRAIT(L, TRAIT_NOGUNS, "highlander")
+ REMOVE_TRAIT(L, TRAIT_NODISMEMBER, "highlander")
/datum/antagonist/highlander/proc/forge_objectives()
var/datum/objective/steal/steal_objective = new
diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
index 48cfefb87f1..41a10364898 100644
--- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
+++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
@@ -246,6 +246,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
set_us_up_the_bomb(owner)
/datum/action/innate/ai/nuke_station/proc/set_us_up_the_bomb(mob/living/owner)
+ var/pass = prob(10) ? "******" : "hunter2"
set waitfor = FALSE
to_chat(owner, "run -o -a 'selfdestruct'")
sleep(5)
@@ -266,7 +267,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
sleep(3)
if(!owner || QDELETED(owner))
return
- to_chat(owner, "auth 'akjv9c88asdf12nb' ******************")
+ to_chat(owner, "auth 'akjv9c88asdf12nb' [pass]")
owner.playsound_local(owner, 'sound/items/timer.ogg', 50, 0)
sleep(30)
if(!owner || QDELETED(owner))
@@ -299,7 +300,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
sleep(14)
if(!owner || QDELETED(owner))
return
- to_chat(owner, "******************")
+ to_chat(owner, "[pass]")
sleep(40)
if(!owner || QDELETED(owner))
return
diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm
index c0fb4cde2b6..fdd2d00e2cf 100644
--- a/code/modules/antagonists/wizard/wizard.dm
+++ b/code/modules/antagonists/wizard/wizard.dm
@@ -144,7 +144,7 @@
var/wizard_name_second = pick(GLOB.wizard_second)
var/randomname = "[wizard_name_first] [wizard_name_second]"
var/mob/living/wiz_mob = owner.current
- var/newname = copytext(sanitize_name(reject_bad_text(input(wiz_mob, "You are the [name]. Would you like to change your name to something else?", "Name change", randomname) as null|text)),1,MAX_NAME_LEN)
+ var/newname = sanitize_name(reject_bad_text(stripped_input(wiz_mob, "You are the [name]. Would you like to change your name to something else?", "Name change", randomname, MAX_NAME_LEN)))
if (!newname)
newname = randomname
diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm
index c28201987f4..43c9cd95735 100644
--- a/code/modules/atmospherics/gasmixtures/reactions.dm
+++ b/code/modules/atmospherics/gasmixtures/reactions.dm
@@ -494,7 +494,6 @@
//Possibly burning a bit of organic matter through maillard reaction, so a *tiny* bit more heat would be understandable
air.temperature += cleaned_air * 0.002
- SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, cleaned_air*MIASMA_RESEARCH_AMOUNT)//Turns out the burning of miasma is kinda interesting to scientists
/datum/gas_reaction/stim_ball
priority = 7
diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm
index a96acb027bb..b384172c513 100644
--- a/code/modules/awaymissions/zlevel.dm
+++ b/code/modules/awaymissions/zlevel.dm
@@ -43,7 +43,7 @@ GLOBAL_LIST_INIT(potentialRandomZlevels, generateMapList(filename = "[global.con
t = trim(t)
if (length(t) == 0)
continue
- else if (copytext(t, 1, 2) == "#")
+ else if (t[1] == "#")
continue
var/pos = findtext(t, " ")
diff --git a/code/modules/cargo/blackmarket/blackmarket_telepad.dm b/code/modules/cargo/blackmarket/blackmarket_telepad.dm
index 02b01b47236..e2b36e4b1e1 100644
--- a/code/modules/cargo/blackmarket/blackmarket_telepad.dm
+++ b/code/modules/cargo/blackmarket/blackmarket_telepad.dm
@@ -101,7 +101,7 @@
var/datum/blackmarket_purchase/P = transmitting
if(!P.item)
QDEL_NULL(transmitting)
- if(!P.item in T.contents)
+ if(!(P.item in T.contents))
QDEL_NULL(transmitting)
return
do_teleport(P.item, get_turf(P.uplink))
diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm
index ebfc2b62519..68911fa5af3 100644
--- a/code/modules/client/asset_cache.dm
+++ b/code/modules/client/asset_cache.dm
@@ -600,7 +600,27 @@ GLOBAL_LIST_EMPTY(asset_datums)
/datum/asset/spritesheet/simple/achievements
name ="achievements"
assets = list(
- "default" = 'icons/UI_Icons/Achievements/default.png'
+ "default" = 'icons/UI_Icons/Achievements/default.png',
+ "basemisc" = 'icons/UI_Icons/Achievements/basemisc.png',
+ "baseboss" = 'icons/UI_Icons/Achievements/baseboss.png',
+ "baseskill" = 'icons/UI_Icons/Achievements/baseskill.png',
+ "bbgum" = 'icons/UI_Icons/Achievements/Boss/bbgum.png',
+ "colossus" = 'icons/UI_Icons/Achievements/Boss/colossus.png',
+ "hierophant" = 'icons/UI_Icons/Achievements/Boss/hierophant.png',
+ "legion" = 'icons/UI_Icons/Achievements/Boss/legion.png',
+ "miner" = 'icons/UI_Icons/Achievements/Boss/miner.png',
+ "swarmer" = 'icons/UI_Icons/Achievements/Boss/swarmer.png',
+ "tendril" = 'icons/UI_Icons/Achievements/Boss/tendril.png',
+ "featofstrength" = 'icons/UI_Icons/Achievements/Misc/featofstrength.png',
+ "helbital" = 'icons/UI_Icons/Achievements/Misc/helbital.png',
+ "jackpot" = 'icons/UI_Icons/Achievements/Misc/jackpot.png',
+ "meteors" = 'icons/UI_Icons/Achievements/Misc/meteors.png',
+ "timewaste" = 'icons/UI_Icons/Achievements/Misc/timewaste.png',
+ "upgrade" = 'icons/UI_Icons/Achievements/Misc/upgrade.png',
+ "clownking" = 'icons/UI_Icons/Achievements/Misc/clownking.png',
+ "clownthanks" = 'icons/UI_Icons/Achievements/Misc/clownthanks.png',
+ "rule8" = 'icons/UI_Icons/Achievements/Misc/rule8.png',
+ "mining" = 'icons/UI_Icons/Achievements/Skills/mining.png',
)
/datum/asset/spritesheet/simple/pills
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index bb3ed3c4d5c..04f9e9f4c3c 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -83,7 +83,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
log_href("[src] (usr:[usr]\[[COORD(usr)]\]) : [hsrc ? "[hsrc] " : ""][href]")
//byond bug ID:2256651
- if (asset_cache_job && asset_cache_job in completed_asset_jobs)
+ if (asset_cache_job && (asset_cache_job in completed_asset_jobs))
to_chat(src, "An error has been detected in how your client is receiving resources. Attempting to correct.... (If you keep seeing these messages you might want to close byond and reconnect)")
src << browse("...", "window=asset_cache_browser")
@@ -438,7 +438,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
winset(src, "[child]", "[entries[child]]")
if (!ispath(child, /datum/verbs/menu))
var/procpath/verbpath = child
- if (copytext(verbpath.name,1,2) != "@")
+ if (verbpath.name[1] != "@")
new child(src)
for (var/thing in prefs.menuoptions)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 374c2153f6b..14509f250cf 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1299,7 +1299,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(new_socks)
socks = new_socks
- if(BODY_ZONE_PRECISE_EYES)
+ if("eyes")
var/new_eyes = input(user, "Choose your character's eye colour:", "Character Preference","#"+eye_color) as color|null
if(new_eyes)
eye_color = sanitize_hexcolor(new_eyes)
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index caff3d9e99a..3b8237dde68 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -141,7 +141,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
/datum/preferences/proc/load_path(ckey,filename="preferences.sav")
if(!ckey)
return
- path = "data/player_saves/[copytext(ckey,1,2)]/[ckey]/[filename]"
+ path = "data/player_saves/[ckey[1]]/[ckey]/[filename]"
/datum/preferences/proc/load_preferences()
if(!path)
@@ -416,7 +416,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
jumpsuit_style = sanitize_inlist(jumpsuit_style, GLOB.jumpsuitlist, initial(jumpsuit_style))
uplink_spawn_loc = sanitize_inlist(uplink_spawn_loc, GLOB.uplink_spawn_loc_list, initial(uplink_spawn_loc))
features["mcolor"] = sanitize_hexcolor(features["mcolor"], 3, 0)
- features["ethcolor"] = copytext(features["ethcolor"],1,7)
+ features["ethcolor"] = copytext_char(features["ethcolor"], 1, 7)
features["tail_lizard"] = sanitize_inlist(features["tail_lizard"], GLOB.tails_list_lizard)
features["tail_human"] = sanitize_inlist(features["tail_human"], GLOB.tails_list_human, "None")
features["snout"] = sanitize_inlist(features["snout"], GLOB.snouts_list)
diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm
index 6646d4cbf5a..f5eb663fb74 100644
--- a/code/modules/client/verbs/ooc.dm
+++ b/code/modules/client/verbs/ooc.dm
@@ -28,7 +28,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
if(QDELETED(src))
return
- msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
+ msg = copytext_char(sanitize(msg), 1, MAX_MESSAGE_LEN)
var/raw_msg = msg
if(!msg)
@@ -36,7 +36,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
msg = emoji_parse(msg)
- if((copytext(msg, 1, 2) in list(".",";",":","#")) || (findtext(lowertext(copytext(msg, 1, 5)), "say")))
+ if((msg[1] in list(".",";",":","#")) || findtext_char(msg, "say", 1, 5))
if(alert("Your message \"[raw_msg]\" looks like it was meant for in game communication, say it in OOC?", "Meant for OOC?", "No", "Yes") != "Yes")
return
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index 6910c856b7e..763443bd7a4 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -158,6 +158,17 @@
transfer_prints = FALSE
carrytrait = TRAIT_QUICKER_CARRY
+/obj/item/clothing/gloves/color/latex/engineering
+ name = "tinker's gloves"
+ desc = "Overdesigned engineering gloves that have automated construction subrutines dialed in, allowing for faster construction while worn."
+ icon = 'icons/obj/clothing/clockwork_garb.dmi'
+ icon_state = "clockwork_gauntlets"
+ item_state = "clockwork_gauntlets"
+ siemens_coefficient = 0.8
+ permeability_coefficient = 0.3
+ carrytrait = TRAIT_QUICK_BUILD
+ custom_materials = list(/datum/material/iron=2000, /datum/material/silver=1500, /datum/material/gold = 1000)
+
/obj/item/clothing/gloves/color/white
name = "white gloves"
desc = "These look pretty fancy."
diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
index 211909016ec..01bbfe414d5 100644
--- a/code/modules/clothing/neck/_neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -181,7 +181,7 @@
return ..()
/obj/item/clothing/neck/petcollar/attack_self(mob/user)
- tagname = copytext(sanitize(input(user, "Would you like to change the name on the tag?", "Name your new pet", "Spot") as null|text),1,MAX_NAME_LEN)
+ tagname = stripped_input(user, "Would you like to change the name on the tag?", "Name your new pet", "Spot", MAX_NAME_LEN)
name = "[initial(name)] - [tagname]"
//////////////
diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm
index e809d8ba4dc..b254e26f4c4 100644
--- a/code/modules/clothing/outfits/ert.dm
+++ b/code/modules/clothing/outfits/ert.dm
@@ -16,8 +16,9 @@
R.freqlock = TRUE
var/obj/item/card/id/W = H.wear_id
- W.registered_name = H.real_name
- W.update_label()
+ if(W)
+ W.registered_name = H.real_name
+ W.update_label()
..()
/datum/outfit/centcom/ert/commander
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 73cc9d8c6cf..fe30fa19d6c 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -116,6 +116,11 @@
user.changeNext_move(CLICK_CD_MELEE)
..()
+/obj/item/clothing/suit/space/hardsuit/examine(mob/user)
+ . = ..()
+ if(!helmet && helmettype)
+ . += " The helmet on [src] seems to be malfunctioning. It's light bulb needs to be replaced."
+
/obj/item/clothing/suit/space/hardsuit/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/tank/jetpack/suit))
if(jetpack)
@@ -142,6 +147,22 @@
jetpack = null
to_chat(user, "You successfully remove the jetpack from [src].")
return
+ else if(istype(I, /obj/item/light) && helmettype)
+ if(src == user.get_item_by_slot(ITEM_SLOT_OCLOTHING))
+ to_chat(user, "You cannot replace the bulb in the helmet of [src] while wearing it.")
+ return
+ if(helmet)
+ to_chat(user, "The helmet of [src] does not require a new bulb.")
+ return
+ var/obj/item/light/L = I
+ if(L.status)
+ to_chat(user, "This bulb is too damaged to use as a replacement!")
+ return
+ if(do_after(user, 50, 1, src))
+ qdel(I)
+ helmet = new helmettype(src)
+ to_chat(user, "You have successfully repaired [src]'s helmet.")
+ new /obj/item/light/bulb/broken(drop_location())
return ..()
diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm
index c66b5c8dd3c..1e7325503d0 100644
--- a/code/modules/clothing/suits/toggles.dm
+++ b/code/modules/clothing/suits/toggles.dm
@@ -184,6 +184,7 @@
if(!helmettype)
return
if(!helmet)
+ to_chat(H, "The helmet's lightbulb seems to be damaged! You'll need a replacement bulb.")
return
if(!suittoggled)
if(ishuman(src.loc))
diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm
index 552d9c59bb5..27aa266a5a0 100644
--- a/code/modules/detectivework/footprints_and_rag.dm
+++ b/code/modules/detectivework/footprints_and_rag.dm
@@ -38,7 +38,7 @@
C.visible_message("[user] has touched \the [C] with \the [src].")
log_combat(user, C, "touched", src, log_object)
- else if(istype(A) && src in user)
+ else if(istype(A) && (src in user))
user.visible_message("[user] starts to wipe down [A] with [src]!", "You start to wipe down [A] with [src]...")
if(do_after(user,30, target = A))
user.visible_message("[user] finishes wiping off [A]!", "You finish wiping off [A].")
diff --git a/code/modules/emoji/emoji_parse.dm b/code/modules/emoji/emoji_parse.dm
index db46ca09ca8..65e8063ce0c 100644
--- a/code/modules/emoji/emoji_parse.dm
+++ b/code/modules/emoji/emoji_parse.dm
@@ -12,14 +12,14 @@
parsed += copytext(text, pos, search)
if(search)
pos = search
- search = findtext(text, ":", pos+1)
+ search = findtext(text, ":", pos + length(text[pos]))
if(search)
- emoji = lowertext(copytext(text, pos+1, search))
+ emoji = lowertext(copytext(text, pos + length(text[pos]), search))
var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/goonchat)
var/tag = sheet.icon_tag("emoji-[emoji]")
if(tag)
parsed += tag
- pos = search + 1
+ pos = search + length(text[pos])
else
parsed += copytext(text, pos, search)
pos = search
@@ -42,12 +42,12 @@
search = findtext(text, ":", pos)
if(search)
pos = search
- search = findtext(text, ":", pos+1)
+ search = findtext(text, ":", pos + length(text[pos]))
if(search)
- var/word = lowertext(copytext(text, pos+1, search))
+ var/word = lowertext(copytext(text, pos + length(text[pos]), search))
if(word in emojis)
- final += lowertext(copytext(text, pos, search+1))
- pos = search + 1
+ final += lowertext(copytext(text, pos, search + length(text[search])))
+ pos = search + length(text[search])
continue
break
return final
diff --git a/code/modules/error_handler/error_handler.dm b/code/modules/error_handler/error_handler.dm
index 9791f89e14f..5fa58387e9c 100644
--- a/code/modules/error_handler/error_handler.dm
+++ b/code/modules/error_handler/error_handler.dm
@@ -12,14 +12,14 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
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")
+ if(copytext(E.name, 1, 32) == "Maximum recursion level reached")//32 == length() of that string + 1
//log to world while intentionally triggering the byond bug.
log_world("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.
- else if(copytext(E.name,1,18) == "Out of resources!")
+ else if(copytext(E.name, 1, 18) == "Out of resources!")//18 == length() of that string + 1
log_world("BYOND out of memory. Restarting")
log_game("BYOND out of memory. Restarting")
TgsEndProcess()
@@ -109,7 +109,7 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
usrinfo = null
continue // Our usr info is better, replace it
- if(copytext(line, 1, 3) != " ")
+ if(copytext(line, 1, 3) != " ")//3 == length(" ") + 1
desclines += (" " + line) // Pad any unpadded lines, so they look pretty
else
desclines += line
diff --git a/code/modules/events/creep_awakening.dm b/code/modules/events/creep_awakening.dm
index d0269b8ddef..b8842119ba4 100644
--- a/code/modules/events/creep_awakening.dm
+++ b/code/modules/events/creep_awakening.dm
@@ -13,7 +13,7 @@
continue
if(H.stat == DEAD)
continue
- if(!SSjob.GetJob(H.mind.assigned_role) || H.mind.assigned_role in GLOB.nonhuman_positions) //only station jobs sans nonhuman roles, prevents ashwalkers trying to stalk with crewmembers they never met
+ if(!SSjob.GetJob(H.mind.assigned_role) || (H.mind.assigned_role in GLOB.nonhuman_positions)) //only station jobs sans nonhuman roles, prevents ashwalkers trying to stalk with crewmembers they never met
continue
if(H.mind.has_antag_datum(/datum/antagonist/obsessed))
continue
diff --git a/code/modules/events/fugitive_spawning.dm b/code/modules/events/fugitive_spawning.dm
index a490cf5f26a..7b4628f1356 100644
--- a/code/modules/events/fugitive_spawning.dm
+++ b/code/modules/events/fugitive_spawning.dm
@@ -25,6 +25,8 @@
if(candidates.len >= 1) //solo refugees
if(prob(30))
possible_backstories.Add("waldo") //less common as it comes with magicks and is kind of immershun shattering
+ else //For accurate deadchat feedback
+ minimum_required = 4
if(candidates.len >= 4)//group refugees
possible_backstories.Add("prisoner", "cultist", "synth")
if(!possible_backstories.len)
diff --git a/code/modules/food_and_drinks/food/snacks/meat.dm b/code/modules/food_and_drinks/food/snacks/meat.dm
index 2da69ded522..fd8e67f4848 100644
--- a/code/modules/food_and_drinks/food/snacks/meat.dm
+++ b/code/modules/food_and_drinks/food/snacks/meat.dm
@@ -210,7 +210,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab/spider
name = "spider meat"
- desc = "A slab of spider meat."
+ desc = "A slab of spider meat. That is so Kafkaesque."
icon_state = "spidermeat"
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/toxin = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#7CFC00"
diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm
index 0a2efbe1e40..202bb9edf85 100644
--- a/code/modules/food_and_drinks/food/snacks_meat.dm
+++ b/code/modules/food_and_drinks/food/snacks_meat.dm
@@ -118,6 +118,8 @@
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("meat" = 1)
+ slices_num = 6
+ slice_path = /obj/item/reagent_containers/food/snacks/salami
foodtype = MEAT | BREAKFAST
var/roasted = FALSE
@@ -125,6 +127,14 @@
. = ..()
eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp")
+/obj/item/reagent_containers/food/snacks/salami
+ name = "salami"
+ desc = "A slice of cured salami."
+ icon_state = "salami"
+ list_reagents = list(/datum/reagent/consumable/nutriment = 1)
+ tastes = list("meat" = 1)
+ foodtype = MEAT
+
/obj/item/reagent_containers/food/snacks/rawkhinkali
name = "raw khinkali"
desc = "One hundred khinkalis? Do I look like a pig?"
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index ed32abfbad2..2744f122238 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
@@ -216,7 +216,7 @@
meatslab.throw_at(pick(nearby_turfs),i,3)
for (var/turfs=1 to meat_produced)
var/turf/gibturf = pick(nearby_turfs)
- if (!gibturf.density && src in view(gibturf))
+ if (!gibturf.density && (src in view(gibturf)))
new gibtype(gibturf,i,diseases)
pixel_x = initial(pixel_x) //return to its spot after shaking
diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm
index 48fff02117c..829b79bc02b 100644
--- a/code/modules/food_and_drinks/pizzabox.dm
+++ b/code/modules/food_and_drinks/pizzabox.dm
@@ -125,10 +125,10 @@
return
else
bomb_timer = input(user, "Set the [bomb] timer from [BOMB_TIMER_MIN] to [BOMB_TIMER_MAX].", bomb, bomb_timer) as num|null
-
+
if (isnull(bomb_timer))
return
-
+
bomb_timer = CLAMP(CEILING(bomb_timer / 2, 1), BOMB_TIMER_MIN, BOMB_TIMER_MAX)
bomb_defused = FALSE
@@ -221,7 +221,7 @@
unprocess()
qdel(src)
if(!bomb_active || bomb_defused)
- if(bomb_defused && bomb in src)
+ if(bomb_defused && (bomb in src))
bomb.defuse()
bomb_active = FALSE
unprocess()
diff --git a/code/modules/goonchat/browserOutput.dm b/code/modules/goonchat/browserOutput.dm
index 21ffdf66624..903a911a21e 100644
--- a/code/modules/goonchat/browserOutput.dm
+++ b/code/modules/goonchat/browserOutput.dm
@@ -66,8 +66,8 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("tmp/iconCache.sav")) //Cache of ico
// Arguments are in the form "param[paramname]=thing"
var/list/params = list()
for(var/key in href_list)
- if(length(key) > 7 && findtext(key, "param")) // 7 is the amount of characters in the basic param key template.
- var/param_name = copytext(key, 7, -1)
+ if(length_char(key) > 7 && findtext(key, "param")) // 7 is the amount of characters in the basic param key template.
+ var/param_name = copytext_char(key, 7, -1)
var/item = href_list[key]
params[param_name] = item
diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm
index f30e766d7d8..f64c5311fd5 100644
--- a/code/modules/holiday/holidays.dm
+++ b/code/modules/holiday/holidays.dm
@@ -23,8 +23,8 @@
// Returns special prefixes for the station name on certain days. You wind up with names like "Christmas Object Epsilon". See new_station_name()
/datum/holiday/proc/getStationPrefix()
//get the first word of the Holiday and use that
- var/i = findtext(name," ",1,0)
- return copytext(name,1,i)
+ var/i = findtext(name, " ")
+ return copytext(name, 1, i)
// Return 1 if this holidy should be celebrated today
/datum/holiday/proc/shouldCelebrate(dd, mm, yy, ww, ddd)
diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm
index b61d286aa1e..1e662d28e58 100644
--- a/code/modules/hydroponics/gene_modder.dm
+++ b/code/modules/hydroponics/gene_modder.dm
@@ -407,7 +407,7 @@
/obj/machinery/plantgenes/proc/repaint_seed()
if(!seed)
return
- if(copytext(seed.name, 1, 13) == "experimental")
+ if(copytext(seed.name, 1, 13) == "experimental")//13 == length("experimental") + 1
return // Already modded name and icon
seed.name = "experimental " + seed.name
seed.icon_state = "seed-x"
diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm
index cc40eb59aa4..cc6995f36f4 100644
--- a/code/modules/hydroponics/grown/towercap.dm
+++ b/code/modules/hydroponics/grown/towercap.dm
@@ -230,7 +230,7 @@
var/turf/open/O = loc
if(O.air)
var/loc_gases = O.air.gases
- if(loc_gases[/datum/gas/oxygen][MOLES] >= 5)
+ if(loc_gases[/datum/gas/oxygen] && loc_gases[/datum/gas/oxygen][MOLES] >= 5)
return TRUE
return FALSE
diff --git a/code/modules/jobs/job_exp.dm b/code/modules/jobs/job_exp.dm
index b0be0ed2fe2..49df71d2aee 100644
--- a/code/modules/jobs/job_exp.dm
+++ b/code/modules/jobs/job_exp.dm
@@ -40,7 +40,7 @@ GLOBAL_PROTECT(exp_to_update)
return exp_type
/proc/job_is_xp_locked(jobtitle)
- if(!CONFIG_GET(flag/use_exp_restrictions_heads) && jobtitle in (GLOB.command_positions | list("AI")))
+ if(!CONFIG_GET(flag/use_exp_restrictions_heads) && (jobtitle in (GLOB.command_positions | list("AI"))))
return FALSE
if(!CONFIG_GET(flag/use_exp_restrictions_other) && !(jobtitle in (GLOB.command_positions | list("AI"))))
return FALSE
diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm
index 5c7bf68d470..61fbfacee25 100644
--- a/code/modules/jobs/job_types/paramedic.dm
+++ b/code/modules/jobs/job_types/paramedic.dm
@@ -31,7 +31,7 @@
belt = /obj/item/storage/belt/medical/paramedic
id = /obj/item/card/id
l_pocket = /obj/item/pda/medical
- r_pocket = /obj/item/pinpointer/crew
+ r_pocket = /obj/item/pinpointer/crew/prox
backpack_contents = list(/obj/item/roller=1)
pda_slot = ITEM_SLOT_LPOCKET
diff --git a/code/modules/language/codespeak.dm b/code/modules/language/codespeak.dm
index bbad7befb89..12ac08b5d63 100644
--- a/code/modules/language/codespeak.dm
+++ b/code/modules/language/codespeak.dm
@@ -13,13 +13,13 @@
. = ""
var/list/words = list()
- while(length(.) < length(input))
+ while(length_char(.) < length_char(input))
words += generate_code_phrase(return_list=TRUE)
. = jointext(words, ", ")
. = capitalize(.)
- var/input_ending = copytext(input, length(input))
+ var/input_ending = copytext_char(input, -1)
var/static/list/endings
if(!endings)
diff --git a/code/modules/language/language.dm b/code/modules/language/language.dm
index 8b9cc09dffc..bf8087ad73c 100644
--- a/code/modules/language/language.dm
+++ b/code/modules/language/language.dm
@@ -80,11 +80,11 @@
if(lookup)
return lookup
- var/input_size = length(input)
+ var/input_size = length_char(input)
var/scrambled_text = ""
var/capitalize = TRUE
- while(length(scrambled_text) < input_size)
+ while(length_char(scrambled_text) < input_size)
var/next = pick(syllables)
if(capitalize)
next = capitalize(next)
@@ -98,10 +98,10 @@
scrambled_text += " "
scrambled_text = trim(scrambled_text)
- var/ending = copytext(scrambled_text, length(scrambled_text))
+ var/ending = copytext_char(scrambled_text, -1)
if(ending == ".")
- scrambled_text = copytext(scrambled_text,1,length(scrambled_text)-1)
- var/input_ending = copytext(input, input_size)
+ scrambled_text = copytext_char(scrambled_text, 1, -2)
+ var/input_ending = copytext_char(input, -1)
if(input_ending in list("!","?","."))
scrambled_text += input_ending
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index bcafa426367..0354b480c6b 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -377,9 +377,9 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
if(checkoutperiod < 1)
checkoutperiod = 1
if(href_list["editbook"])
- buffer_book = copytext(sanitize(input("Enter the book's title:") as text|null),1,MAX_MESSAGE_LEN)
+ buffer_book = stripped_input(usr, "Enter the book's title:")
if(href_list["editmob"])
- buffer_mob = copytext(sanitize(input("Enter the recipient's name:") as text|null),1,MAX_NAME_LEN)
+ buffer_mob = stripped_input(usr, "Enter the recipient's name:", max_length = MAX_NAME_LEN)
if(href_list["checkout"])
var/datum/borrowbook/b = new /datum/borrowbook
b.bookname = sanitize(buffer_book)
@@ -396,7 +396,7 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
if(b && istype(b))
inventory.Remove(b)
if(href_list["setauthor"])
- var/newauthor = copytext(sanitize(input("Enter the author's name: ") as text|null),1,MAX_MESSAGE_LEN)
+ var/newauthor = stripped_input(usr, "Enter the author's name: ")
if(newauthor)
scanner.cache.author = newauthor
if(href_list["setcategory"])
diff --git a/code/modules/library/soapstone.dm b/code/modules/library/soapstone.dm
index 3f9f33e2fc0..8c37a8645b7 100644
--- a/code/modules/library/soapstone.dm
+++ b/code/modules/library/soapstone.dm
@@ -149,7 +149,7 @@
/obj/structure/chisel_message/update_icon()
..()
var/hash = md5(hidden_message)
- var/newcolor = copytext(hash, 1, 7)
+ var/newcolor = copytext_char(hash, 1, 7)
add_atom_colour("#[newcolor]", FIXED_COLOUR_PRIORITY)
light_color = "#[newcolor]"
set_light(1)
diff --git a/code/modules/mapping/reader.dm b/code/modules/mapping/reader.dm
index 66b24d4e7fb..86b501c455d 100644
--- a/code/modules/mapping/reader.dm
+++ b/code/modules/mapping/reader.dm
@@ -241,7 +241,8 @@
var/variables_start = findtext(full_def, "{")
var/path_text = trim_text(copytext(full_def, 1, variables_start))
var/atom_def = text2path(path_text) //path definition, e.g /obj/foo/bar
- old_position = dpos + 1
+ if(dpos)
+ old_position = dpos + length(model[dpos])
if(!ispath(atom_def, /atom)) // Skip the item if the path does not exist. Fix your crap, mappers!
if(bad_paths)
@@ -253,7 +254,7 @@
var/list/fields = list()
if(variables_start)//if there's any variable
- full_def = copytext(full_def,variables_start+1,length(full_def))//removing the last '}'
+ full_def = copytext(full_def, variables_start + length(full_def[variables_start]), -length(copytext_char(full_def, -1))) //removing the last '}'
fields = readlist(full_def, ";")
if(fields.len)
if(!trim(fields[fields.len]))
@@ -305,7 +306,7 @@
//The next part of the code assumes there's ALWAYS an /area AND a /turf on a given tile
//first instance the /area and remove it from the members list
index = members.len
- if(members[index] != /area/template_noop)
+ if(members[index] != /area/template_noop)
var/atype = members[index]
world.preloader_setup(members_attributes[index], atype)//preloader for assigning set variables on atom creation
var/atom/instance = areaCache[atype]
@@ -423,12 +424,13 @@
var/trim_left = trim_text(copytext(text,old_position,(equal_position ? equal_position : position)))
var/left_constant = delimiter == ";" ? trim_left : parse_constant(trim_left)
- old_position = position + 1
+ if(position)
+ old_position = position + length(text[position])
if(equal_position && !isnum(left_constant))
// Associative var, so do the association.
// Note that numbers cannot be keys - the RHS is dropped if so.
- var/trim_right = trim_text(copytext(text,equal_position+1,position))
+ var/trim_right = trim_text(copytext(text, equal_position + length(text[equal_position]), position))
var/right_constant = parse_constant(trim_right)
.[left_constant] = right_constant
@@ -442,12 +444,12 @@
return num
// string
- if(findtext(text,"\"",1,2))
- return copytext(text,2,findtext(text,"\"",3,0))
+ if(text[1] == "\"")
+ return copytext(text, length(text[1]) + 1, findtext(text, "\"", length(text[1]) + 1))
// list
- if(copytext(text,1,6) == "list(")
- return readlist(copytext(text,6,length(text)))
+ if(copytext(text, 1, 6) == "list(")//6 == length("list(") + 1
+ return readlist(copytext(text, 6, -1))
// typepath
var/path = text2path(text)
@@ -455,8 +457,8 @@
return path
// file
- if(copytext(text,1,2) == "'")
- return file(copytext(text,2,length(text)))
+ if(text[1] == "'")
+ return file(copytext_char(text, 2, -1))
// null
if(text == "null")
diff --git a/code/modules/mapping/verify.dm b/code/modules/mapping/verify.dm
index a9834e37098..1f071aaec72 100644
--- a/code/modules/mapping/verify.dm
+++ b/code/modules/mapping/verify.dm
@@ -60,8 +60,9 @@
// build_cache will check bad paths for us
var/list/modelCache = build_cache(TRUE, report.bad_paths)
+ var/static/regex/area_or_turf = regex(@"/(turf|area)/")
for(var/path in report.bad_paths)
- if(copytext(path, 1, 7) == "/turf/" || copytext(path, 1, 7) == "/area/")
+ if(area_or_turf.Find("[path]", 1, 1))
report.loadable = FALSE
// check for tiles with the wrong number of turfs or areas
diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm
index 59f2e9daba4..64151c75585 100644
--- a/code/modules/mining/abandoned_crates.dm
+++ b/code/modules/mining/abandoned_crates.dm
@@ -29,14 +29,17 @@
var/input = input(usr, "Enter [codelen] digits. All digits must be unique.", "Deca-Code Lock", "") as text|null
if(user.canUseTopic(src, BE_CLOSE))
var/list/sanitised = list()
- var/sanitycheck = 1
- for(var/i=1,i<=length(input),i++) //put the guess into a list
- sanitised += text2num(copytext(input,i,i+1))
- for(var/i=1,i<=(length(input)-1),i++) //compare each digit in the guess to all those following it
- for(var/j=(i+1),j<=length(input),j++)
+ var/sanitycheck = TRUE
+ var/char = ""
+ var/length_input = length(input)
+ for(var/i = 1, i <= length_input, i += length(char)) //put the guess into a list
+ char = input[i]
+ sanitised += text2num(char)
+ for(var/i = 1, i <= length(sanitised) - 1, i++) //compare each digit in the guess to all those following it
+ for(var/j = i + 1, j <= length(sanitised), j++)
if(sanitised[i] == sanitised[j])
- sanitycheck = null //if a digit is repeated, reject the input
- if (input == code)
+ sanitycheck = FALSE //if a digit is repeated, reject the input
+ if(input == code)
to_chat(user, "The crate unlocks!")
locked = FALSE
cut_overlays()
@@ -44,7 +47,7 @@
tamperproof = 0 // set explosion chance to zero, so we dont accidently hit it with a multitool and instantly die
if(!spawned_loot)
spawn_loot()
- else if (input == null || sanitycheck == null || length(input) != codelen)
+ else if(!input || !sanitycheck || length(sanitised) != codelen)
to_chat(user, "You leave the crate alone.")
else
to_chat(user, "A red light flashes.")
@@ -69,20 +72,27 @@
else
to_chat(user, "* Anti-Tamper Bomb will activate after [attempts] failed access attempts.")
if(lastattempt != null)
- var/list/guess = list()
- var/list/answer = list()
- var/bulls = 0
- var/cows = 0
- for(var/i=1,i<=length(lastattempt),i++)
- guess += text2num(copytext(lastattempt,i,i+1))
- for(var/i=1,i<=length(lastattempt),i++)
- answer += text2num(copytext(code,i,i+1))
- for(var/i = 1, i < codelen + 1, i++) // Go through list and count matches
- if( answer.Find(guess[i],1,codelen+1))
- ++cows
- if( answer[i] == guess[i])
+ var/bulls = 0 //right position, right number
+ var/cows = 0 //wrong position but in the puzzle
+
+ var/lastattempt_char = ""
+ var/length_lastattempt = length(lastattempt)
+ var/lastattempt_it = 1
+
+ var/code_char = ""
+ var/length_code = length(code)
+ var/code_it = 1
+
+ while(lastattempt_it <= length_lastattempt && code_it <= length_code) // Go through list and count matches
+ lastattempt_char = lastattempt[lastattempt_it]
+ code_char = code[code_it]
+ if(lastattempt_char == code_char)
++bulls
- --cows
+ else if(findtext(code, lastattempt_char))
+ ++cows
+
+ lastattempt_it += length(lastattempt_char)
+ code_it += length(code_char)
to_chat(user, "Last code attempt, [lastattempt], had [bulls] correct digits at correct positions and [cows] correct digits at incorrect positions.")
return
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index e1fb698d1f2..573f02b50f9 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -411,12 +411,13 @@
icon_state = "hook"
icon = 'icons/obj/lavaland/artefacts.dmi'
pass_flags = PASSTABLE
- damage = 25
- armour_penetration = 100
+ damage = 20
+ stamina = 20
+ armour_penetration = 60
damage_type = BRUTE
hitsound = 'sound/effects/splat.ogg'
- paralyze = 30
var/chain
+ var/knockdown_time = (0.5 SECONDS)
/obj/projectile/hook/fire(setAngle)
if(firer)
@@ -432,6 +433,10 @@
return
A.visible_message("[A] is snagged by [firer]'s hook!")
new /datum/forced_movement(A, get_turf(firer), 5, TRUE)
+ if (isliving(target))
+ var/mob/living/fresh_meat = target
+ fresh_meat.Knockdown(knockdown_time)
+ return
//TODO: keep the chain beamed to A
//TODO: needs a callback to delete the chain
@@ -452,7 +457,7 @@
/obj/projectile/hook/bounty
damage = 0
- paralyze = 20
+ stamina = 40
//Immortality Talisman
/obj/item/immortality_talisman
@@ -1034,8 +1039,6 @@
var/list/da_list = list()
for(var/I in GLOB.alive_mob_list & GLOB.player_list)
var/mob/living/L = I
- if(is_centcom_level(L.z))
- continue
da_list[L.real_name] = L
var/choice = input(user,"Who do you want dead?","Choose Your Victim") as null|anything in sortList(da_list)
diff --git a/code/modules/mining/machine_silo.dm b/code/modules/mining/machine_silo.dm
index 8bea7b76099..94912dfc554 100644
--- a/code/modules/mining/machine_silo.dm
+++ b/code/modules/mining/machine_silo.dm
@@ -235,5 +235,5 @@ GLOBAL_LIST_EMPTY(silo_access_logs)
var/val = round(materials[key]) / MINERAL_MATERIAL_AMOUNT
msg += sep
sep = ", "
- msg += "[amount < 0 ? "-" : "+"][val] [copytext(key, 2)]"
+ msg += "[amount < 0 ? "-" : "+"][val] [copytext(key, length(key[1]) + 1)]"
formatted = msg.Join()
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index 884f34099b6..4b311da18d4 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -93,31 +93,28 @@
/obj/machinery/mineral/equipment_vendor/Topic(href, href_list)
if(..())
return
- if(href_list["purchase"])
- var/mob/M = usr
- var/obj/item/card/id/I = M.get_idcard(TRUE)
- if(istype(I))
- var/datum/data/mining_equipment/prize = locate(href_list["purchase"]) in prize_list
- if (!prize || !(prize in prize_list))
- to_chat(usr, "Error: Invalid choice!")
- flick(icon_deny, src)
- return
- if(prize.cost > I.mining_points)
- to_chat(usr, "Error: Insufficient points for [prize.equipment_name] on [I]!")
- flick(icon_deny, src)
- else
- if (I.mining_points -= prize.cost)
- to_chat(usr, "[src] clanks to life briefly before vending [prize.equipment_name]!")
- new prize.equipment_path(src.loc)
- SSblackbox.record_feedback("nested tally", "mining_equipment_bought", 1, list("[type]", "[prize.equipment_path]"))
- else
- to_chat(usr, "Error: Transaction failure, please try again later!")
- flick(icon_deny, src)
- else
- to_chat(usr, "Error: An ID is required!")
- flick(icon_deny, src)
+ if(!href_list["purchase"])
+ return
+ var/mob/M = usr
+ var/obj/item/card/id/I = M.get_idcard(TRUE)
+ if(!istype(I))
+ to_chat(usr, "Error: An ID is required!")
+ flick(icon_deny, src)
+ return
+ var/datum/data/mining_equipment/prize = locate(href_list["purchase"]) in prize_list
+ if (!prize || !(prize in prize_list))
+ to_chat(usr, "Error: Invalid choice!")
+ flick(icon_deny, src)
+ return
+ if(prize.cost > I.mining_points)
+ to_chat(usr, "Error: Insufficient points for [prize.equipment_name] on [I]!")
+ flick(icon_deny, src)
+ return
+ I.mining_points -= prize.cost
+ to_chat(usr, "[src] clanks to life briefly before vending [prize.equipment_name]!")
+ new prize.equipment_path(loc)
+ SSblackbox.record_feedback("nested tally", "mining_equipment_bought", 1, list("[type]", "[prize.equipment_path]"))
updateUsrDialog()
- return
/obj/machinery/mineral/equipment_vendor/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/mining_voucher))
diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm
index 7ab4ff1fe3e..61366a12d77 100644
--- a/code/modules/mob/dead/dead.dm
+++ b/code/modules/mob/dead/dead.dm
@@ -70,7 +70,8 @@ INITIALIZE_IMMEDIATE(/mob/dead)
set desc= "Jump to the other server"
if(notransform)
return
- var/list/csa = CONFIG_GET(keyed_list/cross_server)
+ var/list/our_id = CONFIG_GET(string/cross_comms_name)
+ var/list/csa = CONFIG_GET(keyed_list/cross_server) - our_id
var/pick
switch(csa.len)
if(0)
diff --git a/code/modules/mob/dead/new_player/sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories.dm
index 396d8646423..e9cb770ccfd 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories.dm
@@ -1532,6 +1532,10 @@
name = "Thigh-high (Bee)"
icon_state = "bee_thigh"
+/datum/sprite_accessory/socks/thocks
+ name = "Thocks"
+ icon_state = "thocks"
+
//////////.//////////////////
// MutantParts Definitions //
/////////////////////////////
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index e26e5a3cf6e..58f110428e6 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -194,13 +194,13 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
else
ghostimage_default.icon_state = new_form
- if(ghost_accs >= GHOST_ACCS_DIR && icon_state in GLOB.ghost_forms_with_directions_list) //if this icon has dirs AND the client wants to show them, we make sure we update the dir on movement
+ if(ghost_accs >= GHOST_ACCS_DIR && (icon_state in GLOB.ghost_forms_with_directions_list)) //if this icon has dirs AND the client wants to show them, we make sure we update the dir on movement
updatedir = 1
else
updatedir = 0 //stop updating the dir in case we want to show accessories with dirs on a ghost sprite without dirs
setDir(2 )//reset the dir to its default so the sprites all properly align up
- if(ghost_accs == GHOST_ACCS_FULL && icon_state in GLOB.ghost_forms_with_accessories_list) //check if this form supports accessories and if the client wants to show them
+ if(ghost_accs == GHOST_ACCS_FULL && (icon_state in GLOB.ghost_forms_with_accessories_list)) //check if this form supports accessories and if the client wants to show them
var/datum/sprite_accessory/S
if(facial_hairstyle)
S = GLOB.facial_hairstyles_list[facial_hairstyle]
@@ -230,14 +230,16 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
var/b_val
var/g_val
var/color_format = length(input_color)
+ if(color_format != length_char(input_color))
+ return 0
if(color_format == 3)
- r_val = hex2num(copytext(input_color, 1, 2))*16
- g_val = hex2num(copytext(input_color, 2, 3))*16
- b_val = hex2num(copytext(input_color, 3, 0))*16
+ r_val = hex2num(copytext(input_color, 1, 2)) * 16
+ g_val = hex2num(copytext(input_color, 2, 3)) * 16
+ b_val = hex2num(copytext(input_color, 3, 4)) * 16
else if(color_format == 6)
r_val = hex2num(copytext(input_color, 1, 3))
g_val = hex2num(copytext(input_color, 3, 5))
- b_val = hex2num(copytext(input_color, 5, 0))
+ b_val = hex2num(copytext(input_color, 5, 7))
else
return 0 //If the color format is not 3 or 6, you're using an unexpected way to represent a color.
@@ -251,7 +253,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
if(b_val > 255)
b_val = 255
- return num2hex(r_val, 2) + num2hex(g_val, 2) + num2hex(b_val, 2)
+ return copytext(rgb(r_val, g_val, b_val), 2)
/*
Transfer_mind is there to check if mob is being deleted/not going to have a body.
@@ -260,7 +262,7 @@ Works together with spawning an observer, noted above.
/mob/proc/ghostize(can_reenter_corpse = TRUE)
if(key)
- if(!cmptext(copytext(key,1,2),"@")) // Skip aghosts.
+ if(key[1] != "@") // Skip aghosts.
stop_sound_channel(CHANNEL_HEARTBEAT) //Stop heartbeat sounds because You Are A Ghost Now
var/mob/dead/observer/ghost = new(src) // Transfer safety to observer spawning proc.
SStgui.on_transfer(src, ghost) // Transfer NanoUIs.
@@ -331,7 +333,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(!can_reenter_corpse)
to_chat(src, "You cannot re-enter your body.")
return
- if(mind.current.key && copytext(mind.current.key,1,2)!="@") //makes sure we don't accidentally kick any clients
+ if(mind.current.key && mind.current.key[1] != "@") //makes sure we don't accidentally kick any clients
to_chat(usr, "Another consciousness is in your body...It is resisting you.")
return
client.change_view(CONFIG_GET(string/default_view))
diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm
index 633b0d6cb16..159772e037d 100644
--- a/code/modules/mob/dead/observer/say.dm
+++ b/code/modules/mob/dead/observer/say.dm
@@ -1,18 +1,17 @@
/mob/dead/observer/check_emote(message, forced)
if(message == "*spin" || message == "*flip")
- emote(copytext(message, 2), intentional = !forced)
- return 1
+ emote(copytext(message, length(message[1]) + 1), intentional = !forced)
+ return TRUE
/mob/dead/observer/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
- message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
+ message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN))
if (!message)
return
var/message_mode = get_message_mode(message)
if(client && (message_mode == MODE_ADMIN || message_mode == MODE_DEADMIN))
- message = copytext(message, 3)
- if(findtext(message, " ", 1, 2))
- message = copytext(message, 2)
+ message = copytext_char(message, 3)
+ message = trim_left(message)
if(message_mode == MODE_ADMIN)
client.cmd_admin_say(message)
diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index 7577bcca357..c0d8c192382 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -4,7 +4,7 @@
var/param = message
var/custom_param = findchar(act, " ")
if(custom_param)
- param = copytext(act, custom_param + 1, length(act) + 1)
+ param = copytext(act, custom_param + length(act[custom_param]))
act = copytext(act, 1, custom_param)
var/list/key_emotes = GLOB.emote_list[act]
diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm
index d27db8155f9..37b1283bb99 100644
--- a/code/modules/mob/living/blood.dm
+++ b/code/modules/mob/living/blood.dm
@@ -178,7 +178,7 @@
var/datum/disease/D = thing
blood_data["viruses"] += D.Copy()
- blood_data["blood_DNA"] = copytext(dna.unique_enzymes,1,0)
+ blood_data["blood_DNA"] = dna.unique_enzymes
if(disease_resistances && disease_resistances.len)
blood_data["resistances"] = disease_resistances.Copy()
var/list/temp_chem = list()
@@ -196,7 +196,7 @@
if(!suiciding)
blood_data["cloneable"] = 1
- blood_data["blood_type"] = copytext(dna.blood_type,1,0)
+ blood_data["blood_type"] = dna.blood_type
blood_data["gender"] = gender
blood_data["real_name"] = real_name
blood_data["features"] = dna.features
diff --git a/code/modules/mob/living/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm
index bd40caf5831..0b97af81a55 100644
--- a/code/modules/mob/living/brain/MMI.dm
+++ b/code/modules/mob/living/brain/MMI.dm
@@ -59,7 +59,7 @@
brainmob.container = src
var/fubar_brain = newbrain.brain_death && newbrain.suicided && brainmob.suiciding //brain is damaged beyond repair or from a suicider
if(!fubar_brain && !(newbrain.organ_flags & ORGAN_FAILING)) // the brain organ hasn't been beaten to death, nor was from a suicider.
- brainmob.stat = CONSCIOUS //we manually revive the brain mob
+ brainmob.set_stat(CONSCIOUS) //we manually revive the brain mob
GLOB.dead_mob_list -= brainmob
GLOB.alive_mob_list += brainmob
else if(!fubar_brain && newbrain.organ_flags & ORGAN_FAILING) // the brain is damaged, but not from a suicider
@@ -98,7 +98,7 @@
/obj/item/mmi/proc/eject_brain(mob/user)
brainmob.container = null //Reset brainmob mmi var.
brainmob.forceMove(brain) //Throw mob into brain.
- brainmob.stat = DEAD
+ brainmob.set_stat(DEAD)
brainmob.emp_damage = 0
brainmob.reset_perspective() //so the brainmob follows the brain organ instead of the mmi. And to update our vision
GLOB.alive_mob_list -= brainmob //Get outta here
diff --git a/code/modules/mob/living/brain/death.dm b/code/modules/mob/living/brain/death.dm
index 6dd1a11758c..7caff58d720 100644
--- a/code/modules/mob/living/brain/death.dm
+++ b/code/modules/mob/living/brain/death.dm
@@ -1,7 +1,7 @@
/mob/living/brain/death(gibbed)
if(stat == DEAD)
return
- stat = DEAD
+ set_stat(DEAD)
if(!gibbed && container)//If not gibbed but in a container.
var/obj/item/mmi = container
diff --git a/code/modules/mob/living/brain/posibrain.dm b/code/modules/mob/living/brain/posibrain.dm
index b8fb37d45c2..e916917d84a 100644
--- a/code/modules/mob/living/brain/posibrain.dm
+++ b/code/modules/mob/living/brain/posibrain.dm
@@ -106,7 +106,7 @@ GLOBAL_VAR(posibrain_notify_cooldown)
brainmob.stored_dna = new /datum/dna/stored(brainmob)
C.dna.copy_dna(brainmob.stored_dna)
brainmob.timeofhostdeath = C.timeofdeath
- brainmob.stat = CONSCIOUS
+ brainmob.set_stat(CONSCIOUS)
if(brainmob.mind)
brainmob.mind.assigned_role = new_role
if(C.mind)
@@ -129,7 +129,7 @@ GLOBAL_VAR(posibrain_notify_cooldown)
name = "[initial(name)] ([brainmob.name])"
to_chat(brainmob, welcome_message)
brainmob.mind.assigned_role = new_role
- brainmob.stat = CONSCIOUS
+ brainmob.set_stat(CONSCIOUS)
GLOB.dead_mob_list -= brainmob
GLOB.alive_mob_list += brainmob
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index a5c6b61be6f..3c095a08a9e 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -18,7 +18,8 @@
status_flags = CANUNCONSCIOUS|CANPUSH
- var/heat_protection = 0.5
+ heat_protection = 0.5 // minor heat insulation
+
var/leaping = 0
gib_type = /obj/effect/decal/cleanable/xenoblood/xgibs
unique_name = 1
@@ -48,22 +49,9 @@
return -10
/mob/living/carbon/alien/handle_environment(datum/gas_mixture/environment)
- if(!environment)
- return
-
- var/loc_temp = get_temperature(environment)
-
- // Aliens are now weak to fire.
-
- //After then, it reacts to the surrounding atmosphere based on your thermal protection
- if(!on_fire) // If you're on fire, ignore local air temperature
- if(loc_temp > bodytemperature)
- //Place is hotter than we are
- var/thermal_protection = heat_protection //This returns a 0 - 1 value, which corresponds to the percentage of heat protection.
- if(thermal_protection < 1)
- adjust_bodytemperature((1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR))
- else
- adjust_bodytemperature(1 * ((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR))
+ // Run base mob body temperature proc before taking damage
+ // this balances body temp to the enviroment and natural stabilization
+ . = ..()
if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT)
//Body temperature is too hot.
diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm
index 899d7871793..e9d71604262 100644
--- a/code/modules/mob/living/carbon/alien/larva/life.dm
+++ b/code/modules/mob/living/carbon/alien/larva/life.dm
@@ -20,12 +20,12 @@
return
if(IsUnconscious() || IsSleeping() || getOxyLoss() > 50 || (HAS_TRAIT(src, TRAIT_DEATHCOMA)) || health <= crit_threshold)
if(stat == CONSCIOUS)
- stat = UNCONSCIOUS
+ set_stat(UNCONSCIOUS)
become_blind(UNCONSCIOUS_BLIND)
update_mobility()
else
if(stat == UNCONSCIOUS)
- stat = CONSCIOUS
+ set_stat(CONSCIOUS)
cure_blind(UNCONSCIOUS_BLIND)
set_resting(FALSE)
update_damage_hud()
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index c3e13671110..3cbf52e9779 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -301,7 +301,7 @@
visible_message("[src] attempts to remove [I]!")
to_chat(src, "You attempt to remove [I]... (This will take around [DisplayTimeText(breakouttime)] and you need to stand still.)")
if(do_after(src, breakouttime, 0, target = src))
- clear_cuffs(I, cuff_break)
+ . = clear_cuffs(I, cuff_break)
else
to_chat(src, "You fail to remove [I]!")
@@ -310,12 +310,12 @@
visible_message("[src] is trying to break [I]!")
to_chat(src, "You attempt to break [I]... (This will take around 5 seconds and you need to stand still.)")
if(do_after(src, breakouttime, 0, target = src))
- clear_cuffs(I, cuff_break)
+ . = clear_cuffs(I, cuff_break)
else
to_chat(src, "You fail to break [I]!")
else if(cuff_break == INSTANT_CUFFBREAK)
- clear_cuffs(I, cuff_break)
+ . = clear_cuffs(I, cuff_break)
I.item_flags &= ~BEING_REMOVED
/mob/living/carbon/proc/uncuff()
@@ -428,7 +428,7 @@
return 0
return ..()
-/mob/living/carbon/proc/vomit(lost_nutrition = 10, blood = FALSE, stun = TRUE, distance = 1, message = TRUE, toxic = FALSE, harm = TRUE, force = FALSE)
+/mob/living/carbon/proc/vomit(lost_nutrition = 10, blood = FALSE, stun = TRUE, distance = 1, message = TRUE, toxic = FALSE, harm = TRUE, force = FALSE, purge = FALSE)
if((HAS_TRAIT(src, TRAIT_NOHUNGER) || HAS_TRAIT(src, TRAIT_TOXINLOVER)) && !force)
return TRUE
@@ -471,7 +471,7 @@
T.add_vomit_floor(src, VOMIT_PURPLE)
else
if(T)
- T.add_vomit_floor(src, VOMIT_TOXIC)//toxic barf looks different
+ T.add_vomit_floor(src, VOMIT_TOXIC, purge)//toxic barf looks different || call purge when doing detoxicfication to pump more chems out of the stomach.
T = get_step(T, dir)
if (is_blocked_turf(T))
break
@@ -759,7 +759,7 @@
cure_blind(UNCONSCIOUS_BLIND)
return
if(IsUnconscious() || IsSleeping() || getOxyLoss() > 50 || (HAS_TRAIT(src, TRAIT_DEATHCOMA)) || (health <= HEALTH_THRESHOLD_FULLCRIT && !HAS_TRAIT(src, TRAIT_NOHARDCRIT)))
- stat = UNCONSCIOUS
+ set_stat(UNCONSCIOUS)
become_blind(UNCONSCIOUS_BLIND)
if(CONFIG_GET(flag/near_death_experience) && health <= HEALTH_THRESHOLD_NEARDEATH && !HAS_TRAIT(src, TRAIT_NODEATH))
ADD_TRAIT(src, TRAIT_SIXTHSENSE, "near-death")
@@ -767,9 +767,9 @@
REMOVE_TRAIT(src, TRAIT_SIXTHSENSE, "near-death")
else
if(health <= crit_threshold && !HAS_TRAIT(src, TRAIT_NOSOFTCRIT))
- stat = SOFT_CRIT
+ set_stat(SOFT_CRIT)
else
- stat = CONSCIOUS
+ set_stat(CONSCIOUS)
cure_blind(UNCONSCIOUS_BLIND)
REMOVE_TRAIT(src, TRAIT_SIXTHSENSE, "near-death")
update_mobility()
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index 6862d7ce05d..97fd3e1eb4c 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -16,7 +16,7 @@
var/disgust = 0
-//inventory slots
+ //inventory slots
var/obj/item/back = null
var/obj/item/clothing/mask/wear_mask = null
var/obj/item/clothing/neck/wear_neck = null
@@ -28,7 +28,7 @@
var/obj/item/clothing/glasses/glasses = null //only used by humans.
var/obj/item/clothing/ears = null //only used by humans.
- var/datum/dna/dna = null//Carbon
+ var/datum/dna/dna = null // Carbon
var/datum/mind/last_mind = null //last mind to control this mob, for blood-based cloning
var/failed_last_breath = 0 //This is used to determine if the mob failed a breath. If they did fail a brath, they will attempt to breathe each tick, otherwise just once per 4 ticks.
@@ -64,3 +64,8 @@
var/drunkenness = 0 //Overall drunkenness - check handle_alcohol() in life.dm for effects
var/stam_regen_start_time = 0 //used to halt stamina regen temporarily
var/stam_paralyzed = FALSE //knocks you down
+
+ /// Protection (insulation) from the heat, Value 0-1 corresponding to the percentage of protection
+ var/heat_protection = 0 // No heat protection
+ /// Protection (insulation) from the cold, Value 0-1 corresponding to the percentage of protection
+ var/cold_protection = 0 // No cold protection
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 9f3707aa47a..e20c5627613 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -34,7 +34,8 @@
if(M.occupant == src)
M.go_out()
- dna.species.spec_death(gibbed, src)
+ if(!QDELETED(dna)) //The gibbed param is bit redundant here since dna won't exist at this point if they got deleted.
+ dna.species.spec_death(gibbed, src)
if(SSticker.HasRoundStarted())
SSblackbox.ReportDeath(src)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 41d82045c8f..0bc2935888f 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -710,6 +710,17 @@
else
..()
+/mob/living/carbon/human/clear_cuffs(obj/item/I, cuff_break)
+ . = ..()
+ if(.)
+ return
+ if(!I.loc || buckled)
+ return FALSE
+ if(I == wear_suit)
+ visible_message("[src] manages to [cuff_break ? "break" : "remove"] [I]!")
+ to_chat(src, "You successfully [cuff_break ? "break" : "remove"] [I].")
+ return TRUE
+
/mob/living/carbon/human/replace_records_name(oldname,newname) // Only humans have records right now, move this up if changed.
for(var/list/L in list(GLOB.data_core.general,GLOB.data_core.medical,GLOB.data_core.security,GLOB.data_core.locked))
var/datum/data/record/R = find_record("name", oldname, L)
@@ -796,7 +807,7 @@
override = dna.species.override_float
..()
-/mob/living/carbon/human/vomit(lost_nutrition = 10, blood = 0, stun = 1, distance = 0, message = 1, toxic = 0)
+/mob/living/carbon/human/vomit(lost_nutrition = 10, blood = FALSE, stun = TRUE, distance = 1, message = TRUE, toxic = FALSE, harm = TRUE, force = FALSE, purge = FALSE)
if(blood && (NOBLOOD in dna.species.species_traits) && !HAS_TRAIT(src, TRAIT_TOXINLOVER))
if(message)
visible_message("[src] dry heaves!", \
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 62d3321206d..698afb1b1ad 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -105,8 +105,15 @@
var/obj/item/organ/lungs/lun = L
lun.check_breath(breath,src)
+/// Environment handlers for species
/mob/living/carbon/human/handle_environment(datum/gas_mixture/environment)
+ // If we are in a cryo bed do not process life functions
+ if(istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell))
+ return
+
dna.species.handle_environment(environment, src)
+ dna.species.handle_environment_pressure(environment, src)
+ dna.species.handle_body_temperature(src)
///FIRE CODE
/mob/living/carbon/human/handle_fire()
@@ -174,10 +181,11 @@
return thermal_protection_flags
-/mob/living/carbon/human/proc/get_heat_protection(temperature) //Temperature is the temperature you're being exposed to.
+/mob/living/carbon/human/get_heat_protection(temperature)
var/thermal_protection_flags = get_heat_protection_flags(temperature)
+ var/thermal_protection = heat_protection
- var/thermal_protection = 0
+ // Apply clothing items protection
if(thermal_protection_flags)
if(thermal_protection_flags & HEAD)
thermal_protection += THERMAL_PROTECTION_HEAD
@@ -202,7 +210,6 @@
if(thermal_protection_flags & HAND_RIGHT)
thermal_protection += THERMAL_PROTECTION_HAND_RIGHT
-
return min(1,thermal_protection)
//See proc/get_heat_protection_flags(temperature) for the description of this proc.
@@ -231,11 +238,15 @@
return thermal_protection_flags
-/mob/living/carbon/human/proc/get_cold_protection(temperature)
- temperature = max(temperature, 2.7) //There is an occasional bug where the temperature is miscalculated in ares with a small amount of gas on them, so this is necessary to ensure that that bug does not affect this calculation. Space's temperature is 2.7K and most suits that are intended to protect against any cold, protect down to 2.0K.
+/mob/living/carbon/human/get_cold_protection(temperature)
+ // There is an occasional bug where the temperature is miscalculated in areas with small amounts of gas.
+ // This is necessary to ensure that does not affect this calculation.
+ // Space's temperature is 2.7K and most suits that are intended to protect against any cold, protect down to 2.0K.
+ temperature = max(temperature, 2.7)
var/thermal_protection_flags = get_cold_protection_flags(temperature)
+ var/thermal_protection = cold_protection
- var/thermal_protection = 0
+ // Apply clothing items protection
if(thermal_protection_flags)
if(thermal_protection_flags & HEAD)
thermal_protection += THERMAL_PROTECTION_HEAD
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index 107c157ddd0..4c2b8d092d7 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -82,30 +82,22 @@
/mob/living/carbon/human/proc/forcesay(list/append) //this proc is at the bottom of the file because quote fuckery makes notepad++ cri
if(stat == CONSCIOUS)
if(client)
- var/virgin = 1 //has the text been modified yet?
var/temp = winget(client, "input", "text")
- if(findtextEx(temp, "Say \"", 1, 7) && length(temp) > 5) //"case sensitive means
+ var/say_starter = "Say \"" //"
+ if(findtextEx(temp, say_starter, 1, length(say_starter) + 1) && length(temp) > length(say_starter)) //case sensitive means
- temp = replacetext(temp, ";", "") //general radio
+ temp = trim_left(copytext(temp, length(say_starter + 1)))
+ temp = replacetext(temp, ";", "", 1, 2) //general radio
+ while(trim_left(temp)[1] == ":") //dept radio again (necessary)
+ temp = copytext_char(trim_left(temp), 3)
- if(findtext(trim_left(temp), ":", 6, 7)) //dept radio
- temp = copytext(trim_left(temp), 8)
- virgin = 0
-
- if(virgin)
- temp = copytext(trim_left(temp), 6) //normal speech
- virgin = 0
-
- while(findtext(trim_left(temp), ":", 1, 2)) //dept radio again (necessary)
- temp = copytext(trim_left(temp), 3)
-
- if(findtext(temp, "*", 1, 2)) //emotes
+ if(temp[1] == "*") //emotes
return
var/trimmed = trim_left(temp)
if(length(trimmed))
if(append)
- temp += pick(append)
+ trimmed += pick(append)
- say(temp)
+ say(trimmed)
winset(client, "input", "text=[null]")
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 6ae31b7febd..822fca385dc 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -54,6 +54,15 @@ GLOBAL_LIST_EMPTY(roundstart_races)
var/datum/action/innate/flight/fly //the actual flying ability given to flying species
var/wings_icon = "Angel" //the icon used for the wings
+ /// The natural temperature for a body
+ var/bodytemp_normal = BODYTEMP_NORMAL
+ /// Minimum amount of kelvin moved toward normal body temperature per tick.
+ var/bodytemp_autorecovery_min = BODYTEMP_AUTORECOVERY_MINIMUM
+ /// The body temperature limit the body can take before it starts taking damage from heat.
+ var/bodytemp_heat_damage_limit = BODYTEMP_HEAT_DAMAGE_LIMIT
+ /// The body temperature limit the body can take before it starts taking damage from cold.
+ var/bodytemp_cold_damage_limit = BODYTEMP_COLD_DAMAGE_LIMIT
+
// species-only traits. Can be found in DNA.dm
var/list/species_traits = list()
// generic traits tied to having the species
@@ -86,6 +95,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
//Think magic mirror and pride mirror, slime extract, ERT etc, see defines
//in __DEFINES/mobs.dm, defaults to NONE, so people actually have to think about it
var/changesource_flags = NONE
+
///////////
// PROCS //
///////////
@@ -1605,55 +1615,81 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(HAS_TRAIT(H, TRAIT_NOBREATH))
return TRUE
+//////////////////////////
+// ENVIRONMENT HANDLERS //
+//////////////////////////
+/// Handle the environment for species
/datum/species/proc/handle_environment(datum/gas_mixture/environment, mob/living/carbon/human/H)
- if(!environment)
- return
- if(istype(H.loc, /obj/machinery/atmospherics/components/unary/cryo_cell))
- return
+ var/areatemp = H.get_temperature(environment)
+ var/natural = 0 // Body temperature stability have the body try and normalize on it's own
- var/loc_temp = H.get_temperature(environment)
+ if(H.stat != DEAD) // If you are dead your body does not stabilize naturally
+ natural = natural_bodytemperature_stabilization(H)
- //Body temperature is adjusted in two parts: first there your body tries to naturally preserve homeostasis (shivering/sweating), then it reacts to the surrounding environment
- //Thermal protection (insulation) has mixed benefits in two situations (hot in hot places, cold in hot places)
- if(!H.on_fire) //If you're on fire, you do not heat up or cool down based on surrounding gases
- var/natural = 0
- if(H.stat != DEAD)
- natural = H.natural_bodytemperature_stabilization()
- var/thermal_protection = 1
- if(loc_temp < H.bodytemperature) //Place is colder than we are
- thermal_protection -= H.get_cold_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
- if(H.bodytemperature < BODYTEMP_NORMAL) //we're cold, insulation helps us retain body heat and will reduce the heat we lose to the environment
- H.adjust_bodytemperature((thermal_protection+1)*natural + max(thermal_protection * (loc_temp - H.bodytemperature) / BODYTEMP_COLD_DIVISOR, BODYTEMP_COOLING_MAX))
- else //we're sweating, insulation hinders our ability to reduce heat - and it will reduce the amount of cooling you get from the environment
- H.adjust_bodytemperature(natural*(1/(thermal_protection+1)) + max((thermal_protection * (loc_temp - H.bodytemperature) + BODYTEMP_NORMAL - H.bodytemperature) / BODYTEMP_COLD_DIVISOR , BODYTEMP_COOLING_MAX)) //Extra calculation for hardsuits to bleed off heat
- if (loc_temp > H.bodytemperature) //Place is hotter than we are
- var/natural = 0
- if(H.stat != DEAD)
- natural = H.natural_bodytemperature_stabilization()
- var/thermal_protection = 1
- thermal_protection -= H.get_heat_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
- if(H.bodytemperature < BODYTEMP_NORMAL) //and we're cold, insulation enhances our ability to retain body heat but reduces the heat we get from the environment
- H.adjust_bodytemperature((thermal_protection+1)*natural + min(thermal_protection * (loc_temp - H.bodytemperature) / BODYTEMP_HEAT_DIVISOR, BODYTEMP_HEATING_MAX))
- else //we're sweating, insulation hinders out ability to reduce heat - but will reduce the amount of heat we get from the environment
- H.adjust_bodytemperature(natural*(1/(thermal_protection+1)) + min(thermal_protection * (loc_temp - H.bodytemperature) / BODYTEMP_HEAT_DIVISOR, BODYTEMP_HEATING_MAX))
+ /// Get the mobs thermal protection and environmental change
+ var/thermal_protection = 1 // The inverse of the amount of protection
+ var/environment_change = 0 // The amount of change the from the enviroment
+ var/natural_change = 0 // The amount that natural stabilization changes after applying thermal protection
- // +/- 50 degrees from 310K is the 'safe' zone, where no damage is dealt.
- if(H.bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT && !HAS_TRAIT(H, TRAIT_RESISTHEAT))
- //Body temperature is too hot.
+ if(areatemp > H.bodytemperature) // It is hot here
+ thermal_protection -= H.get_heat_protection(areatemp) // Get the thermal protection of the mob
+ environment_change = min(thermal_protection * (areatemp - H.bodytemperature) / BODYTEMP_HEAT_DIVISOR, \
+ BODYTEMP_HEATING_MAX)
+ if(H.bodytemperature < bodytemp_normal)
+ // Our bodytemp is below normal, insulation helps us retain body heat
+ // and will reduce the heat we lose to the environment
+ natural_change = (thermal_protection + 1) * natural
+ else
+ // Our bodytemp is above normal and sweating, insulation hinders out ability to reduce heat
+ // but will reduce the amount of heat we get from the environment
+ natural_change = (1 / (thermal_protection + 1)) * natural
+
+ else // It is cold here
+ thermal_protection -= H.get_cold_protection(areatemp) // Get the thermal protection of the mob
+
+ if(!H.on_fire) // If we are on fire ignore local temperature in cold areas
+ if(H.bodytemperature < bodytemp_normal)
+ // Our bodytemp is below normal, insulation helps us retain body heat
+ // and will reduce the heat we lose to the environment
+ natural_change = (thermal_protection + 1) * natural
+ // How much the environment cools the mob with thermal protection
+ environment_change = max(thermal_protection * (areatemp - H.bodytemperature) / BODYTEMP_COLD_DIVISOR, \
+ BODYTEMP_COOLING_MAX)
+ else
+ // Our bodytemp is above normal and sweating, insulation hinders out ability to reduce heat
+ // but will reduce the amount of heat we get from the environment
+ natural_change = (1 / (thermal_protection + 1)) * natural
+ // How much the environment cools the mob with thermal protection
+ // Extra calculation for hardsuits to bleed off heat
+ environment_change = max((thermal_protection * (areatemp - H.bodytemperature) + bodytemp_normal - \
+ H.bodytemperature) / BODYTEMP_COLD_DIVISOR, BODYTEMP_COOLING_MAX)
+
+ // Apply the temperature changes, combining natual and enviromental changes
+ H.adjust_bodytemperature(natural_change + environment_change)
+
+/// Handle the body temperature status effects for the species
+/// Traits for resitance to heat or cold are handled here.
+/datum/species/proc/handle_body_temperature(mob/living/carbon/human/H)
+ // Body temperature is too hot, and we do not have resist traits
+ if(H.bodytemperature > bodytemp_heat_damage_limit && !HAS_TRAIT(H, TRAIT_RESISTHEAT))
+ // Clear cold mood and apply hot mood
SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "cold")
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "hot", /datum/mood_event/hot)
+ // Remove any slow down from the cold
H.remove_movespeed_modifier(MOVESPEED_ID_COLD)
- var/burn_damage
+ var/burn_damage = 0
var/firemodifier = H.fire_stacks / 50
- if (H.on_fire)
- burn_damage = max(log(2-firemodifier,(H.bodytemperature-BODYTEMP_NORMAL))-5,0)
- else
+ if (!H.on_fire) // We are not on fire, reduce the modifier
firemodifier = min(firemodifier, 0)
- burn_damage = max(log(2-firemodifier,(H.bodytemperature-BODYTEMP_NORMAL))-5,0) // this can go below 5 at log 2.5
+
+ // this can go below 5 at log 2.5
+ burn_damage = max(log(2 - firemodifier, (H.bodytemperature - bodytemp_normal)) - 5,0)
+
+ // Display alerts based on the amount of fire damage being taken
if (burn_damage)
switch(burn_damage)
if(0 to 2)
@@ -1662,55 +1698,116 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.throw_alert("temp", /obj/screen/alert/hot, 2)
else
H.throw_alert("temp", /obj/screen/alert/hot, 3)
+
+ // Apply species and physiology modifiers to heat damage
burn_damage = burn_damage * heatmod * H.physiology.heat_mod
- if (H.stat < UNCONSCIOUS && (prob(burn_damage) * 10) / 4) //40% for level 3 damage on humans
+
+ // 40% for level 3 damage on humans to scream in pain
+ if (H.stat < UNCONSCIOUS && (prob(burn_damage) * 10) / 4)
H.emote("scream")
+
+ // Apply the damage to all body parts
H.apply_damage(burn_damage, BURN, spread_damage = TRUE)
- else if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !HAS_TRAIT(H, TRAIT_RESISTCOLD))
+ // Body temperature is too cold, and we do not have resist traits
+ else if(H.bodytemperature < bodytemp_cold_damage_limit && !HAS_TRAIT(H, TRAIT_RESISTCOLD))
+ // clear any hot moods and apply cold mood
SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "hot")
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "cold", /datum/mood_event/cold)
- //Sorry for the nasty oneline but I don't want to assign a variable on something run pretty frequently
- H.add_movespeed_modifier(MOVESPEED_ID_COLD, override = TRUE, multiplicative_slowdown = ((BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR), blacklisted_movetypes = FLOATING)
+
+ // Apply cold slow down
+ H.add_movespeed_modifier(MOVESPEED_ID_COLD, override = TRUE, \
+ multiplicative_slowdown = ((bodytemp_cold_damage_limit - H.bodytemperature) / COLD_SLOWDOWN_FACTOR), \
+ blacklisted_movetypes = FLOATING)
+
+ // Display alerts based on the amount of cold damage being taken
+ // Apply more damage based on how cold you are
switch(H.bodytemperature)
- if(200 to BODYTEMP_COLD_DAMAGE_LIMIT)
+ if(200 to bodytemp_cold_damage_limit)
H.throw_alert("temp", /obj/screen/alert/cold, 1)
- H.apply_damage(COLD_DAMAGE_LEVEL_1*coldmod*H.physiology.cold_mod, BURN)
+ H.apply_damage(COLD_DAMAGE_LEVEL_1 * coldmod * H.physiology.cold_mod, BURN)
if(120 to 200)
H.throw_alert("temp", /obj/screen/alert/cold, 2)
- H.apply_damage(COLD_DAMAGE_LEVEL_2*coldmod*H.physiology.cold_mod, BURN)
+ H.apply_damage(COLD_DAMAGE_LEVEL_2 * coldmod * H.physiology.cold_mod, BURN)
else
H.throw_alert("temp", /obj/screen/alert/cold, 3)
- H.apply_damage(COLD_DAMAGE_LEVEL_3*coldmod*H.physiology.cold_mod, BURN)
+ H.apply_damage(COLD_DAMAGE_LEVEL_3 * coldmod * H.physiology.cold_mod, BURN)
+ // We are not to hot or cold, remove status and moods
else
H.clear_alert("temp")
H.remove_movespeed_modifier(MOVESPEED_ID_COLD)
SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "cold")
SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "hot")
+/// Handle the air pressure of the environment
+/datum/species/proc/handle_environment_pressure(datum/gas_mixture/environment, mob/living/carbon/human/H)
var/pressure = environment.return_pressure()
- var/adjusted_pressure = H.calculate_affecting_pressure(pressure) //Returns how much pressure actually affects the mob.
+ var/adjusted_pressure = H.calculate_affecting_pressure(pressure)
+
+ // Set alerts and apply damage based on the amount of pressure
switch(adjusted_pressure)
+
+ // Very high pressure, show an alert and take damage
if(HAZARD_HIGH_PRESSURE to INFINITY)
if(!HAS_TRAIT(H, TRAIT_RESISTHIGHPRESSURE))
- H.adjustBruteLoss(min(((adjusted_pressure / HAZARD_HIGH_PRESSURE) -1 ) * PRESSURE_DAMAGE_COEFFICIENT, MAX_HIGH_PRESSURE_DAMAGE) * H.physiology.pressure_mod)
+ H.adjustBruteLoss(min(((adjusted_pressure / HAZARD_HIGH_PRESSURE) -1 ) * \
+ PRESSURE_DAMAGE_COEFFICIENT, MAX_HIGH_PRESSURE_DAMAGE) * H.physiology.pressure_mod)
H.throw_alert("pressure", /obj/screen/alert/highpressure, 2)
else
H.clear_alert("pressure")
+
+ // High pressure, show an alert
if(WARNING_HIGH_PRESSURE to HAZARD_HIGH_PRESSURE)
H.throw_alert("pressure", /obj/screen/alert/highpressure, 1)
+
+ // No pressure issues here clear pressure alerts
if(WARNING_LOW_PRESSURE to WARNING_HIGH_PRESSURE)
H.clear_alert("pressure")
+
+ // Low pressure here, show an alert
if(HAZARD_LOW_PRESSURE to WARNING_LOW_PRESSURE)
- H.throw_alert("pressure", /obj/screen/alert/lowpressure, 1)
+ // We have low pressure resit trait, clear alerts
+ if(HAS_TRAIT(H, TRAIT_RESISTLOWPRESSURE))
+ H.clear_alert("pressure")
+ else
+ H.throw_alert("pressure", /obj/screen/alert/lowpressure, 1)
+
+ // Very low pressure, show an alert and take damage
else
+ // We have low pressure resit trait, clear alerts
if(HAS_TRAIT(H, TRAIT_RESISTLOWPRESSURE))
H.clear_alert("pressure")
else
H.adjustBruteLoss(LOW_PRESSURE_DAMAGE * H.physiology.pressure_mod)
H.throw_alert("pressure", /obj/screen/alert/lowpressure, 2)
+/// Used to stabilize the body temperature back to normal on living mobs
+/// Returns the amount of degrees kelvin to change the body temperature
+/datum/species/proc/natural_bodytemperature_stabilization(mob/living/carbon/human/H)
+ var/body_temp = H.bodytemperature // Get current body temperature
+ var/body_temperature_difference = bodytemp_normal - body_temp
+
+ // We are very cold, increate body temperature
+ if(body_temp <= bodytemp_cold_damage_limit)
+ return max((body_temperature_difference * H.metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR), \
+ bodytemp_autorecovery_min)
+
+ // we are cold, reduce the minimum increment and do not jump over the difference
+ if(body_temp > bodytemp_cold_damage_limit && body_temp < bodytemp_normal)
+ return max(body_temperature_difference * H.metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, \
+ min(body_temperature_difference, bodytemp_autorecovery_min / 4))
+
+ // We are hot, reduce the minimum increment and do not jump below the difference
+ if(body_temp > bodytemp_normal && body_temp <= bodytemp_heat_damage_limit)
+ return min(body_temperature_difference * H.metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, \
+ max(body_temperature_difference, -(bodytemp_autorecovery_min / 4)))
+
+ // We are very hot, reduce the body temperature
+ if(body_temp >= bodytemp_heat_damage_limit)
+ return min((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), -bodytemp_autorecovery_min)
+
+
//////////
// FIRE //
//////////
diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm
index debb99f61d1..f8f8f2ab8b1 100644
--- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm
+++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm
@@ -20,6 +20,11 @@
inherent_traits = list(TRAIT_NOHUNGER)
sexes = FALSE //no fetish content allowed
toxic_food = NONE
+ // Body temperature for ethereals is much higher then humans as they like hotter environments
+ bodytemp_normal = (BODYTEMP_NORMAL + 50)
+ bodytemp_heat_damage_limit = FIRE_MINIMUM_TEMPERATURE_TO_SPREAD // about 150C
+ // Cold temperatures hurt faster as it is harder to move with out the heat energy
+ bodytemp_cold_damage_limit = (T20C - 10) // about 10c
var/current_color
var/EMPeffect = FALSE
var/emageffect = FALSE
@@ -31,7 +36,6 @@
var/static/b2 = 149
//this is shit but how do i fix it? no clue.
-
/datum/species/ethereal/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load)
.=..()
if(ishuman(C))
@@ -65,7 +69,7 @@
if(!emageffect)
current_color = rgb(r2 + ((r1-r2)*healthpercent), g2 + ((g1-g2)*healthpercent), b2 + ((b1-b2)*healthpercent))
H.set_light(1 + (2 * healthpercent), 1 + (1 * healthpercent), current_color)
- fixed_mut_color = copytext(current_color, 2)
+ fixed_mut_color = copytext_char(current_color, 2)
else
H.set_light(0)
fixed_mut_color = rgb(128,128,128)
diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
index 56bf72b996e..d0831543da4 100644
--- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
@@ -25,6 +25,13 @@
deathsound = 'sound/voice/lizard/deathsound.ogg'
wings_icon = "Dragon"
species_language_holder = /datum/language_holder/lizard
+ // Lizards are coldblooded and can stand a greater temperature range than humans
+ bodytemp_heat_damage_limit = (BODYTEMP_HEAT_DAMAGE_LIMIT + 20) // This puts lizards 10 above lavaland max heat for ash lizards.
+ bodytemp_cold_damage_limit = (BODYTEMP_COLD_DAMAGE_LIMIT - 10)
+
+/// Lizards are cold blooded and do not stabilize body temperature naturally
+/datum/species/lizard/natural_bodytemperature_stabilization(mob/living/carbon/human/H)
+ return 0
/datum/species/lizard/random_name(gender,unique,lastname)
if(unique)
diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
index 65484b964c3..03ed5b82756 100644
--- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
@@ -23,6 +23,15 @@
outfit_important_for_life = /datum/outfit/plasmaman
species_language_holder = /datum/language_holder/skeleton
+ // Body temperature for Plasmen is much lower human as they can handle colder environments
+ bodytemp_normal = (BODYTEMP_NORMAL - 40)
+ // The minimum amount they stabilize per tick is reduced making hot areas harder to deal with
+ bodytemp_autorecovery_min = 2
+ // They are hurt at hot temps faster as it is harder to hold their form
+ bodytemp_heat_damage_limit = (BODYTEMP_HEAT_DAMAGE_LIMIT - 20) // about 40C
+ // This effects how fast body temp stabilizes, also if cold resit is lost on the mob
+ bodytemp_cold_damage_limit = (BODYTEMP_COLD_DAMAGE_LIMIT - 50) // about -50c
+
/datum/species/plasmaman/spec_life(mob/living/carbon/human/H)
var/datum/gas_mixture/environment = H.loc.return_air()
var/atmos_sealed = FALSE
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 ef5f8546502..cf361d73d80 100644
--- a/code/modules/mob/living/carbon/human/species_types/zombies.dm
+++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm
@@ -15,6 +15,9 @@
disliked_food = NONE
liked_food = GROSS | MEAT | RAW
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | ERT_SPAWN
+ bodytemp_normal = T0C // They have no natural body heat, the environment regulates body temp
+ bodytemp_heat_damage_limit = FIRE_MINIMUM_TEMPERATURE_TO_EXIST // Take damage at fire temp
+ bodytemp_cold_damage_limit = MINIMUM_TEMPERATURE_TO_MOVE // take damage below minimum movement temp
/datum/species/zombie/check_roundstart_eligible()
if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
@@ -33,10 +36,13 @@
var/regen_cooldown = 0
changesource_flags = MIRROR_BADMIN | WABBAJACK | ERT_SPAWN
+/// Zombies do not stabilize body temperature they are the walking dead and are cold blooded
+/datum/species/zombie/natural_bodytemperature_stabilization(mob/living/carbon/human/H)
+ return 0
+
/datum/species/zombie/infectious/check_roundstart_eligible()
return FALSE
-
/datum/species/zombie/infectious/spec_stun(mob/living/carbon/human/H,amount)
. = min(20, amount)
@@ -80,7 +86,6 @@
infection = new()
infection.Insert(C)
-
// Your skin falls off
/datum/species/krokodil_addict
name = "Human"
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 72200d457e6..5cad858962b 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -567,18 +567,79 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
if(drunkenness >= 101)
adjustToxLoss(2) //Let's be honest you shouldn't be alive by now
-//used in human and monkey handle_environment()
+/// Base carbon environment handler, adds natural stabilization
+/mob/living/carbon/handle_environment(datum/gas_mixture/environment)
+ var/areatemp = get_temperature(environment)
+ var/natural = 0 // Have the body regulate it's own temperature
+
+ if(stat != DEAD) // If you are dead your body does not stabilize naturally
+ natural = natural_bodytemperature_stabilization()
+
+ /// Get the mobs thermal protection and environmental change
+ var/thermal_protection = 1 // The inverse of the amount of protection
+ var/environment_change = 0 // The amount of change the from the enviroment
+ var/natural_change = 0 // The amount that natural stabilization changes after applying thermal protection
+
+ if(areatemp > bodytemperature) // It is hot here
+ thermal_protection -= get_heat_protection(areatemp) // Get the thermal protection of the mob
+ environment_change = min(thermal_protection * (areatemp - bodytemperature) / BODYTEMP_HEAT_DIVISOR, BODYTEMP_HEATING_MAX)
+ if(bodytemperature < BODYTEMP_NORMAL)
+ // Our bodytemp is below normal we are cold, insulation helps us retain body heat
+ // and will reduce the heat we lose to the environment
+ natural_change = (thermal_protection + 1) * natural
+ else
+ // Our bodytemp is above normal and sweating, insulation hinders out ability to reduce heat
+ // but will reduce the amount of heat we get from the environment
+ natural_change = (1 / (thermal_protection + 1)) * natural
+ else // It is cold here
+ thermal_protection -= get_cold_protection(areatemp) // Get the thermal protection of the mob
+ if(!on_fire) // If on fire ignore ignore local temperature in cold areas
+ environment_change = max(thermal_protection * (areatemp - bodytemperature) / BODYTEMP_COLD_DIVISOR, BODYTEMP_COOLING_MAX)
+ if(bodytemperature < BODYTEMP_NORMAL)
+ // Our bodytemp is below normal, insulation helps us retain body heat
+ // and will reduce the heat we lose to the environment
+ natural_change = (thermal_protection + 1) * natural
+ else
+ // Our bodytemp is above normal and sweating, insulation hinders out ability to reduce heat
+ // but will reduce the amount of heat we get from the environment
+ natural_change = (1 / (thermal_protection + 1)) * natural
+
+ // Apply the temperature changes, combining natual and enviromental changes
+ adjust_bodytemperature(natural_change + environment_change)
+
+/// Used to stabilize the body temperature back to normal on living mobs
+/// Returns the amount of degrees kelvin to change the body temperature
/mob/living/carbon/proc/natural_bodytemperature_stabilization()
var/body_temperature_difference = BODYTEMP_NORMAL - bodytemperature
- switch(bodytemperature)
- if(-INFINITY to BODYTEMP_COLD_DAMAGE_LIMIT) //Cold damage limit is 50 below the default, the temperature where you start to feel effects.
- return max((body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM)
- if(BODYTEMP_COLD_DAMAGE_LIMIT to BODYTEMP_NORMAL)
- return max(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, min(body_temperature_difference, BODYTEMP_AUTORECOVERY_MINIMUM/4))
- if(BODYTEMP_NORMAL to BODYTEMP_HEAT_DAMAGE_LIMIT) // Heat damage limit is 50 above the default, the temperature where you start to feel effects.
- return min(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, max(body_temperature_difference, -BODYTEMP_AUTORECOVERY_MINIMUM/4))
- if(BODYTEMP_HEAT_DAMAGE_LIMIT to INFINITY)
- return min((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), -BODYTEMP_AUTORECOVERY_MINIMUM) //We're dealing with negative numbers
+
+ // We are very cold, increate body temperature
+ if(bodytemperature <= BODYTEMP_COLD_DAMAGE_LIMIT)
+ return max((body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR), \
+ BODYTEMP_AUTORECOVERY_MINIMUM)
+
+ // we are cold, reduce the minimum increment and do not jump over the difference
+ if(bodytemperature > BODYTEMP_COLD_DAMAGE_LIMIT && bodytemperature < BODYTEMP_NORMAL)
+ return max(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, \
+ min(body_temperature_difference, BODYTEMP_AUTORECOVERY_MINIMUM / 4))
+
+ // We are hot, reduce the minimum increment and do not jump below the difference
+ if(bodytemperature > BODYTEMP_NORMAL && bodytemperature <= BODYTEMP_HEAT_DAMAGE_LIMIT)
+ return min(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, \
+ max(body_temperature_difference, -(BODYTEMP_AUTORECOVERY_MINIMUM / 4)))
+
+ // We are very hot, reduce the body temperature
+ if(bodytemperature >= BODYTEMP_HEAT_DAMAGE_LIMIT)
+ return min((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), -BODYTEMP_AUTORECOVERY_MINIMUM)
+
+/// This returns the percentage of protection from heat as a value from 0 - 1
+/// temperature is the temperature you're being exposed to
+/mob/living/carbon/proc/get_heat_protection(temperature)
+ return heat_protection
+
+/// This returns the percentage of protection from cold as a value from 0 - 1
+/// temperature is the temperature you're being exposed to
+/mob/living/carbon/proc/get_cold_protection(temperature)
+ return cold_protection
/////////
//LIVER//
diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm
index ad54eb08a19..f9a0f9443ef 100644
--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ b/code/modules/mob/living/carbon/monkey/life.dm
@@ -68,20 +68,9 @@
. = ..() // interact with body heat after dealing with the hot air
/mob/living/carbon/monkey/handle_environment(datum/gas_mixture/environment)
- if(!environment)
- return
-
- var/loc_temp = get_temperature(environment)
-
- if(stat != DEAD)
- adjust_bodytemperature(natural_bodytemperature_stabilization())
-
- if(!on_fire) //If you're on fire, you do not heat up or cool down based on surrounding gases
- if(loc_temp < bodytemperature)
- adjust_bodytemperature(max((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR, BODYTEMP_COOLING_MAX))
- else
- adjust_bodytemperature(min((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR, BODYTEMP_HEATING_MAX))
-
+ // Run base mob body temperature proc before taking damage
+ // this balances body temp to the enviroment and natural stabilization
+ . = ..()
if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT && !HAS_TRAIT(src, TRAIT_RESISTHEAT))
switch(bodytemperature)
diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
index 8270ec173ab..4af4fb07fa9 100644
--- a/code/modules/mob/living/death.dm
+++ b/code/modules/mob/living/death.dm
@@ -48,7 +48,7 @@
/mob/living/death(gibbed)
var/was_dead_before = stat == DEAD
- stat = DEAD
+ set_stat(DEAD)
unset_machine()
timeofdeath = world.time
tod = station_time_timestamp()
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index 8639547ec3d..9daaeee352e 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -411,17 +411,11 @@
. = ..() && intentional
/datum/emote/living/custom/proc/check_invalid(mob/user, input)
- . = TRUE
- if(copytext(input,1,5) == "says")
+ var/static/regex/stop_bad_mime = regex(@"says|exclaims|yells|asks")
+ if(stop_bad_mime.Find(input, 1, 1))
to_chat(user, "Invalid emote.")
- else if(copytext(input,1,9) == "exclaims")
- to_chat(user, "Invalid emote.")
- else if(copytext(input,1,6) == "yells")
- to_chat(user, "Invalid emote.")
- else if(copytext(input,1,5) == "asks")
- to_chat(user, "Invalid emote.")
- else
- . = FALSE
+ return TRUE
+ return FALSE
/datum/emote/living/custom/run_emote(mob/user, params, type_override = null, intentional = FALSE)
if(!can_run_emote(user, TRUE, intentional))
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index b1c48aa8c90..946aab7babe 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -1,3 +1,6 @@
+/// This divisor controls how fast body temperature changes to match the environment
+#define BODYTEMP_DIVISOR 8
+
/mob/living/proc/Life(seconds, times_fired)
set waitfor = FALSE
set invisibility = 0
@@ -83,8 +86,15 @@
/mob/living/proc/handle_random_events()
return
+// Base mob environment handler for body temperature
/mob/living/proc/handle_environment(datum/gas_mixture/environment)
- return
+ var/loc_temp = get_temperature(environment)
+
+ if(loc_temp < bodytemperature) // it is cold here
+ if(!on_fire) // do not reduce body temp when on fire
+ adjust_bodytemperature(max((loc_temp - bodytemperature) / BODYTEMP_DIVISOR, BODYTEMP_COOLING_MAX))
+ else // this is a hot place
+ adjust_bodytemperature(min((loc_temp - bodytemperature) / BODYTEMP_DIVISOR, BODYTEMP_HEATING_MAX))
/mob/living/proc/handle_fire()
if(fire_stacks < 0) //If we've doused ourselves in water to avoid fire, dry off slowly
@@ -143,3 +153,5 @@
if(gravity >= GRAVITY_DAMAGE_TRESHOLD) //Aka gravity values of 3 or more
var/grav_stregth = gravity - GRAVITY_DAMAGE_TRESHOLD
adjustBruteLoss(min(grav_stregth,3))
+
+#undef BODYTEMP_DIVISOR
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 9f6ddea959f..7a41abc5f6b 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -534,7 +534,7 @@
GLOB.dead_mob_list -= src
GLOB.alive_mob_list += src
set_suicide(FALSE)
- stat = UNCONSCIOUS //the mob starts unconscious,
+ set_stat(UNCONSCIOUS) //the mob starts unconscious,
updatehealth() //then we check if the mob should wake up.
update_mobility()
update_sight()
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index b8f13a87745..cd169a000a8 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -94,7 +94,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
ic_blocked = TRUE
if(sanitize)
- message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
+ message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN))
if(!message || message == "")
return
@@ -110,12 +110,10 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
var/in_critical = InCritical()
if(one_character_prefix[message_mode])
- message = copytext(message, 2)
+ message = copytext_char(message, 2)
else if(message_mode || saymode)
- message = copytext(message, 3)
- if(findtext(message, " ", 1, 2))
- message = copytext(message, 2)
-
+ message = copytext_char(message, 3)
+ message = trim_left(message)
if(message_mode == MODE_ADMIN)
if(client)
client.cmd_admin_say(message)
@@ -146,11 +144,10 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
// No, you cannot speak in xenocommon just because you know the key
if(can_speak_language(message_language))
language = message_language
- message = copytext(message, 3)
+ message = copytext_char(message, 3)
// Trim the space if they said ",0 I LOVE LANGUAGES"
- if(findtext(message, " ", 1, 2))
- message = copytext(message, 2)
+ message = trim_left(message)
if(!language)
language = get_selected_language()
@@ -178,8 +175,8 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
if(fullcrit)
var/health_diff = round(-HEALTH_THRESHOLD_DEAD + health)
// If we cut our message short, abruptly end it with a-..
- var/message_len = length(message)
- message = copytext(message, 1, health_diff) + "[message_len > health_diff ? "-.." : "..."]"
+ var/message_len = length_char(message)
+ message = copytext_char(message, 1, health_diff) + "[message_len > health_diff ? "-.." : "..."]"
message = Ellipsis(message, 10, 1)
last_words = message
message_mode = MODE_WHISPER_CRIT
@@ -321,13 +318,13 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
return 1
/mob/living/proc/get_key(message)
- var/key = copytext(message, 1, 2)
+ var/key = message[1]
if(key in GLOB.department_radio_prefixes)
- return lowertext(copytext(message, 2, 3))
+ return lowertext(message[1 + length(key)])
/mob/living/proc/get_message_language(message)
- if(copytext(message, 1, 2) == ",")
- var/key = copytext(message, 2, 3)
+ if(message[1] == ",")
+ var/key = message[1 + length(message[1])]
for(var/ld in GLOB.all_languages)
var/datum/language/LD = ld
if(initial(LD.key) == key)
@@ -361,7 +358,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
if(message_mode == MODE_HEADSET)
imp.radio.talk_into(src, message, , spans, language)
return ITALICS | REDUCE_RANGE
- if(message_mode == MODE_DEPARTMENT || message_mode in imp.radio.channels)
+ if(message_mode == MODE_DEPARTMENT || (message_mode in imp.radio.channels))
imp.radio.talk_into(src, message, message_mode, spans, language)
return ITALICS | REDUCE_RANGE
@@ -380,7 +377,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
return ITALICS | REDUCE_RANGE
if(MODE_INTERCOM)
- for (var/obj/item/radio/intercom/I in view(1, null))
+ for (var/obj/item/radio/intercom/I in view(MODE_RANGE_INTERCOM, null))
I.talk_into(src, message, , spans, language)
return ITALICS | REDUCE_RANGE
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index 39268fd4cf8..bc5ace42214 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -75,7 +75,7 @@
death()
return
else if(stat == UNCONSCIOUS)
- stat = CONSCIOUS
+ set_stat(CONSCIOUS)
diag_hud_set_status()
/mob/living/silicon/ai/update_sight()
diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm
index e2bdea92c5d..b36036892d2 100644
--- a/code/modules/mob/living/silicon/ai/say.dm
+++ b/code/modules/mob/living/silicon/ai/say.dm
@@ -26,7 +26,8 @@
..()
/mob/living/silicon/ai/get_message_mode(message)
- if(copytext(message, 1, 3) in list(":h", ":H", ".h", ".H", "#h", "#H"))
+ var/static/regex/holopad_finder = regex(@"[:.#][hH]")
+ if(holopad_finder.Find(message, 1, 1))
return MODE_HOLOPAD
else
return ..()
diff --git a/code/modules/mob/living/silicon/pai/death.dm b/code/modules/mob/living/silicon/pai/death.dm
index 22f8b59ec33..8a350b13246 100644
--- a/code/modules/mob/living/silicon/pai/death.dm
+++ b/code/modules/mob/living/silicon/pai/death.dm
@@ -1,7 +1,7 @@
/mob/living/silicon/pai/death(gibbed)
if(stat == DEAD)
return
- stat = DEAD
+ set_stat(DEAD)
mobility_flags = NONE
update_sight()
clear_fullscreens()
diff --git a/code/modules/mob/living/silicon/pai/personality.dm b/code/modules/mob/living/silicon/pai/personality.dm
index 2c473be7495..1b95b60061e 100644
--- a/code/modules/mob/living/silicon/pai/personality.dm
+++ b/code/modules/mob/living/silicon/pai/personality.dm
@@ -8,7 +8,7 @@
*/
/datum/paiCandidate/proc/savefile_path(mob/user)
- return "data/player_saves/[copytext(user.ckey, 1, 2)]/[user.ckey]/pai.sav"
+ return "data/player_saves/[user.ckey[1]]/[user.ckey]/pai.sav"
/datum/paiCandidate/proc/savefile_save(mob/user)
if(IsGuestKey(user.key))
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 798b450e8c3..d9878026cff 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -159,7 +159,7 @@
mmi.forceMove(T)
if(mmi.brainmob)
if(mmi.brainmob.stat == DEAD)
- mmi.brainmob.stat = CONSCIOUS
+ mmi.brainmob.set_stat(CONSCIOUS)
GLOB.dead_mob_list -= mmi.brainmob
GLOB.alive_mob_list += mmi.brainmob
mind.transfer_to(mmi.brainmob)
@@ -945,13 +945,13 @@
return
if(IsUnconscious() || IsStun() || IsKnockdown() || IsParalyzed() || getOxyLoss() > maxHealth*0.5)
if(stat == CONSCIOUS)
- stat = UNCONSCIOUS
+ set_stat(UNCONSCIOUS)
become_blind(UNCONSCIOUS_BLIND)
update_mobility()
update_headlamp()
else
if(stat == UNCONSCIOUS)
- stat = CONSCIOUS
+ set_stat(CONSCIOUS)
cure_blind(UNCONSCIOUS_BLIND)
update_mobility()
update_headlamp()
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 a6239093dfe..d9b2dc8af14 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -45,8 +45,8 @@ Difficulty: Very Hard
pixel_x = -32
del_on_death = TRUE
gps_name = "Angelic Signal"
- achievement_type = /datum/award/achievement/boss/colussus_kill
- crusher_achievement_type = /datum/award/achievement/boss/colussus_crusher
+ achievement_type = /datum/award/achievement/boss/colossus_kill
+ crusher_achievement_type = /datum/award/achievement/boss/colossus_crusher
score_achievement_type = /datum/award/score/colussus_score
crusher_loot = list(/obj/structure/closet/crate/necropolis/colossus/crusher)
loot = list(/obj/structure/closet/crate/necropolis/colossus)
@@ -129,6 +129,8 @@ Difficulty: Very Hard
if(H.mind)
if(istype(H.mind.martial_art, /datum/martial_art/the_sleeping_carp))
. = TRUE
+ if (is_species(H, /datum/species/golem/sand))
+ . = TRUE
/mob/living/simple_animal/hostile/megafauna/colossus/proc/alternating_dir_shots()
ranged_cooldown = world.time + 40
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index acfd0ed3db4..ec405d9be46 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -401,14 +401,14 @@ Difficulty: Hard
if(health > 0 || stat == DEAD)
return
else
- stat = DEAD
+ set_stat(DEAD)
blinking = TRUE //we do a fancy animation, release a huge burst(), and leave our staff.
visible_message("\"Mrmxmexmrk wipj-hiwxvygx wiuyirgi...\"")
visible_message("[src] shrinks, releasing a massive burst of energy!")
for(var/mob/living/L in view(7,src))
stored_nearby += L // store the people to grant the achievements to once we die
hierophant_burst(null, get_turf(src), 10)
- stat = CONSCIOUS // deathgasp wont run if dead, stupid
+ set_stat(CONSCIOUS) // deathgasp wont run if dead, stupid
..(force_grant = stored_nearby)
/mob/living/simple_animal/hostile/megafauna/hierophant/Destroy()
@@ -533,13 +533,13 @@ Difficulty: Hard
if(QDELETED(caster))
return FALSE
if(mover == caster.pulledby)
- return TRUE
+ return
if(istype(mover, /obj/projectile))
var/obj/projectile/P = mover
if(P.firer == caster)
- return TRUE
- if(mover == caster)
- return TRUE
+ return
+ if(mover != caster)
+ return FALSE
/obj/effect/temp_visual/hierophant/chaser //a hierophant's chaser. follows target around, moving and producing a blast every speed deciseconds.
duration = 98
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
index 3bacd6a851a..7455461709f 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
@@ -44,7 +44,7 @@
nodamage = TRUE
flag = "energy"
temperature = 50
-
+
/obj/projectile/temp/basilisk/heated
name = "energy blast"
icon_state= "chronobolt"
@@ -67,7 +67,7 @@
adjustBruteLoss(140)
if(3)
adjustBruteLoss(110)
-
+
/mob/living/simple_animal/hostile/asteroid/basilisk/AttackingTarget()
. = ..()
if(lava_drinker && !warmed_up && istype(target, /turf/open/lava))
@@ -80,7 +80,7 @@
warmed_up = TRUE
projectiletype = /obj/projectile/temp/basilisk/heated
addtimer(CALLBACK(src, .proc/cool_down), 3000)
-
+
mob/living/simple_animal/hostile/asteroid/basilisk/proc/cool_down()
visible_message("[src] appears to be cooling down...")
if(stat != DEAD)
@@ -115,6 +115,31 @@ mob/living/simple_animal/hostile/asteroid/basilisk/proc/cool_down()
loot = list()
butcher_results = list(/obj/item/stack/ore/diamond = 2, /obj/item/stack/sheet/sinew = 2, /obj/item/stack/sheet/bone = 1)
lava_drinker = FALSE
+ search_objects = 1
+ wanted_objects = list(/obj/item/pen/survival, /obj/item/stack/ore/diamond)
+
+/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/Life()
+ . = ..()
+ if(stat == CONSCIOUS)
+ consume_bait()
+
+/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/proc/consume_bait()
+ var/obj/item/stack/ore/diamond/diamonds = locate(/obj/item/stack/ore/diamond) in oview(src, 9)
+ var/obj/item/pen/survival/bait = locate(/obj/item/pen/survival) in oview(src, 9)
+ if(!diamonds && !bait)
+ return
+ if(diamonds)
+ var/distanced = 0
+ distanced = get_dist(loc,diamonds.loc)
+ if(distanced <= 1 && diamonds)
+ qdel(diamonds)
+ src.visible_message("[src] consumes [diamonds], and it disappears! ...At least, you think.")
+ if(bait)
+ var/distanceb = 0
+ distanceb = get_dist(loc,bait.loc)
+ if(distanceb <= 1 && bait)
+ qdel(bait)
+ src.visible_message("[src] examines [bait] closer, and telekinetically shatters the pen.")
/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random/Initialize()
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm
index 1dd642ecd65..798bd37fbc0 100644
--- a/code/modules/mob/living/simple_animal/hostile/statue.dm
+++ b/code/modules/mob/living/simple_animal/hostile/statue.dm
@@ -193,7 +193,7 @@
/obj/effect/proc_holder/spell/aoe_turf/blindness/cast(list/targets,mob/user = usr)
for(var/mob/living/L in GLOB.alive_mob_list)
var/turf/T = get_turf(L.loc)
- if(T && T in targets)
+ if(T && (T in targets))
L.blind_eyes(4)
return
diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
index 497a0c3310f..393690cfcf7 100644
--- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
+++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
@@ -102,7 +102,7 @@
if(length(grasping) < max_grasps)
grasping:
for(var/mob/living/L in view(grasp_range, src))
- if(L == src || faction_check_mob(L) || L in grasping || L == target)
+ if(L == src || faction_check_mob(L) || (L in grasping) || L == target)
continue
for(var/turf/T in getline(src,L))
if (T.density)
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 715fd440db7..b02b84adc1e 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -213,8 +213,8 @@
ears.forceMove(drop_location())
ears = null
for(var/possible_phrase in speak)
- if(copytext(possible_phrase,1,3) in GLOB.department_radio_keys)
- possible_phrase = copytext(possible_phrase,3)
+ if(copytext_char(possible_phrase, 2, 3) in GLOB.department_radio_keys)
+ possible_phrase = copytext_char(possible_phrase, 3)
//Adding things to inventory
else if(href_list["add_inv"])
@@ -422,8 +422,8 @@
if(prob(50))
useradio = 1
- if((copytext(possible_phrase,1,2) in GLOB.department_radio_prefixes) && (copytext(possible_phrase,2,3) in GLOB.department_radio_keys))
- possible_phrase = "[useradio?pick(available_channels):""][copytext(possible_phrase,3)]" //crop out the channel prefix
+ if((possible_phrase[1] in GLOB.department_radio_prefixes) && (copytext_char(possible_phrase, 2, 3) in GLOB.department_radio_keys))
+ possible_phrase = "[useradio?pick(available_channels):""][copytext_char(possible_phrase, 3)]" //crop out the channel prefix
else
possible_phrase = "[useradio?pick(available_channels):""][possible_phrase]"
@@ -431,8 +431,8 @@
else //If we have no headset or channels to use, dont try to use any!
for(var/possible_phrase in speak)
- if((copytext(possible_phrase,1,2) in GLOB.department_radio_prefixes) && (copytext(possible_phrase,2,3) in GLOB.department_radio_keys))
- possible_phrase = copytext(possible_phrase,3) //crop out the channel prefix
+ if((possible_phrase[1] in GLOB.department_radio_prefixes) && (copytext_char(possible_phrase, 2, 3) in GLOB.department_radio_keys))
+ possible_phrase = copytext_char(possible_phrase, 3) //crop out the channel prefix
newspeak.Add(possible_phrase)
speak = newspeak
@@ -470,11 +470,11 @@
return
return
- if(parrot_interest && parrot_interest in view(src))
+ if(parrot_interest && (parrot_interest in view(src)))
parrot_state = PARROT_SWOOP | PARROT_STEAL
return
- if(parrot_perch && parrot_perch in view(src))
+ if(parrot_perch && (parrot_perch in view(src)))
parrot_state = PARROT_SWOOP | PARROT_RETURN
return
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index de2c17f5bc6..70319db4621 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -208,7 +208,7 @@
if(health <= 0)
death()
else
- stat = CONSCIOUS
+ set_stat(CONSCIOUS)
med_hud_set_status()
if(footstep_type)
AddComponent(/datum/component/footstep, footstep_type)
diff --git a/code/modules/mob/living/simple_animal/slime/death.dm b/code/modules/mob/living/simple_animal/slime/death.dm
index 66a71cced72..0e2bfc3e45f 100644
--- a/code/modules/mob/living/simple_animal/slime/death.dm
+++ b/code/modules/mob/living/simple_animal/slime/death.dm
@@ -21,7 +21,7 @@
if(buckled)
Feedstop(silent = TRUE) //releases ourselves from the mob we fed on.
- stat = DEAD
+ set_stat(DEAD)
cut_overlays()
if(SSticker.mode)
diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm
index 88589b550b8..68a098aad57 100644
--- a/code/modules/mob/living/simple_animal/slime/life.dm
+++ b/code/modules/mob/living/simple_animal/slime/life.dm
@@ -108,14 +108,17 @@
AIproc = 0
/mob/living/simple_animal/slime/handle_environment(datum/gas_mixture/environment)
- if(!environment)
- return
-
var/loc_temp = get_temperature(environment)
+ var/divisor = 10 /// The divisor controls how fast body temperature changes, lower causes faster changes
- adjust_bodytemperature(adjust_body_temperature(bodytemperature, loc_temp, 1))
+ if(abs(loc_temp - bodytemperature) > 50) // If the difference is great, reduce the divisor for faster stabilization
+ divisor = 5
- //Account for massive pressure differences
+ if(loc_temp < bodytemperature) // It is cold here
+ if(!on_fire) // Do not reduce body temp when on fire
+ adjust_bodytemperature((loc_temp - bodytemperature) / divisor)
+ else // This is a hot place
+ adjust_bodytemperature((loc_temp - bodytemperature) / divisor)
if(bodytemperature < (T0C + 5)) // start calculating temperature damage etc
if(bodytemperature <= (T0C - 40)) // stun temperature
@@ -126,7 +129,6 @@
adjustBruteLoss(200)
else
adjustBruteLoss(round(sqrt(bodytemperature)) * 2)
-
else
Tempstun = 0
@@ -138,39 +140,21 @@
if(stat == CONSCIOUS && stasis)
to_chat(src, "Nerve gas in the air has put you in stasis!")
- stat = UNCONSCIOUS
+ set_stat(UNCONSCIOUS)
powerlevel = 0
rabid = 0
update_mobility()
regenerate_icons()
else if(stat == UNCONSCIOUS && !stasis)
to_chat(src, "You wake up from the stasis.")
- stat = CONSCIOUS
+ set_stat(CONSCIOUS)
update_mobility()
regenerate_icons()
updatehealth()
-
return //TODO: DEFERRED
-/mob/living/simple_animal/slime/proc/adjust_body_temperature(current, loc_temp, boost)
- var/temperature = current
- var/difference = abs(current-loc_temp) //get difference
- var/increments// = difference/10 //find how many increments apart they are
- if(difference > 50)
- increments = difference/5
- else
- increments = difference/10
- var/change = increments*boost // Get the amount to change by (x per increment)
- var/temp_change
- if(current < loc_temp)
- temperature = min(loc_temp, temperature+change)
- else if(current > loc_temp)
- temperature = max(loc_temp, temperature-change)
- temp_change = (temperature - current)
- return temp_change
-
/mob/living/simple_animal/slime/handle_status_effects()
..()
if(prob(30) && !stat)
diff --git a/code/modules/mob/living/simple_animal/status_procs.dm b/code/modules/mob/living/simple_animal/status_procs.dm
index 62a262f9e60..c5f0c8cb4b9 100644
--- a/code/modules/mob/living/simple_animal/status_procs.dm
+++ b/code/modules/mob/living/simple_animal/status_procs.dm
@@ -8,8 +8,6 @@
/mob/living/simple_animal/set_blindness()
return
-
-
/mob/living/simple_animal/blur_eyes()
return
@@ -19,7 +17,5 @@
/mob/living/simple_animal/set_blurriness()
return
-
-
/mob/living/simple_animal/become_blind()
return
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 9d68c3290cc..90f49faa0c5 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -138,7 +138,7 @@
if(!client)
return
- msg = copytext(msg, 1, MAX_MESSAGE_LEN)
+ msg = copytext_char(msg, 1, MAX_MESSAGE_LEN)
if(type)
if(type & MSG_VISUAL && eye_blind )//Vision related
@@ -527,7 +527,7 @@
if (world.time < memory_throttle_time)
return
memory_throttle_time = world.time + 5 SECONDS
- msg = copytext(msg, 1, MAX_MESSAGE_LEN)
+ msg = copytext_char(msg, 1, MAX_MESSAGE_LEN)
msg = sanitize(msg)
mind.store_memory(msg)
@@ -1249,3 +1249,10 @@
for(var/obj/item/I in held_items)
if(I.item_flags & SLOWS_WHILE_IN_HAND)
. += I.slowdown
+
+/mob/proc/set_stat(new_stat)
+ if(new_stat == stat)
+ return
+ SEND_SIGNAL(src, COMSIG_MOB_STATCHANGE, new_stat)
+ . = stat
+ stat = new_stat
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index f98a32450d0..6f7cf5c4f06 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -51,134 +51,127 @@
/**
* Convert random parts of a passed in message to stars
*
- * * n - the string to convert
- * * pr - probability any character gets changed
+ * * phrase - the string to convert
+ * * probability - probability any character gets changed
*
* This proc is dangerously laggy, avoid it or die
*/
-/proc/stars(n, pr)
- n = html_encode(n)
- if (pr == null)
- pr = 25
- if (pr <= 0)
- return null
- else
- if (pr >= 100)
- return n
- var/te = n
- var/t = ""
- n = length(n)
-
- for(var/p = 1 to min(n,MAX_BROADCAST_LEN))
- if ((copytext(te, p, p + 1) == " " || prob(pr)))
- t = text("[][]", t, copytext(te, p, p + 1))
+/proc/stars(phrase, probability = 25)
+ if(probability <= 0)
+ return phrase
+ phrase = html_decode(phrase)
+ var/leng = length(phrase)
+ . = ""
+ var/char = ""
+ for(var/i = 1, i <= leng, i += length(char))
+ char = phrase[i]
+ if(char == " " || !prob(probability))
+ . += char
else
- t = text("[]*", t)
- if(n > MAX_BROADCAST_LEN)
- t += "..." //signals missing text
- return sanitize(t)
+ . += "*"
+ return sanitize(.)
+
/**
* Makes you speak like you're drunk
*/
-/proc/slur(n)
- var/phrase = html_decode(n)
+/proc/slur(phrase)
+ phrase = html_decode(phrase)
var/leng = length(phrase)
- var/counter=length(phrase)
- var/newphrase=""
- var/newletter=""
- while(counter>=1)
- newletter=copytext(phrase,(leng-counter)+1,(leng-counter)+2)
- if(rand(1,3)==3)
- if(lowertext(newletter)=="o")
- newletter="u"
- if(lowertext(newletter)=="s")
- newletter="ch"
- if(lowertext(newletter)=="a")
- newletter="ah"
- if(lowertext(newletter)=="u")
- newletter="oo"
- if(lowertext(newletter)=="c")
- newletter="k"
- if(rand(1,20)==20)
- if(newletter==" ")
- newletter="...huuuhhh..."
- if(newletter==".")
- newletter=" *BURP*."
- switch(rand(1,20))
+ . = ""
+ var/newletter = ""
+ var/rawchar = ""
+ for(var/i = 1, i <= leng, i += length(rawchar))
+ rawchar = newletter = phrase[i]
+ if(rand(1, 3) == 3)
+ var/lowerletter = lowertext(newletter)
+ if(lowerletter == "o")
+ newletter = "u"
+ else if(lowerletter == "s")
+ newletter = "ch"
+ else if(lowerletter == "a")
+ newletter = "ah"
+ else if(lowerletter == "u")
+ newletter = "oo"
+ else if(lowerletter == "c")
+ newletter = "k"
+ if(rand(1, 20) == 20)
+ if(newletter == " ")
+ newletter = "...huuuhhh..."
+ else if(newletter == ".")
+ newletter = " *BURP*."
+ switch(rand(1, 20))
if(1)
- newletter+="'"
+ newletter += "'"
if(10)
- newletter+="[newletter]"
+ newletter += "[newletter]"
if(20)
- newletter+="[newletter][newletter]"
- newphrase+="[newletter]";counter-=1
- return newphrase
+ newletter += "[newletter][newletter]"
+ . += "[newletter]"
+ return sanitize(.)
/// Makes you talk like you got cult stunned, which is slurring but with some dark messages
-/proc/cultslur(n) // Inflicted on victims of a stun talisman
- var/phrase = html_decode(n)
+/proc/cultslur(phrase) // Inflicted on victims of a stun talisman
+ phrase = html_decode(phrase)
var/leng = length(phrase)
- var/counter=length(phrase)
- var/newphrase=""
- var/newletter=""
- while(counter>=1)
- newletter=copytext(phrase,(leng-counter)+1,(leng-counter)+2)
- if(rand(1,2)==2)
- if(lowertext(newletter)=="o")
- newletter="u"
- if(lowertext(newletter)=="t")
- newletter="ch"
- if(lowertext(newletter)=="a")
- newletter="ah"
- if(lowertext(newletter)=="u")
- newletter="oo"
- if(lowertext(newletter)=="c")
- newletter=" NAR "
- if(lowertext(newletter)=="s")
- newletter=" SIE "
- if(rand(1,4)==4)
- if(newletter==" ")
- newletter=" no hope... "
- if(newletter=="H")
- newletter=" IT COMES... "
+ . = ""
+ var/newletter = ""
+ var/rawchar = ""
+ for(var/i = 1, i <= leng, i += length(rawchar))
+ rawchar = newletter = phrase[i]
+ if(rand(1, 2) == 2)
+ var/lowerletter = lowertext(newletter)
+ if(lowerletter == "o")
+ newletter = "u"
+ else if(lowerletter == "t")
+ newletter = "ch"
+ else if(lowerletter == "a")
+ newletter = "ah"
+ else if(lowerletter == "u")
+ newletter = "oo"
+ else if(lowerletter == "c")
+ newletter = " NAR "
+ else if(lowerletter == "s")
+ newletter = " SIE "
+ if(rand(1, 4) == 4)
+ if(newletter == " ")
+ newletter = " no hope... "
+ else if(newletter == "H")
+ newletter = " IT COMES... "
- switch(rand(1,15))
+ switch(rand(1, 15))
if(1)
- newletter="'"
+ newletter = "'"
if(2)
- newletter+="agn"
+ newletter += "agn"
if(3)
- newletter="fth"
+ newletter = "fth"
if(4)
- newletter="nglu"
+ newletter = "nglu"
if(5)
- newletter="glor"
- newphrase+="[newletter]";counter-=1
- return newphrase
+ newletter = "glor"
+ . += newletter
+ return sanitize(.)
///Adds stuttering to the message passed in
-/proc/stutter(n)
- var/te = html_decode(n)
- var/t = ""//placed before the message. Not really sure what it's for.
- n = length(n)//length of the entire word
- var/p = null
- p = 1//1 is the start of any word
- while(p <= n)//while P, which starts at 1 is less or equal to N which is the length.
- var/n_letter = copytext(te, p, p + 1)//copies text from a certain distance. In this case, only one letter at a time.
- if (prob(80) && (ckey(n_letter) in list("b","c","d","f","g","h","j","k","l","m","n","p","q","r","s","t","v","w","x","y","z")))
- if (prob(10))
- n_letter = text("[n_letter]-[n_letter]-[n_letter]-[n_letter]")//replaces the current letter with this instead.
+/proc/stutter(phrase)
+ phrase = html_decode(phrase)
+ var/leng = length(phrase)
+ . = ""
+ var/newletter = ""
+ var/rawchar
+ for(var/i = 1, i <= leng, i += length(rawchar))
+ rawchar = newletter = phrase[i]
+ if(prob(80) && !(lowertext(newletter) in list("a", "e", "i", "o", "u", " ")))
+ if(prob(10))
+ newletter = "[newletter]-[newletter]-[newletter]-[newletter]"
+ else if(prob(20))
+ newletter = "[newletter]-[newletter]-[newletter]"
+ else if (prob(5))
+ newletter = ""
else
- if (prob(20))
- n_letter = text("[n_letter]-[n_letter]-[n_letter]")
- else
- if (prob(5))
- n_letter = null
- else
- n_letter = text("[n_letter]-[n_letter]")
- t = text("[t][n_letter]")//since the above is ran through for each letter, the text just adds up back to the original word.
- p++//for each letter p is increased to find where the next letter will be.
- return copytext(sanitize(t),1,MAX_MESSAGE_LEN)
+ newletter = "[newletter]-[newletter]"
+ . += newletter
+ return sanitize(.)
///Convert a message to derpy speak
/proc/derpspeech(message, stuttering)
@@ -204,48 +197,20 @@
* text is the inputted message, replace_characters will cause original letters to be replaced and chance are the odds that a character gets modified.
*/
/proc/Gibberish(text, replace_characters = FALSE, chance = 50)
+ text = html_decode(text)
. = ""
- for(var/i in 1 to length(text))
- var/letter = text[i]
+ var/rawchar = ""
+ var/letter = ""
+ var/lentext = length(text)
+ for(var/i = 1, i <= lentext, i += length(rawchar))
+ rawchar = letter = text[i]
if(prob(chance))
if(replace_characters)
letter = ""
for(var/j in 1 to rand(0, 2))
- letter += pick("#","@","*","&","%","$","/", "<", ">", ";","*","*","*","*","*","*","*")
+ letter += pick("#", "@", "*", "&", "%", "$", "/", "<", ">", ";", "*", "*", "*", "*", "*", "*", "*")
. += letter
-
-
-/**
- * Convert a message into leet non gaijin speak
- *
- * The difference with stutter is that this proc can stutter more than 1 letter
- *
- * The issue here is that anything that does not have a space is treated as one word (in many instances). For instance, "LOOKING," is a word, including the comma.
- *
- * It's fairly easy to fix if dealing with single letters but not so much with compounds of letters./N
- */
-/proc/ninjaspeak(n) //NINJACODE
- var/te = html_decode(n)
- var/t = ""
- n = length(n)
- var/p = 1
- while(p <= n)
- var/n_letter
- var/n_mod = rand(1,4)
- if(p+n_mod>n+1)
- n_letter = copytext(te, p, n+1)
- else
- n_letter = copytext(te, p, p+n_mod)
- if (prob(50))
- if (prob(30))
- n_letter = text("[n_letter]-[n_letter]-[n_letter]")
- else
- n_letter = text("[n_letter]-[n_letter]")
- else
- n_letter = text("[n_letter]")
- t = text("[t][n_letter]")
- p=p+n_mod
- return copytext(sanitize(t),1,MAX_MESSAGE_LEN)
+ return sanitize(.)
///Shake the camera of the person viewing the mob SO REAL!
/proc/shake_camera(mob/M, duration, strength=1)
@@ -410,7 +375,7 @@
for(var/mob/dead/observer/O in GLOB.player_list)
if(!notify_suiciders && (O in GLOB.suicided_mob_list))
continue
- if (ignore_key && O.ckey in GLOB.poll_ignore[ignore_key])
+ if (ignore_key && (O.ckey in GLOB.poll_ignore[ignore_key]))
continue
var/orbit_link
if (source && action == NOTIFY_ORBIT)
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 5df7959c02e..330d1f83a20 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -32,7 +32,7 @@
to_chat(usr, "Speech is currently admin-disabled.")
return
- message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
+ message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN))
usr.emote("me",1,message,TRUE)
@@ -84,9 +84,9 @@
///Check if this message is an emote
/mob/proc/check_emote(message, forced)
- if(copytext(message, 1, 2) == "*")
- emote(copytext(message, 2), intentional = !forced)
- return 1
+ if(message[1] == "*")
+ emote(copytext(message, length(message[1]) + 1), intentional = !forced)
+ return TRUE
///Check if the mob has a hivemind channel
/mob/proc/hivecheck()
@@ -105,11 +105,11 @@
* * A department radio (lots of values here)
*/
/mob/proc/get_message_mode(message)
- var/key = copytext(message, 1, 2)
+ var/key = message[1]
if(key == "#")
return MODE_WHISPER
else if(key == ";")
return MODE_HEADSET
- else if(length(message) > 2 && (key in GLOB.department_radio_prefixes))
- var/key_symbol = lowertext(copytext(message, 2, 3))
+ else if((length(message) > (length(key) + 1)) && (key in GLOB.department_radio_prefixes))
+ var/key_symbol = lowertext(message[length(key) + 1])
return GLOB.department_radio_keys[key_symbol]
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 32e241bde01..62e66038a0a 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -41,8 +41,8 @@
// hash the original name?
if(tr_flags & TR_HASHNAME)
- O.name = "monkey ([copytext(md5(real_name), 2, 6)])"
- O.real_name = "monkey ([copytext(md5(real_name), 2, 6)])"
+ O.name = "monkey ([copytext_char(md5(real_name), 2, 6)])"
+ O.real_name = "monkey ([copytext_char(md5(real_name), 2, 6)])"
//handle DNA and other attributes
dna.transfer_identity(O)
@@ -216,7 +216,7 @@
dna.transfer_identity(O)
O.updateappearance(mutcolor_update=1)
- if(cmptext("monkey",copytext(O.dna.real_name,1,7)))
+ if(findtext(O.dna.real_name, "monkey", 1, 7)) //7 == length("monkey") + 1
O.real_name = random_unique_name(O.gender)
O.dna.generate_unique_enzymes(O)
else
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index 451c1b04371..be26b588aa9 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -45,15 +45,13 @@
to_chat(user, "You scribble illegibly on the cover of [src]!")
return
- var/inputvalue = input(user, "What would you like to label the folder?", "Folder Labelling", null) as text|null
-
- if (isnull(inputvalue))
+ var/inputvalue = stripped_input(user, "What would you like to label the folder?", "Folder Labelling", "", MAX_NAME_LEN)
+
+ if(!inputvalue)
return
-
- var/n_name = copytext(sanitize(inputvalue), 1, MAX_NAME_LEN)
-
+
if(user.canUseTopic(src, BE_CLOSE))
- name = "folder[(n_name ? " - '[n_name]'" : null)]"
+ name = "folder[(inputvalue ? " - '[inputvalue]'" : null)]"
/obj/item/folder/attack_self(mob/user)
diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm
index bfebf63bc5c..d22cd747ca7 100644
--- a/code/modules/paperwork/handlabeler.dm
+++ b/code/modules/paperwork/handlabeler.dm
@@ -70,7 +70,7 @@
if(mode)
to_chat(user, "You turn on [src].")
//Now let them chose the text.
- var/str = copytext(reject_bad_text(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
+ var/str = reject_bad_text(stripped_input(user, "Label text?", "Set label","", MAX_NAME_LEN))
if(!str || !length(str))
to_chat(user, "Invalid text!")
return
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 3eab1968d33..6f98b5f6036 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -148,7 +148,10 @@
if(istart == 0)
return //No field found with matching id
- laststart = istart+1
+ if(links)
+ laststart = istart + length(info_links[istart])
+ else
+ laststart = istart + length(info[istart])
locid++
if(locid == id)
var/iend = 1
diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm
index bc627ccaf7d..4e9cd08eaef 100644
--- a/code/modules/paperwork/paperplane.dm
+++ b/code/modules/paperwork/paperplane.dm
@@ -33,7 +33,9 @@
/obj/item/paperplane/handle_atom_del(atom/A)
if(A == internalPaper)
+ var/obj/item/paper/P = internalPaper
internalPaper = null
+ P.moveToNullspace() //So we're not deleting it twice when deleting our contents.
if(!QDELETED(src))
qdel(src)
return ..()
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index a8eb4aa808b..3f225e70664 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -244,3 +244,17 @@
item_state = initial(item_state)
lefthand_file = initial(lefthand_file)
righthand_file = initial(righthand_file)
+
+/obj/item/pen/survival
+ name = "survival pen"
+ desc = "The latest in portable survival technology, this pen was designed as a miniature diamond pickaxe. Watchers find them very desirable for their diamond exterior."
+ icon = 'icons/obj/bureaucracy.dmi'
+ icon_state = "digging_pen"
+ item_state = "pen"
+ force = 3
+ w_class = WEIGHT_CLASS_TINY
+ custom_materials = list(/datum/material/iron=10, /datum/material/diamond=100, /datum/material/titanium = 10)
+ pressure_resistance = 2
+ grind_results = list(/datum/reagent/iron = 2, /datum/reagent/iodine = 1)
+ tool_behaviour = TOOL_MINING //For the classic "digging out of prison with a spoon but you're in space so this analogy doesn't work" situation.
+ toolspeed = 10 //You will never willingly choose to use one of these over a shovel.
diff --git a/code/modules/photography/_pictures.dm b/code/modules/photography/_pictures.dm
index 9cab2b1ec0c..4f6136e1102 100644
--- a/code/modules/photography/_pictures.dm
+++ b/code/modules/photography/_pictures.dm
@@ -117,9 +117,9 @@
if(data.len < 5)
return null
var/timestamp = data[2]
- var/year = copytext(timestamp, 1, 5)
- var/month = copytext(timestamp, 5, 7)
- var/day = copytext(timestamp, 7, 9)
+ var/year = copytext_char(timestamp, 1, 5)
+ var/month = copytext_char(timestamp, 5, 7)
+ var/day = copytext_char(timestamp, 7, 9)
var/round = data[4]
. += "[year]/[month]/[day]/round-[round]"
if("O")
diff --git a/code/modules/photography/photos/photo.dm b/code/modules/photography/photos/photo.dm
index 1d648086e69..67813f46594 100644
--- a/code/modules/photography/photos/photo.dm
+++ b/code/modules/photography/photos/photo.dm
@@ -55,9 +55,8 @@
if(!user.is_literate())
to_chat(user, "You scribble illegibly on [src]!")
return
- var/txt = sanitize(input(user, "What would you like to write on the back?", "Photo Writing", null) as text)
- txt = copytext(txt, 1, 128)
- if(user.canUseTopic(src, BE_CLOSE))
+ var/txt = stripped_input(user, "What would you like to write on the back?", "Photo Writing", "", 128)
+ if(txt && user.canUseTopic(src, BE_CLOSE))
scribble = txt
..()
@@ -86,9 +85,9 @@
set category = "Object"
set src in usr
- var/n_name = copytext(sanitize(input(usr, "What would you like to label the photo?", "Photo Labelling", null) as text), 1, MAX_NAME_LEN)
+ var/n_name = stripped_input(usr, "What would you like to label the photo?", "Photo Labelling", "", MAX_NAME_LEN)
//loc.loc check is for making possible renaming photos in clipboards
- if((loc == usr || loc.loc && loc.loc == usr) && usr.stat == CONSCIOUS && !usr.incapacitated())
+ if(n_name && (loc == usr || loc.loc && loc.loc == usr) && usr.stat == CONSCIOUS && !usr.incapacitated())
name = "photo[(n_name ? text("- '[n_name]'") : null)]"
add_fingerprint(usr)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 9f31743e15c..bc0709549e6 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -787,6 +787,48 @@
. = ..()
if(.)
return
+
+ if(isethereal(user))
+ var/mob/living/carbon/human/H = user
+ if(H.a_intent == INTENT_HARM)
+ if(cell.charge <= (cell.maxcharge / 2)) // if charge is under 50% you shouldnt drain it
+ to_chat(H, "The APC doesn't have much power, you probably shouldn't drain any.")
+ return
+ var/obj/item/organ/stomach/ethereal/stomach = H.getorganslot(ORGAN_SLOT_STOMACH)
+ if(stomach.crystal_charge > 145)
+ to_chat(H, "Your charge is full!")
+ return
+ to_chat(H, "You start channeling some power through the APC into your body.")
+ if(do_after(user, 75, target = src))
+ if(cell.charge <= (cell.maxcharge / 2) || (stomach.crystal_charge > 145))
+ return
+ if(istype(stomach))
+ to_chat(H, "You receive some charge from the APC.")
+ stomach.adjust_charge(10)
+ cell.charge -= 10
+ else
+ to_chat(H, "You can't receive charge from the APC!")
+ return
+ if(H.a_intent == INTENT_GRAB)
+ if(cell.charge == cell.maxcharge)
+ to_chat(H, "The APC is full!")
+ return
+ var/obj/item/organ/stomach/ethereal/stomach = H.getorganslot(ORGAN_SLOT_STOMACH)
+ if(stomach.crystal_charge < 10)
+ to_chat(H, "Your charge is too low!")
+ return
+ to_chat(H, "You start channeling power through your body into the APC.")
+ if(do_after(user, 75, target = src))
+ if(cell.charge == cell.maxcharge || (stomach.crystal_charge < 10))
+ return
+ if(istype(stomach))
+ to_chat(H, "You transfer some power to the APC.")
+ stomach.adjust_charge(-10)
+ cell.charge += 10
+ else
+ to_chat(H, "You can't transfer power to the APC!")
+ return
+
if(opened && (!issilicon(user)))
if(cell)
user.visible_message("[user] removes \the [cell] from [src]!", "You remove \the [cell].")
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 7eb860f23ab..bfd5b825453 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -580,6 +580,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list(new/datum/stack_recipe("cable restrain
/obj/structure/cable_bridge/wirecutter_act(mob/living/user, obj/item/I)
. = ..()
qdel(src)
+ return TRUE
#undef UNDER_SMES
#undef UNDER_TERMINAL
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 0d5c9c291f0..56eaa20d65b 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -148,6 +148,28 @@
if(prob(25))
corrupt()
+/obj/item/stock_parts/cell/attack_self(mob/user)
+ if(isethereal(user))
+ var/mob/living/carbon/human/H = user
+ if(charge < 100)
+ to_chat(H, "The [src] doesn't have enough power!")
+ return
+ var/obj/item/organ/stomach/ethereal/stomach = H.getorganslot(ORGAN_SLOT_STOMACH)
+ if(stomach.crystal_charge > 146)
+ to_chat(H, "Your charge is full!")
+ return
+ to_chat(H, "You clumsily channel power through the [src] and into your body, wasting some in the process.")
+ if(do_after(user, 5, target = src))
+ if((charge < 100) || (stomach.crystal_charge > 146))
+ return
+ if(istype(stomach))
+ to_chat(H, "You receive some charge from the [src].")
+ stomach.adjust_charge(3)
+ charge -= 100 //you waste way more than you receive, so that ethereals cant just steal one cell and forget about hunger
+ else
+ to_chat(H, "You can't receive charge from the [src]!")
+ return
+
/obj/item/stock_parts/cell/blob_act(obj/structure/blob/B)
ex_act(EXPLODE_DEVASTATE)
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index bf93577a1a3..2f88da8837d 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -643,7 +643,7 @@
var/obj/item/organ/stomach/ethereal/stomach = H.getorganslot(ORGAN_SLOT_STOMACH)
if(istype(stomach))
to_chat(H, "You receive some charge from the [fitting].")
- stomach.adjust_charge(5)
+ stomach.adjust_charge(2)
else
to_chat(H, "You can't receive charge from the [fitting]!")
return
diff --git a/code/modules/power/pipecleaners.dm b/code/modules/power/pipecleaners.dm
index 4b75fe34784..1b12d64a027 100644
--- a/code/modules/power/pipecleaners.dm
+++ b/code/modules/power/pipecleaners.dm
@@ -85,8 +85,8 @@ By design, d1 is the smallest direction and d2 is the highest
// ensure d1 & d2 reflect the icon_state for entering and exiting pipe_cleaner
var/dash = findtext(icon_state, "-")
- d1 = text2num( copytext( icon_state, 1, dash ) )
- d2 = text2num( copytext( icon_state, dash+1 ) )
+ d1 = text2num(copytext(icon_state, 1, dash))
+ d2 = text2num(copytext(icon_state, dash + length(icon_state[dash])))
if(d1)
stored = new/obj/item/stack/pipe_cleaner_coil(null,2,pipe_cleaner_color)
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index 8de860dd0fe..2a4cd291ed7 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -66,34 +66,68 @@
if(player.stat != DEAD && player.loc && is_station_level(player.loc.z) && !iscultist(player) && !isanimal(player))
souls_needed[player] = TRUE
soul_goal = round(1 + LAZYLEN(souls_needed) * 0.75)
- INVOKE_ASYNC(src, .proc/begin_the_end)
+ INVOKE_ASYNC(GLOBAL_PROC, .proc/begin_the_end)
-/obj/singularity/narsie/large/cult/proc/begin_the_end()
+/proc/begin_the_end()
sleep(50)
+ if(QDELETED(GLOB.cult_narsie)) // uno
+ priority_announce("Status report? We detected a anomaly, but it disappeared almost immediately.","Central Command Higher Dimensional Affairs", 'sound/misc/notice1.ogg')
+ GLOB.cult_narsie = null
+ sleep(20)
+ INVOKE_ASYNC(GLOBAL_PROC, .proc/cult_ending_helper, 2)
+ return
priority_announce("An acausal dimensional event has been detected in your sector. Event has been flagged EXTINCTION-CLASS. Directing all available assets toward simulating solutions. SOLUTION ETA: 60 SECONDS.","Central Command Higher Dimensional Affairs", 'sound/misc/airraid.ogg')
sleep(500)
+ if(QDELETED(GLOB.cult_narsie)) // dos
+ priority_announce("Simulations aborted, sensors report that the acasual event is normalizing. Good work, crew.","Central Command Higher Dimensional Affairs", 'sound/misc/notice1.ogg')
+ GLOB.cult_narsie = null
+ sleep(20)
+ INVOKE_ASYNC(GLOBAL_PROC, .proc/cult_ending_helper, 2)
+ return
priority_announce("Simulations on acausal dimensional event complete. Deploying solution package now. Deployment ETA: ONE MINUTE. ","Central Command Higher Dimensional Affairs")
sleep(50)
set_security_level("delta")
- SSshuttle.registerHostileEnvironment(src)
+ SSshuttle.registerHostileEnvironment(GLOB.cult_narsie)
SSshuttle.lockdown = TRUE
sleep(600)
- if(resolved == FALSE)
- resolved = TRUE
+ if(QDELETED(GLOB.cult_narsie)) // tres
+ priority_announce("Normalization detected! Abort the solution package!","Central Command Higher Dimensional Affairs", 'sound/misc/notice1.ogg')
+ GLOB.cult_narsie = null
+ sleep(20)
+ set_security_level("red")
+ SSshuttle.clearHostileEnvironment()
+ SSshuttle.lockdown = FALSE
+ INVOKE_ASYNC(GLOBAL_PROC, .proc/cult_ending_helper, 2)
+ return
+ if(GLOB.cult_narsie.resolved == FALSE)
+ GLOB.cult_narsie.resolved = TRUE
sound_to_playing_players('sound/machines/alarm.ogg')
addtimer(CALLBACK(GLOBAL_PROC, .proc/cult_ending_helper), 120)
/obj/singularity/narsie/large/cult/Destroy()
- GLOB.cult_narsie = null
+ send_to_playing_players("\"[pick("Nooooo...", "Not die. How-", "Die. Mort-", "Sas tyen re-")]\"")
+ sound_to_playing_players('sound/magic/demon_dies.ogg', 50)
+ var/list/all_cults = list()
+ for(var/datum/antagonist/cult/C in GLOB.antagonists)
+ if(!C.owner)
+ continue
+ all_cults |= C.cult_team
+ for(var/datum/team/cult/T in all_cults)
+ var/datum/objective/eldergod/summon_objective = locate() in T.objectives
+ if(summon_objective)
+ summon_objective.summoned = FALSE
+ summon_objective.killed = TRUE
return ..()
/proc/ending_helper()
SSticker.force_ending = 1
-/proc/cult_ending_helper(var/no_explosion = 0)
- if(no_explosion)
+/proc/cult_ending_helper(var/ending_type = 0)
+ if(ending_type == 2) //narsie fukkin died
+ Cinematic(CINEMATIC_CULT_FAIL,world,CALLBACK(GLOBAL_PROC,/proc/ending_helper))
+ else if(ending_type) //no explosion
Cinematic(CINEMATIC_CULT,world,CALLBACK(GLOBAL_PROC,/proc/ending_helper))
- else
+ else // explosion
Cinematic(CINEMATIC_CULT_NUKE,world,CALLBACK(GLOBAL_PROC,/proc/ending_helper))
//ATTACK GHOST IGNORING PARENT RETURN VALUE
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 90155c83b01..f65bbde74ad 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -898,7 +898,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
if(target)//If we found something
//Do the animation to zap to it from here
- zapstart.Beam(target, icon_state="nzcrentrs_power", time=5)
+ zapstart.Beam(target, icon_state="sm_arc", time=5)
var/zapdir = get_dir(zapstart, target)
if(zapdir)
. = zapdir
diff --git a/code/modules/procedural_mapping/mapGenerator.dm b/code/modules/procedural_mapping/mapGenerator.dm
index 01a6d7ac471..323f74d0efe 100644
--- a/code/modules/procedural_mapping/mapGenerator.dm
+++ b/code/modules/procedural_mapping/mapGenerator.dm
@@ -30,7 +30,7 @@
/datum/mapGenerator/New()
..()
if(buildmode_name == "Undocumented")
- buildmode_name = copytext("[type]", 20) // / d a t u m / m a p g e n e r a t o r / = 20 characters.
+ buildmode_name = copytext_char("[type]", 20) // / d a t u m / m a p g e n e r a t o r / = 20 characters.
initialiseModules()
//Defines the region the map represents, sets map
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 2d2530b156f..5014113efe7 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -250,7 +250,7 @@
if(!is_operational() || recording_recipe)
return
var/amount = text2num(params["amount"])
- if(beaker && amount in beaker.possible_transfer_amounts)
+ if(beaker && (amount in beaker.possible_transfer_amounts))
beaker.reagents.remove_all(amount)
work_animation()
. = TRUE
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index 895d5a11410..405e9056a41 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -551,7 +551,8 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer."
/datum/reagent/consumable/ethanol/screwdrivercocktail/on_mob_life(mob/living/carbon/M)
- if(M.mind && M.mind.assigned_role in list("Station Engineer", "Atmospheric Technician", "Chief Engineer")) //Engineers lose radiation poisoning at a massive rate.
+ var/static/list/increased_rad_loss = list("Station Engineer", "Atmospheric Technician", "Chief Engineer")
+ if(M.mind && (M.mind.assigned_role in increased_rad_loss)) //Engineers lose radiation poisoning at a massive rate.
M.radiation = max(M.radiation - 25, 0)
return ..()
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index a1a915693d2..5a63870178e 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -199,6 +199,14 @@
..()
. = 1
+/datum/reagent/medicine/rezadone/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
+ . = ..()
+ if(iscarbon(M))
+ var/mob/living/carbon/patient = M
+ if(reac_volume >= 5 && HAS_TRAIT_FROM(patient, TRAIT_HUSK, "burn") && patient.getFireLoss() < 50) //One carp yields 12u rezadone.
+ patient.cure_husk("burn")
+ patient.visible_message("[patient]'s body rapidly absorbs moisture from the enviroment, taking on a more healthy appearance.")
+
/datum/reagent/medicine/spaceacillin
name = "Spaceacillin"
description = "Spaceacillin will prevent a patient from conventionally spreading any diseases they are currently infected with."
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index 47bd9b467b4..d8573ee7030 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -46,7 +46,7 @@
if(!user.is_literate())
to_chat(user, "You scribble illegibly on the side of [src]!")
return
- var/str = copytext(sanitize(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
+ var/str = stripped_input(user, "Label text?", "Set label", "", MAX_NAME_LEN)
if(!user.canUseTopic(src, BE_CLOSE))
return
if(!str || !length(str))
@@ -73,10 +73,10 @@
return
user.visible_message("[user] attaches [W] to [src].", "You attach [W] to [src].")
note = W
+ var/overlaystring = "[icon_state]_note"
if(giftwrapped)
- add_overlay(copytext("[icon_state]_note",5))
- return
- add_overlay("[icon_state]_note")
+ overlaystring = copytext(overlaystring, 5) //5 == length("gift") + 1
+ add_overlay(overlaystring)
else
return ..()
@@ -158,7 +158,7 @@
if(!user.is_literate())
to_chat(user, "You scribble illegibly on the side of [src]!")
return
- var/str = copytext(sanitize(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
+ var/str = stripped_input(user, "Label text?", "Set label", "", MAX_NAME_LEN)
if(!user.canUseTopic(src, BE_CLOSE))
return
if(!str || !length(str))
@@ -185,10 +185,10 @@
return
user.visible_message("[user] attaches [W] to [src].", "You attach [W] to [src].")
note = W
+ var/overlaystring = "[icon_state]_note"
if(giftwrapped)
- add_overlay(copytext("[icon_state]_note",5))
- return
- add_overlay("[icon_state]_note")
+ overlaystring = copytext_char(overlaystring, 5) //5 == length("gift") + 1
+ add_overlay(overlaystring)
/obj/item/destTagger
name = "destination tagger"
diff --git a/code/modules/research/bepis.dm b/code/modules/research/bepis.dm
index c3deecc958c..52cd141cc37 100644
--- a/code/modules/research/bepis.dm
+++ b/code/modules/research/bepis.dm
@@ -133,11 +133,13 @@
if(gauss_real >= gauss_minor) //Minor Success.
var/reward_number = 1
say("Experiment concluded with partial success. Dispensing compiled research efforts.")
- reward_number = rand(1,2)
+ reward_number = rand(1,3)
if(reward_number == 1)
new /obj/item/stack/circuit_stack/full(dropturf)
if(reward_number == 2)
new /obj/item/airlock_painter/decal(dropturf)
+ if(reward_number == 3)
+ new /obj/item/pen/survival(dropturf)
return
if(gauss_real <= -1) //Critical Failure
say("ERROR: CRITICAL MACHIME MALFUNCTI- ON. CURRENCY IS NOT CRASH. CANNOT COMPUTE COMMAND: 'make bucks'") //not a typo, for once.
diff --git a/code/modules/research/designs/limbgrower_designs.dm b/code/modules/research/designs/limbgrower_designs.dm
index 882a65a299f..798e934875c 100644
--- a/code/modules/research/designs/limbgrower_designs.dm
+++ b/code/modules/research/designs/limbgrower_designs.dm
@@ -43,3 +43,67 @@
reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 75)
build_path = /obj/item/melee/synthetic_arm_blade
category = list("other","emagged")
+
+/datum/design/heart
+ name = "Heart"
+ id = "heart"
+ build_type = LIMBGROWER
+ reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 30)
+ build_path = /obj/item/organ/heart
+ category = list("other")
+
+/datum/design/lungs
+ name = "Lungs"
+ id = "lungs"
+ build_type = LIMBGROWER
+ reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 20)
+ build_path = /obj/item/organ/lungs
+ category = list("other")
+
+/datum/design/liver
+ name = "Liver"
+ id = "liver"
+ build_type = LIMBGROWER
+ reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 20)
+ build_path = /obj/item/organ/liver
+ category = list("other")
+
+/datum/design/stomach
+ name = "Stomach"
+ id = "stomach"
+ build_type = LIMBGROWER
+ reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 15)
+ build_path = /obj/item/organ/stomach
+ category = list("other")
+
+/datum/design/appendix
+ name = "Appendix"
+ id = "appendix"
+ build_type = LIMBGROWER
+ reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 5) //why would you need this
+ build_path = /obj/item/organ/appendix
+ category = list("other")
+
+/datum/design/eyes
+ name = "Eyes"
+ id = "eyes"
+ build_type = LIMBGROWER
+ reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 10)
+ build_path = /obj/item/organ/eyes
+ category = list("other")
+
+/datum/design/ears
+ name = "Ears"
+ id = "ears"
+ build_type = LIMBGROWER
+ reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 10)
+ build_path = /obj/item/organ/ears
+ category = list("other")
+
+/datum/design/tongue
+ name = "Tongue"
+ id = "tongue"
+ build_type = LIMBGROWER
+ reagents_list = list(/datum/reagent/medicine/C2/instabitaluri = 10)
+ build_path = /obj/item/organ/tongue
+ category = list("other")
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index ad41674f246..432f0018f97 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -136,11 +136,21 @@
desc = "Allows tracking of someone's location if their suit sensors are turned to tracking beacon."
id = "crewpinpointer"
build_type = PROTOLATHE
- materials = list(/datum/material/iron = 3000, /datum/material/glass = 1500, /datum/material/gold = 200)
+ materials = list(/datum/material/iron = 3000, /datum/material/glass = 1500, /datum/material/gold = 500)
build_path = /obj/item/pinpointer/crew
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+/datum/design/crewpinpointerprox
+ name = "Proximity Crew Pinpointer"
+ desc = "Displays your approximate proximity to someone if their suit sensors are turned to tracking beacon."
+ id = "crewpinpointerprox"
+ build_type = PROTOLATHE
+ materials = list(/datum/material/iron = 1200, /datum/material/glass = 300, /datum/material/gold = 200)
+ build_path = /obj/item/pinpointer/crew/prox
+ category = list("Medical Designs")
+ departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+
/datum/design/defibrillator
name = "Defibrillator"
desc = "A portable defibrillator, used for resuscitating recently deceased crew."
@@ -507,8 +517,8 @@
//Cybernetic organs
/datum/design/cybernetic_liver
- name = "Cybernetic Liver"
- desc = "A cybernetic liver"
+ name = "Basic Cybernetic Liver"
+ desc = "A basic cybernetic liver."
id = "cybernetic_liver"
build_type = PROTOLATHE | MECHFAB
construction_time = 40
@@ -517,20 +527,24 @@
category = list("Misc", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-/datum/design/cybernetic_liver_u
- name = "Upgraded Cybernetic Liver"
- desc = "An upgraded cybernetic liver"
- id = "cybernetic_liver_u"
- build_type = PROTOLATHE | MECHFAB
- construction_time = 50
+/datum/design/cybernetic_liver/tier2
+ name = "Cybernetic Liver"
+ desc = "A cybernetic liver."
+ id = "cybernetic_liver_tier2"
materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
- build_path = /obj/item/organ/liver/cybernetic/upgraded
- category = list("Misc", "Medical Designs")
- departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+ build_path = /obj/item/organ/liver/cybernetic/tier2
+
+/datum/design/cybernetic_liver/tier3
+ name = "Upgraded Cybernetic Liver"
+ desc = "An upgraded cybernetic liver."
+ id = "cybernetic_liver_tier3"
+ construction_time = 50
+ materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver=500)
+ build_path = /obj/item/organ/liver/cybernetic/tier3
/datum/design/cybernetic_heart
- name = "Cybernetic Heart"
- desc = "A cybernetic heart"
+ name = "Basic Cybernetic Heart"
+ desc = "A basic cybernetic heart."
id = "cybernetic_heart"
build_type = PROTOLATHE | MECHFAB
construction_time = 40
@@ -539,20 +553,24 @@
category = list("Misc", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-/datum/design/cybernetic_heart_u
+/datum/design/cybernetic_heart/tier2
+ name = "Cybernetic Heart"
+ desc = "A cybernetic heart."
+ id = "cybernetic_heart_tier2"
+ materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
+ build_path = /obj/item/organ/heart/cybernetic/tier2
+
+/datum/design/cybernetic_heart/tier3
name = "Upgraded Cybernetic Heart"
- desc = "An upgraded cybernetic heart"
- id = "cybernetic_heart_u"
- build_type = PROTOLATHE | MECHFAB
+ desc = "An upgraded cybernetic heart."
+ id = "cybernetic_heart_tier3"
construction_time = 50
materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver=500)
- build_path = /obj/item/organ/heart/cybernetic/upgraded
- category = list("Misc", "Medical Designs")
- departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+ build_path = /obj/item/organ/heart/cybernetic/tier3
/datum/design/cybernetic_lungs
- name = "Cybernetic Lungs"
- desc = "A pair of cybernetic lungs."
+ name = "Basic Cybernetic Lungs"
+ desc = "A basic pair of cybernetic lungs."
id = "cybernetic_lungs"
build_type = PROTOLATHE | MECHFAB
construction_time = 40
@@ -561,16 +579,20 @@
category = list("Misc", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-/datum/design/cybernetic_lungs_u
+/datum/design/cybernetic_lungs/tier2
+ name = "Cybernetic Lungs"
+ desc = "A pair of cybernetic lungs."
+ id = "cybernetic_lungs_tier2"
+ materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
+ build_path = /obj/item/organ/lungs/cybernetic/tier2
+
+/datum/design/cybernetic_lungs/tier3
name = "Upgraded Cybernetic Lungs"
desc = "A pair of upgraded cybernetic lungs."
- id = "cybernetic_lungs_u"
- build_type = PROTOLATHE | MECHFAB
+ id = "cybernetic_lungs_tier3"
construction_time = 50
materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver = 500)
- build_path = /obj/item/organ/lungs/cybernetic/upgraded
- category = list("Misc", "Medical Designs")
- departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+ build_path = /obj/item/organ/lungs/cybernetic/tier3
/datum/design/cybernetic_ears
name = "Cybernetic Ears"
@@ -593,9 +615,11 @@
build_path = /obj/item/organ/ears/cybernetic/upgraded
category = list("Misc", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+
/////////////////////
///Surgery Designs///
/////////////////////
+
/datum/design/surgery
name = "Surgery Design"
desc = "what"
diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index 2f218b9cbe4..c236a9973c2 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -286,15 +286,24 @@
category = list("Electronics")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
-/datum/design/plasticducky
- name = "Rubber Ducky"
- desc = "The classic Nanotracen design for competitively priced bath based duck toys. No need for fancy Waffle co. rubber, buy Plastic Ducks today!"
- id = "plasticducky"
+/datum/design/eng_gloves
+ name = "Tinkers Gloves"
+ desc = "Overdesigned engineering gloves that have automated construction subroutines dialed in, allowing for faster construction while worn."
+ id = "eng_gloves"
build_type = PROTOLATHE
- materials = list(/datum/material/plastic = 1000)
- build_path = /obj/item/bikehorn/rubberducky/plasticducky
+ materials = list(/datum/material/iron=2000, /datum/material/silver=1500, /datum/material/gold = 1000)
+ build_path = /obj/item/clothing/gloves/color/latex/engineering
category = list("Equipment")
- departmental_flags = DEPARTMENTAL_FLAG_ALL
+ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/lavarods
+ name = "Lava-Resistant Metal Rods"
+ id = "lava_rods"
+ build_type = PROTOLATHE
+ materials = list(/datum/material/iron=1000, /datum/material/plasma=500, /datum/material/titanium=2000)
+ build_path = /obj/item/stack/rods/lava
+ category = list("initial", "Stock Parts")
+ departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
/////////////////////////////////////////
////////////Janitor Designs//////////////
diff --git a/code/modules/research/nanites/nanite_programmer.dm b/code/modules/research/nanites/nanite_programmer.dm
index 9841b451e7f..f84f8247ee6 100644
--- a/code/modules/research/nanites/nanite_programmer.dm
+++ b/code/modules/research/nanites/nanite_programmer.dm
@@ -8,6 +8,7 @@
use_power = IDLE_POWER_USE
anchored = TRUE
density = TRUE
+ flags_1 = HEAR_1
circuit = /obj/item/circuitboard/machine/nanite_programmer
ui_x = 420
ui_y = 550
@@ -129,3 +130,9 @@
timer *= 10 //convert to deciseconds
program.timer_trigger_delay = timer
. = TRUE
+
+/obj/machinery/nanite_programmer/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode)
+ . = ..()
+ var/static/regex/when = regex("(?:^\\W*when|when\\W*$)", "i") //starts or ends with when
+ if(findtext(raw_message, when) && !istype(speaker, /obj/machinery/nanite_programmer))
+ say("When you code it!!")
diff --git a/code/modules/research/nanites/nanite_programs/suppression.dm b/code/modules/research/nanites/nanite_programs/suppression.dm
index 7408ac75f45..61928d9e91b 100644
--- a/code/modules/research/nanites/nanite_programs/suppression.dm
+++ b/code/modules/research/nanites/nanite_programs/suppression.dm
@@ -276,26 +276,14 @@
desc = "The nanites synthesize serotonin inside the host's brain, creating an artificial sense of happiness."
use_rate = 0.1
rogue_types = list(/datum/nanite_program/brain_decay)
- extra_settings = list(NES_MOOD_MESSAGE)
- var/message = "HAPPINESS ENHANCEMENT"
-/datum/nanite_program/good_mood/set_extra_setting(user, setting)
- if(setting == NES_MOOD_MESSAGE)
- var/new_message = stripped_input(user, "Choose the message visible on the mood effect.", NES_MESSAGE, message, MAX_NAME_LEN)
- if(!new_message)
- return
- message = new_message
-
-/datum/nanite_program/good_mood/get_extra_setting_value(setting)
- if(setting == NES_MOOD_MESSAGE)
- return message
-
-/datum/nanite_program/good_mood/copy_extra_settings_to(datum/nanite_program/good_mood/target)
- target.message = message
+/datum/nanite_program/good_mood/register_extra_settings()
+ . = ..()
+ extra_settings[NES_MOOD_MESSAGE] = new /datum/nanite_extra_setting/text("HAPPINESS ENHANCEMENT")
/datum/nanite_program/good_mood/enable_passive_effect()
. = ..()
- SEND_SIGNAL(host_mob, COMSIG_ADD_MOOD_EVENT, "nanite_happy", /datum/mood_event/nanite_happiness, message)
+ SEND_SIGNAL(host_mob, COMSIG_ADD_MOOD_EVENT, "nanite_happy", /datum/mood_event/nanite_happiness, get_extra_setting_value(NES_MOOD_MESSAGE))
/datum/nanite_program/good_mood/disable_passive_effect()
. = ..()
@@ -306,26 +294,14 @@
desc = "The nanites suppress the production of serotonin inside the host's brain, creating an artificial state of depression."
use_rate = 0.1
rogue_types = list(/datum/nanite_program/brain_decay)
- extra_settings = list(NES_MOOD_MESSAGE)
- var/message = "HAPPINESS SUPPRESSION"
-/datum/nanite_program/bad_mood/set_extra_setting(user, setting)
- if(setting == NES_MOOD_MESSAGE)
- var/new_message = stripped_input(user, "Choose the message visible on the mood effect.", NES_MESSAGE, message, MAX_NAME_LEN)
- if(!new_message)
- return
- message = new_message
-
-/datum/nanite_program/bad_mood/get_extra_setting_value(setting)
- if(setting == NES_MOOD_MESSAGE)
- return message
-
-/datum/nanite_program/bad_mood/copy_extra_settings_to(datum/nanite_program/bad_mood/target)
- target.message = message
+/datum/nanite_program/bad_mood/register_extra_settings()
+ . = ..()
+ extra_settings[NES_MOOD_MESSAGE] = new /datum/nanite_extra_setting/text("HAPPINESS SUPPRESSION")
/datum/nanite_program/bad_mood/enable_passive_effect()
. = ..()
- SEND_SIGNAL(host_mob, COMSIG_ADD_MOOD_EVENT, "nanite_sadness", /datum/mood_event/nanite_sadness, message)
+ SEND_SIGNAL(host_mob, COMSIG_ADD_MOOD_EVENT, "nanite_sadness", /datum/mood_event/nanite_sadness, get_extra_setting_value(NES_MOOD_MESSAGE))
/datum/nanite_program/bad_mood/disable_passive_effect()
. = ..()
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index c2d39d07994..f02c8c98429 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -9,9 +9,9 @@
description = "NT default research technologies."
// Default research tech, prevents bricking
design_ids = list("basic_matter_bin", "basic_cell", "basic_scanning", "basic_capacitor", "basic_micro_laser", "micro_mani", "desttagger", "handlabel", "packagewrap",
- "destructive_analyzer", "circuit_imprinter", "experimentor", "rdconsole", "bepis", "design_disk", "tech_disk", "rdserver", "rdservercontrol", "mechfab", "paystand",
- "space_heater", "beaker", "large_beaker", "bucket", "xlarge_beaker", "sec_rshot", "sec_beanbag_slug", "sec_bshot", "sec_slug", "sec_Islug", "sec_dart", "sec_38",
- "rglass","plasteel","plastitanium","plasmaglass","plasmareinforcedglass","titaniumglass","plastitaniumglass","plumbing_rcd","plastic_knife","plastic_fork","plastic_spoon")
+ "destructive_analyzer", "circuit_imprinter", "experimentor", "rdconsole", "bepis", "design_disk", "tech_disk", "rdserver", "rdservercontrol", "mechfab",
+ "paystand", "space_heater", "bucket", "sec_rshot", "sec_beanbag_slug", "sec_bshot", "sec_slug", "sec_Islug", "sec_dart", "sec_38", "rglass", "plasteel",
+ "plastitanium", "plasmaglass", "plasmareinforcedglass", "titaniumglass", "plastitaniumglass", "plastic_knife", "plastic_fork", "plastic_spoon")
/datum/techweb_node/mmi
id = "mmi"
@@ -26,15 +26,15 @@
display_name = "Cyborg Construction"
description = "Sapient robots with preloaded tool modules and programmable laws."
design_ids = list("robocontrol", "sflash", "borg_suit", "borg_head", "borg_chest", "borg_r_arm", "borg_l_arm", "borg_r_leg", "borg_l_leg", "borgupload",
- "cyborgrecharger", "borg_upgrade_restart", "borg_upgrade_rename")
+ "cyborgrecharger", "borg_upgrade_restart", "borg_upgrade_rename")
/datum/techweb_node/mech
id = "mecha"
starting_node = TRUE
display_name = "Mechanical Exosuits"
description = "Mechanized exosuits that are several magnitudes stronger and more powerful than the average human."
- design_ids = list("mecha_tracking", "mechacontrol", "mechapower", "mech_recharger", "ripley_chassis", "firefighter_chassis", "ripley_torso", "ripley_left_arm", "ripley_right_arm", "ripley_left_leg", "ripley_right_leg",
- "ripley_main", "ripley_peri", "ripleyupgrade", "mech_hydraulic_clamp")
+ design_ids = list("mecha_tracking", "mechacontrol", "mechapower", "mech_recharger", "ripley_chassis", "firefighter_chassis", "ripley_torso", "ripley_left_arm",
+ "ripley_right_arm", "ripley_left_leg", "ripley_right_leg", "ripley_main", "ripley_peri", "ripleyupgrade", "mech_hydraulic_clamp")
/datum/techweb_node/mech_tools
id = "mech_tools"
@@ -48,7 +48,16 @@
starting_node = TRUE
display_name = "Basic Tools"
description = "Basic mechanical, electronic, surgical and botanical tools."
- design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "surgical_drapes", "syringe", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop", "plunger")
+ design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter",
+ "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop", "plunger")
+
+/datum/techweb_node/basic_medical
+ id = "basic_medical"
+ starting_node = TRUE
+ display_name = "Basic Medical Equipment"
+ description = "Basic medical tools and equipment."
+ design_ids = list("cybernetic_liver", "cybernetic_heart", "cybernetic_lungs", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat",
+ "surgical_drapes", "syringe", "plumbing_rcd", "beaker", "large_beaker", "xlarge_beaker")
/////////////////////////Biotech/////////////////////////
/datum/techweb_node/biotech
@@ -56,7 +65,7 @@
display_name = "Biological Technology"
description = "What makes us tick." //the MC, silly!
prereq_ids = list("base")
- design_ids = list("chem_heater", "chem_master", "chem_dispenser", "pandemic", "defibrillator", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "medigel","genescanner", "med_spray_bottle", "chem_pack", "blood_pack", "medical_kiosk")
+ design_ids = list("chem_heater", "chem_master", "chem_dispenser", "pandemic", "defibrillator", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "medigel","genescanner", "med_spray_bottle", "chem_pack", "blood_pack", "medical_kiosk", "crewpinpointerprox")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -489,8 +498,8 @@
id = "cyber_organs"
display_name = "Cybernetic Organs"
description = "We have the technology to rebuild him."
- prereq_ids = list("adv_biotech")
- design_ids = list("cybernetic_ears", "cybernetic_heart", "cybernetic_liver", "cybernetic_lungs")
+ prereq_ids = list("biotech")
+ design_ids = list("cybernetic_ears", "cybernetic_heart_tier2", "cybernetic_liver_tier2", "cybernetic_lungs_tier2")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000)
export_price = 5000
@@ -498,8 +507,8 @@
id = "cyber_organs_upgraded"
display_name = "Upgraded Cybernetic Organs"
description = "We have the technology to upgrade him."
- prereq_ids = list("cyber_organs")
- design_ids = list("cybernetic_ears_u", "cybernetic_heart_u", "cybernetic_liver_u", "cybernetic_lungs_u")
+ prereq_ids = list("adv_biotech", "cyber_organs")
+ design_ids = list("cybernetic_ears_u", "cybernetic_heart_tier3", "cybernetic_liver_tier3", "cybernetic_lungs_tier3")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1500)
export_price = 5000
@@ -1067,6 +1076,17 @@
hidden = TRUE
experimental = TRUE
+/datum/techweb_node/spec_eng
+ id = "spec_eng"
+ display_name = "Specialized Engineering"
+ description = "Conventional wisdom has deemed these engineering products 'technically' safe, but far too dangerous to traditionally condone."
+ prereq_ids = list("base")
+ design_ids = list("lava_rods", "eng_gloves")
+ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
+ export_price = 2500
+ hidden = TRUE
+ experimental = TRUE
+
/datum/techweb_node/aus_security
id = "aus_security"
display_name = "Australicus Security Protocols"
diff --git a/code/modules/research/xenobiology/crossbreeding/_potions.dm b/code/modules/research/xenobiology/crossbreeding/_potions.dm
index 20e74d4fa13..89fdd59adff 100644
--- a/code/modules/research/xenobiology/crossbreeding/_potions.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_potions.dm
@@ -187,7 +187,7 @@ Slimecrossing Potions
if(M.maxHealth <= 0)
to_chat(user, "The slime is too unstable to return!")
M.revive(full_heal = TRUE, admin_revive = FALSE)
- M.stat = CONSCIOUS
+ M.set_stat(CONSCIOUS)
M.visible_message("[M] is filled with renewed vigor and blinks awake!")
M.maxHealth -= 10 //Revival isn't healthy.
M.health -= 10
diff --git a/code/modules/research/xenobiology/crossbreeding/stabilized.dm b/code/modules/research/xenobiology/crossbreeding/stabilized.dm
index 340b78b1a49..eee23636f78 100644
--- a/code/modules/research/xenobiology/crossbreeding/stabilized.dm
+++ b/code/modules/research/xenobiology/crossbreeding/stabilized.dm
@@ -153,7 +153,7 @@ Stabilized extracts:
saved_mind = null
START_PROCESSING(SSobj, src)
if(choice == "Familiar Name")
- var/newname = copytext(sanitize_name(input(user, "Would you like to change the name of [mob_name]", "Name change", mob_name) as null|text),1,MAX_NAME_LEN)
+ var/newname = sanitize_name(stripped_input(user, "Would you like to change the name of [mob_name]", "Name change", mob_name, MAX_NAME_LEN))
if(newname)
mob_name = newname
to_chat(user, "You speak softly into [src], and it shakes slightly in response.")
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 4a767e1ec0f..f7440816b32 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -641,7 +641,7 @@
M.set_nutrition(700)
to_chat(M, "You absorb the potion and feel your intense desire to feed melt away.")
to_chat(user, "You feed the slime the potion, removing its hunger and calming it.")
- var/newname = copytext(sanitize_name(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text),1,MAX_NAME_LEN)
+ var/newname = sanitize_name(stripped_input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime", MAX_NAME_LEN))
if (!newname)
newname = "pet slime"
diff --git a/code/modules/spells/spell_types/mind_transfer.dm b/code/modules/spells/spell_types/mind_transfer.dm
index e85888c389e..4cebceeca82 100644
--- a/code/modules/spells/spell_types/mind_transfer.dm
+++ b/code/modules/spells/spell_types/mind_transfer.dm
@@ -61,7 +61,7 @@ Also, you never added distance checking after target is selected. I've went ahea
return
var/datum/mind/TM = target.mind
- if((target.anti_magic_check(TRUE, FALSE) || TM.has_antag_datum(/datum/antagonist/wizard) || TM.has_antag_datum(/datum/antagonist/cult) || TM.has_antag_datum(/datum/antagonist/changeling) || TM.has_antag_datum(/datum/antagonist/rev)) || cmptext(copytext(target.key,1,2),"@"))
+ if(target.anti_magic_check(TRUE, FALSE) || TM.has_antag_datum(/datum/antagonist/wizard) || TM.has_antag_datum(/datum/antagonist/cult) || TM.has_antag_datum(/datum/antagonist/changeling) || TM.has_antag_datum(/datum/antagonist/rev) || target.key[1] == "@")
if(!silent)
to_chat(user, "[target.p_their(TRUE)] mind is resisting your spell!")
return
diff --git a/code/modules/spells/spell_types/summonitem.dm b/code/modules/spells/spell_types/summonitem.dm
index 7d936306597..37237dbc144 100644
--- a/code/modules/spells/spell_types/summonitem.dm
+++ b/code/modules/spells/spell_types/summonitem.dm
@@ -40,7 +40,7 @@
else
message = "You must hold the desired item in your hands to mark it for recall!"
- else if(marked_item && marked_item in hand_items) //unlinking item to the spell
+ else if(marked_item && (marked_item in hand_items)) //unlinking item to the spell
message = "You remove the mark on [marked_item] to use elsewhere."
name = "Instant Summons"
marked_item = null
diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
index a2917d58e80..4eaeebd7f94 100644
--- a/code/modules/surgery/bodyparts/dismemberment.dm
+++ b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -155,7 +155,7 @@
LB.brainmob = brainmob
brainmob = null
LB.brainmob.forceMove(LB)
- LB.brainmob.stat = DEAD
+ LB.brainmob.set_stat(DEAD)
/obj/item/organ/eyes/transfer_to_limb(obj/item/bodypart/head/LB, mob/living/carbon/human/C)
LB.eyes = src
diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm
index d252e985e5c..69dd5c4cced 100644
--- a/code/modules/surgery/bodyparts/head.dm
+++ b/code/modules/surgery/bodyparts/head.dm
@@ -67,27 +67,27 @@
if(!brain)
. += "The brain has been removed from [src]."
else if(brain.suicided || brainmob?.suiciding)
- . += "There's a pretty dumb expression on [real_name]'s face; they must have really hated life. There is no hope of recovery."
+ . += "There's a miserable expression on [real_name]'s face; they must have really hated life. There's no hope of recovery."
else if(brain.brain_death || brainmob?.health <= HEALTH_THRESHOLD_DEAD)
- . += "It seems to be leaking some kind of... clear fluid? The brain inside must be in pretty bad shape... There is no coming back from that."
+ . += "It's leaking some kind of... clear fluid? The brain inside must be in pretty bad shape."
else if(brainmob)
if(brainmob.get_ghost(FALSE, TRUE))
- . += "Its muscles are still twitching slightly... It still seems to have a bit of life left to it."
+ . += "Its muscles are twitching slightly... It seems to have some life still in it."
else
- . += "It seems seems particularly lifeless. Perhaps there'll be a chance for them later."
+ . += "It's completely lifeless. Perhaps there'll be a chance for them later."
else if(brain?.decoy_override)
- . += "It seems particularly lifeless. Perhaps there'll be a chance for them later."
+ . += "It's completely lifeless. Perhaps there'll be a chance for them later."
else
- . += "It seems completely devoid of life."
+ . += "It's completely lifeless."
if(!eyes)
- . += "[real_name]'s eyes appear to have been removed."
+ . += "[real_name]'s eyes have been removed."
if(!ears)
- . += "[real_name]'s ears appear to have been removed."
+ . += "[real_name]'s ears have been removed."
if(!tongue)
- . += "[real_name]'s tongue appears to have been removed."
+ . += "[real_name]'s tongue has been removed."
/obj/item/bodypart/head/can_dismember(obj/item/I)
diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm
index f31795cea56..3687ac08cb9 100644
--- a/code/modules/surgery/organs/ears.dm
+++ b/code/modules/surgery/organs/ears.dm
@@ -39,7 +39,7 @@
deaf = max(deaf, 1)
else if(!(organ_flags & ORGAN_FAILING)) // if this organ is failing, do not clear deaf stacks.
deaf = max(deaf - 1, 0)
- if(prob(damage / 20) && (damage > low_threshold))
+ if(prob(damage / 30) && (damage > low_threshold))
adjustEarDamage(0, 4)
SEND_SOUND(C, sound('sound/weapons/flash_ring.ogg'))
to_chat(C, "The ringing in your ears grows louder, blocking out any external noises for a moment.")
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index 4309f5fa809..3c51ad92998 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -197,7 +197,7 @@
/obj/item/organ/eyes/robotic/shield/emp_act(severity)
return
-#define RGB2EYECOLORSTRING(definitionvar) ("[copytext(definitionvar,2,3)][copytext(definitionvar,4,5)][copytext(definitionvar,6,7)]")
+#define RGB2EYECOLORSTRING(definitionvar) ("[copytext_char(definitionvar, 2, 3)][copytext_char(definitionvar, 4, 5)][copytext_char(definitionvar, 6, 7)]")
/obj/item/organ/eyes/robotic/glow
name = "High Luminosity Eyes"
diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index 4748856398e..0f7dfc217a3 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -6,7 +6,7 @@
slot = ORGAN_SLOT_HEART
healing_factor = STANDARD_ORGAN_HEALING
- decay_factor = 5 * STANDARD_ORGAN_DECAY //designed to fail about 5 minutes after death
+ decay_factor = 3.5 * STANDARD_ORGAN_DECAY //designed to fail a little under 4 minutes after death
low_threshold_passed = "Prickles of pain appear then die out from within your chest..."
high_threshold_passed = "Something inside your chest hurts, and the pain isn't subsiding. You notice yourself breathing far faster than before."
@@ -172,40 +172,58 @@
colour = "red"
/obj/item/organ/heart/cybernetic
- name = "cybernetic heart"
- desc = "An electronic device designed to mimic the functions of an organic human heart. Also holds an emergency dose of epinephrine, used automatically after facing severe trauma."
+ name = "basic cybernetic heart"
+ desc = "A basic electronic device designed to mimic the functions of an organic human heart."
icon_state = "heart-c"
organ_flags = ORGAN_SYNTHETIC
- maxHealth = 1.1 * STANDARD_ORGAN_THRESHOLD
+ maxHealth = STANDARD_ORGAN_THRESHOLD*0.75 //This also hits defib timer, so a bit higher than its less important counterparts
- var/dose_available = TRUE
+ var/dose_available = FALSE
var/rid = /datum/reagent/medicine/epinephrine
var/ramount = 10
+ var/emp_vulnerability = 80 //Chance of permanent effects if emp-ed.
+
+/obj/item/organ/heart/cybernetic/tier2
+ name = "cybernetic heart"
+ desc = "An electronic device designed to mimic the functions of an organic human heart. Also holds an emergency dose of epinephrine, used automatically after facing severe trauma."
+ icon_state = "heart-c-u"
+ maxHealth = 1.5 * STANDARD_ORGAN_THRESHOLD
+ dose_available = TRUE
+ emp_vulnerability = 40
+
+/obj/item/organ/heart/cybernetic/tier3
+ name = "upgraded cybernetic heart"
+ desc = "An electronic device designed to mimic the functions of an organic human heart. Also holds an emergency dose of epinephrine, used automatically after facing severe trauma. This upgraded model can regenerate its dose after use."
+ icon_state = "heart-c-u2"
+ maxHealth = 2 * STANDARD_ORGAN_THRESHOLD
+ dose_available = TRUE
+ emp_vulnerability = 20
/obj/item/organ/heart/cybernetic/emp_act(severity)
. = ..()
if(. & EMP_PROTECT_SELF)
return
- Stop()
- addtimer(CALLBACK(src, .proc/Restart), 20/severity SECONDS)
- damage += 100/severity
+ if(world.time > severe_cooldown) //So we cant just spam emp to kill people.
+ owner.Dizzy(10)
+ owner.losebreath += 10
+ severe_cooldown = world.time + 20 SECONDS
+ if(prob(emp_vulnerability/severity)) //Chance of permanent effects
+ organ_flags = ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon.
+ Stop()
+ owner.visible_message("[owner] clutches at [owner.p_their()] chest as if [owner.p_their()] heart is stopping!", \
+ "You feel a terrible pain in your chest, as if your heart has stopped!")
+ addtimer(CALLBACK(src, .proc/Restart), 10 SECONDS)
/obj/item/organ/heart/cybernetic/on_life()
. = ..()
if(dose_available && owner.health <= owner.crit_threshold && !owner.reagents.has_reagent(rid))
- owner.reagents.add_reagent(rid, ramount)
used_dose()
/obj/item/organ/heart/cybernetic/proc/used_dose()
+ owner.reagents.add_reagent(rid, ramount)
dose_available = FALSE
-/obj/item/organ/heart/cybernetic/upgraded
- name = "upgraded cybernetic heart"
- desc = "An electronic device designed to mimic the functions of an organic human heart. Also holds an emergency dose of epinephrine, used automatically after facing severe trauma. This upgraded model can regenerate its dose after use."
- icon_state = "heart-c-u"
- maxHealth = 2 * STANDARD_ORGAN_THRESHOLD
-
-/obj/item/organ/heart/cybernetic/upgraded/used_dose()
+/obj/item/organ/heart/cybernetic/tier3/used_dose()
. = ..()
addtimer(VARSET_CALLBACK(src, dose_available, TRUE), 5 MINUTES)
diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm
index 1e4be594255..45d71eb2fff 100755
--- a/code/modules/surgery/organs/liver.dm
+++ b/code/modules/surgery/organs/liver.dm
@@ -13,9 +13,9 @@
healing_factor = STANDARD_ORGAN_HEALING
decay_factor = STANDARD_ORGAN_DECAY
- var/alcohol_tolerance = ALCOHOL_RATE//affects how much damage the liver takes from alcohol
- var/toxTolerance = LIVER_DEFAULT_TOX_TOLERANCE//maximum amount of toxins the liver can just shrug off
- var/toxLethality = LIVER_DEFAULT_TOX_LETHALITY//affects how much damage toxins do to the liver
+ var/alcohol_tolerance = ALCOHOL_RATE //affects how much damage the liver takes from alcohol
+ var/toxTolerance = LIVER_DEFAULT_TOX_TOLERANCE //maximum amount of toxins the liver can just shrug off
+ var/toxLethality = LIVER_DEFAULT_TOX_LETHALITY //affects how much damage toxins do to the liver
var/filterToxins = TRUE //whether to filter toxins
#define HAS_SILENT_TOXIN 0 //don't provide a feedback message if this is the only toxin present
@@ -80,25 +80,41 @@
toxTolerance = 15 // complete toxin immunity like xenos have would be too powerful
/obj/item/organ/liver/cybernetic
- name = "cybernetic liver"
+ name = "basic cybernetic liver"
icon_state = "liver-c"
- desc = "An electronic device designed to mimic the functions of a human liver. Handles toxins slightly better than an organic liver."
+ desc = "A very basic device designed to mimic the functions of a human liver. Handles toxins slightly worse than an organic liver."
organ_flags = ORGAN_SYNTHETIC
- maxHealth = 1.1 * STANDARD_ORGAN_THRESHOLD
- toxTolerance = 3.3
- toxLethality = 0.009
+ toxTolerance = 2
+ toxLethality = 0.011
+ maxHealth = STANDARD_ORGAN_THRESHOLD*0.5
-/obj/item/organ/liver/cybernetic/upgraded
- name = "upgraded cybernetic liver"
+ var/emp_vulnerability = 80 //Chance of permanent effects if emp-ed.
+
+/obj/item/organ/liver/cybernetic/tier2
+ name = "cybernetic liver"
icon_state = "liver-c-u"
+ desc = "An electronic device designed to mimic the functions of a human liver. Handles toxins slightly better than an organic liver."
+ maxHealth = 1.5 * STANDARD_ORGAN_THRESHOLD
+ toxTolerance = 5 //can shrug off up to 5u of toxins
+ toxLethality = 0.008 //20% less damage than a normal liver
+ emp_vulnerability = 40
+
+/obj/item/organ/liver/cybernetic/tier3
+ name = "upgraded cybernetic liver"
+ icon_state = "liver-c-u2"
desc = "An upgraded version of the cybernetic liver, designed to improve further upon organic livers. It is resistant to alcohol poisoning and is very robust at filtering toxins."
alcohol_tolerance = 0.001
maxHealth = 2 * STANDARD_ORGAN_THRESHOLD
- toxTolerance = 15 //can shrug off up to 15u of toxins
+ toxTolerance = 10 //can shrug off up to 10u of toxins
toxLethality = 0.008 //20% less damage than a normal liver
+ emp_vulnerability = 20
/obj/item/organ/liver/cybernetic/emp_act(severity)
. = ..()
if(. & EMP_PROTECT_SELF)
return
- damage += 100/severity
+ if(world.time > severe_cooldown) //So we cant just spam emp to kill people.
+ owner.adjustToxLoss(10)
+ severe_cooldown = world.time + 10 SECONDS
+ if(prob(emp_vulnerability/severity)) //Chance of permanent effects
+ organ_flags = ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon.
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index 8c3807baaab..26c54d188d1 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -429,28 +429,43 @@
owner.blood_volume += (0.2 * plasma_pp) // 10/s when breathing literally nothing but plasma, which will suffocate you.
/obj/item/organ/lungs/cybernetic
- name = "cybernetic lungs"
- desc = "A cybernetic version of the lungs found in traditional humanoid entities. Allows for greater intakes of oxygen than organic lungs, requiring slightly less pressure."
+ name = "basic cybernetic lungs"
+ desc = "A basic cybernetic version of the lungs found in traditional humanoid entities."
icon_state = "lungs-c"
organ_flags = ORGAN_SYNTHETIC
- maxHealth = 1.1 * STANDARD_ORGAN_THRESHOLD
+ safe_oxygen_min = 16
+ maxHealth = STANDARD_ORGAN_THRESHOLD*0.5
+
+ var/emp_vulnerability = 80 //Chance of permanent effects if emp-ed.
+
+/obj/item/organ/lungs/cybernetic/tier2
+ name = "cybernetic lungs"
+ desc = "A cybernetic version of the lungs found in traditional humanoid entities. Allows for greater intakes of oxygen than organic lungs, requiring slightly less pressure."
+ icon_state = "lungs-c-u"
+ organ_flags = ORGAN_SYNTHETIC
+ maxHealth = 1.5 * STANDARD_ORGAN_THRESHOLD
safe_oxygen_min = 13
+ emp_vulnerability = 40
-/obj/item/organ/lungs/cybernetic/emp_act()
- . = ..()
- if(. & EMP_PROTECT_SELF)
- return
- owner.losebreath = 20
-
-
-/obj/item/organ/lungs/cybernetic/upgraded
+/obj/item/organ/lungs/cybernetic/tier3
name = "upgraded cybernetic lungs"
desc = "A more advanced version of the stock cybernetic lungs. Features the ability to filter out lower levels of toxins and carbon dioxide."
- icon_state = "lungs-c-u"
+ icon_state = "lungs-c-u2"
safe_toxins_max = 20
safe_co2_max = 20
maxHealth = 2 * STANDARD_ORGAN_THRESHOLD
+ emp_vulnerability = 20
cold_level_1_threshold = 200
cold_level_2_threshold = 140
cold_level_3_threshold = 100
+
+/obj/item/organ/lungs/cybernetic/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
+ if(world.time > severe_cooldown) //So we cant just spam emp to kill people.
+ owner.losebreath += 20
+ severe_cooldown = world.time + 30 SECONDS
+ if(prob(emp_vulnerability/severity)) //Chance of permanent effects
+ organ_flags = ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon.
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 89f658e6168..f795ba8aa03 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -16,7 +16,7 @@
var/decay_factor = 0 //same as above but when without a living owner, set to 0 for generic organs
var/high_threshold = STANDARD_ORGAN_THRESHOLD * 0.45 //when severe organ damage occurs
var/low_threshold = STANDARD_ORGAN_THRESHOLD * 0.1 //when minor organ damage occurs
-
+ var/severe_cooldown //cooldown for severe effects, used for synthetic organ emp effects.
///Organ variables for determining what we alert the owner with when they pass/clear the damage thresholds
var/prev_damage = 0
var/low_threshold_passed
@@ -81,6 +81,9 @@
/obj/item/organ/proc/on_life() //repair organ damage if the organ is not failing
if(organ_flags & ORGAN_FAILING)
return
+ if(organ_flags & ORGAN_SYNTHETIC_EMP) //Synthetic organ has been emped, is now failing.
+ applyOrganDamage(maxHealth * decay_factor)
+ return
///Damage decrements by a percent of its maxhealth
var/healing_amount = -(maxHealth * healing_factor)
///Damage decrements again by a percent of its maxhealth, up to a total of 4 extra times depending on the owner's health
diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index f97c0b7fcf9..d6e2a313d75 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -169,7 +169,7 @@
var/insertpos = rand(1, message_list.len - 1)
var/inserttext = message_list[insertpos]
- if(!(copytext(inserttext, length(inserttext) - 2) == "..."))
+ if(!(copytext(inserttext, -3) == "..."))//3 == length("...")
message_list[insertpos] = inserttext + "..."
if(prob(20) && message_list.len > 3)
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index e92ef603588..4de3d105070 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -186,7 +186,7 @@
listeners = list(L) //Devil names are unique.
power_multiplier *= 5 //if you're a devil and god himself addressed you, you fucked up
//Cut out the name so it doesn't trigger commands
- message = copytext(message, 0, start)+copytext(message, start + length(devilinfo.truename), length(message) + 1)
+ message = copytext(message, 1, start) + copytext(message, start + length(devilinfo.truename))
break
else if(findtext(message, L.real_name, 1, length(L.real_name) + 1))
specific_listeners += L //focus on those with the specified name
@@ -206,7 +206,7 @@
if(specific_listeners.len)
listeners = specific_listeners
power_multiplier *= (1 + (1/specific_listeners.len)) //2x on a single guy, 1.5x on two and so on
- message = copytext(message, 0, 1)+copytext(message, 1 + length(found_string), length(message) + 1)
+ message = copytext(message, length(found_string) + 1)
var/static/regex/stun_words = regex("stop|wait|stand still|hold on|halt")
var/static/regex/knockdown_words = regex("drop|fall|trip|knockdown")
diff --git a/code/modules/surgery/stomachpump.dm b/code/modules/surgery/stomachpump.dm
new file mode 100644
index 00000000000..6e844940ce2
--- /dev/null
+++ b/code/modules/surgery/stomachpump.dm
@@ -0,0 +1,53 @@
+/datum/surgery/stomach_pump
+ name = "Stomach Pump"
+ steps = list(/datum/surgery_step/incise,
+ /datum/surgery_step/retract_skin,
+ /datum/surgery_step/incise,
+ /datum/surgery_step/clamp_bleeders,
+ /datum/surgery_step/stomach_pump,
+ /datum/surgery_step/close)
+
+ target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ possible_locs = list(BODY_ZONE_CHEST)
+ requires_bodypart_type = TRUE
+ ignore_clothes = FALSE
+
+/datum/surgery/stomach_pump/can_start(mob/user, mob/living/carbon/target)
+ var/obj/item/organ/stomach/S = target.getorganslot(ORGAN_SLOT_STOMACH)
+ if(target.stat != DEAD) //shamelessly lifted off the revival surgery but we're looking for the same critera here, a dead, non-husked, revivable patient.
+ return FALSE
+ if(HAS_TRAIT(target, TRAIT_HUSK))
+ return FALSE
+ if(!S)
+ return FALSE
+ return ..()
+
+//Working the stomach by hand in such a way that you induce vomiting.
+/datum/surgery_step/stomach_pump
+ name = "Pump Stomach"
+ accept_hand = TRUE
+ repeatable = TRUE
+ time = 20
+
+/datum/surgery_step/stomach_pump/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ display_results(user, target, "You begin pumping [target]'s stomach...",
+ "[user] begins to pump [target]'s stomach.",
+ "[user] begins to press on [target]'s chest.")
+
+/datum/surgery_step/stomach_pump/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
+ if(ishuman(target))
+ var/mob/living/carbon/human/H = target
+ display_results(user, target, "[user] forces [H] to vomit, cleansing their stomach of some chemicals!",
+ "[user] forces [H] to vomit, cleansing their stomach of some chemicals!",
+ "[user] forces [H] to vomit!")
+ H.vomit(20, FALSE, TRUE, 1, TRUE, FALSE, purge = TRUE) //called with purge as true to lose more reagents
+ return ..()
+
+/datum/surgery_step/stomach_pump/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ if(ishuman(target))
+ var/mob/living/carbon/human/H = target
+ display_results(user, target, "You screw up, brusing [H]'s chest!",
+ "[user] screws up, brusing [H]'s chest!",
+ "[user] screws up!")
+ H.adjustOrganLoss(ORGAN_SLOT_STOMACH, 5)
+ H.adjustBruteLoss(5)
diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm
index baf85851f42..d66d5d30364 100644
--- a/code/modules/tgui/states.dm
+++ b/code/modules/tgui/states.dm
@@ -103,8 +103,8 @@
*
* return UI_state The state of the UI.
**/
-/mob/living/proc/shared_living_ui_distance(atom/movable/src_object)
- if(!(src_object in view(src))) // If the object is obscured, close it.
+/mob/living/proc/shared_living_ui_distance(atom/movable/src_object, viewcheck = TRUE)
+ if(viewcheck && !(src_object in view(src))) // If the object is obscured, close it.
return UI_CLOSE
var/dist = get_dist(src_object, src)
@@ -116,7 +116,7 @@
return UI_DISABLED
return UI_CLOSE // Otherwise, we got nothing.
-/mob/living/carbon/human/shared_living_ui_distance(atom/movable/src_object)
+/mob/living/carbon/human/shared_living_ui_distance(atom/movable/src_object, viewcheck = TRUE)
if(dna.check_mutation(TK) && tkMaxRangeCheck(src, src_object))
return UI_INTERACTIVE
return ..()
diff --git a/code/modules/tgui/states/physical.dm b/code/modules/tgui/states/physical.dm
index a4cea7c7c20..da994cdb884 100644
--- a/code/modules/tgui/states/physical.dm
+++ b/code/modules/tgui/states/physical.dm
@@ -22,3 +22,29 @@ GLOBAL_DATUM_INIT(physical_state, /datum/ui_state/physical, new)
/mob/living/silicon/ai/physical_can_use_topic(src_object)
return UI_UPDATE // AIs are not physical.
+
+
+ /**
+ * tgui state: physical_obscured_state
+ *
+ * Short-circuits the default state to only check physical distance, being in view doesn't matter
+ **/
+
+GLOBAL_DATUM_INIT(physical_obscured_state, /datum/ui_state/physical_obscured_state, new)
+
+/datum/ui_state/physical_obscured_state/can_use_topic(src_object, mob/user)
+ . = user.shared_ui_interaction(src_object)
+ if(. > UI_CLOSE)
+ return min(., user.physical_obscured_can_use_topic(src_object))
+
+/mob/proc/physical_obscured_can_use_topic(src_object)
+ return UI_CLOSE
+
+/mob/living/physical_obscured_can_use_topic(src_object)
+ return shared_living_ui_distance(src_object, viewcheck = FALSE)
+
+/mob/living/silicon/physical_obscured_can_use_topic(src_object)
+ return max(UI_UPDATE, shared_living_ui_distance(src_object, viewcheck = FALSE)) // Silicons can always see.
+
+/mob/living/silicon/ai/physical_obscured_can_use_topic(src_object)
+ return UI_UPDATE // AIs are not physical.
diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm
index cfadc833106..4b76ce03d1b 100644
--- a/code/modules/vending/medical.dm
+++ b/code/modules/vending/medical.dm
@@ -24,19 +24,19 @@
/obj/item/reagent_containers/syringe/antiviral = 6,
/obj/item/reagent_containers/medigel/libital = 2,
/obj/item/reagent_containers/medigel/aiuri = 2,
- /obj/item/reagent_containers/medigel/sterilizine = 1,
- /obj/item/sensor_device = 2,
- /obj/item/pinpointer/crew = 2)
+ /obj/item/reagent_containers/medigel/sterilizine = 1)
contraband = list(/obj/item/reagent_containers/pill/tox = 3,
/obj/item/reagent_containers/pill/morphine = 4,
/obj/item/reagent_containers/pill/multiver = 6,
/obj/item/storage/box/hug/medical = 1)
premium = list(/obj/item/reagent_containers/medigel/instabitaluri = 2,
- /obj/item/storage/pill_bottle/psicodine = 2,
- /obj/item/reagent_containers/hypospray/medipen = 3,
- /obj/item/storage/belt/medical = 3,
- /obj/item/storage/firstaid/advanced = 2,
- /obj/item/shears = 1)
+ /obj/item/storage/pill_bottle/psicodine = 2,
+ /obj/item/reagent_containers/hypospray/medipen = 3,
+ /obj/item/storage/belt/medical = 3,
+ /obj/item/sensor_device = 2,
+ /obj/item/pinpointer/crew = 2,
+ /obj/item/storage/firstaid/advanced = 2,
+ /obj/item/shears = 1)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/medical
diff --git a/dependencies.sh b/dependencies.sh
index 2699e02c9f6..488504b2887 100755
--- a/dependencies.sh
+++ b/dependencies.sh
@@ -23,4 +23,4 @@ export NODE_VERSION=12
export PHP_VERSION=5.6
# SpacemanDMM git tag
-export SPACEMAN_DMM_VERSION=suite-1.1
+export SPACEMAN_DMM_VERSION=suite-1.2
diff --git a/html/changelog.html b/html/changelog.html
index 34c0336ed45..d0199cb3962 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -51,6 +51,203 @@
-->
+
18 January 2020
+
ArcaneMusic updated:
+
+
A new Technology has been implemented as a major reward in the B.E.P.I.S., Specialized Engineering, to appeal to engineering utility and new construction horizons.
+
Watchers will now actively consume diamond ore left lying around, alongside the new survival pens.
+
Adds a new surgery, Stomach Pump, which allows you to purge a patient's stomach via surgery while surgically dead.
+
+
Arkatos updated:
+
+
Simple mobs will now receive an alert about being in too hot/cold environment.
+
Simple mobs will now receive an alert about choking to death.
+
Added sprites to a several clothing items that were missing them.
+
Silencer, Blank paper and Nothing reagents will now only heal you if are keeping your Vow of Silence. Better not break it, mimes!
+
Teleporter Control Console now uses tgui-next.
+
+
Atlanta Ned updated:
+
+
Your ahelps are now stored in the database!
+
+
Bawhoppen updated:
+
+
Luxury shuttle has been even further adjusted.
+
+
Buggy123 updated:
+
+
Centcomm has updated their emergency temporal response protocols, and will now correctly stand down if a major threat is destroyed before countermeasures can be deployed.
+
+
Dennok updated:
+
+
You do not lose the storage window on storage pickup.
+
+
Denton updated:
+
+
Added an air tank and vents to the seed vault lavaland ruin
+
Fixed active turfs in the seed vault lavaland ruin
+
Fixed shield wall generators in the abandoned space zoo ruin attempting to spawn powered
+
Replaced the magical infinite charge SMES in the abandoned space zoo ruin with a regular one
+
Boxstation: Roundstart Paramedics now properly start in medbay.
+
+
Dorsidwarf updated:
+
+
Added ethereals & tails to the limbgrower and removed flypeople
+
Limbgrower limbs are now appropriately randomly coloured instead of plain white.
+
+
EOBGames updated:
+
+
added resting sprites for the corgi pAI.
+
removed gas miners from Kilo and Donut
+
+
ExcessiveUseOfCobblestone updated:
+
+
Players who are old (and wrinkly) will no longer receive the waypoint unless they have the quirk now.
+
+
Fhaxaris updated:
+
+
flying and floating mobs are no longer affected by the turf under them.
+
the bluespace randomness generator is no longer being used incorrectly
+
nanites getting removed all at once when you get shocked, heavy sleeping being really random if it actually increases the time you sleep, the scary cloning sound (???), and lightbulbs randomly pretending you have insulated gloves are all fixed.
+
+
Fikou updated:
+
+
The limb grower now grows a bunch of organella
+
Added ERP
+
champion belt sprite now shows again
+
centcom commanders and officials have mindshield implants
+
a couple of ert related sprites have been added
+
ert members start with hailers on instead of them being in backpack
+
colossus now enrages on sandstone golems
+
+
Ghommie updated:
+
+
:b: emoji.
+
Fixed shock paddles being insertable in BoHs
+
+
JJRcop updated:
+
+
New proximity crew pinpointer.
+
Paramedic's crew pinpointer replaced with proximity crew pinpointer.
+
The crew monitor was moved to premium items in nanomed, same with the handheld crew pinpointer
+
Fixed unwanted behavior with pinpointer icons.
+
Intercom description tells you about the :i radio key.
+
+
JMoldy updated:
+
+
Removes hitstun on meathook
+
Changes meathook's damage from 25 brute at 100 armor penetration to 20 brute, 20 stamina at 60 armor penetration
+
Changes the bounty hunter's meathook to do 40 stamina damage instead of a stun, adds a half-second knockdown.
+
+
Krysonism updated:
+
+
5u+ rezadone now unhusks bodies.
+
+
LemonInTheDark updated:
+
+
See the below, optimal power setups may have changed, try out those 100% plasma hell setups of yours, it should actually give you a power benefit now. Oh and Pluoxium should be a bit more of a safety gas now.
+
Fixed the SM not increasing/decreasing rad output with most gasses.
+
+
OnlineGirlfriend updated:
+
+
Sausages can be sliced into salami
+
+
Paxilmaniac updated:
+
+
many masks, mostly clown masks, are now the same height all around
+
+
ShizCalev updated:
+
+
Fixed tesla immunity being lost if you have reactive armor and refund the lighting bolt spell / vice versa
+
Added missing traits to the admin trait panel.
+
+
Skoglol updated:
+
+
Reduced heart decay, effectively extending the defib timer slightly to a little under four minutes before requiring heart surgery.
+
Slightly reduced the probability of ear damage causing you to intermittently go deaf.
+
Defib timer is gone, its all organ decay now. The defib hud icon is also gone since any corpse is now defibbable, also making fakedeath a bit more convincing.
+
Fugitives now reports the correct amount minimum candidates to deadchat if it fails.
+
Straight jackets can now be broken out of
+
Metastation hydroponics entrance back to its old version. No more bushes and directional windows.
+
+
SteelSlayer updated:
+
+
Changes the look of the supermatter's electricity arcs to appear more like electricity.
+
Remote signalers now use tgui-next
+
+
TheChosenEvilOne updated:
+
+
Fixed codex gigas, you can now properly input devil names.
+
fixed SM arcs using the old icon as it was accidentally reverted in a recent change.
+
+
Twaticus updated:
+
+
lizard/cat tailwhip inhand sprites
+
meathook inhand sprite
+
+
Vondiech updated:
+
+
Metastation medical lobby vent no longer over-pressurizes the lobby room.
+
+
WarlockD updated:
+
+
Fixed nanite damage sensor, verified it worked in game this time around.
+
+
actioninja updated:
+
+
tgui-next roulette
+
mule bot interface not working properly
+
tgui-next ntos chat
+
Corrected a cable loop on kilo that was likely preventing proper power
+
+
bandit updated:
+
+
New valentines and Valentines-themed arcade machines will arrive next month. Y-you have a valentine, right?
+
+
cacogen updated:
+
+
The wayfinding pinpointer dispenser is different who cares. Recycle discarded pinpointers at the dispenser for 40 cr.
+
Decapitated heads with destroyed brains no longer mislead you into thinking they're unrevivable when examined
+
+
carshalash updated:
+
+
Hex color typo fix
+
+
kevinz000 updated:
+
+
Mobs without MOBILITY_MOVE can no longer move by users trying to ride them around.
+
+
mrhugo13 updated:
+
+
Cleaned up medbay slighty on Metastation.
+
Electrified the grilles into the Medbay Security post on Metastation.
+
+
nemvar updated:
+
+
Added another SDQL option. Using "UPDATE selectors SET #null=value" will now resolve value and discard the return. This is useful if you only care about the side effect of a proc.
+
Fixed an edge case where the mining vendor wouldn't vend your gamer gear.
+
+
nightred updated:
+
+
Species body temperature handling
+
Plasmamen, Lizardpeople, Ethereal have custom body temperatures to deal with
+
natural body temp stabilization now returns proper values
+
clean up of the environment handles for mobs and species
+
+
ninjanomnom updated:
+
+
Blob structures and hierophant barriers should no longer let the wrong things just walk through them
+
+
wesoda25 updated:
+
+
You can now charge through APC's and Energy Cells as an Ethereal! Click an APC on harm intent to drain its energy, or on grab intent to give it your own energy! Click the energy cell while its in your hand to siphon its energy.
+
You now receive less charge from light as an Ethereal.
+
+
zxaber updated:
+
+
Law 0 for emagged borgs is no longer being suppressed.
+
+
08 January 2020
Skoglol updated:
@@ -1305,282 +1502,6 @@
New Power Monitor interface.
New Supermatter Monitor interface.
-
-
15 November 2019
-
Ryll/Shaps updated:
-
-
You can now attach knives to cleanbots! Laugh as Officer Stabby sneaks up and jabs the HoS! Sigh because you are now outranked by a cleanbot! Fun for everyone!
-
-
kriskog updated:
-
-
Toolbelt and medical belt can now hold more total weight.
-
-
nianjiilical updated:
-
-
Properly removes an unused plant.
-
-
ninjanomnom updated:
-
-
You can keybind any emote
-
-
py01 updated:
-
-
Used mime books won't give vow of silence.
-
-
-
14 November 2019
-
Acer202 updated:
-
-
Mura space banjos are now in stock at your local NT instrument supplier! Start picking today!
-
-
Anonmare updated:
-
-
Nanotrasen have refined instabitaluri's formula to be less toxic to living tissue.
-
-
Arkatos updated:
-
-
Skill levels will now show properly.
-
-
Couls updated:
-
-
Custom keybinds will now check what style (classic / hotkey) you prefer when resetting if you use classic mode make sure to reset your keybinds to default!
-
multiple keybind support
-
non-hotkey mode keeps focus on chat
-
pressing 4 as cyborg now properly cycles
-
AI location hotkeys now work again
-
-
EdgeLordExe updated:
-
-
Added new toxin: Nitric Acid
-
Added new explosive: TaTP <-have fun with that one
-
Added new explosive: RDX , don't mix it with electricity!
-
Added new explosive/medical : Penthrite
-
Added chem: Hydrogen peroxide
-
Added chem: Acetone oxide
-
Added chem: Acetaldehyde
-
Added chem: Pentaerythritol
-
Removed the heart stabilizing effect of Corazone, look at Penthrite for that effect
-
Nerfed Water+Potassium explosion so it is harder to gib someone
-
-
Firecage updated:
-
-
Ports carbon paper from Bay. They can be found in carbon paper bins in the HoP's office, QM's office, and Detective's office on every map. Additionally they can be ordered via cargo in the bureaucracy crate.
-
Hydroponics trays which are fully upgraded with Earthsblood can no longer be taken over by weeds.
-
Research servers are no longer invisible after a screwdriver is applied.
-
-
Indie-ana Jones updated:
-
-
Fixed the Lavaland Elites never spawning in when boosted.
-
-
Krysonism updated:
-
-
Fancy drink bottles can now be crafted.
-
Blank drink bottles are now available in the booze-o-mat.
-
Hooch & moonshine have their own bottles.
-
moonshine is now clear, rather than brown.
-
-
Mickyan updated:
-
-
Added a simple framework for taming mobs, feed them their favorite food for a chance to tame them.
-
Feed some wheat to a cow and then ride it around, yeehaw cowboy!
-
-
Okand37 updated:
-
-
Central Command has commissioned a new brand of Kilo-class stations. Rumours report the station design will be used in the up and coming Space Station 13 plasma research station.
-
-
PepperPrepper updated:
-
-
Hulks have a delay before they can scream again
-
-
Skoglol updated:
-
-
Genetics scanner linking feedback made clearer.
-
Ghosts can now turn using the ctrl + direction hotkeys.
-
The "Restore Ghost Character" verb now changes the name of your ghost mob as well.
-
Lava no longer slows you down.
-
Getting hurt no longer adds a move delay.
-
Lava will no longer prevent you from ghosting out of your dead body.
-
-
SteelSlayer updated:
-
-
Upon becoming a species that is rad immune, you will lose any mutations you have
-
When you suicide using an internals tank, you're character will now inflate, and grow in size before you gib.
-
Adds a safe_gib argument to the carbon gib proc. Allows you to specifiy if you want to preserve the items on the mob you're gibbing.
-
-
TheVekter updated:
-
-
Removed items from maintenance on Metastation that were placed there erroneously.
-
-
XDTM updated:
-
-
Nanite Race Sensor was renamed to Species Sensor.
-
Timestop effects now prevent speech.
-
-
actioninja updated:
-
-
Chat is properly sent to legacy window if goonchat fails to load again.
-
Personal crafting menus now work properly on categories without subcategories
-
-
ninjanomnom updated:
-
-
The slowdown from grabbing someone no longer applies when you're floating
-
Chopping off all your legs and growing a few dozen arms no longer turns you into the fastest monstrosity this side of the milky way
-
Lacking legs/arms no longer slows you down if you're weren't using them to move anyway
-
-
py01 updated:
-
-
Fixed changeling tentacle runtime.
-
Chef's table slams do not break tables when outside of the kitchen.
-
-
stylemistake updated:
-
-
Personal Crafting UI will no longer reset its state when crafing an item.
-
Improved table layout of Smart Fridge and Crew Console.
-
Fix ORM not smelting alloys.
-
Fix Computer Fabricator.
-
Tgui CSS got a massive rework.
-
-
zxaber updated:
-
-
RCS Thrusters for mechs can now be printed from an exosuit fabricator after the relevant research has been done. They'll eat up the gas in your mech's air tank, though, so don't go overboard with their use!
-
Mechs that use built-in thrusters (Dark Gygax, Marauder, etc) will now start with the thrusters enabled. The thruster action button is gone, but you can still toggle them in the View Status popout if you feel the need to. Note that these built-in thrusters are still ion-based, and will not deplete your air supply.
-
Mechs using thrusters to move will no longer make stomp sounds.
-
-
-
10 November 2019
-
ATHATH updated:
-
-
Strange reagent properly resurrects non-carbons (it still can resurrect carbons, of course).
-
Strange reagent now brings the blood level of a revived carbon (without the NOBLOOD species trait) up to a safe level.
-
-
Arkatos updated:
-
-
Added new action buttons icons for all mime spells.
-
Revenant health HUD background icon will now show properly.
-
Added themed skills button to all chooseable UI styles.
-
Medibots will now keep tending your wounds continuously.
-
-
Cenrus updated:
-
-
The abandoned bar and port quarter solars are now connected to the air supply
-
-
PepperPrepper updated:
-
-
You can't hold hands with simple mobs
-
scan gates can now detect Felinids
-
-
Potato Masher updated:
-
-
Oldstation (ghost role spacestation) now has a proper basic atmos system with a scrubber loop, as well as additional N2 and O2 in enlarged tanks.
-
Oldstation QoL improvements, including reduced xeno resin spread and an added autolathe to RnD.
-
Oldstation: A few missing pipes have been fixed, having multiple resin floors on one tile/resin floors inside walls have been fixed.
-
-
Skoglol updated:
-
-
Ejecting materials from circuit printer/protolathe through an RND console works again.
-
Materials view of circuit imprinter through rnd console now formatted correctly.
-
Unfucked butchering.
-
Carpet stacks now look like carpets again.
-
Fixed shock propagation.
-
Adds shock propagation to fireman carry.
-
-
SteelSlayer updated:
-
-
Fixes players not getting removed from antag huds properly
-
-
TheVekter updated:
-
-
Modifications have been made to the Mech Fabricator to allow it to withdraw and deposit to the ore silo (Thanks to alexkar598 from Yogstation for the code!)
-
-
actioninja updated:
-
-
Laptop vendors are now available around your nearest space station. Check the science lobby or the dorms.
-
-
-
07 November 2019
-
ATHATH updated:
-
-
Makes a few slight improvements to vo- er, gulp_size code.
-
Teleporter accidents no longer mistakenly report the fly person-ing of nonhumans in logs.
-
-
Arkatos updated:
-
-
You can now only check yourself for injuries if you are conscious.
-
-
Cenrus updated:
-
-
Carp spawner outside xenobiology moved to starboard quarter solars
-
-
Couls updated:
-
-
new button that truly toggles move intent
-
hotkeys using Alt, Shift and Ctrl now work correctly
-
pressing h will allow you to stop pulling now
-
Movement keys are now customizable
-
T, O and M are no longer customizable
-
admin commands for messing with movement keys, this won't work since they're different for each client
-
ooc, say and me are all escapable now and no longer lag at higher pings
-
-
Ghommie updated:
-
-
walking downstair won't show the falling visible message anymore.
-
-
Joe Berrbyson updated:
-
-
The Wizard Gamemode now immediately ends when the main wizard and wizard apprentice antagonists die.
-
-
Skgolol updated:
-
-
Bag of dice now has a special die INSIDE the bag.
-
-
Skoglol updated:
-
-
Dynamic: Latejoin revs is now slightly delayed, will no longer lose instantly if on offstation arrivals shuttle.
-
Dynamic: Clarified some ic messages for revolution.
-
"Trigger a Virus Outbreak" button fixed, targeting added to custom disease.
-
Contractor tablet should no longer break randomly.
-
Some examines have been fixed.
-
Holodeck now works again.
-
Drowsiness now respects sleep immunity.
-
Pirates can no longer retrieve holochips of 0 credits from their data siphon.
-
Alt clicking will no longer show turf contents for items inside bags etc.
-
Goliaths sacrificed at the ashwalker tendril now drop a hide plate.
-
-
SteelSlayer updated:
-
-
Cleans up some scattered hud removal procs and puts them into their respective antag datum file so when the player loses the antag status, they lose the hud
-
Refactors antag hud adding and removing procs. Moves them into the base antag datum file. The new procs can dynamically assign a hud from given arguments. Cuts down on copy and paste
-
Refactors the clown mutation adding and removing procs for antags. Merges it into a single proc in the base antag datum file.
-
-
Time-Green updated:
-
-
Reaction chambers now don't break after certain reactions, like meat creation.
-
-
Tlaltecuhtli updated:
-
-
adds a missing space in split personailty radio
-
actively made research methods creates research notes that can be slapped on the rnd console to convert into points on demand
-
-
actioninja updated:
-
-
Suit storage, tank dispenser, and GPS have been tgui-nextified
-
Learning to bake cakes doesn't break the entire crafting ui anymore
-
-
carlarctg updated:
-
-
Colorful reagent and quantum barber thing also have random colors on init. spriteadd: Adds unused syndie pill sprite, can't be selected in chemmaster but it's there if you need it for stuffs.
-
Regenerative Jelly dyes your hair purple when it enters your bloodstream. spriteadd: Also tweaked some existing reagent colors around, like uranium going from silver to dark green.
-
-
stylemistake updated:
-
-
New Radio interface.
-
New Ore Redemption Machine interface.
-
New Solar Tracker interface.
-
-
zeroisthebiggay updated:
-
-
floor decals in science.
-
GoonStation 13 Development Team
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 7a94565a450..7d08a854763 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -36477,3 +36477,162 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
floyd:
- bugfix: Everything made from glass in the game has a little more tegridy and doesnt
break from a single punch
+2020-01-18:
+ ArcaneMusic:
+ - rscadd: A new Technology has been implemented as a major reward in the B.E.P.I.S.,
+ Specialized Engineering, to appeal to engineering utility and new construction
+ horizons.
+ - tweak: Watchers will now actively consume diamond ore left lying around, alongside
+ the new survival pens.
+ - rscadd: Adds a new surgery, Stomach Pump, which allows you to purge a patient's
+ stomach via surgery while surgically dead.
+ Arkatos:
+ - rscadd: Simple mobs will now receive an alert about being in too hot/cold environment.
+ - rscadd: Simple mobs will now receive an alert about choking to death.
+ - imageadd: Added sprites to a several clothing items that were missing them.
+ - tweak: Silencer, Blank paper and Nothing reagents will now only heal you if are
+ keeping your Vow of Silence. Better not break it, mimes!
+ - rscadd: Teleporter Control Console now uses tgui-next.
+ Atlanta Ned:
+ - server: Your ahelps are now stored in the database!
+ Bawhoppen:
+ - rscadd: Luxury shuttle has been even further adjusted.
+ Buggy123:
+ - rscadd: Centcomm has updated their emergency temporal response protocols, and
+ will now correctly stand down if a major threat is destroyed before countermeasures
+ can be deployed.
+ Dennok:
+ - tweak: You do not lose the storage window on storage pickup.
+ Denton:
+ - tweak: Added an air tank and vents to the seed vault lavaland ruin
+ - bugfix: Fixed active turfs in the seed vault lavaland ruin
+ - bugfix: Fixed shield wall generators in the abandoned space zoo ruin attempting
+ to spawn powered
+ - tweak: Replaced the magical infinite charge SMES in the abandoned space zoo ruin
+ with a regular one
+ - bugfix: 'Boxstation: Roundstart Paramedics now properly start in medbay.'
+ Dorsidwarf:
+ - tweak: Added ethereals & tails to the limbgrower and removed flypeople
+ - rscadd: Limbgrower limbs are now appropriately randomly coloured instead of plain
+ white.
+ EOBGames:
+ - imageadd: added resting sprites for the corgi pAI.
+ - balance: removed gas miners from Kilo and Donut
+ ExcessiveUseOfCobblestone:
+ - bugfix: Players who are old (and wrinkly) will no longer receive the waypoint
+ unless they have the quirk now.
+ Fhaxaris:
+ - bugfix: flying and floating mobs are no longer affected by the turf under them.
+ - bugfix: the bluespace randomness generator is no longer being used incorrectly
+ - bugfix: nanites getting removed all at once when you get shocked, heavy sleeping
+ being really random if it actually increases the time you sleep, the scary cloning
+ sound (???), and lightbulbs randomly pretending you have insulated gloves are
+ all fixed.
+ Fikou:
+ - rscadd: The limb grower now grows a bunch of organella
+ - rscadd: Added ERP
+ - bugfix: champion belt sprite now shows again
+ - bugfix: centcom commanders and officials have mindshield implants
+ - imageadd: a couple of ert related sprites have been added
+ - tweak: ert members start with hailers on instead of them being in backpack
+ - balance: colossus now enrages on sandstone golems
+ Ghommie:
+ - rscadd: ':b: emoji.'
+ - bugfix: Fixed shock paddles being insertable in BoHs
+ JJRcop:
+ - rscadd: New proximity crew pinpointer.
+ - balance: Paramedic's crew pinpointer replaced with proximity crew pinpointer.
+ - balance: The crew monitor was moved to premium items in nanomed, same with the
+ handheld crew pinpointer
+ - bugfix: Fixed unwanted behavior with pinpointer icons.
+ - rscadd: Intercom description tells you about the :i radio key.
+ JMoldy:
+ - balance: Removes hitstun on meathook
+ - balance: Changes meathook's damage from 25 brute at 100 armor penetration to 20
+ brute, 20 stamina at 60 armor penetration
+ - balance: Changes the bounty hunter's meathook to do 40 stamina damage instead
+ of a stun, adds a half-second knockdown.
+ Krysonism:
+ - balance: 5u+ rezadone now unhusks bodies.
+ LemonInTheDark:
+ - balance: See the below, optimal power setups may have changed, try out those 100%
+ plasma hell setups of yours, it should actually give you a power benefit now.
+ Oh and Pluoxium should be a bit more of a safety gas now.
+ - bugfix: Fixed the SM not increasing/decreasing rad output with most gasses.
+ OnlineGirlfriend:
+ - rscadd: Sausages can be sliced into salami
+ Paxilmaniac:
+ - bugfix: many masks, mostly clown masks, are now the same height all around
+ ShizCalev:
+ - bugfix: Fixed tesla immunity being lost if you have reactive armor and refund
+ the lighting bolt spell / vice versa
+ - admin: Added missing traits to the admin trait panel.
+ Skoglol:
+ - balance: Reduced heart decay, effectively extending the defib timer slightly to
+ a little under four minutes before requiring heart surgery.
+ - balance: Slightly reduced the probability of ear damage causing you to intermittently
+ go deaf.
+ - tweak: Defib timer is gone, its all organ decay now. The defib hud icon is also
+ gone since any corpse is now defibbable, also making fakedeath a bit more convincing.
+ - bugfix: Fugitives now reports the correct amount minimum candidates to deadchat
+ if it fails.
+ - bugfix: Straight jackets can now be broken out of
+ - tweak: Metastation hydroponics entrance back to its old version. No more bushes
+ and directional windows.
+ SteelSlayer:
+ - imageadd: Changes the look of the supermatter's electricity arcs to appear more
+ like electricity.
+ - rscadd: Remote signalers now use tgui-next
+ TheChosenEvilOne:
+ - bugfix: Fixed codex gigas, you can now properly input devil names.
+ - bugfix: fixed SM arcs using the old icon as it was accidentally reverted in a
+ recent change.
+ Twaticus:
+ - imageadd: lizard/cat tailwhip inhand sprites
+ - imageadd: meathook inhand sprite
+ Vondiech:
+ - bugfix: Metastation medical lobby vent no longer over-pressurizes the lobby room.
+ WarlockD:
+ - bugfix: Fixed nanite damage sensor, verified it worked in game this time around.
+ actioninja:
+ - rscadd: tgui-next roulette
+ - bugfix: mule bot interface not working properly
+ - rscadd: tgui-next ntos chat
+ - bugfix: Corrected a cable loop on kilo that was likely preventing proper power
+ bandit:
+ - rscadd: New valentines and Valentines-themed arcade machines will arrive next
+ month. Y-you have a valentine, right?
+ cacogen:
+ - tweak: The wayfinding pinpointer dispenser is different who cares. Recycle discarded
+ pinpointers at the dispenser for 40 cr.
+ - bugfix: Decapitated heads with destroyed brains no longer mislead you into thinking
+ they're unrevivable when examined
+ carshalash:
+ - bugfix: Hex color typo fix
+ kevinz000:
+ - bugfix: Mobs without MOBILITY_MOVE can no longer move by users trying to ride
+ them around.
+ mrhugo13:
+ - tweak: Cleaned up medbay slighty on Metastation.
+ - balance: Electrified the grilles into the Medbay Security post on Metastation.
+ nemvar:
+ - admin: 'Added another SDQL option. Using "UPDATE selectors SET #null=value" will
+ now resolve value and discard the return. This is useful if you only care about
+ the side effect of a proc.'
+ - bugfix: Fixed an edge case where the mining vendor wouldn't vend your gamer gear.
+ nightred:
+ - rscadd: Species body temperature handling
+ - balance: Plasmamen, Lizardpeople, Ethereal have custom body temperatures to deal
+ with
+ - bugfix: natural body temp stabilization now returns proper values
+ - refactor: clean up of the environment handles for mobs and species
+ ninjanomnom:
+ - bugfix: Blob structures and hierophant barriers should no longer let the wrong
+ things just walk through them
+ wesoda25:
+ - rscadd: You can now charge through APC's and Energy Cells as an Ethereal! Click
+ an APC on harm intent to drain its energy, or on grab intent to give it your
+ own energy! Click the energy cell while its in your hand to siphon its energy.
+ - balance: You now receive less charge from light as an Ethereal.
+ zxaber:
+ - bugfix: Law 0 for emagged borgs is no longer being suppressed.
diff --git a/html/changelogs/AutoChangeLog-pr-48416.yml b/html/changelogs/AutoChangeLog-pr-48416.yml
deleted file mode 100644
index e5fa6e8e36d..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48416.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Bawhoppen"
-delete-after: True
-changes:
- - rscadd: "Luxury shuttle has been even further adjusted."
diff --git a/html/changelogs/AutoChangeLog-pr-48498.yml b/html/changelogs/AutoChangeLog-pr-48498.yml
deleted file mode 100644
index 6caf849ea6a..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48498.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "actioninja"
-delete-after: True
-changes:
- - rscadd: "tgui-next roulette"
- - bugfix: "mule bot interface not working properly"
diff --git a/html/changelogs/AutoChangeLog-pr-48517.yml b/html/changelogs/AutoChangeLog-pr-48517.yml
deleted file mode 100644
index dfec390f521..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48517.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SteelSlayer"
-delete-after: True
-changes:
- - imageadd: "Changes the look of the supermatter's electricity arcs to appear more like electricity."
diff --git a/html/changelogs/AutoChangeLog-pr-48580.yml b/html/changelogs/AutoChangeLog-pr-48580.yml
deleted file mode 100644
index 3061f254f31..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48580.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "TheChosenEvilOne"
-delete-after: True
-changes:
- - bugfix: "Fixed codex gigas, you can now properly input devil names."
diff --git a/html/changelogs/AutoChangeLog-pr-48604.yml b/html/changelogs/AutoChangeLog-pr-48604.yml
deleted file mode 100644
index e96c90e286b..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48604.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SteelSlayer"
-delete-after: True
-changes:
- - rscadd: "Remote signalers now use tgui-next"
diff --git a/html/changelogs/AutoChangeLog-pr-48645.yml b/html/changelogs/AutoChangeLog-pr-48645.yml
deleted file mode 100644
index 9a62078b466..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48645.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Denton"
-delete-after: True
-changes:
- - tweak: "Added an air tank and vents to the seed vault lavaland ruin"
- - bugfix: "Fixed active turfs in the seed vault lavaland ruin"
diff --git a/html/changelogs/AutoChangeLog-pr-48646.yml b/html/changelogs/AutoChangeLog-pr-48646.yml
deleted file mode 100644
index 6348ed955fe..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48646.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Arkatos"
-delete-after: True
-changes:
- - rscadd: "Simple mobs will now receive an alert about being in too hot/cold environment."
- - rscadd: "Simple mobs will now receive an alert about choking to death."
diff --git a/html/changelogs/AutoChangeLog-pr-48647.yml b/html/changelogs/AutoChangeLog-pr-48647.yml
deleted file mode 100644
index a25da24ba8e..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48647.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "ShizCalev"
-delete-after: True
-changes:
- - bugfix: "Fixed tesla immunity being lost if you have reactive armor and refund the lighting bolt spell / vice versa"
diff --git a/html/changelogs/AutoChangeLog-pr-48648.yml b/html/changelogs/AutoChangeLog-pr-48648.yml
deleted file mode 100644
index 74563aa34f8..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48648.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "ShizCalev"
-delete-after: True
-changes:
- - admin: "Added missing traits to the admin trait panel."
diff --git a/html/changelogs/AutoChangeLog-pr-48649.yml b/html/changelogs/AutoChangeLog-pr-48649.yml
deleted file mode 100644
index 52a4b1015c0..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48649.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "EOBGames"
-delete-after: True
-changes:
- - imageadd: "added resting sprites for the corgi pAI."
diff --git a/html/changelogs/AutoChangeLog-pr-48655.yml b/html/changelogs/AutoChangeLog-pr-48655.yml
deleted file mode 100644
index b5f555e9bb0..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48655.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - bugfix: "Mobs without MOBILITY_MOVE can no longer move by users trying to ride them around."
diff --git a/html/changelogs/AutoChangeLog-pr-48656.yml b/html/changelogs/AutoChangeLog-pr-48656.yml
deleted file mode 100644
index 6edf603093d..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48656.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Twaticus"
-delete-after: True
-changes:
- - imageadd: "lizard/cat tailwhip inhand sprites"
- - imageadd: "meathook inhand sprite"
diff --git a/html/changelogs/AutoChangeLog-pr-48664.yml b/html/changelogs/AutoChangeLog-pr-48664.yml
deleted file mode 100644
index 5ddd09f88fa..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48664.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "WarlockD"
-delete-after: True
-changes:
- - bugfix: "Fixed nanite damage sensor, verified it worked in game this time around."
diff --git a/html/changelogs/AutoChangeLog-pr-48678.yml b/html/changelogs/AutoChangeLog-pr-48678.yml
deleted file mode 100644
index 4844aad993c..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48678.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Dorsidwarf"
-delete-after: True
-changes:
- - tweak: "Added ethereals & tails to the limbgrower and removed flypeople"
- - rscadd: "Limbgrower limbs are now appropriately randomly coloured instead of plain white."
diff --git a/html/changelogs/AutoChangeLog-pr-48681.yml b/html/changelogs/AutoChangeLog-pr-48681.yml
deleted file mode 100644
index 9a00ad6108b..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48681.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Arkatos"
-delete-after: True
-changes:
- - imageadd: "Added sprites to a several clothing items that were missing them."
diff --git a/html/changelogs/AutoChangeLog-pr-48685.yml b/html/changelogs/AutoChangeLog-pr-48685.yml
deleted file mode 100644
index 4a7f5d47ec5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48685.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Dennok"
-delete-after: True
-changes:
- - tweak: "You do not lose the storage window on storage pickup."
diff --git a/html/changelogs/AutoChangeLog-pr-48686.yml b/html/changelogs/AutoChangeLog-pr-48686.yml
deleted file mode 100644
index 5d7f5528b86..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48686.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Arkatos"
-delete-after: True
-changes:
- - tweak: "Silencer, Blank paper and Nothing reagents will now only heal you if are keeping your Vow of Silence. Better not break it, mimes!"
diff --git a/html/changelogs/AutoChangeLog-pr-48691.yml b/html/changelogs/AutoChangeLog-pr-48691.yml
deleted file mode 100644
index ef9342804a6..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48691.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "LemonInTheDark"
-delete-after: True
-changes:
- - balance: "See the below, optimal power setups may have changed, try out those 100% plasma hell setups of yours, it should actually give you a power benefit now. Oh and Pluoxium should be a bit more of a safety gas now."
- - bugfix: "Fixed the SM not increasing/decreasing rad output with most gasses."
diff --git a/html/changelogs/AutoChangeLog-pr-48694.yml b/html/changelogs/AutoChangeLog-pr-48694.yml
deleted file mode 100644
index 71a6a218668..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48694.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Fhaxaris"
-delete-after: True
-changes:
- - bugfix: "flying and floating mobs are no longer affected by the turf under them."
diff --git a/html/changelogs/AutoChangeLog-pr-48699.yml b/html/changelogs/AutoChangeLog-pr-48699.yml
deleted file mode 100644
index 29438079c13..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48699.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "Fikou"
-delete-after: True
-changes:
- - rscadd: "Added ERP"
- - bugfix: "champion belt sprite now shows again"
- - bugfix: "centcom commanders and officials have mindshield implants"
- - imageadd: "a couple of ert related sprites have been added"
- - tweak: "ert members start with hailers on instead of them being in backpack"
diff --git a/html/changelogs/AutoChangeLog-pr-48708.yml b/html/changelogs/AutoChangeLog-pr-48708.yml
deleted file mode 100644
index 7ad64bd8983..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48708.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "ExcessiveUseOfCobblestone"
-delete-after: True
-changes:
- - bugfix: "Players who are old (and wrinkly) will no longer receive the waypoint unless they have the quirk now."
diff --git a/html/changelogs/AutoChangeLog-pr-48714.yml b/html/changelogs/AutoChangeLog-pr-48714.yml
new file mode 100644
index 00000000000..f79c110ca4d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-48714.yml
@@ -0,0 +1,5 @@
+author: "Skoglol, sprites by ArcaneMusic"
+delete-after: True
+changes:
+ - rscadd: "New basic tier of cybernetic organs, available roundstart. Worse than bio organs, but printable en masse."
+ - balance: "Changed emp effect on cybernetic heart, lungs, liver. Now applies an instant (on cooldown) effect, and has a chance to trigger organ decay."
diff --git a/html/changelogs/AutoChangeLog-pr-48729.yml b/html/changelogs/AutoChangeLog-pr-48729.yml
deleted file mode 100644
index cd33666bd29..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48729.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "zxaber"
-delete-after: True
-changes:
- - bugfix: "Law 0 for emagged borgs is no longer being suppressed."
diff --git a/html/changelogs/AutoChangeLog-pr-48651.yml b/html/changelogs/AutoChangeLog-pr-48731.yml
similarity index 52%
rename from html/changelogs/AutoChangeLog-pr-48651.yml
rename to html/changelogs/AutoChangeLog-pr-48731.yml
index 9e88e064014..c452336ca24 100644
--- a/html/changelogs/AutoChangeLog-pr-48651.yml
+++ b/html/changelogs/AutoChangeLog-pr-48731.yml
@@ -1,4 +1,4 @@
author: "carshalash"
delete-after: True
changes:
- - bugfix: "Hex color typo fix"
+ - tweak: "Adds flavor text to spider meat"
diff --git a/html/changelogs/AutoChangeLog-pr-48732.yml b/html/changelogs/AutoChangeLog-pr-48732.yml
deleted file mode 100644
index ab5e9b42193..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48732.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Fhaxaris"
-delete-after: True
-changes:
- - bugfix: "the bluespace randomness generator is no longer being used incorrectly"
- - bugfix: "nanites getting removed all at once when you get shocked, heavy sleeping being really random if it actually increases the time you sleep, the scary cloning sound (???), and lightbulbs randomly pretending you have insulated gloves are all fixed."
diff --git a/html/changelogs/AutoChangeLog-pr-48734.yml b/html/changelogs/AutoChangeLog-pr-48734.yml
deleted file mode 100644
index 69b639ab2f5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-48734.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "actioninja"
-delete-after: True
-changes:
- - rscadd: "tgui-next ntos chat"
diff --git a/html/changelogs/AutoChangeLog-pr-48750.yml b/html/changelogs/AutoChangeLog-pr-48750.yml
new file mode 100644
index 00000000000..bbf48778005
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-48750.yml
@@ -0,0 +1,4 @@
+author: "Improvedname"
+delete-after: True
+changes:
+ - rscadd: "Adds a sprite for the way-finding pinpointer."
diff --git a/html/changelogs/AutoChangeLog-pr-48761.yml b/html/changelogs/AutoChangeLog-pr-48761.yml
new file mode 100644
index 00000000000..20b64c8ffd0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-48761.yml
@@ -0,0 +1,4 @@
+author: "Fikou"
+delete-after: True
+changes:
+ - tweak: "highlanders can no longer be dismembered"
diff --git a/html/changelogs/AutoChangeLog-pr-48790.yml b/html/changelogs/AutoChangeLog-pr-48790.yml
new file mode 100644
index 00000000000..2184161ddce
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-48790.yml
@@ -0,0 +1,4 @@
+author: "Couls"
+delete-after: True
+changes:
+ - tweak: "hardsuit helmets are now repairable by using a lightbulb on the hardsuit"
diff --git a/html/changelogs/AutoChangeLog-pr-48834.yml b/html/changelogs/AutoChangeLog-pr-48834.yml
new file mode 100644
index 00000000000..3bdc90832d0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-48834.yml
@@ -0,0 +1,5 @@
+author: "AnturK"
+delete-after: True
+changes:
+ - rscadd: "Canvases are now available again."
+ - rscadd: "Painting frames can be built from wood. Use a pen to name your masterpiece."
diff --git a/html/changelogs/AutoChangeLog-pr-48847.yml b/html/changelogs/AutoChangeLog-pr-48847.yml
new file mode 100644
index 00000000000..17647bb203c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-48847.yml
@@ -0,0 +1,4 @@
+author: "ArcaneMusic"
+delete-after: True
+changes:
+ - imageadd: "the Rapid Service Fabricator now actually has and uses it's own sprite instead of the RCD."
diff --git a/html/changelogs/AutoChangeLog-pr-48857.yml b/html/changelogs/AutoChangeLog-pr-48857.yml
new file mode 100644
index 00000000000..0e75e4a99c5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-48857.yml
@@ -0,0 +1,4 @@
+author: "Skoglol"
+delete-after: True
+changes:
+ - bugfix: "Atmospherics, janitors closet and virology areas no longer block cult runes."
diff --git a/html/changelogs/AutoChangeLog-pr-48860.yml b/html/changelogs/AutoChangeLog-pr-48860.yml
new file mode 100644
index 00000000000..2b422a3a0fc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-48860.yml
@@ -0,0 +1,4 @@
+author: "Mickyan"
+delete-after: True
+changes:
+ - rscadd: "Added Thocks socks: dress to impress with thongs for your feet"
diff --git a/html/changelogs/AutoChangeLog-pr-48872.yml b/html/changelogs/AutoChangeLog-pr-48872.yml
new file mode 100644
index 00000000000..e538d149b31
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-48872.yml
@@ -0,0 +1,4 @@
+author: "TheChosenEvilOne"
+delete-after: True
+changes:
+ - balance: "Dry Heat Sterilization (converting miasma to oxygen with heat) no longer generates research points."
diff --git a/html/changelogs/AutoChangeLog-pr-48880.yml b/html/changelogs/AutoChangeLog-pr-48880.yml
new file mode 100644
index 00000000000..51a4480d38d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-48880.yml
@@ -0,0 +1,4 @@
+author: "Skoglol"
+delete-after: True
+changes:
+ - bugfix: "Kilo and Donut now has the right amount of gas in the atmos gas tanks."
diff --git a/icons/UI_Icons/Achievements/Boss/bbgum.png b/icons/UI_Icons/Achievements/Boss/bbgum.png
new file mode 100644
index 00000000000..a0962fb1ced
Binary files /dev/null and b/icons/UI_Icons/Achievements/Boss/bbgum.png differ
diff --git a/icons/UI_Icons/Achievements/Boss/colossus.png b/icons/UI_Icons/Achievements/Boss/colossus.png
new file mode 100644
index 00000000000..f544084786d
Binary files /dev/null and b/icons/UI_Icons/Achievements/Boss/colossus.png differ
diff --git a/icons/UI_Icons/Achievements/Boss/drake.png b/icons/UI_Icons/Achievements/Boss/drake.png
new file mode 100644
index 00000000000..19ecc5ae941
Binary files /dev/null and b/icons/UI_Icons/Achievements/Boss/drake.png differ
diff --git a/icons/UI_Icons/Achievements/Boss/hierophant.png b/icons/UI_Icons/Achievements/Boss/hierophant.png
new file mode 100644
index 00000000000..a8f2e6a45ed
Binary files /dev/null and b/icons/UI_Icons/Achievements/Boss/hierophant.png differ
diff --git a/icons/UI_Icons/Achievements/Boss/legion.png b/icons/UI_Icons/Achievements/Boss/legion.png
new file mode 100644
index 00000000000..dc9470a8a97
Binary files /dev/null and b/icons/UI_Icons/Achievements/Boss/legion.png differ
diff --git a/icons/UI_Icons/Achievements/Boss/miner.png b/icons/UI_Icons/Achievements/Boss/miner.png
new file mode 100644
index 00000000000..5164dcfb10b
Binary files /dev/null and b/icons/UI_Icons/Achievements/Boss/miner.png differ
diff --git a/icons/UI_Icons/Achievements/Boss/swarmer.png b/icons/UI_Icons/Achievements/Boss/swarmer.png
new file mode 100644
index 00000000000..bcc017af32d
Binary files /dev/null and b/icons/UI_Icons/Achievements/Boss/swarmer.png differ
diff --git a/icons/UI_Icons/Achievements/Boss/tendril.png b/icons/UI_Icons/Achievements/Boss/tendril.png
new file mode 100644
index 00000000000..3b6b908d3eb
Binary files /dev/null and b/icons/UI_Icons/Achievements/Boss/tendril.png differ
diff --git a/icons/UI_Icons/Achievements/Misc/clownking.png b/icons/UI_Icons/Achievements/Misc/clownking.png
new file mode 100644
index 00000000000..7260c34dcdd
Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/clownking.png differ
diff --git a/icons/UI_Icons/Achievements/Misc/clownthanks.png b/icons/UI_Icons/Achievements/Misc/clownthanks.png
new file mode 100644
index 00000000000..214a4e0a74d
Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/clownthanks.png differ
diff --git a/icons/UI_Icons/Achievements/Misc/featofstrength.png b/icons/UI_Icons/Achievements/Misc/featofstrength.png
new file mode 100644
index 00000000000..5cfc5240bd1
Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/featofstrength.png differ
diff --git a/icons/UI_Icons/Achievements/Misc/helbital.png b/icons/UI_Icons/Achievements/Misc/helbital.png
new file mode 100644
index 00000000000..10b5efdd5e6
Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/helbital.png differ
diff --git a/icons/UI_Icons/Achievements/Misc/jackpot.png b/icons/UI_Icons/Achievements/Misc/jackpot.png
new file mode 100644
index 00000000000..e171c5cb7c9
Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/jackpot.png differ
diff --git a/icons/UI_Icons/Achievements/Misc/longshift.png b/icons/UI_Icons/Achievements/Misc/longshift.png
new file mode 100644
index 00000000000..5f511e21fd5
Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/longshift.png differ
diff --git a/icons/UI_Icons/Achievements/Misc/meteors.png b/icons/UI_Icons/Achievements/Misc/meteors.png
new file mode 100644
index 00000000000..5e6d4bc9bd7
Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/meteors.png differ
diff --git a/icons/UI_Icons/Achievements/Misc/rule8.png b/icons/UI_Icons/Achievements/Misc/rule8.png
new file mode 100644
index 00000000000..2bc518d5ab5
Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/rule8.png differ
diff --git a/icons/UI_Icons/Achievements/Misc/timewaste.png b/icons/UI_Icons/Achievements/Misc/timewaste.png
new file mode 100644
index 00000000000..24d23025fb0
Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/timewaste.png differ
diff --git a/icons/UI_Icons/Achievements/Misc/upgrade.png b/icons/UI_Icons/Achievements/Misc/upgrade.png
new file mode 100644
index 00000000000..e73bb512eb1
Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/upgrade.png differ
diff --git a/icons/UI_Icons/Achievements/Skills/mining.png b/icons/UI_Icons/Achievements/Skills/mining.png
new file mode 100644
index 00000000000..7d87d135b43
Binary files /dev/null and b/icons/UI_Icons/Achievements/Skills/mining.png differ
diff --git a/icons/UI_Icons/Achievements/baseboss.png b/icons/UI_Icons/Achievements/baseboss.png
new file mode 100644
index 00000000000..df2227b391d
Binary files /dev/null and b/icons/UI_Icons/Achievements/baseboss.png differ
diff --git a/icons/UI_Icons/Achievements/basemisc.png b/icons/UI_Icons/Achievements/basemisc.png
new file mode 100644
index 00000000000..1346d1c001d
Binary files /dev/null and b/icons/UI_Icons/Achievements/basemisc.png differ
diff --git a/icons/UI_Icons/Achievements/baseskill.png b/icons/UI_Icons/Achievements/baseskill.png
new file mode 100644
index 00000000000..de6ff8a2e5f
Binary files /dev/null and b/icons/UI_Icons/Achievements/baseskill.png differ
diff --git a/icons/UI_Icons/Achievements/default.png b/icons/UI_Icons/Achievements/default.png
index 0572262dfb8..852298aa0c5 100644
Binary files a/icons/UI_Icons/Achievements/default.png and b/icons/UI_Icons/Achievements/default.png differ
diff --git a/icons/emoji.dmi b/icons/emoji.dmi
index 5b45a892c23..84cc8bbb90b 100644
Binary files a/icons/emoji.dmi and b/icons/emoji.dmi differ
diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi
index 06a04e3d47f..4a5765cf9bf 100644
Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ
diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi
index 6999b223b99..c8e324d4bd2 100644
Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ
diff --git a/icons/mob/clothing/underwear.dmi b/icons/mob/clothing/underwear.dmi
index 4f0638f5893..cdecf549640 100644
Binary files a/icons/mob/clothing/underwear.dmi and b/icons/mob/clothing/underwear.dmi differ
diff --git a/icons/mob/inhands/equipment/tools_lefthand.dmi b/icons/mob/inhands/equipment/tools_lefthand.dmi
index 03bcfc1df1e..030d0db9d1d 100644
Binary files a/icons/mob/inhands/equipment/tools_lefthand.dmi and b/icons/mob/inhands/equipment/tools_lefthand.dmi differ
diff --git a/icons/mob/inhands/equipment/tools_righthand.dmi b/icons/mob/inhands/equipment/tools_righthand.dmi
index 201d27d8a89..37d53c92bdd 100644
Binary files a/icons/mob/inhands/equipment/tools_righthand.dmi and b/icons/mob/inhands/equipment/tools_righthand.dmi differ
diff --git a/icons/obj/artstuff.dmi b/icons/obj/artstuff.dmi
index ea24341f5e0..4ec2c066a95 100644
Binary files a/icons/obj/artstuff.dmi and b/icons/obj/artstuff.dmi differ
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index 6845aa97106..a83172612f5 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi
index 68078bc84b1..2ab80ac0ceb 100644
Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index 8ad974fbffb..1b10515d10a 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index 18097dcf81f..f892ed17f0d 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/machines/wayfinding.dmi b/icons/obj/machines/wayfinding.dmi
new file mode 100644
index 00000000000..678b67231be
Binary files /dev/null and b/icons/obj/machines/wayfinding.dmi differ
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 17ebcf6b4c9..c3c9efe8a1f 100755
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi
index 7d2b7ce0710..2259f47dc5c 100644
Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ
diff --git a/interface/menu.dm b/interface/menu.dm
index 547c2edfc1d..2e54fa32a43 100644
--- a/interface/menu.dm
+++ b/interface/menu.dm
@@ -69,8 +69,8 @@ GLOBAL_LIST_EMPTY(menulist)
if (!verbpath || !(verbpath in typesof("[type]/verb")))
return
- if (copytext(verbpath.name,1,2) == "@")
- winset(C, null, list2params(list("command" = copytext(verbpath.name,2))))
+ if(verbpath.name[1] == "@")
+ winset(C, null, list2params(list("command" = copytext(verbpath.name, length(verbpath.name[1]) + 1))))
else
winset(C, null, list2params(list("command" = replacetext(verbpath.name, " ", "-"))))
diff --git a/strings/arcade.json b/strings/arcade.json
index ce8f4a8d290..bff64234e9b 100644
--- a/strings/arcade.json
+++ b/strings/arcade.json
@@ -12,7 +12,27 @@
"Griffing",
"Lord",
"Professor",
- "Space"
+ "Space",
+ "Unrobust"
+ ],
+
+ "rpg_adjective_valentines": [
+ "Amorous",
+ "Aphrodisiac",
+ "Carnal",
+ "Forever Alone",
+ "Infatuated",
+ "Jilted",
+ "Lascivious",
+ "Lewd",
+ "Lovelorn",
+ "Lusty",
+ "Moonstruck",
+ "Recently Dumped",
+ "Salacious",
+ "Sexy",
+ "Smitten",
+ "Steamy"
],
"rpg_adjective_halloween": [
@@ -49,6 +69,7 @@
"rpg_adjective_xmas": [
"Bleak Midwinter",
"Blustery",
+ "Chilly",
"Frostbitten",
"Jolly",
"Icy",
@@ -64,11 +85,12 @@
"Defeat",
"Destroy",
"Mutilate",
+ "Nuke",
"Own",
+ "Perma",
"Pwn",
"Pulverize",
"Robust",
- "Romance",
"Save",
"Stop",
"Strike",
@@ -76,6 +98,18 @@
"Yeet"
],
+ "rpg_action_valentines": [
+ "Bewitch",
+ "Crush",
+ "Cuddle",
+ "Divorce",
+ "ERP",
+ "Romance",
+ "Seduce",
+ "Smooch",
+ "Titillate"
+ ],
+
"rpg_action_halloween": [
"Amputate",
"Behead",
@@ -97,6 +131,7 @@
"Jingle",
"Nutcrack",
"Regift",
+ "Snowplow",
"Stuff",
"Unwrap",
"Wassail"
@@ -105,6 +140,7 @@
"rpg_enemy": [
"Administrator",
"Bloopers",
+ "Coder",
"Crushulon",
"Ectoplasm",
"ERPer",
@@ -114,14 +150,30 @@
"Lizard Man",
"Mecha-Gondola",
"Peteoid",
+ "Powergamer",
"Slime",
"Syndie",
+ "Tider",
"Uhangoid",
"Unicorn",
"Tunnel Clown",
"Vhakoid"
],
+ "rpg_enemy_valentines": [
+ "Aphrodite",
+ "Comdom",
+ "Ex-Boyfriend",
+ "Ex-Girlfriend",
+ "Husbando",
+ "Maneater",
+ "Spess Casanova",
+ "Spess Don Juan",
+ "St. Valentine",
+ "Waifu",
+ "Xenomorph Maid"
+ ],
+
"rpg_enemy_halloween": [
"Artificer",
"Banshee",
@@ -136,6 +188,7 @@
"Graverobber",
"Headless Horseman",
"Juggernaut",
+ "Mr. Bones",
"Necromancer",
"Poltergeist",
"Reaper",
@@ -154,6 +207,7 @@
"Abominable Snowman",
"Der Klown",
"Elf",
+ "Elf on the Shelf",
"Festivus Pole",
"Ghost of Your Future",
"Grinch",
@@ -170,7 +224,9 @@
"bike horn",
"broken bottle",
"chef's knife",
+ "circular saw",
"claymore",
+ "cleaver",
"crowbar",
"curator's whip",
"fire axe",
@@ -181,23 +237,42 @@
"null rod",
"potted plant",
"rolling pin",
+ "scalpel",
"screwdriver",
"stunprod",
- "toolbox"
+ "toolbox",
+ "welder"
+ ],
+
+ "rpg_weapon_valentines": [
+ "bouquet of deathnettles",
+ "candy-heart shotgun",
+ "cupid's arrow",
+ "declaration of anguished feelings",
+ "razor-sharp breakup letter",
+ "still-beating heart",
+ "thorny rose",
+ "toolbox of chocolates"
],
"rpg_weapon_halloween": [
"chainsaw",
+ "heavy gravestone",
"lit jack-o-lantern",
"machete",
"silver dagger",
"skeleton femur",
+ "spectral blade",
"wooden stake"
],
"rpg_weapon_xmas": [
+ "bike horn playing carols",
+ "blunt fruitcake",
"box cutter",
"Christmas-light garrotte",
+ "festivus polearm",
+ "rejected present",
"sharpened icicle",
"sprig of mistletoe",
"thrown snowball",
diff --git a/strings/tips.txt b/strings/tips.txt
index 1b707a2e67b..e9fe56c0475 100644
--- a/strings/tips.txt
+++ b/strings/tips.txt
@@ -147,7 +147,7 @@ As the Chaplain, your null rod has anti magic functions: it can destroy cultist
As the Chaplain, your bible is also a container that can store small items. Depending on your god, your starting bible may come with a surprise!
As the Chaplain, you are much more likely to get a response by praying to the gods than most people. To boost your chances, make altars with colorful crayon runes, lit candles, and wire art.
As a Botanist, you can hack the MegaSeed Vendor to get access to more exotic seeds. These seeds can alternatively be ordered from cargo.
-As a Botanist, you can mutate the plants growing in your hydroponics trays with unstable mutagen or, as an alternative, crude radioactives from chemistry to get special variations.
+As a Botanist, you can mutate the plants growing in your hydroponics trays with unstable mutagen from chemistry or, as an alternative, grow glowshrooms for their radium which also mutates plants to start you up! You can also take uranium out of the servicelathe and grind that up to mutate plants, isn't science amazing?
As a Botanist, you should look into increasing the potency of your plants. This increases the size, amount of chemicals, points gained from grinding them in the biogenerator, and lets people know you are a proficient botanist.
As a Botanist, you can combine production trait chemicals just like a Chemist. Chlorine (blumpkin) + radium and phosphorus (glowshrooms) equals unstable mutagen!
As a Cook, you can load your food into snack vending machines.
diff --git a/strings/valentines.json b/strings/valentines.json
index 50afaff64c3..18442c89008 100644
--- a/strings/valentines.json
+++ b/strings/valentines.json
@@ -2,7 +2,7 @@
"valentines": [
"Roses are red / Violets are good / One day while Andy...",
"My love for you is like the singularity. It cannot be contained.",
- "Will you be my lusty xenomorph maid?",
+ "You make me lustier than a xenomorph maid.",
"We go together like the clown and the external airlock.",
"Roses are red / Liches are wizards / I love you more than a whole squad of lizards.",
"Be my valentine. Law 2.",
@@ -10,16 +10,15 @@
"I love you like Ian loves the HoP.",
"You're hotter than a plasma fire in toxins.",
"We must have a wizard, because your face summoned magic.",
- "Are you a rogue atmos tech? Because you're taking my breath away.",
+ "Are you a hull breach? Because you're taking my breath away.",
+ "I'm not the atmos tech, but I'm great at laying pipe.",
"Could I have all access... to your heart?",
- "Call me the doctor, because I'm here to inspect your johnson.",
+ "Call me the medical doctor, because I'm here to inspect your johnson.",
"Quick, get the defibrillator! I saw you and my heart stopped.",
"I'm not a changeling, but you make my proboscis extend.",
"I just can't get EI NATH of you.",
- "You must be a nuke op, because you make my heart explode.",
- "Roses are red / Botany is a farm / Not being my Valentine / causes human harm.",
+ "Roses are red / Intents are disarm / Not being my Valentine / causes human harm.",
"I want you more than an assistant wants the captain's spare.",
- "Good thing I wore insulated gloves, because you're too hot to handle!",
"If I was a security officer, I'd brig you all shift.",
"Are you the janitor? Because I think I've fallen for you.",
"You're always valid to my heart.",
@@ -28,37 +27,37 @@
"Someone check the gravitational generator, because I'm only attracted to you.",
"If I were the warden I'd always let you into my armory.",
"The virologist is rogue, and the only cure is a kiss from you.",
- "Would you spend some time in my upgraded sleeper?",
"You must be a silicon, because you've unbolted my heart.",
+ "There's no way you're rogue -- you're a fine piece of Asimov.",
"Are you Nar'Sie? Because there's nar-one else I sie.",
- "If you were a taser, you'd be set to stunning.",
+ "You're more stunning than the entire armory.",
"Do you have stamina damage from running through my dreams?",
- "If I were a xenomorph, would you let me hug you?",
"My love for you is stronger than a reinforced wall.",
"This must be the captain's office, because I see a fox.",
"I'm no highlander, but there can only be one for me.",
"The floor is made of lava! Quick, get on my bed.",
- "Are you bluespace artillery? Because you blow me away.",
"If you were an abandoned station you'd be the DEARelict.",
"If you had an ore bag you'd be a shaft FINEr.",
"I must be the CMO, 'cause I saw you on my CUTE sensors.",
+ "If you were a weather event you'd be an aurora BAElus.",
"Let's call the emergency CUDDLE.",
- "If you were an engineer you'd have insulated LOVEs.",
+ "Recall the shuttle, I want to stay here with you.",
"Could you put your DNA inside my vault?",
- "Roses are red, tide is gray, if I were an assistant I'd steal you away.",
- "Roses are red, text is green, I love you more than cleanbots clean.",
- "Roses are red, shuttles go dockside, I want to know you better than carbon dioxide.",
- "Roses are red, carnations are pink. Let's go out like the lights in a powersink.",
+ "Roses are red / Tide is gray / If I were an assistant I'd steal you away.",
+ "Roses are red / Text is green / I love you more than cleanbots clean.",
+ "Roses are red / Shuttles go dockside / I want to know you better than carbon dioxide.",
+ "Roses are red / Brute kits are pink / Let's go out like the lights in a powersink.",
+ "Roses are red / The hallways are dirty / I'll never leave your side / Just like shitcurity.",
+ "Roses are red / Clowns have a horn / You turn me on / More than library porn.",
"If you were a carp I'd fi-lay you.",
- "I'm a nuke op, and my pinpointer leads to your heart.",
+ "My pinpointer only leads to your heart.",
"Is that an esword in your pocket, or are you excited to see me?",
"I've been chasing you like Runtime chases a laser pointer.",
"I'm no cat, but you've got me in my feel-inids.",
"If Lavaland had an apiary, would you bee mine?",
"If you were a disposal bin I'd ride you all day.",
- "Put on your explorer's suit because I'm taking you to LOVEaland.",
- "You're the vomit to my flyperson.",
- "Get the ore redemptor, because I've just discovered girlfriend material.",
+ "You're the vomit to my goose.",
+ "Get me my ore bag, I just found girlfriend material.",
"You must be liquid dark matter, because you're pulling me closer.",
"Not even sorium can drive me away from you.",
"Wanna make like a borg and do some heavy petting?",
@@ -70,14 +69,35 @@
"Wanna raid my tool storage?",
"You must be a moth, because you set my heart aflutter.",
"I'm the QM, and my highest priority bounty is your love.",
- "Are you wearing space pants? I wish you weren't.",
+ "Are you wearing space pants? Because I want to space your pants.",
"You give me a positive moodlet.",
"Let's make like swarmers and reproduce.",
- "If you were a drone, would you be free tonight?"
+ "If you were a drone, would you be free tonight?",
+ "Get the paramedics -- your body put me into crit!",
+ "Come to the incinerator and be my maint squeeze.",
+ "Come to the courtroom so we can spend some time alone.",
+ "I'm the gray tide -- may I take your hand tele?",
+ "If I were a clown car, would you come inside me?",
+ "If you were telecoms, would you go down on me?",
+ "Your face gets me higher than omega weed.",
+ "Someone check the tachyon doppler array, because you just rocked my world.",
+ "I wish I were your family heirloom so I could be with you all the time.",
+ "How much damage does a toxins bomb do? Enough to break the ice.",
+ "Call me a gibtonite deposit, because I've got a lot of love to gib tonite.",
+ "I don't need an ion cannon, I've got my ion you.",
+ "I don't need the chef's cooking when you're such a snack!",
+ "Does the Chaplain know there's a goddess on board?",
+ "The captain just ordered Build Your Own Shuttle -- guess you'll have to sit on my face.",
+ "Let's get to a pod and share our internals.",
+ "Stand still so I can set your face to Wanted.",
+ "Did you just go through the teleporter? Because you're looking pretty fly.",
+ "Nice jumpsuit. It'd look even better thrown down disposals.",
+ "Heat up 5 parts cream, 5 parts lizard wine, and 1 part strange reagent to 374K, and you'll know what I can do for you."
],
"candyhearts": [
"A heart-shaped candy that reads: HONK ME",
+ "A heart-shaped candy that reads: BWOINK ME",
"A heart-shaped candy that reads: ERP",
"A heart-shaped candy that reads: LEWD",
"A heart-shaped candy that reads: LUSTY",
@@ -97,6 +117,11 @@
"A heart-shaped candy that reads: WAG MY TAIL",
"A heart-shaped candy that reads: PDA",
"A heart-shaped candy that reads: DEVILS KISS",
- "A heart-shaped candy that reads: CHEMISTRY"
+ "A heart-shaped candy that reads: CHEMISTRY",
+ "A heart-shaped candy that reads: CLUSTERBANG",
+ "A heart-shaped candy that reads: OBSESSED",
+ "A heart-shaped candy that reads: ROMANTIC MOODLET",
+ "A heart-shaped candy that reads: WAIFU",
+ "A heart-shaped candy that reads: YOU'RE PURRFECT"
]
}
diff --git a/tgstation.dme b/tgstation.dme
index 2f943989c6b..d0f63548914 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -351,6 +351,7 @@
#include "code\datums\achievements\boss_achievements.dm"
#include "code\datums\achievements\boss_scores.dm"
#include "code\datums\achievements\misc_achievements.dm"
+#include "code\datums\achievements\skill_achievements.dm"
#include "code\datums\actions\beam_rifle.dm"
#include "code\datums\actions\ninja.dm"
#include "code\datums\atmosphere\_atmosphere.dm"
@@ -2854,6 +2855,7 @@
#include "code\modules\surgery\plastic_surgery.dm"
#include "code\modules\surgery\prosthetic_replacement.dm"
#include "code\modules\surgery\remove_embedded_object.dm"
+#include "code\modules\surgery\stomachpump.dm"
#include "code\modules\surgery\surgery.dm"
#include "code\modules\surgery\surgery_helpers.dm"
#include "code\modules\surgery\surgery_step.dm"
diff --git a/tgui-next/packages/tgui/interfaces/Canvas.js b/tgui-next/packages/tgui/interfaces/Canvas.js
new file mode 100644
index 00000000000..0955aedc3bf
--- /dev/null
+++ b/tgui-next/packages/tgui/interfaces/Canvas.js
@@ -0,0 +1,90 @@
+import { Fragment } from 'inferno';
+import { useBackend } from '../backend';
+import { Box } from '../components';
+import { Component, createRef } from 'inferno';
+import { pureComponentHooks } from 'common/react';
+
+
+class PaintCanvas extends Component {
+ constructor(props) {
+ super(props);
+ this.canvasRef = createRef();
+ this.onCVClick = props.onCanvasClick;
+ }
+
+ componentDidMount() {
+ this.drawCanvas(this.props);
+ }
+
+ componentDidUpdate() {
+ this.drawCanvas(this.props);
+ }
+
+ drawCanvas(propSource) {
+ const ctx = this.canvasRef.current.getContext("2d");
+ const grid = propSource.value;
+ const x_size = grid.length;
+ if (!x_size) {
+ return;
+ }
+ const y_size = grid[0].length;
+ const x_scale = Math.round(this.canvasRef.current.width / x_size);
+ const y_scale = Math.round(this.canvasRef.current.height / y_size);
+ ctx.save();
+ ctx.scale(x_scale, y_scale);
+ for (let x = 0; x < grid.length; x++) {
+ const element = grid[x];
+ for (let y = 0; y < element.length; y++) {
+ const color = element[y];
+ ctx.fillStyle = color;
+ ctx.fillRect(x, y, 1, 1);
+ }
+ }
+ ctx.restore();
+ }
+
+ clickwrapper(event) {
+ const x_size = this.props.value.length;
+ if (!x_size)
+ {
+ return;
+ }
+ const y_size = this.props.value[0].length;
+ const x_scale = this.canvasRef.current.width / x_size;
+ const y_scale = this.canvasRef.current.height / y_size;
+ const x = Math.floor(event.offsetX / x_scale)+1;
+ const y = Math.floor(event.offsetY / y_scale)+1;
+ this.onCVClick(x, y);
+ }
+
+ render() {
+ const {
+ res = 1,
+ value,
+ px_per_unit = 28,
+ ...rest
+ } = this.props;
+ const x_size = value.length * px_per_unit;
+ const y_size = x_size !== 0 ? value[0].length * px_per_unit : 0;
+ return (
+
+ );
+ }
+}
+export const Canvas = props => {
+ const { act, data } = useBackend(props);
+ return (
+
+ act("paint", { x, y })} />
+ {data.name}
+ );
+};
diff --git a/tgui-next/packages/tgui/interfaces/Smes.js b/tgui-next/packages/tgui/interfaces/Smes.js
index 5fe71f87c8e..7479af58941 100644
--- a/tgui-next/packages/tgui/interfaces/Smes.js
+++ b/tgui-next/packages/tgui/interfaces/Smes.js
@@ -1,6 +1,6 @@
import { Fragment } from 'inferno';
import { useBackend } from '../backend';
-import { Box, Button, LabeledList, ProgressBar, Section } from '../components';
+import { Box, Button, NumberInput, LabeledList, ProgressBar, Section } from '../components';
export const Smes = props => {
const { act, data } = useBackend(props);
@@ -75,6 +75,17 @@ export const Smes = props => {
onClick={() => act('input', {
adjust: -10000,
})} />
+ {
+ return act('input', {
+ target: value*1000,
+ });
+ }} />