"
output += ruler
- usr << browse({"[output]"}, "window=browse_messages;size=900x500")
+ usr << browse({"[jointext(output, "")]"}, "window=browse_messages;size=900x500")
-proc/get_message_output(type, target_ckey)
+/proc/get_message_output(type, target_ckey)
if(!SSdbcore.Connect())
to_chat(usr, "Failed to establish database connection.")
return
@@ -320,6 +357,7 @@ proc/get_message_output(type, target_ckey)
query += " AND targetckey = '[target_ckey]'"
var/datum/DBQuery/query_get_message_output = SSdbcore.NewQuery(query)
if(!query_get_message_output.warn_execute())
+ qdel(query_get_message_output)
return
while(query_get_message_output.NextRow())
var/message_id = query_get_message_output.item[1]
@@ -333,7 +371,10 @@ proc/get_message_output(type, target_ckey)
output += " [text] "
var/datum/DBQuery/query_message_read = SSdbcore.NewQuery("UPDATE [format_table_name("messages")] SET type = 'message sent' WHERE id = [message_id]")
if(!query_message_read.warn_execute())
+ qdel(query_get_message_output)
+ qdel(query_message_read)
return
+ qdel(query_message_read)
if("watchlist entry")
message_admins("Notice: [key_name_admin(target_ckey)] has been on the watchlist since [timestamp] and has just connected - Reason: [text]")
send2irc_adminless_only("Watchlist", "[key_name(target_ckey)] is on the watchlist and has just connected - Reason: [text]")
@@ -342,6 +383,7 @@ proc/get_message_output(type, target_ckey)
if(editor_ckey)
output += " Last edit by [editor_ckey] (Click here to see edit log)"
output += " [text] "
+ qdel(query_get_message_output)
return output
#define NOTESFILE "data/player_notes.sav"
@@ -366,9 +408,11 @@ proc/get_message_output(type, target_ckey)
var/admin_ckey = note.group[3]
var/datum/DBQuery/query_convert_time = SSdbcore.NewQuery("SELECT ADDTIME(STR_TO_DATE('[timestamp]','%d-%b-%Y'), '0')")
if(!query_convert_time.Execute())
+ qdel(query_convert_time)
return
if(query_convert_time.NextRow())
timestamp = query_convert_time.item[1]
+ qdel(query_convert_time)
if(ckey && notetext && timestamp && admin_ckey && server)
create_message("note", ckey, admin_ckey, notetext, timestamp, server, 1, 0)
notesfile.cd = "/"
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index c8b62bae9e..7cba469019 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -74,7 +74,7 @@
message_admins("[key_name_admin(usr)] tried to create traitors. Unfortunately, there were no candidates available.")
log_admin("[key_name(usr)] failed to create traitors.")
if("changelings")
- if(src.makeChanglings())
+ if(src.makeChangelings())
message_admins("[key_name(usr)] created changelings.")
log_admin("[key_name(usr)] created changelings.")
else
@@ -447,6 +447,8 @@
if("Yes")
delmob = 1
+ log_admin("[key_name(usr)] has used rudimentary transformation on [key_name(M)]. Transforming to [href_list["simplemake"]].; deletemob=[delmob]")
+ message_admins("[key_name_admin(usr)] has used rudimentary transformation on [key_name_admin(M)]. Transforming to [href_list["simplemake"]].; deletemob=[delmob]")
switch(href_list["simplemake"])
if("observer")
M.change_mob_type( /mob/dead/observer , null, null, delmob )
@@ -499,8 +501,6 @@
M.change_mob_type( /mob/living/simple_animal/hostile/construct/wraith , null, null, delmob )
if("shade")
M.change_mob_type( /mob/living/simple_animal/shade , null, null, delmob )
- log_admin("[key_name(usr)] has used rudimentary transformation on [key_name(M)]. Transforming to [href_list["simplemake"]].; deletemob=[delmob]")
- message_admins("[key_name_admin(usr)] has used rudimentary transformation on [key_name_admin(M)]. Transforming to [href_list["simplemake"]].; deletemob=[delmob]")
/////////////////////////////////////new ban stuff
@@ -1058,14 +1058,21 @@
if(!check_rights(R_ADMIN))
return
var/mob/M = locate(href_list["boot2"])
- if (ismob(M))
+ if(ismob(M))
if(!check_if_greater_rights_than(M.client))
to_chat(usr, "Error: They have more rights than you do.")
return
+ if(alert(usr, "Kick [key_name(M)]?", "Confirm", "Yes", "No") != "Yes")
+ return
+ if(!M)
+ to_chat(usr, "Error: [M] no longer exists!")
+ return
+ if(!M.client)
+ to_chat(usr, "Error: [M] no longer has a client!")
+ return
to_chat(M, "You have been kicked from the server by [usr.client.holder.fakekey ? "an Administrator" : "[usr.client.ckey]"].")
log_admin("[key_name(usr)] kicked [key_name(M)].")
message_admins("[key_name_admin(usr)] kicked [key_name_admin(M)].")
- //M.client = null
qdel(M.client)
else if(href_list["addmessage"])
@@ -1193,10 +1200,13 @@
var/message_id = sanitizeSQL("[href_list["messageedits"]]")
var/datum/DBQuery/query_get_message_edits = SSdbcore.NewQuery("SELECT edits FROM [format_table_name("messages")] WHERE id = '[message_id]'")
if(!query_get_message_edits.warn_execute())
+ qdel(query_get_message_edits)
return
if(query_get_message_edits.NextRow())
var/edit_log = query_get_message_edits.item[1]
- usr << browse(edit_log,"window=noteedits")
+ if(!QDELETED(usr))
+ usr << browse(edit_log,"window=noteedits")
+ qdel(query_get_message_edits)
else if(href_list["newban"])
if(!check_rights(R_BAN))
@@ -1815,43 +1825,25 @@
usr.client.smite(H)
else if(href_list["CentComReply"])
- var/mob/living/carbon/human/H = locate(href_list["CentComReply"]) in GLOB.mob_list
- if(!istype(H))
- to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
- return
- if(!istype(H.ears, /obj/item/radio/headset))
- to_chat(usr, "The person you are trying to contact is not wearing a headset.")
+ if(!check_rights(R_ADMIN))
return
- message_admins("[src.owner] has started answering [key_name(H)]'s CentCom request.")
- var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from CentCom", "")
- if(!input)
- message_admins("[src.owner] decided not to answer [key_name(H)]'s CentCom request.")
- return
-
- log_admin("[src.owner] replied to [key_name(H)]'s CentCom message with the message [input].")
- message_admins("[src.owner] replied to [key_name(H)]'s CentCom message with: \"[input]\"")
- to_chat(H, "You hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from Central Command. Message as follows. [input]. Message ends.\"")
+ var/mob/M = locate(href_list["CentComReply"])
+ usr.client.admin_headset_message(M, "CentCom")
else if(href_list["SyndicateReply"])
- var/mob/living/carbon/human/H = locate(href_list["SyndicateReply"])
- if(!istype(H))
- to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human.")
- return
- if(!istype(H.ears, /obj/item/radio/headset))
- to_chat(usr, "The person you are trying to contact is not wearing a headset.")
+ if(!check_rights(R_ADMIN))
return
- message_admins("[src.owner] has started answering [key_name(H)]'s syndicate request.")
- var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from The Syndicate", "")
- if(!input)
- message_admins("[src.owner] decided not to answer [key_name(H)]'s syndicate request.")
+ var/mob/M = locate(href_list["SyndicateReply"])
+ usr.client.admin_headset_message(M, "Syndicate")
+
+ else if(href_list["HeadsetMessage"])
+ if(!check_rights(R_ADMIN))
return
- to_chat(src.owner, "You sent [input] to [H] via a secure channel.")
- log_admin("[src.owner] replied to [key_name(H)]'s Syndicate message with the message [input].")
- message_admins("[src.owner] replied to [key_name(H)]'s Syndicate message with: \"[input]\"")
- to_chat(H, "You hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from your benefactor. Message as follows, agent. [input]. Message ends.\"")
+ var/mob/M = locate(href_list["HeadsetMessage"])
+ usr.client.admin_headset_message(M)
else if(href_list["reject_custom_name"])
if(!check_rights(R_ADMIN))
@@ -1905,7 +1897,7 @@
to_chat(usr, "This can only be used on instances of type /mob.")
return
- show_individual_logging_panel(M, href_list["log_type"])
+ show_individual_logging_panel(M, href_list["log_src"], href_list["log_type"])
else if(href_list["languagemenu"])
if(!check_rights(R_ADMIN))
return
@@ -2014,10 +2006,9 @@
var/X = offset.len > 0 ? text2num(offset[1]) : 0
var/Y = offset.len > 1 ? text2num(offset[2]) : 0
var/Z = offset.len > 2 ? text2num(offset[3]) : 0
- var/tmp_dir = href_list["object_dir"]
- var/obj_dir = tmp_dir ? text2num(tmp_dir) : 2
- if(!obj_dir || !(obj_dir in list(1,2,4,8,5,6,9,10)))
- obj_dir = 2
+ var/obj_dir = text2num(href_list["object_dir"])
+ if(obj_dir && !(obj_dir in list(1,2,4,8,5,6,9,10)))
+ obj_dir = null
var/obj_name = sanitize(href_list["object_name"])
@@ -2060,9 +2051,10 @@
N.name = obj_name
else
var/atom/O = new path(target)
- if(O)
- O.admin_spawned = TRUE
- O.setDir(obj_dir)
+ if(!QDELETED(O))
+ O.flags_1 |= ADMIN_SPAWNED_1
+ if(obj_dir)
+ O.setDir(obj_dir)
if(obj_name)
O.name = obj_name
if(ismob(O))
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
index a19ab3c100..54af4b5167 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
@@ -54,6 +54,7 @@
return
var/list/refs = list()
+ var/where_used = FALSE
for(var/list/query_tree in querys)
var/list/from_objs = list()
var/list/select_types = list()
@@ -82,6 +83,7 @@
objs_all = objs.len
if("where" in query_tree)
+ where_used = TRUE
var/objs_temp = objs
objs = list()
for(var/datum/d in objs_temp)
@@ -119,7 +121,7 @@
var/end_time = REALTIMEOFDAY
end_time -= start_time
return list("SDQL query results: [query_text]",\
- "SDQL query completed: [objs_all] objects selected by path, and [objs_eligible] objects executed on after WHERE filtering if applicable.",\
+ "SDQL query completed: [objs_all] objects selected by path, and [where_used ? objs_eligible : objs_all] objects executed on after WHERE filtering if applicable.",\
"SDQL query took [DisplayTimeText(end_time)] to complete.") + refs
/proc/SDQL_qdel_datum(datum/d)
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index f385cdc1bd..bef39c29ca 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -256,7 +256,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
/datum/admin_help/proc/MessageNoRecipient(msg)
var/ref_src = "[REF(src)]"
//Message to be sent to all admins
- var/admin_msg = "Ticket [TicketHref("#[id]", ref_src)]: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]: [keywords_lookup(msg)]"
+ var/admin_msg = "Ticket [TicketHref("#[id]", ref_src)]: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]:[keywords_lookup(msg)]"
AddInteraction("[LinkedReplyName(ref_src)]: [msg]")
@@ -268,7 +268,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
to_chat(X, admin_msg)
//show it to the person adminhelping too
- to_chat(initiator, "PM to-Admins: [msg]")
+ to_chat(initiator, "PM to-Admins: [msg]")
//Reopen a closed ticket
/datum/admin_help/proc/Reopen()
diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm
index 0136efc3b3..6dcd4e98ca 100644
--- a/code/modules/admin/verbs/adminjump.dm
+++ b/code/modules/admin/verbs/adminjump.dm
@@ -20,8 +20,8 @@
to_chat(src, "Nowhere to jump to!")
return
usr.forceMove(T)
- log_admin("[key_name(usr)] jumped to [A]")
- message_admins("[key_name_admin(usr)] jumped to [A]")
+ log_admin("[key_name(usr)] jumped to [AREACOORD(A)]")
+ message_admins("[key_name_admin(usr)] jumped to [AREACOORD(A)]")
SSblackbox.record_feedback("tally", "admin_verb", 1, "Jump To Area") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/jumptoturf(turf/T in world)
@@ -31,8 +31,8 @@
to_chat(src, "Only administrators may use this command.")
return
- log_admin("[key_name(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]")
- message_admins("[key_name_admin(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]")
+ log_admin("[key_name(usr)] jumped to [AREACOORD(T)]")
+ message_admins("[key_name_admin(usr)] jumped to [AREACOORD(T)]")
usr.forceMove(T)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Jump To Turf") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return
@@ -46,7 +46,7 @@
return
log_admin("[key_name(usr)] jumped to [key_name(M)]")
- message_admins("[key_name_admin(usr)] jumped to [key_name_admin(M)]")
+ message_admins("[key_name_admin(usr)] jumped to [ADMIN_LOOKUPFLW(M)] at [AREACOORD(M)]")
if(src.mob)
var/mob/A = src.mob
var/turf/T = get_turf(M)
@@ -89,7 +89,7 @@
return
var/mob/M = selection.mob
log_admin("[key_name(usr)] jumped to [key_name(M)]")
- message_admins("[key_name_admin(usr)] jumped to [key_name_admin(M)]")
+ message_admins("[key_name_admin(usr)] jumped to [ADMIN_LOOKUPFLW(M)]")
usr.forceMove(M.loc)
@@ -104,8 +104,8 @@
return
var/atom/loc = get_turf(usr)
- log_admin("[key_name(usr)] teleported [key_name(M)] to [COORD(loc)]")
- var/msg = "[key_name_admin(usr)] teleported [key_name_admin(M)] to [ADMIN_COORDJMP(loc)]"
+ log_admin("[key_name(usr)] teleported [key_name(M)] to [AREACOORD(loc)]")
+ var/msg = "[key_name_admin(usr)] teleported [ADMIN_LOOKUPFLW(M)] to [ADMIN_VERBOSEJMP(loc)]"
message_admins(msg)
admin_ticket_log(M, msg)
M.forceMove(loc)
@@ -131,7 +131,7 @@
if(!M)
return
log_admin("[key_name(usr)] teleported [key_name(M)]")
- var/msg = "[key_name_admin(usr)] teleported [key_name_admin(M)]"
+ var/msg = "[key_name_admin(usr)] teleported [ADMIN_LOOKUPFLW(M)]"
message_admins(msg)
admin_ticket_log(M, msg)
if(M)
@@ -149,8 +149,8 @@
if(A && istype(A))
if(M.forceMove(safepick(get_area_turfs(A))))
- log_admin("[key_name(usr)] teleported [key_name(M)] to [A]")
- var/msg = "[key_name_admin(usr)] teleported [key_name_admin(M)] to [A]"
+ log_admin("[key_name(usr)] teleported [key_name(M)] to [AREACOORD(A)]")
+ var/msg = "[key_name_admin(usr)] teleported [ADMIN_LOOKUPFLW(M)] to [AREACOORD(A)]"
message_admins(msg)
admin_ticket_log(M, msg)
else
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 9a8172ea34..4d72f0a8e2 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -8,9 +8,6 @@
if(!holder)
to_chat(src, "Error: Admin-PM-Context: Only administrators may use this command.")
return
- if(holder && !check_rights(R_ADMIN, TRUE))
- to_chat(src, "Error: Admin-PM-Context: Only administrators may use this command.")
- return
if( !ismob(M) || !M.client )
return
cmd_admin_pm(M.client,null)
@@ -23,9 +20,6 @@
if(!holder)
to_chat(src, "Error: Admin-PM-Panel: Only administrators may use this command.")
return
- if(holder && !check_rights(R_ADMIN, TRUE))
- to_chat(src, "Error: Admin-PM-Context: Only administrators may use this command.")
- return
var/list/client/targets[0]
for(var/client/T)
if(T.mob)
@@ -151,15 +145,15 @@
var/keywordparsedmsg = keywords_lookup(msg)
if(irc)
- to_chat(src, "PM to-Admins: [rawmsg]")
+ to_chat(src, "PM to-Admins: [rawmsg]")
var/datum/admin_help/AH = admin_ticket_log(src, "Reply PM from-[key_name(src, TRUE, TRUE)] to IRC: [keywordparsedmsg]")
ircreplyamount--
send2irc("[AH ? "#[AH.id] " : ""]Reply: [ckey]", rawmsg)
else
if(recipient.holder)
if(holder) //both are admins
- to_chat(recipient, "Admin PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]")
- to_chat(src, "Admin PM to-[key_name(recipient, src, 1)]: [keywordparsedmsg]")
+ to_chat(recipient, "Admin PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]")
+ to_chat(src, "Admin PM to-[key_name(recipient, src, 1)]: [keywordparsedmsg]")
//omg this is dumb, just fill in both their tickets
var/interaction_message = "PM from-[key_name(src, recipient, 1)] to-[key_name(recipient, src, 1)]: [keywordparsedmsg]"
@@ -168,12 +162,12 @@
admin_ticket_log(recipient, interaction_message)
else //recipient is an admin but sender is not
- var/replymsg = "Reply PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]"
+ 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]")
+ to_chat(src, "PM to-Admins: [msg]")
- //play the recieving admin the adminhelp sound (if they have them enabled)
+ //play the receiving admin the adminhelp sound (if they have them enabled)
if(recipient.prefs.toggles & SOUND_ADMINHELP)
SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg'))
@@ -183,9 +177,9 @@
new /datum/admin_help(msg, recipient, TRUE)
to_chat(recipient, "-- Administrator private message --")
- to_chat(recipient, "Admin PM from-[key_name(src, recipient, 0)]: [msg]")
+ to_chat(recipient, "Admin PM from-[key_name(src, recipient, 0)]: [msg]")
to_chat(recipient, "Click on the administrator's name to reply.")
- to_chat(src, "Admin PM to-[key_name(recipient, src, 1)]: [msg]")
+ to_chat(src, "Admin PM to-[key_name(recipient, src, 1)]: [msg]")
admin_ticket_log(recipient, "PM From [key_name_admin(src)]: [keywordparsedmsg]")
diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm
index 82bbc27abc..bf39288511 100644
--- a/code/modules/admin/verbs/adminsay.dm
+++ b/code/modules/admin/verbs/adminsay.dm
@@ -12,10 +12,10 @@
log_talk(mob,"[key_name(src)] : [msg]",LOGASAY)
msg = keywords_lookup(msg)
if(check_rights(R_ADMIN,0))
- msg = "ADMIN:[key_name(usr, 1)] [ADMIN_FLW(mob)]: [msg]"
+ msg = "ADMIN:[key_name(usr, 1)] [ADMIN_FLW(mob)]: [msg]"
to_chat(GLOB.admins, msg)
else
- msg = "ADMIN:[key_name(usr, 1)] [ADMIN_FLW(mob)]: [msg]"
+ msg = "ADMIN:[key_name(usr, 1)] [ADMIN_FLW(mob)]: [msg]"
to_chat(GLOB.admins, msg)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Asay") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/admin/verbs/ak47s.dm b/code/modules/admin/verbs/ak47s.dm
index b2e62ed58f..561037060f 100644
--- a/code/modules/admin/verbs/ak47s.dm
+++ b/code/modules/admin/verbs/ak47s.dm
@@ -17,6 +17,6 @@ GLOBAL_VAR_INIT(terrorism, FALSE)
qdel(I)
var/obj/item/gun/energy/laser/LaserAK/AK = new(src)
if(!GLOB.terrorism)
- AK.admin_spawned = TRUE //To prevent announcing
+ AK.flags_1 |= ADMIN_SPAWNED_1 //To prevent announcing
put_in_hands(AK)
AK.pickup(src) //For the stun shielding
diff --git a/code/modules/admin/verbs/atmosdebug.dm b/code/modules/admin/verbs/atmosdebug.dm
index 1f14934065..75407eae9c 100644
--- a/code/modules/admin/verbs/atmosdebug.dm
+++ b/code/modules/admin/verbs/atmosdebug.dm
@@ -9,17 +9,17 @@
//all plumbing - yes, some things might get stated twice, doesn't matter.
for (var/obj/machinery/atmospherics/plumbing in GLOB.machines)
if (plumbing.nodealert)
- to_chat(usr, "Unconnected [plumbing.name] located at [ADMIN_COORDJMP(plumbing)] ([get_area(plumbing.loc)])")
+ to_chat(usr, "Unconnected [plumbing.name] located at [ADMIN_VERBOSEJMP(plumbing)]")
//Manifolds
for (var/obj/machinery/atmospherics/pipe/manifold/pipe in GLOB.machines)
if (!pipe.nodes[1] || !pipe.nodes[2] || !pipe.nodes[3])
- to_chat(usr, "Unconnected [pipe.name] located at [ADMIN_COORDJMP(pipe)] ([get_area(pipe.loc)])")
+ to_chat(usr, "Unconnected [pipe.name] located at [ADMIN_VERBOSEJMP(pipe)]")
//Pipes
for (var/obj/machinery/atmospherics/pipe/simple/pipe in GLOB.machines)
if (!pipe.nodes[1] || !pipe.nodes[2])
- to_chat(usr, "Unconnected [pipe.name] located at [ADMIN_COORDJMP(pipe)] ([get_area(pipe.loc)])")
+ to_chat(usr, "Unconnected [pipe.name] located at [ADMIN_VERBOSEJMP(pipe)]")
/client/proc/powerdebug()
set category = "Mapping"
@@ -33,9 +33,9 @@
if (!PN.nodes || !PN.nodes.len)
if(PN.cables && (PN.cables.len > 1))
var/obj/structure/cable/C = PN.cables[1]
- to_chat(usr, "Powernet with no nodes! (number [PN.number]) - example cable at [ADMIN_COORDJMP(C)] in area [get_area(C.loc)]")
+ to_chat(usr, "Powernet with no nodes! (number [PN.number]) - example cable at [ADMIN_VERBOSEJMP(C)]")
if (!PN.cables || (PN.cables.len < 10))
if(PN.cables && (PN.cables.len > 1))
var/obj/structure/cable/C = PN.cables[1]
- to_chat(usr, "Powernet with fewer than 10 cables! (number [PN.number]) - example cable at [ADMIN_COORDJMP(C)] in area [get_area(C.loc)]")
+ to_chat(usr, "Powernet with fewer than 10 cables! (number [PN.number]) - example cable at [ADMIN_VERBOSEJMP(C)]")
diff --git a/code/modules/admin/verbs/borgpanel.dm b/code/modules/admin/verbs/borgpanel.dm
index 8a162e7794..ec921e78bc 100644
--- a/code/modules/admin/verbs/borgpanel.dm
+++ b/code/modules/admin/verbs/borgpanel.dm
@@ -87,11 +87,11 @@
var/newcharge = input("New charge (0-[borg.cell.maxcharge]):", borg.name, borg.cell.charge) as num|null
if (newcharge)
borg.cell.charge = CLAMP(newcharge, 0, borg.cell.maxcharge)
- message_admins("[key_name_admin(user)] set the charge of [key_name_admin(borg)][ADMIN_FLW(borg)] to [borg.cell.charge].")
+ message_admins("[key_name_admin(user)] set the charge of [ADMIN_LOOKUPFLW(borg)] to [borg.cell.charge].")
log_admin("[key_name(user)] set the charge of [key_name(borg)] to [borg.cell.charge].")
if ("remove_cell")
QDEL_NULL(borg.cell)
- message_admins("[key_name_admin(user)] deleted the cell of [key_name_admin(borg)][ADMIN_FLW(borg)].")
+ message_admins("[key_name_admin(user)] deleted the cell of [ADMIN_LOOKUPFLW(borg)].")
log_admin("[key_name(user)] deleted the cell of [key_name(borg)].")
if ("change_cell")
var/chosen = pick_closest_path(null, make_types_fancy(typesof(/obj/item/stock_parts/cell)))
@@ -104,45 +104,45 @@
borg.cell = new_cell
borg.cell.charge = borg.cell.maxcharge
borg.diag_hud_set_borgcell()
- message_admins("[key_name_admin(user)] changed the cell of [key_name_admin(borg)][ADMIN_FLW(borg)] to [new_cell].")
+ message_admins("[key_name_admin(user)] changed the cell of [ADMIN_LOOKUPFLW(borg)] to [new_cell].")
log_admin("[key_name(user)] changed the cell of [key_name(borg)] to [new_cell].")
if ("toggle_emagged")
borg.SetEmagged(!borg.emagged)
if (borg.emagged)
- message_admins("[key_name_admin(user)] emagged [key_name_admin(borg)][ADMIN_FLW(borg)].")
+ message_admins("[key_name_admin(user)] emagged [ADMIN_LOOKUPFLW(borg)].")
log_admin("[key_name(user)] emagged [key_name(borg)].")
else
- message_admins("[key_name_admin(user)] un-emagged [key_name_admin(borg)][ADMIN_FLW(borg)].")
+ message_admins("[key_name_admin(user)] un-emagged [ADMIN_LOOKUPFLW(borg)].")
log_admin("[key_name(user)] un-emagged [key_name(borg)].")
if ("toggle_lawupdate")
borg.lawupdate = !borg.lawupdate
if (borg.lawupdate)
- message_admins("[key_name_admin(user)] enabled lawsync on [key_name_admin(borg)][ADMIN_FLW(borg)].")
+ message_admins("[key_name_admin(user)] enabled lawsync on [ADMIN_LOOKUPFLW(borg)].")
log_admin("[key_name(user)] enabled lawsync on [key_name(borg)].")
else
- message_admins("[key_name_admin(user)] disabled lawsync on [key_name_admin(borg)][ADMIN_FLW(borg)].")
+ message_admins("[key_name_admin(user)] disabled lawsync on [ADMIN_LOOKUPFLW(borg)].")
log_admin("[key_name(user)] disabled lawsync on [key_name(borg)].")
if ("toggle_lockdown")
borg.SetLockdown(!borg.lockcharge)
if (borg.lockcharge)
- message_admins("[key_name_admin(user)] locked down [key_name_admin(borg)][ADMIN_FLW(borg)].")
+ message_admins("[key_name_admin(user)] locked down [ADMIN_LOOKUPFLW(borg)].")
log_admin("[key_name(user)] locked down [key_name(borg)].")
else
- message_admins("[key_name_admin(user)] released [key_name_admin(borg)][ADMIN_FLW(borg)] from lockdown.")
+ message_admins("[key_name_admin(user)] released [ADMIN_LOOKUPFLW(borg)] from lockdown.")
log_admin("[key_name(user)] released [key_name(borg)] from lockdown.")
if ("toggle_scrambledcodes")
borg.scrambledcodes = !borg.scrambledcodes
if (borg.scrambledcodes)
- message_admins("[key_name_admin(user)] enabled scrambled codes on [key_name_admin(borg)][ADMIN_FLW(borg)].")
+ message_admins("[key_name_admin(user)] enabled scrambled codes on [ADMIN_LOOKUPFLW(borg)].")
log_admin("[key_name(user)] enabled scrambled codes on [key_name(borg)].")
else
- message_admins("[key_name_admin(user)] disabled scrambled codes on [key_name_admin(borg)][ADMIN_FLW(borg)].")
+ message_admins("[key_name_admin(user)] disabled scrambled codes on [ADMIN_LOOKUPFLW(borg)].")
log_admin("[key_name(user)] disabled scrambled codes on [key_name(borg)].")
if ("rename")
var/new_name = stripped_input(user,"What would you like to name this cyborg?","Input a name",borg.real_name,MAX_NAME_LEN)
if(!new_name)
return
- message_admins("[key_name_admin(user)] renamed [key_name_admin(borg)][ADMIN_FLW(borg)] to [new_name].")
+ message_admins("[key_name_admin(user)] renamed [ADMIN_LOOKUPFLW(borg)] to [new_name].")
log_admin("[key_name(user)] renamed [key_name(borg)] to [new_name].")
borg.fully_replace_character_name(borg.real_name,new_name)
if ("toggle_upgrade")
@@ -151,14 +151,14 @@
if (installedupgrade)
installedupgrade.deactivate(borg, user)
borg.upgrades -= installedupgrade
- message_admins("[key_name_admin(user)] removed the [installedupgrade] upgrade from [key_name_admin(borg)][ADMIN_FLW(borg)].")
+ message_admins("[key_name_admin(user)] removed the [installedupgrade] upgrade from [ADMIN_LOOKUPFLW(borg)].")
log_admin("[key_name(user)] removed the [installedupgrade] upgrade from [key_name(borg)].")
qdel(installedupgrade)
else
var/obj/item/borg/upgrade/upgrade = new upgradepath(borg)
upgrade.action(borg, user)
borg.upgrades += upgrade
- message_admins("[key_name_admin(user)] added the [upgrade] borg upgrade to [key_name_admin(borg)][ADMIN_FLW(borg)].")
+ message_admins("[key_name_admin(user)] added the [upgrade] borg upgrade to [ADMIN_LOOKUPFLW(borg)].")
log_admin("[key_name(user)] added the [upgrade] borg upgrade to [key_name(borg)].")
if ("toggle_radio")
var/channel = params["channel"]
@@ -175,7 +175,7 @@
borg.radio.keyslot.syndie = FALSE
else if (channel == "CentCom")
borg.radio.keyslot.independent = FALSE
- message_admins("[key_name_admin(user)] removed the [channel] radio channel from [key_name_admin(borg)][ADMIN_FLW(borg)].")
+ message_admins("[key_name_admin(user)] removed the [channel] radio channel from [ADMIN_LOOKUPFLW(borg)].")
log_admin("[key_name(user)] removed the [channel] radio channel from [key_name(borg)].")
else // We're adding a channel
if (!borg.radio.keyslot) // Assert that an encryption key exists
@@ -185,14 +185,14 @@
borg.radio.keyslot.syndie = TRUE
else if (channel == "CentCom")
borg.radio.keyslot.independent = TRUE
- message_admins("[key_name_admin(user)] added the [channel] radio channel to [key_name_admin(borg)][ADMIN_FLW(borg)].")
+ message_admins("[key_name_admin(user)] added the [channel] radio channel to [ADMIN_LOOKUPFLW(borg)].")
log_admin("[key_name(user)] added the [channel] radio channel to [key_name(borg)].")
borg.radio.recalculateChannels()
if ("setmodule")
var/newmodulepath = text2path(params["module"])
if (ispath(newmodulepath))
borg.module.transform_to(newmodulepath)
- message_admins("[key_name_admin(user)] changed the module of [key_name_admin(borg)][ADMIN_FLW(borg)] to [newmodulepath].")
+ message_admins("[key_name_admin(user)] changed the module of [ADMIN_LOOKUPFLW(borg)] to [newmodulepath].")
log_admin("[key_name(user)] changed the module of [key_name(borg)] to [newmodulepath].")
if ("slavetoai")
var/mob/living/silicon/ai/newai = locate(params["slavetoai"]) in GLOB.ai_list
@@ -202,14 +202,14 @@
borg.undeploy()
borg.connected_ai = newai
borg.notify_ai(TRUE)
- message_admins("[key_name_admin(user)] slaved [key_name_admin(borg)][ADMIN_FLW(borg)] to the AI [key_name_admin(newai)][ADMIN_FLW(newai)].")
+ message_admins("[key_name_admin(user)] slaved [ADMIN_LOOKUPFLW(borg)] to the AI [ADMIN_LOOKUPFLW(newai)].")
log_admin("[key_name(user)] slaved [key_name(borg)] to the AI [key_name(newai)].")
else if (params["slavetoai"] == "null")
borg.notify_ai(DISCONNECT)
if(borg.shell)
borg.undeploy()
borg.connected_ai = null
- message_admins("[key_name_admin(user)] freed [key_name_admin(borg)][ADMIN_FLW(borg)] from being slaved to an AI.")
+ message_admins("[key_name_admin(user)] freed [ADMIN_LOOKUPFLW(borg)] from being slaved to an AI.")
log_admin("[key_name(user)] freed [key_name(borg)] from being slaved to an AI.")
if (borg.lawupdate)
borg.lawsync()
diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm
index 4718ba925d..1c8002943d 100644
--- a/code/modules/admin/verbs/buildmode.dm
+++ b/code/modules/admin/verbs/buildmode.dm
@@ -278,10 +278,10 @@
T.PlaceOnTop(/turf/closed/wall)
else if(iswallturf(object))
T.PlaceOnTop(/turf/closed/wall/r_wall)
- log_admin("Build Mode: [key_name(user)] built [T] at ([T.x],[T.y],[T.z])")
+ log_admin("Build Mode: [key_name(user)] built [T] at [AREACOORD(T)]")
return
else if(right_click)
- log_admin("Build Mode: [key_name(user)] deleted [object] at ([object.x],[object.y],[object.z])")
+ log_admin("Build Mode: [key_name(user)] deleted [object] at [AREACOORD(object)]")
if(isturf(object))
var/turf/T = object
T.ScrapeAway()
@@ -289,7 +289,7 @@
qdel(object)
return
else if(isturf(object) && alt_click && left_click)
- log_admin("Build Mode: [key_name(user)] built an airlock at ([object.x],[object.y],[object.z])")
+ log_admin("Build Mode: [key_name(user)] built an airlock at [AREACOORD(object)]")
new/obj/machinery/door/airlock(get_turf(object))
else if(isturf(object) && ctrl_click && left_click)
var/obj/structure/window/reinforced/window
@@ -298,7 +298,7 @@
else
window = new /obj/structure/window/reinforced(get_turf(object))
window.setDir(build_dir)
- log_admin("Build Mode: [key_name(user)] built a window at ([object.x],[object.y],[object.z])")
+ log_admin("Build Mode: [key_name(user)] built a window at [AREACOORD(object)]")
if(ADV_BUILDMODE)
if(left_click && alt_click)
objholder = object.type
@@ -306,15 +306,15 @@
else if(left_click)
if(ispath(objholder, /turf))
var/turf/T = get_turf(object)
- log_admin("Build Mode: [key_name(user)] modified [T] ([T.x],[T.y],[T.z]) to [objholder]")
+ log_admin("Build Mode: [key_name(user)] modified [T] in [AREACOORD(object)] to [objholder]")
T.PlaceOnTop(objholder)
else
var/obj/A = new objholder (get_turf(object))
A.setDir(build_dir)
- log_admin("Build Mode: [key_name(user)] modified [A]'s ([A.x],[A.y],[A.z]) dir to [build_dir]")
+ log_admin("Build Mode: [key_name(user)] modified [A]'s [COORD(A)] dir to [build_dir]")
else if(right_click)
if(isobj(object))
- log_admin("Build Mode: [key_name(user)] deleted [object] at ([object.x],[object.y],[object.z])")
+ log_admin("Build Mode: [key_name(user)] deleted [object] at [AREACOORD(object)]")
qdel(object)
if(VAR_BUILDMODE)
@@ -343,7 +343,7 @@
if(right_click)
if(throw_atom)
throw_atom.throw_at(object, 10, 1,user)
- log_admin("Build Mode: [key_name(user)] threw [throw_atom] at [object] ([object.x],[object.y],[object.z])")
+ log_admin("Build Mode: [key_name(user)] threw [throw_atom] at [object] in [AREACOORD(object)]")
if(AREA_BUILDMODE)
if(left_click) //rectangular
if(!cornerA)
diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm
index 2fc616d588..a89a30b9ba 100644
--- a/code/modules/admin/verbs/deadsay.dm
+++ b/code/modules/admin/verbs/deadsay.dm
@@ -21,7 +21,7 @@
return
var/static/nicknames = world.file2list("[global.config.directory]/admin_nicknames.txt")
- var/rendered = "DEAD:ADMIN([src.holder.fakekey ? pick(nicknames) : src.key]) says, \"[msg]\""
+ var/rendered = "DEAD:[uppertext(holder.rank)]([src.holder.fakekey ? pick(nicknames) : src.key]) says, \"[msg]\""
for (var/mob/M in GLOB.player_list)
if(isnewplayer(M))
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 2fd212b4dc..d34e1ebd42 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -333,8 +333,8 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
if(ishuman(M))
INVOKE_ASYNC(M, /mob/living/carbon/human/proc/Alienize)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Make Alien") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- log_admin("[key_name(usr)] made [key_name(M)] into an alien.")
- message_admins("[key_name_admin(usr)] made [key_name(M)] into an alien.")
+ log_admin("[key_name(usr)] made [key_name(M)] into an alien at [AREACOORD(M)].")
+ message_admins("[key_name_admin(usr)] made [ADMIN_LOOKUPFLW(M)] into an alien.")
else
alert("Invalid mob")
@@ -348,8 +348,8 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
if(ishuman(M))
INVOKE_ASYNC(M, /mob/living/carbon/human/proc/slimeize)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Make Slime") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- log_admin("[key_name(usr)] made [key_name(M)] into a slime.")
- message_admins("[key_name_admin(usr)] made [key_name(M)] into a slime.")
+ log_admin("[key_name(usr)] made [key_name(M)] into a slime at [AREACOORD(M)].")
+ message_admins("[key_name_admin(usr)] made [ADMIN_LOOKUPFLW(M)] into a slime.")
else
alert("Invalid mob")
@@ -434,7 +434,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
qdel(O)
CHECK_TICK
log_admin("[key_name(src)] has deleted all ([counter]) instances of [hsbitem].")
- message_admins("[key_name_admin(src)] has deleted all ([counter]) instances of [hsbitem].", 0)
+ message_admins("[key_name_admin(src)] has deleted all ([counter]) instances of [hsbitem].")
SSblackbox.record_feedback("tally", "admin_verb", 1, "Delete All") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -443,7 +443,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
set name = "Make Powernets"
SSmachines.makepowernets()
log_admin("[key_name(src)] has remade the powernet. makepowernets() called.")
- message_admins("[key_name_admin(src)] has remade the powernets. makepowernets() called.", 0)
+ message_admins("[key_name_admin(src)] has remade the powernets. makepowernets() called.")
SSblackbox.record_feedback("tally", "admin_verb", 1, "Make Powernets") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_grantfullaccess(mob/M in GLOB.mob_list)
@@ -522,7 +522,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
var/bad_shit = 0
for(var/obj/machinery/computer/atmos_control/tank/console in GLOB.atmos_air_controllers)
- dat += "
[console] at [get_area_name(console, TRUE)] [COORD(console)]:
"
+ dat += "
[console] at [AREACOORD(console)]:
"
if(console.input_tag == console.output_tag)
dat += "Error: input_tag is the same as the output_tag, \"[console.input_tag]\"! "
bad_shit++
@@ -734,14 +734,17 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
if(!dresscode)
return
+ var/delete_pocket
var/mob/living/carbon/human/H
if(isobserver(M))
H = M.change_mob_type(/mob/living/carbon/human, null, null, TRUE)
else
H = M
+ if(alert("Drop Items in Pockets? No will delete them.", "Robust quick dress shop", "Yes", "No") == "No")
+ delete_pocket = TRUE
SSblackbox.record_feedback("tally", "admin_verb", 1, "Select Equipment") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- for (var/obj/item/I in H.get_equipped_items())
+ for (var/obj/item/I in H.get_equipped_items(delete_pocket))
qdel(I)
if(dresscode != "Naked")
H.equipOutfit(dresscode)
@@ -749,7 +752,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
H.regenerate_icons()
log_admin("[key_name(usr)] changed the equipment of [key_name(H)] to [dresscode].")
- message_admins("[key_name_admin(usr)] changed the equipment of [key_name_admin(H)] to [dresscode].")
+ message_admins("[key_name_admin(usr)] changed the equipment of [ADMIN_LOOKUPFLW(H)] to [dresscode].")
/client/proc/robust_dress_shop()
var/list/outfits = list("Cancel","Naked","Custom","As Job...")
@@ -958,15 +961,17 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
/client/proc/clear_dynamic_transit()
set category = "Debug"
- set name = "Clear Dynamic Transit"
- set desc = "Deallocates all transit space, restoring it to round start conditions."
+ set name = "Clear Dynamic Turf Reservations"
+ set desc = "Deallocates all reserved space, restoring it to round start conditions."
if(!holder)
return
- SSshuttle.clear_transit = TRUE
+ var/answer = alert("WARNING: THIS WILL WIPE ALL RESERVED SPACE TO A CLEAN SLATE! ANY MOVING SHUTTLES, ELEVATORS, OR IN-PROGRESS PHOTOGRAPHY WILL BE DELETED!", "Really wipe dynamic turfs?", "YES", "NO")
+ if(answer != "YES")
+ return
message_admins("[key_name_admin(src)] cleared dynamic transit space.")
SSblackbox.record_feedback("tally", "admin_verb", 1, "Clear Dynamic Transit") // If...
log_admin("[key_name(src)] cleared dynamic transit space.")
-
+ SSmapping.wipe_reservations() //this goes after it's logged, incase something horrible happens.
/client/proc/toggle_medal_disable()
set category = "Debug"
diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm
index 5e21955800..39aff33953 100644
--- a/code/modules/admin/verbs/diagnostics.dm
+++ b/code/modules/admin/verbs/diagnostics.dm
@@ -7,7 +7,7 @@
if(T.active_hotspot)
burning = TRUE
- var/list/lines = list("[COORD(target)]: [env.temperature] K ([env.temperature - T0C] C), [env.return_pressure()] kPa[(burning)?(", burning"):(null)]")
+ var/list/lines = list("[AREACOORD(target)]: [env.temperature] K ([env.temperature - T0C] C), [env.return_pressure()] kPa[(burning)?(", burning"):(null)]")
for(var/id in env_gases)
var/gas = env_gases[id]
var/moles = gas[MOLES]
@@ -49,8 +49,8 @@
log_admin("DEBUG: [key_name(M)] next_move = [M.next_move] lastDblClick = [M.next_click] world.time = [world.time]")
M.next_move = 1
M.next_click = 0
- message_admins("[key_name_admin(largest_move_mob)] had the largest move delay with [largest_move_time] frames / [DisplayTimeText(largest_move_time)]!")
- message_admins("[key_name_admin(largest_click_mob)] had the largest click delay with [largest_click_time] frames / [DisplayTimeText(largest_click_time)]!")
+ message_admins("[ADMIN_LOOKUPFLW(largest_move_mob)] had the largest move delay with [largest_move_time] frames / [DisplayTimeText(largest_move_time)]!")
+ message_admins("[ADMIN_LOOKUPFLW(largest_click_mob)] had the largest click delay with [largest_click_time] frames / [DisplayTimeText(largest_click_time)]!")
message_admins("world.time = [world.time]")
SSblackbox.record_feedback("tally", "admin_verb", 1, "Unfreeze Everyone") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return
@@ -75,7 +75,7 @@
for (var/device in f)
if (istype(device, /atom))
var/atom/A = device
- output += " [device] ([A.x],[A.y],[A.z] in area [get_area(device)]) "
+ output += " [device] ([AREACOORD(A)]) "
else
output += " [device] "
diff --git a/code/modules/admin/verbs/dice.dm b/code/modules/admin/verbs/dice.dm
new file mode 100644
index 0000000000..5b0a15257e
--- /dev/null
+++ b/code/modules/admin/verbs/dice.dm
@@ -0,0 +1,25 @@
+/client/proc/roll_dices()
+ set category = "Fun"
+ set name = "Roll Dice"
+ if(!check_rights(R_FUN))
+ return
+
+ var/sum = input("How many times should we throw?") as num
+ var/side = input("Select the number of sides.") as num
+ if(!side)
+ side = 6
+ if(!sum)
+ sum = 2
+
+ var/dice = num2text(sum) + "d" + num2text(side)
+
+ if(alert("Do you want to inform the world about your game?",,"Yes", "No") == "Yes")
+ to_chat(world, "
The dice have been rolled by Gods!
")
+
+ var/result = roll(dice)
+
+ if(alert("Do you want to inform the world about the result?",,"Yes", "No") == "Yes")
+ to_chat(world, "
Gods rolled [dice], result is [result]
")
+
+ message_admins("[key_name_admin(src)] rolled dice [dice], result is [result]")
+ log_admin("[key_name_admin(src)] rolled dice [dice], result is [result]")
diff --git a/code/modules/admin/verbs/individual_logging.dm b/code/modules/admin/verbs/individual_logging.dm
index 50b00da9a6..df151cfef9 100644
--- a/code/modules/admin/verbs/individual_logging.dm
+++ b/code/modules/admin/verbs/individual_logging.dm
@@ -1,32 +1,52 @@
-/proc/show_individual_logging_panel(mob/M, type = INDIVIDUAL_ATTACK_LOG)
+/proc/show_individual_logging_panel(mob/M, source = LOGSRC_CLIENT, type = INDIVIDUAL_ATTACK_LOG)
if(!M || !ismob(M))
return
- var/dat = "
"
dat += ""
+ var/log_source = M.logging;
+ if(source == LOGSRC_CLIENT && M.client) //if client doesn't exist just fall back to the mob log
+ log_source = M.client.player_details.logging //should exist, if it doesn't that's a bug, don't check for it not existing
if(type == INDIVIDUAL_SHOW_ALL_LOG)
- dat += "
Displaying all logs of [key_name(M)]
"
- for(var/log_type in M.logging)
+ dat += "
Displaying all [source] logs of [key_name(M)]
"
+ for(var/log_type in log_source)
dat += "
[log_type]
"
- var/list/reversed = M.logging[log_type]
+ var/list/reversed = log_source[log_type]
if(islist(reversed))
reversed = reverseRange(reversed.Copy())
for(var/entry in reversed)
dat += "[entry]: [reversed[entry]] "
dat += ""
else
- dat += "
[type] of [key_name(M)]
"
- var/list/reversed = M.logging[type]
+ dat += "
[source] [type] of [key_name(M)]
"
+ var/list/reversed = log_source[type]
if(reversed)
reversed = reverseRange(reversed.Copy())
for(var/entry in reversed)
dat += "[entry]: [reversed[entry]]"
- usr << browse(dat, "window=invidual_logging_[M];size=600x480")
+ usr << browse(dat, "window=invidual_logging_[key_name(M)];size=600x480")
diff --git a/code/modules/admin/verbs/manipulate_organs.dm b/code/modules/admin/verbs/manipulate_organs.dm
index e82a99815e..a3b7e4247c 100644
--- a/code/modules/admin/verbs/manipulate_organs.dm
+++ b/code/modules/admin/verbs/manipulate_organs.dm
@@ -1,7 +1,9 @@
/client/proc/manipulate_organs(mob/living/carbon/C in world)
set name = "Manipulate Organs"
set category = "Debug"
- var/operation = input("Select organ operation.", "Organ Manipulation", "cancel") in list("add organ", "add implant", "drop organ/implant", "remove organ/implant", "cancel")
+ var/operation = input("Select organ operation.", "Organ Manipulation", "cancel") as null|anything in list("add organ", "add implant", "drop organ/implant", "remove organ/implant", "cancel")
+ if (!operation)
+ return
var/list/organs = list()
switch(operation)
@@ -10,24 +12,28 @@
var/dat = replacetext("[path]", "/obj/item/organ/", ":")
organs[dat] = path
- var/obj/item/organ/organ = input("Select organ type:", "Organ Manipulation", null) in organs
+ var/obj/item/organ/organ = input("Select organ type:", "Organ Manipulation", null) as null|anything in organs
+ if(!organ)
+ return
organ = organs[organ]
organ = new organ
organ.Insert(C)
log_admin("[key_name(usr)] has added organ [organ.type] to [key_name(C)]")
- message_admins("[key_name_admin(usr)] has added organ [organ.type] to [key_name(C)]")
+ message_admins("[key_name_admin(usr)] has added organ [organ.type] to [ADMIN_LOOKUPFLW(C)]")
if("add implant")
for(var/path in subtypesof(/obj/item/implant))
var/dat = replacetext("[path]", "/obj/item/implant/", ":")
organs[dat] = path
- var/obj/item/implant/organ = input("Select implant type:", "Organ Manipulation", null) in organs
+ var/obj/item/implant/organ = input("Select implant type:", "Organ Manipulation", null) as null|anything in organs
+ if(!organ)
+ return
organ = organs[organ]
organ = new organ
organ.implant(C)
log_admin("[key_name(usr)] has added implant [organ.type] to [key_name(C)]")
- message_admins("[key_name_admin(usr)] has added implant [organ.type] to [key_name(C)]")
+ message_admins("[key_name_admin(usr)] has added implant [organ.type] to [ADMIN_LOOKUPFLW(C)]")
if("drop organ/implant", "remove organ/implant")
for(var/X in C.internal_organs)
@@ -38,7 +44,9 @@
var/obj/item/implant/I = X
organs["[I.name] ([I.type])"] = I
- var/obj/item/organ = input("Select organ/implant:", "Organ Manipulation", null) in organs
+ var/obj/item/organ = input("Select organ/implant:", "Organ Manipulation", null) as null|anything in organs
+ if(!organ)
+ return
organ = organs[organ]
if(!organ)
return
@@ -46,7 +54,7 @@
var/obj/item/implant/I
log_admin("[key_name(usr)] has removed [organ.type] from [key_name(C)]")
- message_admins("[key_name_admin(usr)] has removed [organ.type] from [key_name(C)]")
+ message_admins("[key_name_admin(usr)] has removed [organ.type] from [ADMIN_LOOKUPFLW(C)]")
if(isorgan(organ))
O = organ
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index c62ee34dac..800a94c4ba 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -105,11 +105,11 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list(
for(var/obj/machinery/camera/C2 in CL)
if(C1 != C2)
if(C1.c_tag == C2.c_tag)
- output += "
c_tag match for cameras at [ADMIN_COORDJMP(C1)] ([C1.loc.loc]) and [ADMIN_COORDJMP(C2)] ([C2.loc.loc]) - c_tag is [C1.c_tag]
"
+ output += "
c_tag match for cameras at [ADMIN_VERBOSEJMP(C1)] and [ADMIN_VERBOSEJMP(C2)] - c_tag is [C1.c_tag]
Camera not connected to wall at [ADMIN_COORDJMP(C1)] ([C1.loc.loc]) Network: [json_encode(C1.network)]
"
+ output += "
Camera not connected to wall at [ADMIN_VERBOSEJMP(C1)] Network: [json_encode(C1.network)]
"
output += "
"
usr << browse(output,"window=airreport;size=1000x500")
@@ -153,7 +153,7 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list(
for(var/t in GLOB.active_turfs_startlist)
var/turf/T = t
- dat += "[ADMIN_COORDJMP(T)]\n"
+ dat += "[ADMIN_VERBOSEJMP(T)]\n"
dat += " "
usr << browse(dat, "window=at_list")
diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm
index 4869319cfa..405595d1de 100644
--- a/code/modules/admin/verbs/modifyvariables.dm
+++ b/code/modules/admin/verbs/modifyvariables.dm
@@ -629,8 +629,9 @@ GLOBAL_PROTECT(VVpixelmovement)
if (O.vv_edit_var(variable, var_new) == FALSE)
to_chat(src, "Your edit was rejected by the object.")
return
+ SEND_GLOBAL_SIGNAL(COMSIG_GLOB_VAR_EDIT, args)
log_world("### VarEdit by [key_name(src)]: [O.type] [variable]=[var_value] => [var_new]")
- log_admin("[key_name(src)] modified [original_name]'s [variable] to from [html_encode("[var_value]")] to [html_encode("[var_new]")]")
+ log_admin("[key_name(src)] modified [original_name]'s [variable] from [html_encode("[var_value]")] to [html_encode("[var_new]")]")
var/msg = "[key_name_admin(src)] modified [original_name]'s [variable] from [var_value] to [var_new]"
message_admins(msg)
admin_ticket_log(O, msg)
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index fd9de5308b..190ddd7e63 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -57,7 +57,7 @@
var/mob/living/carbon/human/H = null
for(var/mob/living/carbon/human/applicant in GLOB.player_list)
- if(isReadytoRumble(applicant, ROLE_TRAITOR, FALSE))
+ if(isReadytoRumble(applicant, ROLE_TRAITOR))
if(temp.age_check(applicant.client))
if(!(applicant.job in temp.restricted_jobs))
candidates += applicant
@@ -76,7 +76,7 @@
return 0
-/datum/admins/proc/makeChanglings()
+/datum/admins/proc/makeChangelings()
var/datum/game_mode/changeling/temp = new
if(CONFIG_GET(flag/protect_roles_from_antagonist))
@@ -95,11 +95,11 @@
candidates += applicant
if(candidates.len)
- var/numChanglings = min(candidates.len, 3)
+ var/numChangelings = min(candidates.len, 3)
- for(var/i = 0, i[ADMIN_FULLMONTY(src)] [ADMIN_SC(src)]: [msg]"
+ msg = "[icon2html(cross, GLOB.admins)][prayer_type][deity ? " (to [deity])" : ""]: [ADMIN_FULLMONTY(src)] [ADMIN_SC(src)]:[msg]"
for(var/client/C in GLOB.admins)
if(C.prefs.chat_toggles & CHAT_PRAYER)
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index be0b9d04bb..0184c4b34f 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -14,7 +14,7 @@
M.regenerate_icons()
log_admin("[key_name(usr)] made [key_name(M)] drop everything!")
- var/msg = "[key_name_admin(usr)] made [key_name_admin(M)] drop everything!"
+ var/msg = "[key_name_admin(usr)] made [ADMIN_LOOKUPFLW(M)] drop everything!"
message_admins(msg)
admin_ticket_log(M, msg)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Drop Everything") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -28,11 +28,11 @@
if(!check_rights(R_ADMIN))
return
- message_admins("[key_name_admin(src)] has started answering [key_name(M.key, 0, 0)]'s prayer.")
+ message_admins("[key_name_admin(src)] has started answering [ADMIN_LOOKUPFLW(M)]'s prayer.")
var/msg = input("Message:", text("Subtle PM to [M.key]")) as text|null
if (!msg)
- message_admins("[key_name_admin(src)] decided not to answer [key_name(M.key, 0, 0)]'s prayer")
+ message_admins("[key_name_admin(src)] decided not to answer [ADMIN_LOOKUPFLW(M)]'s prayer")
return
if(usr)
if (usr.client)
@@ -45,6 +45,42 @@
admin_ticket_log(M, msg)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Subtle Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+/client/proc/cmd_admin_headset_message(mob/M in GLOB.mob_list)
+ set category = "Special Verbs"
+ set name = "Headset Message"
+
+ admin_headset_message(M)
+
+/client/proc/admin_headset_message(mob/M in GLOB.mob_list, sender = null)
+ var/mob/living/carbon/human/H = M
+
+ if(!check_rights(R_ADMIN))
+ return
+
+ if(!istype(H))
+ to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
+ return
+ if(!istype(H.ears, /obj/item/radio/headset))
+ to_chat(usr, "The person you are trying to contact is not wearing a headset.")
+ return
+
+ if (!sender)
+ sender = input("Who is the message from?", "Sender") as null|anything in list("CentCom","Syndicate")
+ if(!sender)
+ return
+
+ message_admins("[key_name_admin(src)] has started answering [key_name_admin(H)]'s [sender] request.")
+ var/input = input("Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from [sender]", "") as text|null
+ if(!input)
+ message_admins("[key_name_admin(src)] decided not to answer [key_name_admin(H)]'s [sender] request.")
+ return
+
+ log_admin("[key_name(src)] replied to [key_name(H)]'s [sender] message with the message [input].")
+ message_admins("[key_name_admin(src)] replied to [key_name_admin(H)]'s [sender] message with: \"[input]\"")
+ to_chat(H, "You hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from [sender == "Syndicate" ? "your benefactor" : "Central Command"]. Message as follows[sender == "Syndicate" ? ", agent." : ":"] [input]. Message ends.\"")
+
+ SSblackbox.record_feedback("tally", "admin_verb", 1, "Headset Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
/client/proc/cmd_admin_mod_antag_rep(client/C in GLOB.clients, var/operation)
set category = "Special Verbs"
set name = "Modify Antagonist Reputation"
@@ -149,8 +185,8 @@
for(var/mob/M in view(range,A))
to_chat(M, msg)
- log_admin("LocalNarrate: [key_name(usr)] at [get_area(A)][COORD(A)]: [msg]")
- message_admins(" LocalNarrate: [key_name_admin(usr)] at [get_area(A)][ADMIN_JMP(A)]: [msg] ")
+ log_admin("LocalNarrate: [key_name(usr)] at [AREACOORD(A)]: [msg]")
+ message_admins(" LocalNarrate: [key_name_admin(usr)] at [ADMIN_VERBOSEJMP(A)]: [msg] ")
SSblackbox.record_feedback("tally", "admin_verb", 1, "Local Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_godmode(mob/M in GLOB.mob_list)
@@ -163,7 +199,7 @@
to_chat(usr, "Toggled [(M.status_flags & GODMODE) ? "ON" : "OFF"]")
log_admin("[key_name(usr)] has toggled [key_name(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]")
- var/msg = "[key_name_admin(usr)] has toggled [key_name_admin(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]"
+ var/msg = "[key_name_admin(usr)] has toggled [ADMIN_LOOKUPFLW(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]"
message_admins(msg)
admin_ticket_log(M, msg)
SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Godmode", "[M.status_flags & GODMODE ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -504,7 +540,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
M.revive(full_heal = 1, admin_revive = 1)
log_admin("[key_name(usr)] healed / revived [key_name(M)]")
- var/msg = "Admin [key_name_admin(usr)] healed / revived [key_name_admin(M)]!"
+ var/msg = "Admin [key_name_admin(usr)] healed / revived [ADMIN_LOOKUPFLW(M)]!"
message_admins(msg)
admin_ticket_log(M, msg)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Rejuvinate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -609,8 +645,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
return
explosion(O, devastation, heavy, light, flash, null, null,flames)
- log_admin("[key_name(usr)] created an explosion ([devastation],[heavy],[light],[flames]) at ([O.x],[O.y],[O.z])")
- message_admins("[key_name_admin(usr)] created an explosion ([devastation],[heavy],[light],[flames]) at ([O.x],[O.y],[O.z])")
+ log_admin("[key_name(usr)] created an explosion ([devastation],[heavy],[light],[flames]) at [AREACOORD(O)]")
+ message_admins("[key_name_admin(usr)] created an explosion ([devastation],[heavy],[light],[flames]) at [AREACOORD(O)]")
SSblackbox.record_feedback("tally", "admin_verb", 1, "Explosion") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return
else
@@ -633,8 +669,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
if (heavy || light)
empulse(O, heavy, light)
- log_admin("[key_name(usr)] created an EM Pulse ([heavy],[light]) at ([O.x],[O.y],[O.z])")
- message_admins("[key_name_admin(usr)] created an EM Pulse ([heavy],[light]) at ([O.x],[O.y],[O.z])")
+ log_admin("[key_name(usr)] created an EM Pulse ([heavy],[light]) at [AREACOORD(O)]")
+ message_admins("[key_name_admin(usr)] created an EM Pulse ([heavy],[light]) at [AREACOORD(O)]")
SSblackbox.record_feedback("tally", "admin_verb", 1, "EM Pulse") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return
@@ -820,8 +856,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
N.set_safety()
N.set_active()
- log_admin("[key_name(usr)] [N.timing ? "activated" : "deactivated"] a nuke at ([N.x],[N.y],[N.z]).")
- message_admins("[ADMIN_LOOKUPFLW(usr)] [N.timing ? "activated" : "deactivated"] a nuke at [ADMIN_COORDJMP(N)].")
+ log_admin("[key_name(usr)] [N.timing ? "activated" : "deactivated"] a nuke at [AREACOORD(N)].")
+ message_admins("[ADMIN_LOOKUPFLW(usr)] [N.timing ? "activated" : "deactivated"] a nuke at [ADMIN_VERBOSEJMP(N)].")
SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Nuke", "[N.timing]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
@@ -1277,7 +1313,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
if(!check_rights(R_ADMIN))
return
- var/list/punishment_list = list(ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_BSA, ADMIN_PUNISHMENT_FIREBALL, ADMIN_PUNISHMENT_ROD)
+ var/list/punishment_list = list(ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_BSA, ADMIN_PUNISHMENT_FIREBALL, ADMIN_PUNISHMENT_ROD, ADMIN_PUNISHMENT_SUPPLYPOD)
var/punishment = input("Choose a punishment", "DIVINE SMITING") as null|anything in punishment_list
@@ -1305,6 +1341,24 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
var/turf/startT = spaceDebrisStartLoc(startside, T.z)
var/turf/endT = spaceDebrisFinishLoc(startside, T.z)
new /obj/effect/immovablerod(startT, endT,target)
+ if(ADMIN_PUNISHMENT_SUPPLYPOD)
+ ///////load the supply pod up with something!
+ var/target_path = input(usr,"Enter typepath of an atom you'd like to send with the pod (type \"empty\" to send an empty pod):" ,"Typepath","/obj/item/reagent_containers/food/snacks/grown/harebell") as null|text
+ if (isnull(target_path))
+ return
+ if (target_path == "empty")//if you type "empty", spawn an empty pod
+ new /obj/effect/DPtarget(get_turf(target), null, POD_CENTCOM)
+ return
+ var/delivery = text2path(target_path)
+ if(!ispath(delivery))
+ delivery = pick_closest_path(target_path)
+ if(!delivery)
+ alert("ERROR: Incorrect / improper path given.")
+ return
+ //send the pod
+ if(iscarbon(target))
+ target.Stun(10)//takes 0.53 seconds for CentCom pod to land
+ new /obj/effect/DPtarget(get_turf(target), delivery, POD_CENTCOM)
var/msg = "[key_name_admin(usr)] punished [key_name_admin(target)] with [punishment]."
message_admins(msg)
diff --git a/code/modules/admin/verbs/spawnobjasmob.dm b/code/modules/admin/verbs/spawnobjasmob.dm
index f51f776d6f..621e6c3618 100644
--- a/code/modules/admin/verbs/spawnobjasmob.dm
+++ b/code/modules/admin/verbs/spawnobjasmob.dm
@@ -66,5 +66,5 @@
basemob.ckey = mainsettings["ckey"]["value"]
- log_admin("[key_name(usr)] spawned a sentient object-mob [basemob] from [chosen_obj] at ([usr.x],[usr.y],[usr.z])")
+ log_admin("[key_name(usr)] spawned a sentient object-mob [basemob] from [chosen_obj] at [AREACOORD(usr)]")
SSblackbox.record_feedback("tally", "admin_verb", 1, "Spawn object-mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm
index 1e7d3303d6..50281d54b4 100644
--- a/code/modules/antagonists/_common/antag_datum.dm
+++ b/code/modules/antagonists/_common/antag_datum.dm
@@ -75,7 +75,7 @@ GLOBAL_LIST_EMPTY(antagonists)
/datum/antagonist/proc/is_banned(mob/M)
if(!M)
return FALSE
- . = (jobban_isbanned(M, ROLE_SYNDICATE) || (job_rank && jobban_isbanned(M,job_rank)))
+ . = (jobban_isbanned(M, ROLE_SYNDICATE) || QDELETED(M) || (job_rank && (jobban_isbanned(M,job_rank) || QDELETED(M))))
/datum/antagonist/proc/replace_banned_player()
set waitfor = FALSE
@@ -110,12 +110,12 @@ GLOBAL_LIST_EMPTY(antagonists)
/datum/antagonist/proc/give_antag_moodies()
if(!antag_moodlet)
return
- owner.current.SendSignal(COMSIG_ADD_MOOD_EVENT, "antag_moodlet", antag_moodlet)
+ SEND_SIGNAL(owner.current, COMSIG_ADD_MOOD_EVENT, "antag_moodlet", antag_moodlet)
/datum/antagonist/proc/clear_antag_moodies()
if(!antag_moodlet)
return
- owner.current.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "antag_moodlet")
+ SEND_SIGNAL(owner.current, COMSIG_CLEAR_MOOD_EVENT, "antag_moodlet")
//Returns the team antagonist belongs to if any.
/datum/antagonist/proc/get_team()
diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm
index 0a000c4bf0..ca87b94d5b 100644
--- a/code/modules/antagonists/_common/antag_spawner.dm
+++ b/code/modules/antagonists/_common/antag_spawner.dm
@@ -58,6 +58,8 @@
return
var/list/candidates = pollCandidatesForMob("Do you want to play as a wizard's [href_list["school"]] apprentice?", ROLE_WIZARD, null, ROLE_WIZARD, 150, src)
if(LAZYLEN(candidates))
+ if(QDELETED(src))
+ return
if(used)
to_chat(H, "You already used this contract!")
return
@@ -121,7 +123,7 @@
to_chat(user, "You activate [src] and wait for confirmation.")
var/list/nuke_candidates = pollGhostCandidates("Do you want to play as a syndicate [borg_to_spawn ? "[lowertext(borg_to_spawn)] cyborg":"operative"]?", ROLE_OPERATIVE, null, ROLE_OPERATIVE, 150, POLL_IGNORE_SYNDICATE)
if(LAZYLEN(nuke_candidates))
- if(!(check_usability(user)))
+ if(QDELETED(src) || !check_usability(user))
return
used = TRUE
var/mob/dead/observer/G = pick(nuke_candidates)
@@ -235,7 +237,7 @@
return
var/list/candidates = pollCandidatesForMob("Do you want to play as a [initial(demon_type.name)]?", ROLE_ALIEN, null, ROLE_ALIEN, 50, src)
if(LAZYLEN(candidates))
- if(used)
+ if(used || QDELETED(src))
return
used = TRUE
var/mob/dead/observer/C = pick(candidates)
diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm
index 28cc4d9698..f19521e821 100644
--- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm
+++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm
@@ -30,9 +30,9 @@
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/proc/toggle_nodrop()
- flags_1 ^= NODROP_1
+ item_flags ^= NODROP
if(ismob(loc))
- to_chat(loc, "Your vest is now [flags_1 & NODROP_1 ? "locked" : "unlocked"].")
+ to_chat(loc, "Your vest is now [item_flags & NODROP ? "locked" : "unlocked"].")
/obj/item/clothing/suit/armor/abductor/vest/proc/flip_mode()
switch(mode)
@@ -359,7 +359,7 @@
to_chat(L, "You hear a voice in your head saying: [message]")
to_chat(user, "You send the message to your target.")
- log_talk(user,"[key_name(user)] sent an abductor mind message to [L]/[L.ckey]: '[message]'", LOGSAY)
+ log_talk(user,"[key_name(user)] sent an abductor mind message to [key_name(L)]: '[message]'", LOGSAY)
/obj/item/firing_pin/abductor
@@ -589,9 +589,10 @@ Congratulations! You are now trained for invasive xenobiology research!"}
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
breakouttime = 450
trashtype = /obj/item/restraints/handcuffs/energy/used
+ flags_1 = NONE
/obj/item/restraints/handcuffs/energy/used
- flags_1 = DROPDEL_1
+ item_flags = DROPDEL
/obj/item/restraints/handcuffs/energy/used/dropped(mob/user)
user.visible_message("[user]'s [name] breaks in a discharge of energy!", \
diff --git a/code/modules/antagonists/abductor/equipment/abduction_outfits.dm b/code/modules/antagonists/abductor/equipment/abduction_outfits.dm
index 8b8851ec18..e2b881d147 100644
--- a/code/modules/antagonists/abductor/equipment/abduction_outfits.dm
+++ b/code/modules/antagonists/abductor/equipment/abduction_outfits.dm
@@ -17,7 +17,7 @@
var/obj/item/clothing/suit/armor/abductor/vest/V = locate() in H
if(V)
console.AddVest(V)
- V.flags_1 |= NODROP_1
+ V.item_flags |= NODROP
var/obj/item/storage/backpack/B = locate() in H
if(B)
diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm
index 1e53f778d6..969590402c 100644
--- a/code/modules/antagonists/abductor/equipment/gland.dm
+++ b/code/modules/antagonists/abductor/equipment/gland.dm
@@ -285,7 +285,7 @@
addtimer(CALLBACK(src, .proc/zap), rand(30, 100))
/obj/item/organ/heart/gland/electric/proc/zap()
- tesla_zap(owner, 4, 8000, FALSE, TRUE)
+ tesla_zap(owner, 4, 8000, TESLA_MOB_DAMAGE | TESLA_OBJ_DAMAGE | TESLA_MOB_STUN)
playsound(get_turf(owner), 'sound/magic/lightningshock.ogg', 50, 1)
/obj/item/organ/heart/gland/chem
diff --git a/code/modules/antagonists/abductor/machinery/console.dm b/code/modules/antagonists/abductor/machinery/console.dm
index e629a0b47d..a14b667069 100644
--- a/code/modules/antagonists/abductor/machinery/console.dm
+++ b/code/modules/antagonists/abductor/machinery/console.dm
@@ -17,7 +17,6 @@
icon = 'icons/obj/abductor.dmi'
icon_state = "console"
density = TRUE
- anchored = TRUE
var/obj/item/abductor/gizmo/gizmo
var/obj/item/clothing/suit/armor/abductor/vest/vest
var/obj/machinery/abductor/experiment/experiment
@@ -76,7 +75,7 @@
dat+=" "
dat += "Select Agent Vest Disguise "
- dat += "[vest.flags_1 & NODROP_1 ? "Unlock" : "Lock"] Vest "
+ dat += "[vest.item_flags & NODROP ? "Unlock" : "Lock"] Vest "
else
dat += "NO AGENT VEST DETECTED"
var/datum/browser/popup = new(user, "computer", "Abductor Console", 400, 500)
diff --git a/code/modules/antagonists/abductor/machinery/dispenser.dm b/code/modules/antagonists/abductor/machinery/dispenser.dm
index c837adf1f0..17fa311c8f 100644
--- a/code/modules/antagonists/abductor/machinery/dispenser.dm
+++ b/code/modules/antagonists/abductor/machinery/dispenser.dm
@@ -4,7 +4,6 @@
icon = 'icons/obj/abductor.dmi'
icon_state = "dispenser"
density = TRUE
- anchored = TRUE
var/list/gland_types
var/list/gland_colors
var/list/amounts
diff --git a/code/modules/antagonists/abductor/machinery/experiment.dm b/code/modules/antagonists/abductor/machinery/experiment.dm
index 527913e6aa..5614fc9105 100644
--- a/code/modules/antagonists/abductor/machinery/experiment.dm
+++ b/code/modules/antagonists/abductor/machinery/experiment.dm
@@ -4,7 +4,6 @@
icon = 'icons/obj/abductor.dmi'
icon_state = "experiment-open"
density = FALSE
- anchored = TRUE
state_open = TRUE
var/points = 0
var/credits = 0
diff --git a/code/modules/antagonists/abductor/machinery/pad.dm b/code/modules/antagonists/abductor/machinery/pad.dm
index dff2fe812e..1cb95fbf05 100644
--- a/code/modules/antagonists/abductor/machinery/pad.dm
+++ b/code/modules/antagonists/abductor/machinery/pad.dm
@@ -3,7 +3,6 @@
desc = "Use this to transport to and from the humans' habitat."
icon = 'icons/obj/abductor.dmi'
icon_state = "alien-pad-idle"
- anchored = TRUE
var/turf/teleport_target
/obj/machinery/abductor/pad/proc/Warp(mob/living/target)
diff --git a/code/modules/antagonists/blob/blob/blobs/core.dm b/code/modules/antagonists/blob/blob/blobs/core.dm
index 1140f540c4..e048aa7665 100644
--- a/code/modules/antagonists/blob/blob/blobs/core.dm
+++ b/code/modules/antagonists/blob/blob/blobs/core.dm
@@ -78,3 +78,11 @@
B.change_to(/obj/structure/blob/shield/core, overmind)
..()
+/obj/structure/blob/core/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/stationloving, FALSE, TRUE)
+
+/obj/structure/blob/core/onTransitZ(old_z, new_z)
+ if(overmind && is_station_level(new_z))
+ overmind.forceMove(get_turf(src))
+ return ..()
diff --git a/code/modules/antagonists/blob/blob/overmind.dm b/code/modules/antagonists/blob/blob/overmind.dm
index 9d31852d28..3483c3a557 100644
--- a/code/modules/antagonists/blob/blob/overmind.dm
+++ b/code/modules/antagonists/blob/blob/overmind.dm
@@ -123,7 +123,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
else
L.fully_heal()
- for(var/V in GLOB.sortedAreas)
+ for(var/V in GLOB.the_station_areas)
var/area/A = V
if(!A.blob_allowed)
continue
diff --git a/code/modules/antagonists/blob/blob/theblob.dm b/code/modules/antagonists/blob/blob/theblob.dm
index 6fda7df130..dc7aa821d6 100644
--- a/code/modules/antagonists/blob/blob/theblob.dm
+++ b/code/modules/antagonists/blob/blob/theblob.dm
@@ -204,6 +204,9 @@
return null
/obj/structure/blob/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
if(severity > 0)
if(overmind)
overmind.blob_reagent_datum.emp_reaction(src, severity)
diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm
index a42ae6ef4f..ab6dd3607d 100644
--- a/code/modules/antagonists/changeling/changeling.dm
+++ b/code/modules/antagonists/changeling/changeling.dm
@@ -451,7 +451,7 @@
/datum/antagonist/changeling/proc/update_changeling_icons_added()
var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_CHANGELING]
hud.join_hud(owner.current)
- set_antag_hud(owner.current, "changling")
+ set_antag_hud(owner.current, "changeling")
/datum/antagonist/changeling/proc/update_changeling_icons_removed()
var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_CHANGELING]
diff --git a/code/modules/antagonists/changeling/powers/absorb.dm b/code/modules/antagonists/changeling/powers/absorb.dm
index 199bc6636b..a8bec72771 100644
--- a/code/modules/antagonists/changeling/powers/absorb.dm
+++ b/code/modules/antagonists/changeling/powers/absorb.dm
@@ -112,10 +112,3 @@
target.death(0)
target.Drain()
return TRUE
-
-
-
-//Absorbs the target DNA.
-//datum/changeling/proc/absorb_dna(mob/living/carbon/T, mob/user)
-
-//datum/changeling/proc/store_dna(datum/dna/new_dna, mob/user)
diff --git a/code/modules/antagonists/changeling/powers/augmented_eyesight.dm b/code/modules/antagonists/changeling/powers/augmented_eyesight.dm
index f48464700f..5ec5440a2b 100644
--- a/code/modules/antagonists/changeling/powers/augmented_eyesight.dm
+++ b/code/modules/antagonists/changeling/powers/augmented_eyesight.dm
@@ -1,4 +1,4 @@
-//Augmented Eyesight: Gives you x-ray vision or protection from flashes. Also, high DNA cost because of how powerful it is.
+//Augmented Eyesight: Gives you X-ray vision or protection from flashes. Also, high DNA cost because of how powerful it is.
//Possible todo: make a custom message for directing a penlight/flashlight at the eyes - not sure what would display though.
/obj/effect/proc_holder/changeling/augmented_eyesight
@@ -41,7 +41,7 @@
return 1
-/obj/effect/proc_holder/changeling/augmented_eyesight/on_refund(mob/user) //Get rid of x-ray vision and flash protection when the user refunds this ability
+/obj/effect/proc_holder/changeling/augmented_eyesight/on_refund(mob/user) //Get rid of X-ray vision and flash protection when the user refunds this ability
var/obj/item/organ/eyes/E = user.getorganslot(ORGAN_SLOT_EYES)
if(E)
if (active)
diff --git a/code/modules/antagonists/changeling/powers/digitalcamo.dm b/code/modules/antagonists/changeling/powers/digitalcamo.dm
index afb4e0bef7..68a1fa4add 100644
--- a/code/modules/antagonists/changeling/powers/digitalcamo.dm
+++ b/code/modules/antagonists/changeling/powers/digitalcamo.dm
@@ -1,6 +1,6 @@
/obj/effect/proc_holder/changeling/digitalcamo
name = "Digital Camouflage"
- desc = "By evolving the ability to distort our form and proprotions, we defeat common altgorithms used to detect lifeforms on cameras."
+ desc = "By evolving the ability to distort our form and proportions, we defeat common algorithms used to detect lifeforms on cameras."
helptext = "We cannot be tracked by camera or seen by AI units while using this skill. However, humans looking at us will find us... uncanny."
dna_cost = 1
diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm
index dbc8446fca..08fe6bd0ce 100644
--- a/code/modules/antagonists/changeling/powers/mutations.dm
+++ b/code/modules/antagonists/changeling/powers/mutations.dm
@@ -29,7 +29,7 @@
/obj/effect/proc_holder/changeling/weapon/proc/check_weapon(mob/user, obj/item/hand_item)
if(istype(hand_item, weapon_type))
- user.temporarilyRemoveItemFromInventory(hand_item, TRUE) //DROPDEL_1 will delete the item
+ user.temporarilyRemoveItemFromInventory(hand_item, TRUE) //DROPDEL will delete the item
if(!silent)
playsound(user, 'sound/effects/blobattack.ogg', 30, 1)
user.visible_message("With a sickening crunch, [user] reforms [user.p_their()] [weapon_name_simple] into an arm!", "We assimilate the [weapon_name_simple] back into our body.", "We search for the scent of any nearby changelings.")
+ changeling.chem_recharge_slowdown += 0.5
+ user.apply_status_effect(/datum/status_effect/agent_pinpointer/changeling)
+ else
+ to_chat(user, "We stop searching for now.")
+ changeling.chem_recharge_slowdown -= 0.5
+ user.remove_status_effect(/datum/status_effect/agent_pinpointer/changeling)
+
+ receptors_active = !receptors_active
+
+//Modified IA pinpointer - Points to the NEAREST changeling, but will only get you within a few tiles of the target.
+//You'll still have to rely on intuition and observation to make the identification. Lings can 'hide' in public places.
+/datum/status_effect/agent_pinpointer/changeling
+ alert_type = /obj/screen/alert/status_effect/agent_pinpointer/changeling
+ minimum_range = CHANGELING_PHEROMONE_MIN_DISTANCE
+ tick_interval = CHANGELING_PHEROMONE_PING_TIME
+ range_fuzz_factor = 0
+
+/datum/status_effect/agent_pinpointer/changeling/scan_for_target()
+ var/turf/my_loc = get_turf(owner)
+
+ var/list/mob/living/carbon/changelings = list()
+
+ for(var/mob/living/carbon/C in GLOB.alive_mob_list)
+ if(C != owner && C.mind)
+ var/datum/antagonist/changeling/antag_datum = C.mind.has_antag_datum(/datum/antagonist/changeling)
+ if(istype(antag_datum))
+ var/their_loc = get_turf(C)
+ var/distance = get_dist_euclidian(my_loc, their_loc)
+ if (distance < CHANGELING_PHEROMONE_MAX_DISTANCE)
+ changelings[C] = (CHANGELING_PHEROMONE_MAX_DISTANCE ** 2) - (distance ** 2)
+
+ if(changelings.len)
+ scan_target = pickweight(changelings) //Point at a 'random' changeling, biasing heavily towards closer ones.
+ else
+ scan_target = null
+
+
+/obj/screen/alert/status_effect/agent_pinpointer/changeling
+ name = "Pheromone Scent"
+ desc = "The nose always knows."
\ No newline at end of file
diff --git a/code/modules/antagonists/changeling/powers/tiny_prick.dm b/code/modules/antagonists/changeling/powers/tiny_prick.dm
index 1d0a4cf143..a801c87ac2 100644
--- a/code/modules/antagonists/changeling/powers/tiny_prick.dm
+++ b/code/modules/antagonists/changeling/powers/tiny_prick.dm
@@ -134,7 +134,7 @@
return 1
/obj/effect/proc_holder/changeling/sting/false_armblade/sting_action(mob/user, mob/target)
- add_logs(user, target, "stung", object="falso armblade sting")
+ add_logs(user, target, "stung", object="false armblade sting")
var/obj/item/held = target.get_active_held_item()
if(held && !target.dropItemToGround(held))
diff --git a/code/modules/antagonists/changeling/powers/transform.dm b/code/modules/antagonists/changeling/powers/transform.dm
index 2929b5743e..1e2b22cdae 100644
--- a/code/modules/antagonists/changeling/powers/transform.dm
+++ b/code/modules/antagonists/changeling/powers/transform.dm
@@ -8,7 +8,7 @@
/obj/item/clothing/glasses/changeling
name = "flesh"
- flags_1 = NODROP_1
+ item_flags = NODROP
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/clothing/glasses/changeling/attack_hand(mob/user)
@@ -20,7 +20,7 @@
/obj/item/clothing/under/changeling
name = "flesh"
- flags_1 = NODROP_1
+ item_flags = NODROP
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/clothing/under/changeling/attack_hand(mob/user)
@@ -32,7 +32,7 @@
/obj/item/clothing/suit/changeling
name = "flesh"
- flags_1 = NODROP_1
+ item_flags = NODROP
allowed = list(/obj/item/changeling)
//ATTACK HAND IGNORING PARENT RETURN VALUE
@@ -45,7 +45,7 @@
/obj/item/clothing/head/changeling
name = "flesh"
- flags_1 = NODROP_1
+ item_flags = NODROP
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/clothing/head/changeling/attack_hand(mob/user)
@@ -57,7 +57,7 @@
/obj/item/clothing/shoes/changeling
name = "flesh"
- flags_1 = NODROP_1
+ item_flags = NODROP
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/clothing/shoes/changeling/attack_hand(mob/user)
@@ -69,7 +69,7 @@
/obj/item/clothing/gloves/changeling
name = "flesh"
- flags_1 = NODROP_1
+ item_flags = NODROP
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/clothing/gloves/changeling/attack_hand(mob/user)
@@ -81,7 +81,7 @@
/obj/item/clothing/mask/changeling
name = "flesh"
- flags_1 = NODROP_1
+ item_flags = NODROP
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/clothing/mask/changeling/attack_hand(mob/user)
@@ -93,7 +93,7 @@
/obj/item/changeling
name = "flesh"
- flags_1 = NODROP_1
+ item_flags = NODROP
slot_flags = ALL
allowed = list(/obj/item/changeling)
diff --git a/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm b/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm
index f3de8d04a8..34a986aa97 100644
--- a/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm
+++ b/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm
@@ -44,6 +44,7 @@
icon = 'icons/turf/floors.dmi'
icon_state = "clockwork_floor"
layer = TURF_LAYER
+ plane = FLOOR_PLANE
/obj/effect/clockwork/overlay/floor/bloodcult //this is used by BLOOD CULT, it shouldn't use such a path...
icon_state = "cult"
\ No newline at end of file
diff --git a/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm b/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm
index b32345fa69..bd986bac25 100644
--- a/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm
+++ b/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm
@@ -254,8 +254,8 @@
var/list/repair_values = list()
if(!fabricator.fabricator_repair_checks(repair_values, src, user))
return
- user.visible_message("[user]'s [fabricator.name] starts coverin[src == user ? "g [user.p_them()]" : "g [src]"] in glowing orange energy...", \
- "You start repairin[src == user ? "g yourself" : "g [src]"]...")
+ user.visible_message("[user]'s [fabricator.name] starts covering [src == user ? "[user.p_them()]" : "[src]"] in glowing orange energy...", \
+ "You start repairing [src == user ? "yourself" : "[src]"]...")
fabricator.repairing = src
while(fabricator && user && src)
if(!do_after(user, repair_values["healing_for_cycle"] * fabricator.speed_multiplier, target = src, \
@@ -283,7 +283,7 @@
if(health == maxHealth) //if we're at maximum health, replace the turf under us
return FALSE
else if(fabricator_heal(user, fabricator) && user)
- user.visible_message("[user]'s [fabricator.name] stops coverin[src == user ? "g [user.p_them()]" : "g [src]"] with glowing orange energy.", \
+ user.visible_message("[user]'s [fabricator.name] stops covering [src == user ? "[user.p_them()]" : "[src]"] with glowing orange energy.", \
"You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_theyre(TRUE)]"] now at [abs(HEALTH_THRESHOLD_DEAD - health)]/[abs(HEALTH_THRESHOLD_DEAD - maxHealth)] health.")
//Same with clockwork mobs.
@@ -292,7 +292,7 @@
if(health == maxHealth) //if we're at maximum health, replace the turf under us
return FALSE
else if(fabricator_heal(user, fabricator) && user)
- user.visible_message("[user]'s [fabricator.name] stops coverin[src == user ? "g [user.p_them()]" : "g [src]"] with glowing orange energy.", \
+ user.visible_message("[user]'s [fabricator.name] stops covering [src == user ? "[user.p_them()]" : "[src]"] with glowing orange energy.", \
"You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_theyre(TRUE)]"] now at [health]/[maxHealth] health.")
//Cogscarabs get special interaction because they're drones and have innate self-heals/revives.
@@ -304,13 +304,13 @@
if(health == maxHealth)
return FALSE
else if(!(flags_1 & GODMODE))
- user.visible_message("[user]'s [fabricator.name] starts coverin[src == user ? "g [user.p_them()]" : "g [src]"] in glowing orange energy...", \
- "You start repairin[src == user ? "g yourself" : "g [src]"]...")
+ user.visible_message("[user]'s [fabricator.name] starts covering [src == user ? "[user.p_them()]" : "[src]"] in glowing orange energy...", \
+ "You start repairing [src == user ? "yourself" : "[src]"]...")
fabricator.repairing = src
if(do_after(user, (maxHealth - health)*2, target=src))
adjustHealth(-maxHealth)
- user.visible_message("[user]'s [fabricator.name] stops coverin[src == user ? "g [user.p_them()]" : "g [src]"] with glowing orange energy.", \
- "You finish repairin[src == user ? "g yourself" : "g [src]"].")
+ user.visible_message("[user]'s [fabricator.name] stops covering [src == user ? "[user.p_them()]" : "[src]"] with glowing orange energy.", \
+ "You finish repairing [src == user ? "yourself" : "[src]"].")
if(fabricator)
fabricator.repairing = null
diff --git a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm
index d39656c8d8..aaeb871e5d 100644
--- a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm
+++ b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm
@@ -67,7 +67,7 @@
name = "replicant manacles"
desc = "Heavy manacles made out of freezing-cold metal. It looks like brass, but feels much more solid."
icon_state = "brass_manacles"
- flags_1 = DROPDEL_1
+ item_flags = DROPDEL
/obj/item/restraints/handcuffs/clockwork/dropped(mob/user)
user.visible_message("[user]'s [name] come apart at the seams!", \
diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm
index 32bf870886..8ed8edae8a 100644
--- a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm
+++ b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm
@@ -50,7 +50,7 @@
user.emote("scream")
user.apply_damage(30, BRUTE, BODY_ZONE_HEAD)
user.adjustBrainLoss(30)
- addtimer(CALLBACK(user, /mob/living.proc/dropItemToGround), src, 1) //equipped happens before putting stuff on(but not before picking items up), 1). thus, we need to wait for it to be on before forcing it off.
+ addtimer(CALLBACK(user, /mob/living.proc/dropItemToGround, src, TRUE), 1) //equipped happens before putting stuff on(but not before picking items up), 1). thus, we need to wait for it to be on before forcing it off.
/obj/item/clothing/head/helmet/clockwork/mob_can_equip(mob/M, mob/equipper, slot, disable_warning = 0)
if(equipper && !is_servant_of_ratvar(equipper))
@@ -106,13 +106,13 @@
if(slot == SLOT_WEAR_SUIT && !is_servant_of_ratvar(user))
if(!iscultist(user))
to_chat(user, "\"Now now, this is for my servants, not you.\"")
- user.visible_message("As [user] puts [src] on, it flickers off [user.p_their()] body!", "The curiass flickers off your body, leaving only nausea!")
+ user.visible_message("As [user] puts [src] on, it flickers off [user.p_their()] body!", "The cuirass flickers off your body, leaving only nausea!")
if(iscarbon(user))
var/mob/living/carbon/C = user
C.vomit(20)
else
to_chat(user, "\"I think this armor is too hot for you to handle.\"")
- to_chat(user, "The curiass emits a burst of flame as you scramble to get it off!")
+ to_chat(user, "The cuirass emits a burst of flame as you scramble to get it off!")
user.emote("scream")
user.apply_damage(15, BURN, BODY_ZONE_CHEST)
user.adjust_fire_stacks(2)
diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm
index c464656150..1cdc05a07a 100644
--- a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm
+++ b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm
@@ -278,7 +278,7 @@
dat += "Items "
dat += "Slab: A clockwork slab, a Servant's most important tool. You're holding one! Keep it safe and hidden. "
dat += "Visor: A judicial visor, which is a pair of glasses that can smite an area for a brief stun and delayed explosion. "
- dat += "Wraith Specs: Wraith spectacles, which provide true sight (x-ray, night vision) but damage the wearer's eyes. "
+ dat += "Wraith Specs: Wraith spectacles, which provide true sight (X-ray, night vision) but damage the wearer's eyes. "
dat += "Spear: A Ratvarian spear, which is a very powerful melee weapon that produces Vitality. "
dat += "Fabricator: A replica fabricator, which converts objects into clockwork versions.
"
dat += "Constructs "
diff --git a/code/modules/antagonists/clockcult/clock_items/integration_cog.dm b/code/modules/antagonists/clockcult/clock_items/integration_cog.dm
index 4e4aff5569..0ce70336fe 100644
--- a/code/modules/antagonists/clockcult/clock_items/integration_cog.dm
+++ b/code/modules/antagonists/clockcult/clock_items/integration_cog.dm
@@ -9,7 +9,7 @@
Siphons 5 W of power per second while in an APC."
icon_state = "wall_gear"
w_class = WEIGHT_CLASS_TINY
- flags_1 = NOBLUDGEON_1
+ item_flags = NOBLUDGEON
var/obj/machinery/power/apc/apc
/obj/item/clockwork/integration_cog/Initialize()
diff --git a/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm b/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm
index c89a04c932..741b251a4f 100644
--- a/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm
+++ b/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm
@@ -8,7 +8,7 @@
righthand_file = 'icons/mob/inhands/antag/clockwork_righthand.dmi'
w_class = WEIGHT_CLASS_NORMAL
force = 5
- flags_1 = NOBLUDGEON_1
+ item_flags = NOBLUDGEON
var/speed_multiplier = 1 //The speed ratio the fabricator operates at
var/uses_power = TRUE
var/repairing = null //what we're currently repairing, if anything
diff --git a/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm b/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm
index dab12dc304..6fda25a1b5 100644
--- a/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm
+++ b/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm
@@ -1,4 +1,4 @@
-//Wraith spectacles: Grants x-ray and night vision at the eventual cost of the wearer's sight if worn too long. Nar-Sian cultists are instantly blinded.
+//Wraith spectacles: Grants X-ray and night vision at the eventual cost of the wearer's sight if worn too long. Nar-Sian cultists are instantly blinded.
/obj/item/clothing/glasses/wraith_spectacles
name = "antique spectacles"
desc = "Unnerving glasses with opaque yellow lenses."
diff --git a/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm b/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm
index ad4062598e..e78a6e4623 100644
--- a/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm
+++ b/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm
@@ -29,7 +29,7 @@
descname = "Trap, Stunning"
name = "Sigil of Transgression"
desc = "Wards a tile with a sigil, which will briefly stun the next non-Servant to cross it and apply Belligerent to them."
- invocations = list("Divinity, smite...", "...those who tresspass here!")
+ invocations = list("Divinity, smite...", "...those who trespass here!")
channel_time = 50
power_cost = 50
whispered = TRUE
diff --git a/code/modules/antagonists/clockcult/clock_structure.dm b/code/modules/antagonists/clockcult/clock_structure.dm
index a7eb192dc8..300e85e380 100644
--- a/code/modules/antagonists/clockcult/clock_structure.dm
+++ b/code/modules/antagonists/clockcult/clock_structure.dm
@@ -117,6 +117,9 @@
to_chat(user, "As you unsecure [src] from the floor, you see cracks appear in its surface!")
/obj/structure/destructible/clockwork/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
if(anchored && unanchored_icon)
anchored = FALSE
update_anchored(null, obj_integrity > max_integrity * 0.25)
@@ -203,6 +206,9 @@
toggle()
/obj/structure/destructible/clockwork/powered/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
if(forced_disable(TRUE))
new /obj/effect/temp_visual/emp(loc)
diff --git a/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm
index 2b1d9d5f02..35a6c34aaf 100644
--- a/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm
+++ b/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm
@@ -335,7 +335,7 @@
sleep(3)
GLOB.clockwork_gateway_activated = TRUE
var/turf/T = SSmapping.get_station_center()
- new /obj/structure/destructible/clockwork/massive/ratvar(T)
+ new /obj/structure/destructible/clockwork/massive/ratvar(T, TRUE) //Citadel edit - hugboxes ratvar spawning by admins
SSticker.force_ending = TRUE
var/x0 = T.x
var/y0 = T.y
diff --git a/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm b/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm
index 9fbcdfd223..b8b5c90dd8 100644
--- a/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm
+++ b/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm
@@ -17,7 +17,7 @@
var/convert_range = 10
obj_flags = CAN_BE_HIT | DANGEROUS_POSSESSION
-/obj/structure/destructible/clockwork/massive/ratvar/Initialize()
+/obj/structure/destructible/clockwork/massive/ratvar/Initialize(mapload, is_from_gateway = FALSE)
. = ..()
GLOB.ratvar_awakens++
for(var/obj/O in GLOB.all_clockwork_objects)
@@ -29,7 +29,8 @@
sound_to_playing_players('sound/effects/ratvar_reveal.ogg')
var/mutable_appearance/alert_overlay = mutable_appearance('icons/effects/clockwork_effects.dmi', "ratvar_alert")
notify_ghosts("The Justiciar's light calls to you! Reach out to Ratvar in [get_area_name(src)] to be granted a shell to spread his glory!", null, source = src, alert_overlay = alert_overlay)
- INVOKE_ASYNC(SSshuttle.emergency, /obj/docking_port/mobile/emergency.proc/request, null, 10, null, FALSE, 0)
+ if(is_from_gateway) //citadel edit - hugbox
+ INVOKE_ASYNC(SSshuttle.emergency, /obj/docking_port/mobile/emergency.proc/request, null, 10, null, FALSE, 0)
/obj/structure/destructible/clockwork/massive/ratvar/Destroy()
GLOB.ratvar_awakens--
diff --git a/code/modules/antagonists/clockcult/clock_structures/trap_triggers/repeater.dm b/code/modules/antagonists/clockcult/clock_structures/trap_triggers/repeater.dm
index 41292f818d..f5ed91ac15 100644
--- a/code/modules/antagonists/clockcult/clock_structures/trap_triggers/repeater.dm
+++ b/code/modules/antagonists/clockcult/clock_structures/trap_triggers/repeater.dm
@@ -12,7 +12,7 @@
return
if(!is_servant_of_ratvar(user))
return
- if(!isprocessing)
+ if(!(datum_flags & DF_ISPROCESSING))
START_PROCESSING(SSprocessing, src)
to_chat(user, "You activate [src].")
icon_state = "[icon_state]_on"
diff --git a/code/modules/antagonists/clockcult/clockcult.dm b/code/modules/antagonists/clockcult/clockcult.dm
index bbb83fc9a5..f2c0518cc2 100644
--- a/code/modules/antagonists/clockcult/clockcult.dm
+++ b/code/modules/antagonists/clockcult/clockcult.dm
@@ -159,7 +159,7 @@
SSticker.mode.servants_of_ratvar -= owner
SSticker.mode.update_servant_icons_removed(owner)
if(!silent)
- owner.current.visible_message("[owner] seems to have remembered [owner.p_their()] true allegiance!", null, null, null, owner.current)
+ owner.current.visible_message("[owner.current] seems to have remembered [owner.current.p_their()] true allegiance!", null, null, null, owner.current)
to_chat(owner, "A cold, cold darkness flows through your mind, extinguishing the Justiciar's light and all of your memories as his servant.")
owner.current.log_message("Has renounced the cult of Ratvar!", INDIVIDUAL_ATTACK_LOG)
owner.special_role = null
diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm
index 3df3d63ebd..847b49c354 100644
--- a/code/modules/antagonists/cult/blood_magic.dm
+++ b/code/modules/antagonists/cult/blood_magic.dm
@@ -64,7 +64,7 @@
qdel(nullify_spell)
return
BS = possible_spells[entered_spell_name]
- if(QDELETED(src) || owner.incapacitated() || !BS)
+ if(QDELETED(src) || owner.incapacitated() || !BS || (rune && !(locate(/obj/effect/rune/empower) in range(1, owner))) || (spells.len >= limit))
return
to_chat(owner,"You begin to carve unnatural symbols into your flesh!")
SEND_SOUND(owner, sound('sound/weapons/slice.ogg',0,1,10))
@@ -271,7 +271,6 @@
attached_action.desc += " Has [attached_action.charges] use\s remaining."
attached_action.UpdateButtonIcon()
if(attached_action.charges <= 0)
- remove_mousepointer(ranged_ability_user.client)
remove_ranged_ability("You have exhausted the spell's power!")
qdel(src)
@@ -340,7 +339,8 @@
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "disintegrate"
item_state = null
- flags_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1
+ item_flags = NEEDS_PERMIT | ABSTRACT | NODROP | DROPDEL
+
w_class = WEIGHT_CLASS_HUGE
throwforce = 0
throw_range = 0
@@ -520,7 +520,7 @@
name = "shadow shackles"
desc = "Shackles that bind the wrists with sinister magic."
trashtype = /obj/item/restraints/handcuffs/energy/used
- flags_1 = DROPDEL_1
+ item_flags = DROPDEL
/obj/item/restraints/handcuffs/energy/cult/used/dropped(mob/user)
user.visible_message("[user]'s shackles shatter in a discharge of dark magic!", \
@@ -542,7 +542,7 @@
var/obj/item/stack/sheet/candidate = target
if(candidate.use(50))
uses--
- to_chat(user, "A dark cloud eminates from your hand and swirls around the metal, twisting it into a construct shell!")
+ to_chat(user, "A dark cloud emanates from your hand and swirls around the metal, twisting it into a construct shell!")
new /obj/structure/constructshell(T)
SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25))
else
@@ -553,12 +553,12 @@
if(candidate.use(quantity))
uses --
new /obj/item/stack/sheet/runed_metal(T,quantity)
- to_chat(user, "A dark cloud eminates from you hand and swirls around the plasteel, transforming it into runed metal!")
+ to_chat(user, "A dark cloud emanates from you hand and swirls around the plasteel, transforming it into runed metal!")
SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25))
else if(istype(target,/mob/living/silicon/robot))
var/mob/living/silicon/robot/candidate = target
if(candidate.mmi)
- user.visible_message("A dark cloud eminates from [user]'s hand and swirls around [candidate]!")
+ user.visible_message("A dark cloud emanates from [user]'s hand and swirls around [candidate]!")
playsound(T, 'sound/machines/airlock_alien_prying.ogg', 80, 1)
var/prev_color = candidate.color
candidate.color = "black"
@@ -581,7 +581,7 @@
candidate.color = prev_color
else
uses--
- to_chat(user, "A dark cloud eminates from you hand and swirls around [candidate] - twisting it into a construct shell!")
+ to_chat(user, "A dark cloud emanates from you hand and swirls around [candidate] - twisting it into a construct shell!")
new /obj/structure/constructshell(T)
SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25))
else if(istype(target,/obj/machinery/door/airlock))
diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm
index 0c7fb025c7..8ea391d2ca 100644
--- a/code/modules/antagonists/cult/cult.dm
+++ b/code/modules/antagonists/cult/cult.dm
@@ -95,7 +95,7 @@
else
to_chat(mob, "You have a [item_name] in your [where].")
if(where == "backpack")
- mob.back.SendSignal(COMSIG_TRY_STORAGE_SHOW, mob)
+ SEND_SIGNAL(mob.back, COMSIG_TRY_STORAGE_SHOW, mob)
return TRUE
/datum/antagonist/cult/apply_innate_effects(mob/living/mob_override)
@@ -128,7 +128,7 @@
SSticker.mode.cult -= owner
SSticker.mode.update_cult_icons_removed(owner)
if(!silent)
- owner.current.visible_message("[owner.current] looks like [owner.current.p_theyve()] just reverted to [owner.p_their()] old faith!", null, null, null, owner.current)
+ owner.current.visible_message("[owner.current] looks like [owner.current.p_theyve()] just reverted to [owner.current.p_their()] old faith!", null, null, null, owner.current)
to_chat(owner.current, "An unfamiliar white light flashes through your mind, cleansing the taint of the Geometer and all your memories as her servant.")
owner.current.log_message("Has renounced the cult of Nar'Sie!", INDIVIDUAL_ATTACK_LOG)
if(cult_team.blood_target && cult_team.blood_target_image && owner.current.client)
@@ -228,7 +228,7 @@
target_candidates += player.mind
if(target_candidates.len == 0)
- message_admins("Cult Sacrifice: Could not find unconvertable target, checking for convertable target.")
+ message_admins("Cult Sacrifice: Could not find unconvertible target, checking for convertible target.")
for(var/mob/living/carbon/human/player in GLOB.player_list)
if(player.mind && !player.mind.has_antag_datum(/datum/antagonist/cult) && player.stat != DEAD)
target_candidates += player.mind
@@ -248,7 +248,7 @@
objectives += sac_objective
else
- message_admins("Cult Sacrifice: Could not find unconvertable or convertable target. WELP!")
+ message_admins("Cult Sacrifice: Could not find unconvertible or convertible target. WELP!")
//SUMMON OBJECTIVE
diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm
index b51ff99041..fd1d0d1c67 100644
--- a/code/modules/antagonists/cult/cult_comms.dm
+++ b/code/modules/antagonists/cult/cult_comms.dm
@@ -215,7 +215,7 @@
var/cooldown = 0
var/base_cooldown = 1200
-/datum/action/innate/cult/master/cultmark/New()
+/datum/action/innate/cult/master/cultmark/New(Target)
CM = new()
CM.attached_action = src
..()
@@ -299,7 +299,7 @@
name = "Mark a Blood Target for the Cult"
desc = "Marks a target for the entire cult to track."
-/datum/action/innate/cult/master/cultmark/IsAvailable()
+/datum/action/innate/cult/master/cultmark/ghost/IsAvailable()
if(istype(owner, /mob/dead/observer) && iscultist(owner.mind.current))
return TRUE
else
@@ -457,7 +457,6 @@
new /obj/effect/temp_visual/cult/sparks(get_turf(target), ranged_ability_user.dir)
attached_action.throwing = FALSE
attached_action.cooldown = world.time + attached_action.base_cooldown
- remove_mousepointer(ranged_ability_user.client)
remove_ranged_ability("A pulse of blood magic surges through you as you shift [attached_action.throwee] through time and space.")
caller.update_action_buttons_icon()
addtimer(CALLBACK(caller, /mob.proc/update_action_buttons_icon), attached_action.base_cooldown)
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index 5f56e1b91b..e1710dae96 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -64,7 +64,8 @@
/obj/item/melee/cultblade/ghost
name = "eldritch sword"
force = 19 //can't break normal airlocks
- flags_1 = NODROP_1|DROPDEL_1
+ item_flags = NEEDS_PERMIT | NODROP | DROPDEL
+ flags_1 = NONE
/obj/item/melee/cultblade/pickup(mob/living/user)
..()
@@ -301,7 +302,7 @@
item_state = "cult_hoodalt"
/obj/item/clothing/head/culthood/alt/ghost
- flags_1 = NODROP_1|DROPDEL_1
+ item_flags = NODROP | DROPDEL
/obj/item/clothing/suit/cultrobes/alt
name = "cultist robes"
@@ -310,7 +311,7 @@
item_state = "cultrobesalt"
/obj/item/clothing/suit/cultrobes/alt/ghost
- flags_1 = NODROP_1|DROPDEL_1
+ item_flags = NODROP | DROPDEL
/obj/item/clothing/head/magus
@@ -333,7 +334,7 @@
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
/obj/item/clothing/head/helmet/space/hardsuit/cult
- name = "nar-sien hardened helmet"
+ name = "\improper Nar-Sien hardened helmet"
desc = "A heavily-armored helmet worn by warriors of the Nar-Sien cult. It can withstand hard vacuum."
icon_state = "cult_helmet"
item_state = "cult_helmet"
@@ -342,7 +343,7 @@
actions_types = list()
/obj/item/clothing/suit/space/hardsuit/cult
- name = "nar-sien hardened armor"
+ name = "\improper Nar-Sien hardened armor"
icon_state = "cult_armor"
item_state = "cult_armor"
desc = "A heavily-armored exosuit worn by warriors of the Nar-Sien cult. It can withstand hard vacuum."
@@ -520,7 +521,7 @@
sleep(20)
var/global/list/curses
if(!curses)
- curses = list("A fuel technician just slit his own throat and begged for death. The shuttle will be delayed by three minutes.",
+ curses = list("A fuel technician just slit his own throat and begged for death.",
"The shuttle's navigation programming was replaced by a file containing just two words: IT COMES.",
"The shuttle's custodian was found washing the windows with their own blood.",
"A shuttle engineer began screaming 'DEATH IS NOT THE END' and ripped out wires until an arc flash seared off her flesh.",
@@ -754,7 +755,7 @@
guns_left = 24
mag_type = /obj/item/ammo_box/magazine/internal/boltaction/enchanted/arcane_barrage/blood
fire_sound = 'sound/magic/wand_teleport.ogg'
- flags_1 = NOBLUDGEON_1 | DROPDEL_1
+ item_flags = NEEDS_PERMIT | NOBLUDGEON | DROPDEL
/obj/item/ammo_box/magazine/internal/boltaction/enchanted/arcane_barrage/blood
@@ -792,7 +793,7 @@
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "disintegrate"
item_state = null
- flags_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1
+ item_flags = ABSTRACT | NODROP | DROPDEL
w_class = WEIGHT_CLASS_HUGE
throwforce = 0
throw_range = 0
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
index a1241d5998..df4715bc69 100644
--- a/code/modules/antagonists/cult/runes.dm
+++ b/code/modules/antagonists/cult/runes.dm
@@ -496,13 +496,13 @@ structure_check() searches for nearby cultist structures required for the invoca
if((istype(I, /obj/item/melee/cultblade/dagger) && iscultist(user)))
user.visible_message("[user.name] begins erasing [src]...", "You begin erasing [src]...")
if(do_after(user, 50, target = src)) //Prevents accidental erasures.
- log_game("Summon Narsie rune erased by [user.mind.key] (ckey) with [I.name]")
- message_admins("[key_name_admin(user)] erased a Narsie rune with [I.name]")
+ log_game("Summon Narsie rune erased by [key_name(user)] with [I.name]")
+ message_admins("[ADMIN_LOOKUPFLW(user)] erased a Narsie rune with [I.name]")
..()
else
if(istype(I, /obj/item/nullrod)) //Begone foul magiks. You cannot hinder me.
- log_game("Summon Narsie rune erased by [user.mind.key] (ckey) using a null rod")
- message_admins("[key_name_admin(user)] erased a Narsie rune with a null rod")
+ log_game("Summon Narsie rune erased by [key_name(user)] using a null rod")
+ message_admins("[ADMIN_LOOKUPFLW(user)] erased a Narsie rune with a null rod")
..()
//Rite of Resurrection: Requires a dead or inactive cultist. When reviving the dead, you can only perform one revival for every sacrifice your cult has carried out.
@@ -804,7 +804,7 @@ structure_check() searches for nearby cultist structures required for the invoca
construct_invoke = FALSE
color = RUNE_COLOR_DARKRED
var/mob/living/affecting = null
- var/ghost_limit = 4
+ var/ghost_limit = 3
var/ghosts = 0
/obj/effect/rune/manifest/Initialize()
@@ -834,10 +834,15 @@ structure_check() searches for nearby cultist structures required for the invoca
if(A.map_name == "Space" || is_mining_level(T.z))
to_chat(user, "The veil is not weak enough here to manifest spirits, you must be on station!")
return
+ if(ghosts >= ghost_limit)
+ to_chat(user, "You are sustaining too many ghosts to summon more!")
+ fail_invoke()
+ log_game("Manifest rune failed - too many summoned ghosts")
+ return list()
notify_ghosts("Manifest rune invoked in [get_area(src)].", 'sound/effects/ghost2.ogg', source = src)
var/list/ghosts_on_rune = list()
for(var/mob/dead/observer/O in T)
- if(O.client && !jobban_isbanned(O, ROLE_CULTIST))
+ if(O.client && !jobban_isbanned(O, ROLE_CULTIST) && !QDELETED(src) && !QDELETED(O))
ghosts_on_rune += O
if(!ghosts_on_rune.len)
to_chat(user, "There are no spirits near [src]!")
@@ -852,11 +857,6 @@ structure_check() searches for nearby cultist structures required for the invoca
new_human.apply_status_effect(STATUS_EFFECT_SUMMONEDGHOST) //ghosts can't summon more ghosts
new_human.see_invisible = SEE_INVISIBLE_OBSERVER
ghosts++
- if(ghosts >= ghost_limit)
- to_chat(user, "You are sustaining too many ghosts to summon more!")
- fail_invoke()
- log_game("Manifest rune failed - too many summoned ghosts")
- return list()
playsound(src, 'sound/magic/exit_blood.ogg', 50, 1)
visible_message("A cloud of red mist forms above [src], and from within steps... a [new_human.gender == FEMALE ? "wo":""]man.")
to_chat(user, "Your blood begins flowing into [src]. You must remain in place and conscious to maintain the forms of those summoned. This will hurt you slowly but surely...")
diff --git a/code/modules/antagonists/devil/devil.dm b/code/modules/antagonists/devil/devil.dm
index 3852eb6de1..fe05c9284c 100644
--- a/code/modules/antagonists/devil/devil.dm
+++ b/code/modules/antagonists/devil/devil.dm
@@ -387,7 +387,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
return H.reagents.has_reagent("holy water")
return 0
if(BANISH_COFFIN)
- return (body && istype(body.loc, /obj/structure/closet/coffin))
+ return (body && istype(body.loc, /obj/structure/closet/crate/coffin))
if(BANISH_FORMALDYHIDE)
if(iscarbon(body))
var/mob/living/carbon/H = body
diff --git a/code/modules/antagonists/devil/imp/imp.dm b/code/modules/antagonists/devil/imp/imp.dm
index 7752d0449f..da51a5d698 100644
--- a/code/modules/antagonists/devil/imp/imp.dm
+++ b/code/modules/antagonists/devil/imp/imp.dm
@@ -36,7 +36,7 @@
var/boost = 0
bloodcrawl = BLOODCRAWL_EAT
var/list/consumed_mobs = list()
- var/playstyle_string = "You are an imp, a mischevious creature from hell. You are the lowest rank on the hellish totem pole \
+ var/playstyle_string = "You are an imp, a mischievous creature from hell. You are the lowest rank on the hellish totem pole \
Though you are not obligated to help, perhaps by aiding a higher ranking devil, you might just get a promotion. However, you are incapable \
of intentionally harming a fellow devil."
diff --git a/code/modules/antagonists/devil/true_devil/_true_devil.dm b/code/modules/antagonists/devil/true_devil/_true_devil.dm
index 72b945600b..4e1175c13e 100644
--- a/code/modules/antagonists/devil/true_devil/_true_devil.dm
+++ b/code/modules/antagonists/devil/true_devil/_true_devil.dm
@@ -67,7 +67,7 @@
//Left hand items
for(var/obj/item/I in held_items)
- if(!(I.flags_1 & ABSTRACT_1))
+ if(!(I.item_flags & ABSTRACT))
msg += "It is holding [I.get_examine_string(user)] in its [get_held_index_name(get_held_index_of_item(I))].\n"
//Braindead
diff --git a/code/modules/antagonists/disease/disease_abilities.dm b/code/modules/antagonists/disease/disease_abilities.dm
index 9a792749a0..07cd3030b1 100644
--- a/code/modules/antagonists/disease/disease_abilities.dm
+++ b/code/modules/antagonists/disease/disease_abilities.dm
@@ -54,7 +54,7 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
stage_speed += initial(S.stage_speed)
transmittable += initial(S.transmittable)
threshold_block += "
"
/datum/disease_ability/proc/CanBuy(mob/camera/disease/D)
if(world.time < D.next_adaptation_time)
@@ -130,14 +130,14 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
required_total_points = 0
start_with = TRUE
short_desc = "Force the host you are following to cough, spreading your infection to those nearby."
- long_desc = "Force the host you are following to cough with extra force, spreading your infection to those within two meters of your host even if your transmitability is low. Cooldown: 10 seconds"
+ long_desc = "Force the host you are following to cough with extra force, spreading your infection to those within two meters of your host even if your transmissibility is low. Cooldown: 10 seconds"
/datum/action/cooldown/disease_cough
name = "Cough"
icon_icon = 'icons/mob/actions/actions_minor_antag.dmi'
button_icon_state = "cough"
- desc = "Force the host you are following to cough with extra force, spreading your infection to those within two meters of your host even if your transmitability is low. Cooldown: 10 seconds"
+ desc = "Force the host you are following to cough with extra force, spreading your infection to those within two meters of your host even if your transmissibility is low. Cooldown: 10 seconds"
cooldown_time = 100
/datum/action/cooldown/disease_cough/Trigger()
@@ -148,7 +148,7 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
if(!L)
return FALSE
if(L.stat != CONSCIOUS)
- to_chat(D, "Your host must be concious to cough.")
+ to_chat(D, "Your host must be conscious to cough.")
return FALSE
to_chat(D, "You force [L.real_name] to cough.")
L.emote("cough")
@@ -170,7 +170,7 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
name = "Sneeze"
icon_icon = 'icons/mob/actions/actions_minor_antag.dmi'
button_icon_state = "sneeze"
- desc = "Force the host you are following to sneeze with extra force, spreading your infection to any victims in a 4 meter cone in front of your host even if your transmitability is low. Cooldown: 20 seconds"
+ desc = "Force the host you are following to sneeze with extra force, spreading your infection to any victims in a 4 meter cone in front of your host even if your transmissibility is low. Cooldown: 20 seconds"
cooldown_time = 200
/datum/action/cooldown/disease_sneeze/Trigger()
@@ -181,7 +181,7 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
if(!L)
return FALSE
if(L.stat != CONSCIOUS)
- to_chat(D, "Your host must be concious to sneeze.")
+ to_chat(D, "Your host must be conscious to sneeze.")
return FALSE
to_chat(D, "You force [L.real_name] to sneeze.")
L.emote("sneeze")
@@ -243,7 +243,7 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
cost = 2
required_total_points = 4
short_desc = "Cause victims to cough intermittently."
- long_desc = "Cause victims to cough intermittently, spreading your infection if your transmitability is high."
+ long_desc = "Cause victims to cough intermittently, spreading your infection if your transmissibility is high."
/datum/disease_ability/symptom/sneeze
name = "Involuntary Sneezing"
@@ -251,7 +251,7 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
cost = 2
required_total_points = 4
short_desc = "Cause victims to sneeze intermittently."
- long_desc = "Cause victims to sneeze intermittently, spreading your infection and also increasing transmitability and resistance, at the cost of stealth."
+ long_desc = "Cause victims to sneeze intermittently, spreading your infection and also increasing transmissibility and resistance, at the cost of stealth."
/datum/disease_ability/symptom/beard
//I don't think I need to justify the fact that this is the best symptom
@@ -277,7 +277,7 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
cost = 4
required_total_points = 8
short_desc = "Cause victims to choke."
- long_desc = "Cause victims to choke, threatening asphyxiation. Decreases stats, especially transmittability."
+ long_desc = "Cause victims to choke, threatening asphyxiation. Decreases stats, especially transmissibility."
/datum/disease_ability/symptom/confusion
@@ -295,7 +295,7 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
cost = 4
required_total_points = 8
short_desc = "Cause victims to become eternally young."
- long_desc = "Cause victims to become eternally young. Provides boosts to all stats except transmittability."
+ long_desc = "Cause victims to become eternally young. Provides boosts to all stats except transmissibility."
/datum/disease_ability/symptom/vomit
@@ -304,7 +304,7 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
cost = 4
required_total_points = 8
short_desc = "Cause victims to vomit."
- long_desc = "Cause victims to vomit. Slightly increases transmittability. Vomiting also also causes the victims to lose nutrition and removes some toxin damage."
+ long_desc = "Cause victims to vomit. Slightly increases transmissibility. Vomiting also also causes the victims to lose nutrition and removes some toxin damage."
/datum/disease_ability/symptom/voice_change
@@ -367,7 +367,7 @@ GLOBAL_LIST_INIT(disease_ability_singletons, list(
cost = 4
required_total_points = 8
short_desc = "Cause victims to lose weight."
- long_desc = "Cause victims to lose weight, and make it almost immpossible for them to gain nutrition from food. Reduced nutrition allows your infection to spread more easily from hosts, especially by sneezing."
+ long_desc = "Cause victims to lose weight, and make it almost impossible for them to gain nutrition from food. Reduced nutrition allows your infection to spread more easily from hosts, especially by sneezing."
/datum/disease_ability/symptom/metabolism_heal
diff --git a/code/modules/antagonists/disease/disease_event.dm b/code/modules/antagonists/disease/disease_event.dm
index ad66ee0cbb..7183ed5455 100644
--- a/code/modules/antagonists/disease/disease_event.dm
+++ b/code/modules/antagonists/disease/disease_event.dm
@@ -20,7 +20,7 @@
var/mob/camera/disease/virus = new /mob/camera/disease(SSmapping.get_station_center())
virus.key = selected.key
INVOKE_ASYNC(virus, /mob/camera/disease/proc/pick_name)
- message_admins("[key_name_admin(virus)] has been made into a sentient disease by an event.")
+ message_admins("[ADMIN_LOOKUPFLW(virus)] has been made into a sentient disease by an event.")
log_game("[key_name(virus)] was spawned as a sentient disease by an event.")
spawned_mobs += virus
return SUCCESSFUL_SPAWN
diff --git a/code/modules/antagonists/disease/disease_mob.dm b/code/modules/antagonists/disease/disease_mob.dm
index bf035e1f21..6908c5eebf 100644
--- a/code/modules/antagonists/disease/disease_mob.dm
+++ b/code/modules/antagonists/disease/disease_mob.dm
@@ -81,7 +81,7 @@ the new instance inside the host to be updated to the template's stats.
/mob/camera/disease/Login()
..()
if(freemove)
- to_chat(src, "You have [round((freemove_end - world.time)/10)] seconds to select your first host. Click on a human to select your host.")
+ to_chat(src, "You have [DisplayTimeText(freemove_end - world.time)] to select your first host. Click on a human to select your host.")
/mob/camera/disease/Stat()
@@ -285,7 +285,7 @@ the new instance inside the host to be updated to the template's stats.
..()
/mob/camera/disease/proc/adapt_cooldown()
- to_chat(src, "You have altered your genetic structure. You will be unable to adapt again for [adaptation_cooldown/10] seconds.")
+ to_chat(src, "You have altered your genetic structure. You will be unable to adapt again for [DisplayTimeText(adaptation_cooldown)].")
next_adaptation_time = world.time + adaptation_cooldown
addtimer(CALLBACK(src, .proc/notify_adapt_ready), adaptation_cooldown)
@@ -310,7 +310,7 @@ the new instance inside the host to be updated to the template's stats.
Resistance: [DT.totalResistance()] \
Stealth: [DT.totalStealth()] \
Stage Speed: [DT.totalStageSpeed()] \
- Transmittability: [DT.totalTransmittable()]\
+ Transmissibility: [DT.totalTransmittable()]\
Cure: [DT.cure_text]"
dat += "
Adaptations
\
Points: [points] / [total_points]\
diff --git a/code/modules/antagonists/highlander/highlander.dm b/code/modules/antagonists/highlander/highlander.dm
index c55f177b7a..62da2df87f 100644
--- a/code/modules/antagonists/highlander/highlander.dm
+++ b/code/modules/antagonists/highlander/highlander.dm
@@ -42,7 +42,7 @@
if(!istype(H))
return
- for(var/obj/item/I in H.get_equipped_items())
+ for(var/obj/item/I in H.get_equipped_items(TRUE))
qdel(I)
for(var/obj/item/I in H.held_items)
qdel(I)
@@ -59,13 +59,13 @@
W.access += get_all_centcom_access()
W.assignment = "Highlander"
W.registered_name = H.real_name
- W.flags_1 |= NODROP_1
+ W.item_flags |= NODROP
W.update_label(H.real_name)
H.equip_to_slot_or_del(W, SLOT_WEAR_ID)
sword = new(H)
if(!GLOB.highlander)
- sword.admin_spawned = TRUE //To prevent announcing
+ sword.flags_1 |= ADMIN_SPAWNED_1 //To prevent announcing
sword.pickup(H) //For the stun shielding
H.put_in_hands(sword)
diff --git a/code/modules/antagonists/morph/morph.dm b/code/modules/antagonists/morph/morph.dm
index 6572584eab..12f8d22897 100644
--- a/code/modules/antagonists/morph/morph.dm
+++ b/code/modules/antagonists/morph/morph.dm
@@ -238,7 +238,7 @@
player_mind.add_antag_datum(/datum/antagonist/morph)
to_chat(S, S.playstyle_string)
SEND_SOUND(S, sound('sound/magic/mutate.ogg'))
- message_admins("[key_name_admin(S)] has been made into a morph by an event.")
+ message_admins("[ADMIN_LOOKUPFLW(S)] has been made into a morph by an event.")
log_game("[key_name(S)] was spawned as a morph by an event.")
spawned_mobs += S
return SUCCESSFUL_SPAWN
diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
index 3da349ef90..df04059f99 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
@@ -7,6 +7,7 @@ GLOBAL_LIST_EMPTY(jam_on_wardec)
/obj/item/nuclear_challenge
name = "Declaration of War (Challenge Mode)"
+ icon = 'icons/obj/device.dmi'
icon_state = "gangtool-red"
item_state = "radio"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
@@ -15,7 +16,7 @@ GLOBAL_LIST_EMPTY(jam_on_wardec)
Such a brazen move will attract the attention of powerful benefactors within the Syndicate, who will supply your team with a massive amount of bonus telecrystals. \
Must be used within five minutes, or your benefactors will lose interest."
var/declaring_war = FALSE
- var/uplink_type = /obj/item/radio/uplink/nuclear
+ var/uplink_type = /obj/item/uplink/nuclear
/obj/item/nuclear_challenge/attack_self(mob/living/user)
if(!check_allowed(user))
@@ -87,7 +88,7 @@ GLOBAL_LIST_EMPTY(jam_on_wardec)
return TRUE
/obj/item/nuclear_challenge/clownops
- uplink_type = /obj/item/radio/uplink/clownop
+ uplink_type = /obj/item/uplink/clownop
#undef CHALLENGE_TELECRYSTALS
#undef CHALLENGE_TIME_LIMIT
diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
index a9c6a112bd..df9b35ee8b 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
@@ -3,6 +3,7 @@
desc = "You probably shouldn't stick around to see if this is armed."
icon = 'icons/obj/machines/nuke.dmi'
icon_state = "nuclearbomb_base"
+ anchored = FALSE
density = TRUE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
@@ -15,6 +16,7 @@
var/numeric_input = ""
var/timing = FALSE
var/exploding = FALSE
+ var/exploded = FALSE
var/detonation_timer = null
var/r_code = "ADMIN"
var/yes_code = FALSE
@@ -254,7 +256,7 @@
first_status = "Set"
else
first_status = "Auth S1."
- var/second_status = safety ? "Safe" : "Engaged"
+ var/second_status = exploded ? "Warhead triggered, thanks for flying Nanotrasen" : (safety ? "Safe" : "Engaged")
data["status1"] = first_status
data["status2"] = second_status
data["anchored"] = anchored
@@ -331,13 +333,13 @@
timer_set = CLAMP(N,minimum_timer_set,maximum_timer_set)
. = TRUE
if("safety")
- if(auth && yes_code)
+ if(auth && yes_code && !exploded)
set_safety()
if("anchor")
if(auth && yes_code)
set_anchor()
if("toggle_timer")
- if(auth && yes_code && !safety)
+ if(auth && yes_code && !safety && !exploded)
set_active()
@@ -369,11 +371,11 @@
if(timing)
previous_level = get_security_level()
bomb_set = TRUE
- set_security_level("delta")
detonation_timer = world.time + (timer_set * 10)
for(var/obj/item/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list)
S.switch_mode_to(TRACK_INFILTRATOR)
countdown.start()
+ set_security_level("delta")
else
bomb_set = FALSE
detonation_timer = null
@@ -395,9 +397,9 @@
return
qdel(src)
-/obj/machinery/nuclearbomb/tesla_act(power, explosive)
+/obj/machinery/nuclearbomb/tesla_act(power, tesla_flags)
..()
- if(explosive)
+ if(tesla_flags & TESLA_MACHINE_EXPLOSIVE)
qdel(src)//like the singulo, tesla deletes it. stops it from exploding over and over
#define NUKERANGE 127
@@ -455,6 +457,71 @@
else
return CINEMATIC_SELFDESTRUCT_MISS
+/obj/machinery/nuclearbomb/beer
+ name = "Nanotrasen-brand nuclear fission explosive"
+ desc = "One of the more successful achievements of the Nanotrasen Corporate Warfare Division, their nuclear fission explosives are renowned for being cheap to produce and devastatingly effective. Signs explain that though this particular device has been decommissioned, every Nanotrasen station is equipped with an equivalent one, just in case. All Captains carefully guard the disk needed to detonate them - at least, the sign says they do. There seems to be a tap on the back."
+ var/obj/structure/reagent_dispensers/beerkeg/keg
+
+/obj/machinery/nuclearbomb/beer/Initialize()
+ . = ..()
+ keg = new(src)
+ QDEL_NULL(core)
+
+/obj/machinery/nuclearbomb/beer/examine(mob/user)
+ . = ..()
+ if(keg.reagents.total_volume)
+ to_chat(user, "It has [keg.reagents.total_volume] unit\s left.")
+ else
+ to_chat(user, "It's empty.")
+
+/obj/machinery/nuclearbomb/beer/attackby(obj/item/W, mob/user, params)
+ if(W.is_refillable())
+ W.afterattack(keg, user, TRUE) // redirect refillable containers to the keg, allowing them to be filled
+ return TRUE // pretend we handled the attack, too.
+ if(istype(W, /obj/item/nuke_core_container))
+ to_chat(user, "[src] has had its plutonium core removed as a part of being decommissioned.")
+ return TRUE
+ return ..()
+
+/obj/machinery/nuclearbomb/beer/actually_explode()
+ var/turf/bomb_location = get_turf(src)
+ if(!bomb_location)
+ disarm()
+ return
+ if(is_station_level(bomb_location.z))
+ var/datum/round_event_control/E = locate(/datum/round_event_control/vent_clog/beer) in SSevents.control
+ if(E)
+ E.runEvent()
+ addtimer(CALLBACK(src, .proc/really_actually_explode), 110)
+ else
+ visible_message("[src] fizzes ominously.")
+ addtimer(CALLBACK(src, .proc/fizzbuzz), 110)
+
+/obj/machinery/nuclearbomb/beer/proc/disarm()
+ bomb_set = FALSE
+ detonation_timer = null
+ exploding = FALSE
+ exploded = TRUE
+ set_security_level(previous_level)
+ for(var/obj/item/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list)
+ S.switch_mode_to(initial(S.mode))
+ S.alert = FALSE
+ countdown.stop()
+ update_icon()
+
+/obj/machinery/nuclearbomb/beer/proc/fizzbuzz()
+ var/datum/reagents/R = new/datum/reagents(1000)
+ R.my_atom = src
+ R.add_reagent("beer", 100)
+
+ var/datum/effect_system/foam_spread/foam = new
+ foam.set_up(200, get_turf(src), R)
+ foam.start()
+ disarm()
+
+/obj/machinery/nuclearbomb/beer/really_actually_explode()
+ disarm()
+
/proc/KillEveryoneOnZLevel(z)
if(!z)
return
@@ -521,7 +588,7 @@ This is here to make the tiles around the station mininuke change when it's arme
CRASH("A fake nuke disk tried to call process(). Who the fuck and how the fuck")
var/turf/newturf = get_turf(src)
if(newturf && lastlocation == newturf)
- if(last_disk_move < world.time - 5000 && prob((world.time - 5000 - last_disk_move)*0.00001))
+ if(last_disk_move < world.time - 5000 && prob((world.time - 5000 - last_disk_move)*0.0001))
var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control
if(istype(loneop))
loneop.weight += 1
diff --git a/code/modules/antagonists/nukeop/equipment/pinpointer.dm b/code/modules/antagonists/nukeop/equipment/pinpointer.dm
index 1cdc356559..d8dc709975 100644
--- a/code/modules/antagonists/nukeop/equipment/pinpointer.dm
+++ b/code/modules/antagonists/nukeop/equipment/pinpointer.dm
@@ -52,7 +52,7 @@
/obj/item/pinpointer/nuke/proc/switch_mode_to(new_mode)
if(isliving(loc))
var/mob/living/L = loc
- to_chat(L, "Your [name] beeps as it reconfigures its tracking algorithms.")
+ to_chat(L, "Your [name] beeps as it reconfigures it's tracking algorithms.")
playsound(L, 'sound/machines/triple_beep.ogg', 50, 1)
mode = new_mode
scan_for_target()
@@ -65,7 +65,8 @@
/obj/item/pinpointer/syndicate_cyborg // Cyborg pinpointers just look for a random operative.
name = "cyborg syndicate pinpointer"
desc = "An integrated tracking device, jury-rigged to search for living Syndicate operatives."
- flags_1 = NODROP_1
+ item_flags = NODROP
+ flags_1 = NONE
/obj/item/pinpointer/syndicate_cyborg/scan_for_target()
target = null
@@ -79,4 +80,3 @@
if(closest_operative)
target = closest_operative
..()
-
diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm
index df7d21e46b..db25adcda4 100644
--- a/code/modules/antagonists/nukeop/nukeop.dm
+++ b/code/modules/antagonists/nukeop/nukeop.dm
@@ -65,6 +65,8 @@
nuke.r_code = nuke_team.memorized_code
else //Already set by admins/something else?
nuke_team.memorized_code = nuke.r_code
+ for(var/obj/machinery/nuclearbomb/beer/beernuke in GLOB.nuke_list)
+ beernuke.r_code = nuke_team.memorized_code
else
stack_trace("Syndicate nuke not found during nuke team creation.")
nuke_team.memorized_code = null
@@ -256,7 +258,8 @@
/datum/team/nuclear/proc/syndies_escaped()
var/obj/docking_port/mobile/S = SSshuttle.getShuttle("syndicate")
- return S && (is_centcom_level(S.z) || is_transit_level(S.z))
+ var/obj/docking_port/stationary/transit/T = locate() in S.loc
+ return S && (is_centcom_level(S.z) || T)
/datum/team/nuclear/proc/get_result()
var/evacuation = SSshuttle.emergency.mode == SHUTTLE_ENDGAME
@@ -275,7 +278,7 @@
return NUKE_RESULT_WRONG_STATION
else if (!disk_rescued && !station_was_nuked && nuke_off_station && syndies_didnt_escape)
return NUKE_RESULT_WRONG_STATION_DEAD
- else if ((disk_rescued || evacuation) && operatives_dead())
+ else if ((disk_rescued && evacuation) && operatives_dead())
return NUKE_RESULT_CREW_WIN_SYNDIES_DEAD
else if (disk_rescued)
return NUKE_RESULT_CREW_WIN
diff --git a/code/modules/antagonists/official/official.dm b/code/modules/antagonists/official/official.dm
index 4b867585ae..23bf472422 100644
--- a/code/modules/antagonists/official/official.dm
+++ b/code/modules/antagonists/official/official.dm
@@ -31,7 +31,7 @@
else if (!mission)
var/datum/objective/missionobj = new
missionobj.owner = owner
- missionobj.explanation_text = "Conduct a routine preformance review of [station_name()] and its Captain."
+ missionobj.explanation_text = "Conduct a routine performance review of [station_name()] and its Captain."
missionobj.completed = 1
mission = missionobj
objectives |= mission
diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm
index c520b64146..03150c0254 100644
--- a/code/modules/antagonists/revenant/revenant.dm
+++ b/code/modules/antagonists/revenant/revenant.dm
@@ -109,11 +109,6 @@
revealed = FALSE
incorporeal_move = INCORPOREAL_MOVE_JAUNT
invisibility = INVISIBILITY_REVENANT
- if(staticOverlays.len)
- for(var/mob/living/simple_animal/drone/D in GLOB.drones_list)
- if(D && D.client && D.seeStatic)
- D.staticOverlays.Remove(staticOverlays)
- D.client.images.Remove(staticOverlays)
to_chat(src, "You are once more concealed.")
if(unstun_time && world.time >= unstun_time)
unstun_time = 0
@@ -250,15 +245,6 @@
else
to_chat(src, "You have been revealed!")
unreveal_time = unreveal_time + time
- if(staticOverlays.len)
- for(var/mob/living/simple_animal/drone/D in GLOB.drones_list)
- if(D && D.client && D.seeStatic)
- if(D.staticChoice in staticOverlays)
- D.staticOverlays |= staticOverlays[D.staticChoice]
- D.client.images |= staticOverlays[D.staticChoice]
- else
- D.staticOverlays |= staticOverlays["static"]
- D.client.images |= staticOverlays["static"]
update_spooky_icon()
/mob/living/simple_animal/revenant/proc/stun(time)
diff --git a/code/modules/antagonists/revenant/revenant_spawn_event.dm b/code/modules/antagonists/revenant/revenant_spawn_event.dm
index 483be4dc34..c9a892cd64 100644
--- a/code/modules/antagonists/revenant/revenant_spawn_event.dm
+++ b/code/modules/antagonists/revenant/revenant_spawn_event.dm
@@ -53,7 +53,7 @@
var/mob/living/simple_animal/revenant/revvie = new(pick(spawn_locs))
revvie.key = selected.key
- message_admins("[key_name_admin(revvie)] [ADMIN_FLW(revvie)] has been made into a revenant by an event.")
+ message_admins("[ADMIN_LOOKUPFLW(revvie)] has been made into a revenant by an event.")
log_game("[key_name(revvie)] was spawned as a revenant by an event.")
spawned_mobs += revvie
return SUCCESSFUL_SPAWN
diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm
index 19c3a43020..a454a9a964 100644
--- a/code/modules/antagonists/revolution/revolution.dm
+++ b/code/modules/antagonists/revolution/revolution.dm
@@ -201,7 +201,7 @@
/datum/antagonist/rev/farewell()
if(ishuman(owner.current))
- owner.current.visible_message("[owner.current] looks like [owner.p_theyve()] just remembered [owner.p_their()] real allegiance!", null, null, null, owner.current)
+ owner.current.visible_message("[owner.current] looks like [owner.current.p_theyve()] just remembered [owner.current.p_their()] real allegiance!", null, null, null, owner.current)
to_chat(owner, "You are no longer a brainwashed revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you...")
else if(issilicon(owner.current))
owner.current.visible_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.", null, null, null, owner.current)
diff --git a/code/modules/antagonists/slaughter/slaughterevent.dm b/code/modules/antagonists/slaughter/slaughterevent.dm
index 38054fccec..4d81741c91 100644
--- a/code/modules/antagonists/slaughter/slaughterevent.dm
+++ b/code/modules/antagonists/slaughter/slaughterevent.dm
@@ -41,7 +41,7 @@
to_chat(S, S.playstyle_string)
to_chat(S, "You are currently not currently in the same plane of existence as the station. Blood Crawl near a blood pool to manifest.")
SEND_SOUND(S, 'sound/magic/demon_dies.ogg')
- message_admins("[key_name_admin(S)] has been made into a slaughter demon by an event.")
+ message_admins("[ADMIN_LOOKUPFLW(S)] has been made into a slaughter demon by an event.")
log_game("[key_name(S)] was spawned as a slaughter demon by an event.")
spawned_mobs += S
return SUCCESSFUL_SPAWN
diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm
index 3ea2e1d739..d4d86cc087 100644
--- a/code/modules/antagonists/swarmer/swarmer.dm
+++ b/code/modules/antagonists/swarmer/swarmer.dm
@@ -128,6 +128,9 @@
return ..() | SPAN_ROBOT
/mob/living/simple_animal/hostile/swarmer/emp_act()
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
if(health > 1)
adjustHealth(health-1)
else
@@ -370,6 +373,10 @@
to_chat(S, "Attempting to dismantle this machine would result in an immediate counterattack. Aborting.")
return FALSE
+/obj/machinery/porta_turret_cover/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
+ to_chat(S, "Attempting to dismantle this machine would result in an immediate counterattack. Aborting.")
+ return FALSE
+
/mob/living/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
S.DisperseTarget(src)
return TRUE
@@ -402,6 +409,10 @@
to_chat(S, "This object does not contain enough materials to work with.")
return FALSE
+/obj/machinery/field/generator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
+ to_chat(S, "Destroying this object would cause a catastrophic chain reaction. Aborting.")
+ return FALSE
+
////END CTRL CLICK FOR SWARMERS////
/mob/living/simple_animal/hostile/swarmer/proc/Fabricate(atom/fabrication_object,fabrication_cost = 0)
@@ -554,6 +565,9 @@
playsound(src, 'sound/items/welder.ogg', 100, 1)
/obj/structure/swarmer/emp_act()
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
qdel(src)
/obj/structure/swarmer/trap
diff --git a/code/modules/antagonists/traitor/IAA/internal_affairs.dm b/code/modules/antagonists/traitor/IAA/internal_affairs.dm
index 605db9797d..5213c679ca 100644
--- a/code/modules/antagonists/traitor/IAA/internal_affairs.dm
+++ b/code/modules/antagonists/traitor/IAA/internal_affairs.dm
@@ -5,12 +5,6 @@
#define TRAITOR_AGENT_ROLE "Syndicate External Affairs Agent"
/datum/antagonist/traitor/internal_affairs
- name = "Internal Affairs Agent"
- human_datum = /datum/antagonist/traitor/human/internal_affairs
- ai_datum = /datum/antagonist/traitor/AI/internal_affairs
- antagpanel_category = "IAA"
-
-/datum/antagonist/traitor/AI/internal_affairs
name = "Internal Affairs Agent"
employer = "Nanotrasen"
special_role = "internal affairs agent"
@@ -20,47 +14,29 @@
var/list/datum/mind/targets_stolen
-/datum/antagonist/traitor/human/internal_affairs
- name = "Internal Affairs Agent"
- employer = "Nanotrasen"
- special_role = "internal affairs agent"
- antagpanel_category = "IAA"
- var/syndicate = FALSE
- var/last_man_standing = FALSE
- var/list/datum/mind/targets_stolen
-
-
-/datum/antagonist/traitor/human/internal_affairs/proc/give_pinpointer()
+/datum/antagonist/traitor/internal_affairs/proc/give_pinpointer()
if(owner && owner.current)
owner.current.apply_status_effect(/datum/status_effect/agent_pinpointer)
-/datum/antagonist/traitor/human/internal_affairs/apply_innate_effects()
+/datum/antagonist/traitor/internal_affairs/apply_innate_effects()
.=..() //in case the base is used in future
if(owner && owner.current)
give_pinpointer(owner.current)
-/datum/antagonist/traitor/human/internal_affairs/remove_innate_effects()
+/datum/antagonist/traitor/internal_affairs/remove_innate_effects()
.=..()
if(owner && owner.current)
owner.current.remove_status_effect(/datum/status_effect/agent_pinpointer)
-/datum/antagonist/traitor/human/internal_affairs/on_gain()
+/datum/antagonist/traitor/internal_affairs/on_gain()
START_PROCESSING(SSprocessing, src)
.=..()
-/datum/antagonist/traitor/human/internal_affairs/on_removal()
+/datum/antagonist/traitor/internal_affairs/on_removal()
STOP_PROCESSING(SSprocessing,src)
.=..()
-/datum/antagonist/traitor/human/internal_affairs/process()
+/datum/antagonist/traitor/internal_affairs/process()
iaa_process()
-/datum/antagonist/traitor/AI/internal_affairs/on_gain()
- START_PROCESSING(SSprocessing, src)
- .=..()
-/datum/antagonist/traitor/AI/internal_affairs/on_removal()
- STOP_PROCESSING(SSprocessing,src)
- .=..()
-/datum/antagonist/traitor/AI/internal_affairs/process()
- iaa_process()
/datum/status_effect/agent_pinpointer
id = "agent_pinpointer"
@@ -68,6 +44,7 @@
tick_interval = PINPOINTER_PING_TIME
alert_type = /obj/screen/alert/status_effect/agent_pinpointer
var/minimum_range = PINPOINTER_MINIMUM_RANGE
+ var/range_fuzz_factor = PINPOINTER_EXTRA_RANDOM_RANGE
var/mob/scan_target = null
/obj/screen/alert/status_effect/agent_pinpointer
@@ -85,7 +62,7 @@
if(here.z != there.z)
linked_alert.icon_state = "pinonnull"
return
- if(get_dist_euclidian(here,there)<=minimum_range + rand(0, PINPOINTER_EXTRA_RANDOM_RANGE))
+ if(get_dist_euclidian(here,there)<=minimum_range + rand(0, range_fuzz_factor))
linked_alert.icon_state = "pinondirect"
else
linked_alert.setDir(get_dir(here, there))
@@ -142,21 +119,14 @@
continue
remove_objective(objective_)
-/datum/antagonist/traitor/human/internal_affairs/reinstate_escape_objective()
+/datum/antagonist/traitor/internal_affairs/reinstate_escape_objective()
..()
- var/datum/objective/escape/escape_objective = new
+ var/objtype = traitor_kind == TRAITOR_HUMAN ? /datum/objective/escape : /datum/objective/survive
+ var/datum/objective/escape_objective = new objtype
escape_objective.owner = owner
add_objective(escape_objective)
-/datum/antagonist/traitor/AI/internal_affairs/reinstate_escape_objective()
- ..()
- var/datum/objective/survive/survive_objective = new
- survive_objective.owner = owner
- add_objective(survive_objective)
-
-/datum/antagonist/traitor/proc/steal_targets(datum/mind/victim)
- var/datum/antagonist/traitor/human/internal_affairs/this = src //Should only use this if IAA
-
+/datum/antagonist/traitor/internal_affairs/proc/steal_targets(datum/mind/victim)
if(!owner.current||owner.current.stat==DEAD)
return
to_chat(owner.current, " Target eliminated: [victim.name]")
@@ -165,13 +135,13 @@
var/datum/objective/assassinate/internal/objective = objective_
if(objective.target==owner)
continue
- else if(this.targets_stolen.Find(objective.target) == 0)
+ else if(targets_stolen.Find(objective.target) == 0)
var/datum/objective/assassinate/internal/new_objective = new
new_objective.owner = owner
new_objective.target = objective.target
new_objective.update_explanation_text()
add_objective(new_objective)
- this.targets_stolen += objective.target
+ targets_stolen += objective.target
var/status_text = objective.check_completion() ? "neutralised" : "active"
to_chat(owner.current, " New target added to database: [objective.target.name] ([status_text]) ")
else if(istype(objective_, /datum/objective/destroy/internal))
@@ -179,31 +149,30 @@
var/datum/objective/destroy/internal/new_objective = new
if(objective.target==owner)
continue
- else if(this.targets_stolen.Find(objective.target) == 0)
+ else if(targets_stolen.Find(objective.target) == 0)
new_objective.owner = owner
new_objective.target = objective.target
new_objective.update_explanation_text()
add_objective(new_objective)
- this.targets_stolen += objective.target
+ targets_stolen += objective.target
var/status_text = objective.check_completion() ? "neutralised" : "active"
to_chat(owner.current, " New target added to database: [objective.target.name] ([status_text]) ")
- this.last_man_standing = TRUE
+ last_man_standing = TRUE
for(var/objective_ in owner.objectives)
if(!is_internal_objective(objective_))
continue
var/datum/objective/assassinate/internal/objective = objective_
if(!objective.check_completion())
- this.last_man_standing = FALSE
+ last_man_standing = FALSE
return
- if(this.last_man_standing)
- if(this.syndicate)
+ if(last_man_standing)
+ if(syndicate)
to_chat(owner.current," All the loyalist agents are dead, and no more is required of you. Die a glorious death, agent. ")
else
to_chat(owner.current," All the other agents are dead, and you're the last loose end. Stage a Syndicate terrorist attack to cover up for today's events. You no longer have any limits on collateral damage.")
replace_escape_objective(owner)
-/datum/antagonist/traitor/proc/iaa_process()
- var/datum/antagonist/traitor/human/internal_affairs/this = src //Should only use this if IAA
+/datum/antagonist/traitor/internal_affairs/proc/iaa_process()
if(owner&&owner.current&&owner.current.stat!=DEAD)
for(var/objective_ in owner.objectives)
if(!is_internal_objective(objective_))
@@ -220,20 +189,18 @@
else
if(objective.stolen)
var/fail_msg = "Your sensors tell you that [objective.target.current.real_name], one of the targets you were meant to have killed, pulled one over on you, and is still alive - do the job properly this time! "
- if(this.last_man_standing)
- if(this.syndicate)
+ if(last_man_standing)
+ if(syndicate)
fail_msg += " You no longer have permission to die. "
else
fail_msg += " The truth could still slip out! Cease any terrorist actions as soon as possible, unneeded property damage or loss of employee life will lead to your contract being terminated."
reinstate_escape_objective(owner)
- this.last_man_standing = FALSE
+ last_man_standing = FALSE
to_chat(owner.current, fail_msg)
objective.stolen = FALSE
-/datum/antagonist/traitor/proc/forge_iaa_objectives()
- var/datum/antagonist/traitor/human/internal_affairs/this = src //Should only use this if IAA
+/datum/antagonist/traitor/internal_affairs/proc/forge_iaa_objectives()
if(SSticker.mode.target_list.len && SSticker.mode.target_list[owner]) // Is a double agent
-
// Assassinate
var/datum/mind/target_mind = SSticker.mode.target_list[owner]
if(issilicon(target_mind.current))
@@ -241,6 +208,7 @@
destroy_objective.owner = owner
destroy_objective.target = target_mind
destroy_objective.update_explanation_text()
+ add_objective(destroy_objective)
else
var/datum/objective/assassinate/internal/kill_objective = new
kill_objective.owner = owner
@@ -253,31 +221,25 @@
employer = "The Syndicate"
owner.special_role = TRAITOR_AGENT_ROLE
special_role = TRAITOR_AGENT_ROLE
- this.syndicate = TRUE
+ syndicate = TRUE
forge_single_objective()
-
else
..() // Give them standard objectives.
return
-/datum/antagonist/traitor/human/internal_affairs/forge_traitor_objectives()
+/datum/antagonist/traitor/internal_affairs/forge_traitor_objectives()
forge_iaa_objectives()
- var/datum/objective/escape/escape_objective = new
+
+ var/objtype = traitor_kind == TRAITOR_HUMAN ? /datum/objective/escape : /datum/objective/survive
+ var/datum/objective/escape_objective = new objtype
escape_objective.owner = owner
add_objective(escape_objective)
-/datum/antagonist/traitor/AI/internal_affairs/forge_traitor_objectives()
- forge_iaa_objectives()
- var/datum/objective/survive/survive_objective = new
- survive_objective.owner = owner
- add_objective(survive_objective)
-
-/datum/antagonist/traitor/proc/greet_iaa()
- var/datum/antagonist/traitor/human/internal_affairs/this = src //Should only use this if IAA
- var/crime = pick("distribution of contraband" , "unauthorized erotic action on duty", "embezzlement", "piloting under the influence", "dereliction of duty", "syndicate collaboration", "mutiny", "multiple homicides", "corporate espionage", "recieving bribes", "malpractice", "worship of prohbited life forms", "possession of profane texts", "murder", "arson", "insulting their manager", "grand theft", "conspiracy", "attempting to unionize", "vandalism", "gross incompetence")
+/datum/antagonist/traitor/internal_affairs/proc/greet_iaa()
+ var/crime = pick("distribution of contraband" , "unauthorized erotic action on duty", "embezzlement", "piloting under the influence", "dereliction of duty", "syndicate collaboration", "mutiny", "multiple homicides", "corporate espionage", "receiving bribes", "malpractice", "worship of prohibited life forms", "possession of profane texts", "murder", "arson", "insulting their manager", "grand theft", "conspiracy", "attempting to unionize", "vandalism", "gross incompetence")
to_chat(owner.current, "You are the [special_role].")
- if(this.syndicate)
+ if(syndicate)
to_chat(owner.current, "Your target has been framed for [crime], and you have been tasked with eliminating them to prevent them defending themselves in court.")
to_chat(owner.current, "Any damage you cause will be a further embarrassment to Nanotrasen, so you have no limits on collateral damage.")
to_chat(owner.current, " You have been provided with a standard uplink to accomplish your task. ")
@@ -289,13 +251,9 @@
to_chat(owner.current, "Finally, watch your back. Your target has friends in high places, and intel suggests someone may have taken out a contract of their own to protect them.")
owner.announce_objectives()
-/datum/antagonist/traitor/AI/internal_affairs/greet()
+/datum/antagonist/traitor/internal_affairs/greet()
greet_iaa()
-/datum/antagonist/traitor/human/internal_affairs/greet()
- greet_iaa()
-
-
#undef PROB_ACTUAL_TRAITOR
#undef PINPOINTER_EXTRA_RANDOM_RANGE
#undef PINPOINTER_MINIMUM_RANGE
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index f3ea4ef2ea..9066759648 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -1,39 +1,23 @@
+#define TRAITOR_HUMAN "human"
+#define TRAITOR_AI "AI"
+
/datum/antagonist/traitor
name = "Traitor"
roundend_category = "traitors"
antagpanel_category = "Traitor"
job_rank = ROLE_TRAITOR
antag_moodlet = /datum/mood_event/focused
- var/should_specialise = TRUE //do we split into AI and human, set to true on inital assignment only
- var/ai_datum = /datum/antagonist/traitor/AI
- var/human_datum = /datum/antagonist/traitor/human
var/special_role = ROLE_TRAITOR
var/employer = "The Syndicate"
var/give_objectives = TRUE
var/should_give_codewords = TRUE
-
-
-
-/datum/antagonist/traitor/human
- show_in_antagpanel = FALSE
- should_specialise = FALSE
var/should_equip = TRUE
-
-
-/datum/antagonist/traitor/AI
- show_in_antagpanel = FALSE
- should_specialise = FALSE
-
-/datum/antagonist/traitor/specialization(datum/mind/new_owner)
- if(should_specialise)
- if(new_owner.current && isAI(new_owner.current))
- return new ai_datum()
- else
- return new human_datum()
- else
- return ..()
+ var/traitor_kind = TRAITOR_HUMAN //Set on initial assignment
/datum/antagonist/traitor/on_gain()
+ if(owner.current && isAI(owner.current))
+ traitor_kind = TRAITOR_AI
+
SSticker.mode.traitors += owner
owner.special_role = special_role
if(give_objectives)
@@ -56,19 +40,18 @@
traitor_mob.dna.add_mutation(CLOWNMUT)
/datum/antagonist/traitor/on_removal()
- SSticker.mode.traitors -= owner
- if(!silent && owner.current)
- to_chat(owner.current," You are no longer the [special_role]! ")
- owner.special_role = null
- ..()
-
-/datum/antagonist/traitor/AI/on_removal()
- if(owner.current && isAI(owner.current))
+ //Remove malf powers.
+ if(traitor_kind == TRAITOR_AI && owner.current && isAI(owner.current))
var/mob/living/silicon/ai/A = owner.current
A.set_zeroth_law("")
A.verbs -= /mob/living/silicon/ai/proc/choose_modules
A.malf_picker.remove_malf_verbs(A)
qdel(A.malf_picker)
+
+ SSticker.mode.traitors -= owner
+ if(!silent && owner.current)
+ to_chat(owner.current," You are no longer the [special_role]! ")
+ owner.special_role = null
..()
/datum/antagonist/traitor/proc/add_objective(var/datum/objective/O)
@@ -80,9 +63,13 @@
objectives -= O
/datum/antagonist/traitor/proc/forge_traitor_objectives()
- return
+ switch(traitor_kind)
+ if(TRAITOR_AI)
+ forge_ai_objectives()
+ else
+ forge_human_objectives()
-/datum/antagonist/traitor/human/forge_traitor_objectives()
+/datum/antagonist/traitor/proc/forge_human_objectives()
var/is_hijacker = FALSE
if (GLOB.joined_player_list.len >= 30) // Less murderboning on lowpop thanks
is_hijacker = prob(10)
@@ -127,7 +114,7 @@
add_objective(escape_objective)
return
-/datum/antagonist/traitor/AI/forge_traitor_objectives()
+/datum/antagonist/traitor/proc/forge_ai_objectives()
var/objective_count = 0
if(prob(30))
@@ -142,9 +129,16 @@
var/datum/objective/survive/exist/exist_objective = new
exist_objective.owner = owner
add_objective(exist_objective)
+
+
/datum/antagonist/traitor/proc/forge_single_objective()
- return 0
-/datum/antagonist/traitor/human/forge_single_objective() //Returns how many objectives are added
+ switch(traitor_kind)
+ if(TRAITOR_AI)
+ return forge_single_AI_objective()
+ else
+ return forge_single_human_objective()
+
+/datum/antagonist/traitor/proc/forge_single_human_objective() //Returns how many objectives are added
.=1
if(prob(50))
var/list/active_ais = active_ais()
@@ -164,7 +158,7 @@
kill_objective.find_target()
add_objective(kill_objective)
else
- if(prob(15) && !(locate(/datum/objective/download in owner.objectives)))
+ if(prob(15) && !(locate(/datum/objective/download) in owner.objectives) && !(owner.assigned_role in list("Research Director", "Scientist", "Roboticist")))
var/datum/objective/download/download_objective = new
download_objective.owner = owner
download_objective.gen_amount_goal()
@@ -175,7 +169,7 @@
steal_objective.find_target()
add_objective(steal_objective)
-/datum/antagonist/traitor/AI/forge_single_objective()
+/datum/antagonist/traitor/proc/forge_single_AI_objective()
.=1
var/special_pick = rand(1,4)
switch(special_pick)
@@ -209,34 +203,41 @@
if(should_give_codewords)
give_codewords()
+/datum/antagonist/traitor/proc/update_traitor_icons_added(datum/mind/traitor_mind)
+ var/datum/atom_hud/antag/traitorhud = GLOB.huds[ANTAG_HUD_TRAITOR]
+ traitorhud.join_hud(owner.current)
+ set_antag_hud(owner.current, "traitor")
+
+/datum/antagonist/traitor/proc/update_traitor_icons_removed(datum/mind/traitor_mind)
+ var/datum/atom_hud/antag/traitorhud = GLOB.huds[ANTAG_HUD_TRAITOR]
+ traitorhud.leave_hud(owner.current)
+ set_antag_hud(owner.current, null)
+
/datum/antagonist/traitor/proc/finalize_traitor()
- SSticker.mode.update_traitor_icons_added(owner)
- return
+ switch(traitor_kind)
+ if(TRAITOR_AI)
+ add_law_zero()
+ owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/malf.ogg', 100, FALSE, pressure_affected = FALSE)
+ owner.current.grant_language(/datum/language/codespeak)
+ if(TRAITOR_HUMAN)
+ if(should_equip)
+ equip(silent)
+ owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/tatoralert.ogg', 100, FALSE, pressure_affected = FALSE)
-/datum/antagonist/traitor/AI/finalize_traitor()
- ..()
- add_law_zero()
- owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/malf.ogg', 100, FALSE, pressure_affected = FALSE)
- owner.current.grant_language(/datum/language/codespeak)
-
-/datum/antagonist/traitor/AI/apply_innate_effects(mob/living/mob_override)
+/datum/antagonist/traitor/apply_innate_effects(mob/living/mob_override)
. = ..()
+ update_traitor_icons_added()
var/mob/living/silicon/ai/A = mob_override || owner.current
- if(istype(A))
+ if(istype(A) && traitor_kind == TRAITOR_AI)
A.hack_software = TRUE
-/datum/antagonist/traitor/AI/remove_innate_effects(mob/living/mob_override)
+/datum/antagonist/traitor/remove_innate_effects(mob/living/mob_override)
. = ..()
+ update_traitor_icons_removed()
var/mob/living/silicon/ai/A = mob_override || owner.current
- if(istype(A))
+ if(istype(A) && traitor_kind == TRAITOR_AI)
A.hack_software = FALSE
-/datum/antagonist/traitor/human/finalize_traitor()
- ..()
- if(should_equip)
- equip(silent)
- owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/tatoralert.ogg', 100, FALSE, pressure_affected = FALSE)
-
/datum/antagonist/traitor/proc/give_codewords()
if(!owner.current)
return
@@ -251,7 +252,7 @@
to_chat(traitor_mob, "Use the code words in the order provided, during regular conversation, to identify other agents. Proceed with caution, however, as everyone is a potential foe.")
-/datum/antagonist/traitor/AI/proc/add_law_zero()
+/datum/antagonist/traitor/proc/add_law_zero()
var/mob/living/silicon/ai/killer = owner.current
if(!killer || !istype(killer))
return
@@ -263,12 +264,10 @@
killer.add_malf_picker()
/datum/antagonist/traitor/proc/equip(var/silent = FALSE)
- return
+ if(traitor_kind == TRAITOR_HUMAN)
+ owner.equip_traitor(employer, silent, src)
-/datum/antagonist/traitor/human/equip(var/silent = FALSE)
- owner.equip_traitor(employer, silent, src)
-
-/datum/antagonist/traitor/human/proc/assign_exchange_role()
+/datum/antagonist/traitor/proc/assign_exchange_role()
//set faction
var/faction = "red"
if(owner == SSticker.mode.exchange_blue)
diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
index 4482629a2e..ff4f7276bc 100644
--- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
+++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
@@ -319,7 +319,6 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
name = "doomsday device"
icon_state = "nuclearbomb_base"
desc = "A weapon which disintegrates all organic life in a large area."
- anchored = TRUE
density = TRUE
verb_exclaim = "blares"
var/timing = FALSE
@@ -533,7 +532,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
if(!is_station_level(AA.z))
continue
AA.obj_flags |= EMAGGED
- to_chat(owner, "All air alarm safeties on the station have been overriden. Air alarms may now use the Flood environmental mode.")
+ to_chat(owner, "All air alarm safeties on the station have been overridden. Air alarms may now use the Flood environmental mode.")
owner.playsound_local(owner, 'sound/machines/terminal_off.ogg', 50, 0)
@@ -556,6 +555,9 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
/datum/action/innate/ai/ranged/overload_machine/proc/detonate_machine(obj/machinery/M)
if(M && !QDELETED(M))
+ var/turf/T = get_turf(M)
+ message_admins("[ADMIN_LOOKUPFLW(usr)] overloaded [M.name] at [ADMIN_VERBOSEJMP(T)].")
+ log_game("[key_name(usr)] overloaded [M.name] at [AREACOORD(T)].")
explosion(get_turf(M), 0, 2, 3, 0)
if(M) //to check if the explosion killed it before we try to delete it
qdel(M)
@@ -623,7 +625,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
to_chat(ranged_ability_user, "You can only animate machines!")
return
if(!target.can_be_overridden() || is_type_in_typecache(target, GLOB.blacklisted_malf_machines))
- to_chat(ranged_ability_user, "That machine can't be overriden!")
+ to_chat(ranged_ability_user, "That machine can't be overridden!")
return
ranged_ability_user.playsound_local(ranged_ability_user, 'sound/misc/interference.ogg', 50, 0)
attached_action.adjust_uses(-1)
@@ -804,7 +806,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
desc = "[initial(desc)] There are [uses] reactivations remaining."
-//Upgrade Camera Network: EMP-proofs all cameras, in addition to giving them x-ray vision.
+//Upgrade Camera Network: EMP-proofs all cameras, in addition to giving them X-ray vision.
/datum/AI_Module/large/upgrade_cameras
module_name = "Upgrade Camera Network"
mod_pick_name = "upgradecam"
diff --git a/code/modules/antagonists/valentines/valentine.dm b/code/modules/antagonists/valentines/valentine.dm
index 7e1effbaff..31e69b32c2 100644
--- a/code/modules/antagonists/valentines/valentine.dm
+++ b/code/modules/antagonists/valentines/valentine.dm
@@ -16,8 +16,17 @@
/datum/antagonist/valentine/on_gain()
forge_objectives()
+ if(isliving(owner))
+ var/mob/living/L = owner
+ L.apply_status_effect(STATUS_EFFECT_INLOVE, date)
. = ..()
+/datum/antagonist/valentine/on_removal()
+ . = ..()
+ if(isliving(owner))
+ var/mob/living/L = owner
+ L.remove_status_effect(STATUS_EFFECT_INLOVE)
+
/datum/antagonist/valentine/greet()
to_chat(owner, "You're on a date with [date.name]! Protect [date.p_them()] at all costs. This takes priority over all other loyalties.")
diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm
index 1427f5ab68..415d1318cb 100644
--- a/code/modules/antagonists/wizard/equipment/artefact.dm
+++ b/code/modules/antagonists/wizard/equipment/artefact.dm
@@ -98,8 +98,10 @@
icon_state = "reality"
pixel_x = -96
pixel_y = -96
- grav_pull = 6
+ dissipate = 0
+ move_self = 0
consume_range = 3
+ grav_pull = 4
current_size = STAGE_FOUR
allowed_size = STAGE_FOUR
@@ -107,6 +109,10 @@
move()
eat()
return
+
+/obj/singularity/wizard/mapped/admin_investigate_setup()
+ return
+
/////////////////////////////////////////Scrying///////////////////
/obj/item/scrying
@@ -203,7 +209,7 @@
for(var/obj/item/I in H)
H.dropItemToGround(I)
- var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionaire)
+ var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionnaire)
H.equip_to_slot_or_del(new hat(H), SLOT_HEAD)
H.equip_to_slot_or_del(new /obj/item/clothing/under/roman(H), SLOT_W_UNIFORM)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), SLOT_SHOES)
@@ -277,7 +283,7 @@
if(BODY_ZONE_PRECISE_MOUTH)
var/wgw = sanitize(input(user, "What would you like the victim to say", "Voodoo", null) as text)
target.say(wgw)
- log_game("[user][user.key] made [target][target.key] say [wgw] with a voodoo doll.")
+ log_game("[key_name(user)] made [key_name(target)] say [wgw] with a voodoo doll.")
if(BODY_ZONE_PRECISE_EYES)
user.set_machine(src)
user.reset_perspective(target)
diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm
index e26c1e6d39..50bc4f54a4 100644
--- a/code/modules/antagonists/wizard/equipment/soulstone.dm
+++ b/code/modules/antagonists/wizard/equipment/soulstone.dm
@@ -9,7 +9,7 @@
desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artefact's power."
w_class = WEIGHT_CLASS_TINY
slot_flags = ITEM_SLOT_BELT
- var/usability = 0
+ var/usability = FALSE
var/old_shard = FALSE
var/spent = FALSE
@@ -23,7 +23,7 @@
whatever spark it once held long extinguished."
/obj/item/soulstone/anybody
- usability = 1
+ usability = TRUE
/obj/item/soulstone/anybody/chaplain
name = "mysterious old shard"
@@ -63,8 +63,9 @@
if(!ishuman(M))//If target is not a human.
return ..()
if(iscultist(M))
- to_chat(user, "\"Come now, do not capture your bretheren's soul.\"")
- return
+ if(iscultist(user))
+ to_chat(user, "\"Come now, do not capture your bretheren's soul.\"")
+ return
add_logs(user, M, "captured [M.name]'s soul", src)
transfer_soul("VICTIM", M, user)
@@ -82,7 +83,7 @@
/obj/item/soulstone/proc/release_shades(mob/user)
for(var/mob/living/simple_animal/shade/A in src)
A.status_flags &= ~GODMODE
- A.canmove = 1
+ A.canmove = TRUE
A.forceMove(get_turf(user))
A.cancel_camera()
icon_state = "soulstone"
@@ -114,7 +115,7 @@
var/obj/item/soulstone/SS = O
if(!iscultist(user) && !iswizard(user) && !SS.usability)
to_chat(user, "An overwhelming feeling of dread comes over you as you attempt to place the soulstone into the shell. It would be wise to be rid of this quickly.")
- user.Dizzy(120)
+ user.Dizzy(30)
return
SS.transfer_soul("CONSTRUCT",src,user)
SS.was_used()
@@ -128,15 +129,15 @@
switch(choice)
if("FORCE")
if(!iscarbon(target)) //TODO: Add sacrifice stoning for non-organics, just because you have no body doesnt mean you dont have a soul
- return 0
+ return FALSE
if(contents.len)
- return 0
+ return FALSE
var/mob/living/carbon/T = target
if(T.client != null)
for(var/obj/item/W in T)
T.dropItemToGround(W)
init_shade(T, user)
- return 1
+ return TRUE
else
to_chat(user, "Capture failed!: The soul has already fled its mortal frame. You attempt to bring it back...")
return getCultGhost(T,user)
@@ -149,7 +150,7 @@
to_chat(user, "\"This soul is mine.SACRIFICE THEM!\"")
else
to_chat(user, "The soulstone seems to reject this soul.")
- return 0
+ return FALSE
if(contents.len)
to_chat(user, "Capture failed!: The soulstone is full! Free an existing soul to make room.")
else
@@ -172,7 +173,7 @@
else
T.forceMove(src) //put shade in stone
T.status_flags |= GODMODE
- T.canmove = 0
+ T.canmove = FALSE
T.health = T.maxHealth
icon_state = "soulstone2"
name = "soulstone: Shade of [T.real_name]"
@@ -222,7 +223,7 @@
if(newstruct.mind && ((stoner && iscultist(stoner)) || cultoverride) && SSticker && SSticker.mode)
SSticker.mode.add_cultist(newstruct.mind, 0)
if(iscultist(stoner) || cultoverride)
- to_chat(newstruct, "You are still bound to serve the cult[stoner ? " and [stoner]":""], follow [stoner.p_their()] orders and help [stoner.p_them()] complete [stoner.p_their()] goals at all costs.")
+ to_chat(newstruct, "You are still bound to serve the cult[stoner ? " and [stoner]":""], follow [stoner ? stoner.p_their() : "their"] orders and help [stoner ? stoner.p_them() : "them"] complete [stoner ? stoner.p_their() : "their"] goals at all costs.")
else if(stoner)
to_chat(newstruct, "You are still bound to serve your creator, [stoner], follow [stoner.p_their()] orders and help [stoner.p_them()] complete [stoner.p_their()] goals at all costs.")
newstruct.clear_alert("bloodsense")
@@ -239,7 +240,7 @@
T.dust_animation()
var/mob/living/simple_animal/shade/S = new /mob/living/simple_animal/shade(src)
S.status_flags |= GODMODE //So they won't die inside the stone somehow
- S.canmove = 0//Can't move out of the soul stone
+ S.canmove = FALSE//Can't move out of the soul stone
S.name = "Shade of [T.real_name]"
S.real_name = "Shade of [T.real_name]"
S.key = T.key
@@ -272,15 +273,15 @@
if(consenting_candidates.len)
chosen_ghost = pick(consenting_candidates)
if(!T)
- return 0
+ return FALSE
if(!chosen_ghost)
to_chat(U, "There were no spirits willing to become a shade.")
- return 0
+ return FALSE
if(contents.len) //If they used the soulstone on someone else in the meantime
- return 0
+ return FALSE
T.ckey = chosen_ghost.ckey
for(var/obj/item/W in T)
T.dropItemToGround(W)
init_shade(T, U)
qdel(T)
- return 1
+ return TRUE
diff --git a/code/modules/antagonists/wizard/equipment/spellbook.dm b/code/modules/antagonists/wizard/equipment/spellbook.dm
index 3f94c65437..afefaa68c1 100644
--- a/code/modules/antagonists/wizard/equipment/spellbook.dm
+++ b/code/modules/antagonists/wizard/equipment/spellbook.dm
@@ -318,7 +318,7 @@
/datum/spellbook_entry/item/scryingorb
name = "Scrying Orb"
- desc = "An incandescent orb of crackling energy, using it will allow you to ghost while alive, allowing you to spy upon the station with ease. In addition, buying it will permanently grant you x-ray vision."
+ desc = "An incandescent orb of crackling energy, using it will allow you to ghost while alive, allowing you to spy upon the station with ease. In addition, buying it will permanently grant you X-ray vision."
item_path = /obj/item/scrying
category = "Defensive"
@@ -409,7 +409,7 @@
/datum/spellbook_entry/item/battlemage
name = "Battlemage Armour"
- desc = "An ensorcelled suit of armour, protected by a powerful shield. The shield can completly negate sixteen attacks before being permanently depleted."
+ desc = "An ensorceled suit of armour, protected by a powerful shield. The shield can completely negate sixteen attacks before being permanently depleted."
item_path = /obj/item/clothing/suit/space/hardsuit/shielded/wizard
limit = 1
category = "Defensive"
@@ -452,7 +452,7 @@
/datum/spellbook_entry/summon/ghosts
name = "Summon Ghosts"
- desc = "Spook the crew out by making them see dead people. Be warned, ghosts are capricious and occasionally vindicative, and some will use their incredibly minor abilties to frustrate you."
+ desc = "Spook the crew out by making them see dead people. Be warned, ghosts are capricious and occasionally vindicative, and some will use their incredibly minor abilities to frustrate you."
cost = 0
/datum/spellbook_entry/summon/ghosts/IsAvailible()
@@ -589,22 +589,22 @@
switch(category)
if("Offensive")
dat += "Spells and items geared towards debilitating and destroying.
"
- dat += "Items are not bound to you and can be stolen. Additionaly they cannot typically be returned once purchased. "
+ dat += "Items are not bound to you and can be stolen. Additionally they cannot typically be returned once purchased. "
dat += "For spells: the number after the spell name is the cooldown time. "
dat += "You can reduce this number by spending more points on the spell. "
if("Defensive")
- dat += "Spells and items geared towards improving your survivabilty or reducing foes' ability to attack.
"
- dat += "Items are not bound to you and can be stolen. Additionaly they cannot typically be returned once purchased. "
+ dat += "Spells and items geared towards improving your survivability or reducing foes' ability to attack.
"
+ dat += "Items are not bound to you and can be stolen. Additionally they cannot typically be returned once purchased. "
dat += "For spells: the number after the spell name is the cooldown time. "
dat += "You can reduce this number by spending more points on the spell. "
if("Mobility")
dat += "Spells and items geared towards improving your ability to move. It is a good idea to take at least one.
"
- dat += "Items are not bound to you and can be stolen. Additionaly they cannot typically be returned once purchased. "
+ dat += "Items are not bound to you and can be stolen. Additionally they cannot typically be returned once purchased. "
dat += "For spells: the number after the spell name is the cooldown time. "
dat += "You can reduce this number by spending more points on the spell. "
if("Assistance")
- dat += "Spells and items geared towards bringing in outside forces to aid you or improving upon your other items and abilties.
"
- dat += "Items are not bound to you and can be stolen. Additionaly they cannot typically be returned once purchased. "
+ dat += "Spells and items geared towards bringing in outside forces to aid you or improving upon your other items and abilities.
"
+ dat += "Items are not bound to you and can be stolen. Additionally they cannot typically be returned once purchased. "
dat += "For spells: the number after the spell name is the cooldown time. "
dat += "You can reduce this number by spending more points on the spell. "
if("Challenges")
diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
index 25a0e804a4..d40666babb 100644
--- a/code/modules/assembly/bomb.dm
+++ b/code/modules/assembly/bomb.dm
@@ -52,7 +52,7 @@
if(I.use_tool(src, user, 0, volume=40))
status = TRUE
GLOB.bombers += "[key_name(user)] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]"
- message_admins("[key_name_admin(user)] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]")
+ message_admins("[ADMIN_LOOKUPFLW(user)] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]")
to_chat(user, "A pressure hole has been bored to [bombtank] valve. \The [bombtank] can now be ignited.")
add_fingerprint(user)
return TRUE
@@ -117,7 +117,7 @@
if(isigniter(assembly.a_left) == isigniter(assembly.a_right))
return
- if((src in user.get_equipped_items()) && !user.canUnEquip(src))
+ if((src in user.get_equipped_items(TRUE)) && !user.canUnEquip(src))
to_chat(user, "[src] is stuck to you!")
return
diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm
index c60519b45e..2ac7f2e383 100644
--- a/code/modules/assembly/flash.dm
+++ b/code/modules/assembly/flash.dm
@@ -1,6 +1,7 @@
/obj/item/assembly/flash
name = "flash"
desc = "A powerful and versatile flashbulb device, with applications ranging from disorienting attackers to acting as visual receptors in robot production."
+ icon = 'icons/obj/device.dmi'
icon_state = "flash"
item_state = "flashtool"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
@@ -153,13 +154,15 @@
to_chat(user, "[src] emits a blinding light!")
/obj/item/assembly/flash/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
if(!try_use_flash())
- return FALSE
+ return
AOE_flash()
burn_out()
- . = ..()
-/obj/item/assembly/flash/activate()//AOE flash on signal recieved
+/obj/item/assembly/flash/activate()//AOE flash on signal received
if(!..())
return
AOE_flash()
@@ -208,7 +211,7 @@
/obj/item/assembly/flash/armimplant
name = "photon projector"
- desc = "A high-powered photon projector implant normally used for lighting purposes, but also doubles as a flashbulb weapon. Self-repair protocals fix the flashbulb if it ever burns out."
+ desc = "A high-powered photon projector implant normally used for lighting purposes, but also doubles as a flashbulb weapon. Self-repair protocols fix the flashbulb if it ever burns out."
var/flashcd = 20
var/overheat = 0
var/obj/item/organ/cyberimp/arm/flash/I = null
diff --git a/code/modules/assembly/helpers.dm b/code/modules/assembly/helpers.dm
index f1dc93b446..5ad5e129a0 100644
--- a/code/modules/assembly/helpers.dm
+++ b/code/modules/assembly/helpers.dm
@@ -13,4 +13,4 @@ Name: IsAssemblyHolder
Desc: If true is an object that can hold an assemblyholder object
*/
/obj/proc/IsAssemblyHolder()
- return FALSE
+ return FALSE
\ No newline at end of file
diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm
index 2aae7db5e2..1f62bfaaef 100644
--- a/code/modules/assembly/igniter.dm
+++ b/code/modules/assembly/igniter.dm
@@ -26,7 +26,7 @@
return FALSE//Cooldown check
var/turf/location = get_turf(loc)
if(location)
- location.hotspot_expose(1000,1000)
+ location.hotspot_expose(700,10)
sparks.start()
return TRUE
diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 4a6c9d2db3..94359f0a10 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -33,6 +33,7 @@
/obj/item/assembly/infra/Destroy()
STOP_PROCESSING(SSobj, src)
+ QDEL_NULL(listener)
QDEL_LIST(beams)
. = ..()
@@ -166,8 +167,14 @@
listener = newloc.AddComponent(/datum/component/redirect, COMSIG_ATOM_EXITED, CALLBACK(src, .proc/check_exit))
/obj/item/assembly/infra/proc/check_exit(atom/movable/offender)
- if(offender && ((offender.flags_1 & ABSTRACT_1) || offender == src))
+ if(QDELETED(src))
return
+ if(offender == src || istype(offender,/obj/effect/beam/i_beam))
+ return
+ if (offender && isitem(offender))
+ var/obj/item/I = offender
+ if (I.item_flags & ABSTRACT)
+ return
return refreshBeam()
/obj/item/assembly/infra/ui_interact(mob/user)//TODO: change this this to the wire control panel
@@ -216,10 +223,13 @@
var/obj/item/assembly/infra/master
anchored = TRUE
density = FALSE
- flags_1 = ABSTRACT_1
pass_flags = PASSTABLE|PASSGLASS|PASSGRILLE|LETPASSTHROW
/obj/effect/beam/i_beam/Crossed(atom/movable/AM as mob|obj)
- if(istype(AM, /obj/effect/beam) || (AM.flags_1 & ABSTRACT_1))
+ if(istype(AM, /obj/effect/beam))
return
+ if (isitem(AM))
+ var/obj/item/I = AM
+ if (I.item_flags & ABSTRACT)
+ return
master.trigger_beam(AM, get_turf(src))
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index 7f6a1fab12..97b4543a05 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -34,27 +34,35 @@
update_icon()
return TRUE
+/obj/item/assembly/prox_sensor/on_detach()
+ . = ..()
+ if(!.)
+ return
+ else
+ proximity_monitor.SetHost(src,src)
+
+
/obj/item/assembly/prox_sensor/toggle_secure()
secured = !secured
if(!secured)
if(scanning)
toggle_scan()
- proximity_monitor.host = src
+ proximity_monitor.SetHost(src,src)
timing = FALSE
STOP_PROCESSING(SSobj, src)
else
START_PROCESSING(SSobj, src)
- proximity_monitor.host = loc
+ proximity_monitor.SetHost(loc,src)
update_icon()
return secured
+
/obj/item/assembly/prox_sensor/HasProximity(atom/movable/AM as mob|obj)
if (istype(AM, /obj/effect/beam))
return
sense()
-
/obj/item/assembly/prox_sensor/proc/sense()
if(!scanning || !secured || next_activate > world.time)
return FALSE
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index 42188bba9f..8959029b9b 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -24,7 +24,7 @@
return MANUAL_SUICIDE
/obj/item/assembly/signaler/proc/manual_suicide(mob/living/carbon/user)
- user.visible_message("[user]'s \the [src] recieves a signal, killing [user.p_them()] instantly!")
+ user.visible_message("[user]'s \the [src] receives a signal, killing [user.p_them()] instantly!")
user.adjustOxyLoss(200)//it sends an electrical pulse to their heart, killing them. or something.
user.death(0)
@@ -158,21 +158,21 @@ Code:
// Embedded signaller used in grenade construction.
// It's necessary because the signaler doens't have an off state.
// Generated during grenade construction. -Sayu
-/obj/item/assembly/signaler/reciever
+/obj/item/assembly/signaler/receiver
var/on = FALSE
-/obj/item/assembly/signaler/reciever/proc/toggle_safety()
+/obj/item/assembly/signaler/receiver/proc/toggle_safety()
on = !on
-/obj/item/assembly/signaler/reciever/activate()
+/obj/item/assembly/signaler/receiver/activate()
toggle_safety()
return TRUE
-/obj/item/assembly/signaler/reciever/examine(mob/user)
+/obj/item/assembly/signaler/receiver/examine(mob/user)
..()
to_chat(user, "The radio receiver is [on?"on":"off"].")
-/obj/item/assembly/signaler/reciever/receive_signal(datum/signal/signal)
+/obj/item/assembly/signaler/receiver/receive_signal(datum/signal/signal)
if(!on)
return
return ..(signal)
@@ -186,6 +186,7 @@ Code:
item_state = "electronic"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+ resistance_flags = FIRE_PROOF
var/anomaly_type = /obj/effect/anomaly
/obj/item/assembly/signaler/anomaly/receive_signal(datum/signal/signal)
diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm
index a3c9c68d55..ede69a6b22 100644
--- a/code/modules/atmospherics/environmental/LINDA_fire.dm
+++ b/code/modules/atmospherics/environmental/LINDA_fire.dm
@@ -42,6 +42,11 @@
active_hotspot.just_spawned = (current_cycle < SSair.times_fired)
//remove just_spawned protection if no longer processing this cell
SSair.add_to_active(src, 0)
+ else
+ var/datum/gas_mixture/heating = air_contents.remove_ratio(exposed_volume/air_contents.volume)
+ heating.temperature = exposed_temperature
+ heating.react()
+ assume_air(heating)
return igniting
//This is the icon for fire on turfs, also helps for nurturing small fires until they are full tile
@@ -231,7 +236,7 @@
else
chance_of_deletion = 100
if(prob(chance_of_deletion))
- T.ScrapeAway()
+ T.Melt()
else
T.to_be_destroyed = FALSE
T.max_fire_temperature_sustained = 0
@@ -256,4 +261,4 @@
. = ..()
if(!isliving(loc))
return INITIALIZE_HINT_QDEL
-#undef INSUFFICIENT
\ No newline at end of file
+#undef INSUFFICIENT
diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
index 8acf6b095e..104879b168 100644
--- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
+++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
@@ -100,28 +100,38 @@
if (atmos_overlay_types)
for(var/overlay in atmos_overlay_types-new_overlay_types) //doesn't remove overlays that would only be added
- vars["vis_contents"] -= overlay
+ vis_contents -= overlay
- if (new_overlay_types.len)
+ if (length(new_overlay_types))
if (atmos_overlay_types)
- vars["vis_contents"] += new_overlay_types - atmos_overlay_types //don't add overlays that already exist
+ vis_contents += new_overlay_types - atmos_overlay_types //don't add overlays that already exist
else
- vars["vis_contents"] += new_overlay_types
+ vis_contents += new_overlay_types
UNSETEMPTY(new_overlay_types)
src.atmos_overlay_types = new_overlay_types
/turf/open/proc/tile_graphic()
- . = new /list
+ var/static/list/nonoverlaying_gases = typecache_of_gases_with_no_overlays()
if(air)
+ . = new /list
var/list/gases = air.gases
for(var/id in gases)
+ if (nonoverlaying_gases[id])
+ continue
var/gas = gases[id]
var/gas_meta = gas[GAS_META]
var/gas_overlay = gas_meta[META_GAS_OVERLAY]
if(gas_overlay && gas[MOLES] > gas_meta[META_GAS_MOLES_VISIBLE])
. += gas_overlay
+/proc/typecache_of_gases_with_no_overlays()
+ . = list()
+ for (var/gastype in subtypesof(/datum/gas))
+ var/datum/gas/gasvar = gastype
+ if (!initial(gasvar.gas_overlay))
+ .[gastype] = TRUE
+
/////////////////////////////SIMULATION///////////////////////////////////
#define LAST_SHARE_CHECK \
@@ -238,9 +248,6 @@
if (!M.anchored && !M.pulledby && M.last_high_pressure_movement_air_cycle < SSair.times_fired)
M.experience_pressure_difference(pressure_difference, pressure_direction)
-/turf/closed/proc/high_pressure_movements()
- return
-
/atom/movable/var/pressure_resistance = 10
/atom/movable/var/last_high_pressure_movement_air_cycle = 0
diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
index 6e78256c87..f2bb51159c 100644
--- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
@@ -285,8 +285,6 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
return 1
/datum/gas_mixture/share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4)
- if(!sharer)
- return 0
var/list/cached_gases = gases
var/list/sharer_gases = sharer.gases
@@ -322,7 +320,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
if(delta > 0)
heat_capacity_self_to_sharer += gas_heat_capacity
else
- heat_capacity_sharer_to_self -= gas_heat_capacity //subtract here instead of adding the absolute value because we know that delta is negative. saves a proc call.
+ heat_capacity_sharer_to_self -= gas_heat_capacity //subtract here instead of adding the absolute value because we know that delta is negative.
gas[MOLES] -= delta
sharergas[MOLES] += delta
@@ -348,8 +346,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
if(abs(new_sharer_heat_capacity/old_sharer_heat_capacity - 1) < 0.1) // <10% change in sharer heat capacity
temperature_share(sharer, OPEN_HEAT_TRANSFER_COEFFICIENT)
- var/list/unique_gases = cached_gases ^ sharer_gases
- if(unique_gases.len) //if all gases were present in both mixtures, we know that no gases are 0
+ if(length(cached_gases ^ sharer_gases)) //if all gases were present in both mixtures, we know that no gases are 0
garbage_collect(cached_gases - sharer_gases) //any gases the sharer had, we are guaranteed to have. gases that it didn't have we are not.
sharer.garbage_collect(sharer_gases - cached_gases) //the reverse is equally true
sharer.after_share(src, atmos_adjacent_turfs)
@@ -358,8 +355,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
TOTAL_MOLES(cached_gases,our_moles)
var/their_moles
TOTAL_MOLES(sharer_gases,their_moles)
- var/delta_pressure = temperature_archived*(our_moles + moved_moles) - sharer.temperature_archived*(their_moles - moved_moles)
- return delta_pressure * R_IDEAL_GAS_EQUATION / volume
+ return (temperature_archived*(our_moles + moved_moles) - sharer.temperature_archived*(their_moles - moved_moles)) * R_IDEAL_GAS_EQUATION / volume
/datum/gas_mixture/after_share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4)
return
diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm
index 12ad70a9e3..9d0b5dd8a4 100644
--- a/code/modules/atmospherics/gasmixtures/gas_types.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_types.dm
@@ -43,6 +43,7 @@ GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(/datum/gas/oxygen, /datum/g
var/moles_visible = null
var/dangerous = FALSE //currently used by canisters
var/fusion_power = 0 //How much the gas accelerates a fusion reaction
+
/datum/gas/oxygen
id = "o2"
specific_heat = 20
@@ -57,7 +58,7 @@ GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(/datum/gas/oxygen, /datum/g
id = "co2"
specific_heat = 30
name = "Carbon Dioxide"
- fusion_power = 2
+ fusion_power = 3
/datum/gas/plasma
id = "plasma"
@@ -73,6 +74,7 @@ GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(/datum/gas/oxygen, /datum/g
name = "Water Vapor"
gas_overlay = "water_vapor"
moles_visible = MOLES_GAS_VISIBLE
+ fusion_power = 4
/datum/gas/hypernoblium
id = "nob"
@@ -89,7 +91,6 @@ GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(/datum/gas/oxygen, /datum/g
gas_overlay = "nitrous_oxide"
moles_visible = 1
dangerous = TRUE
- fusion_power = 2
/datum/gas/nitryl
id = "no2"
@@ -98,7 +99,7 @@ GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(/datum/gas/oxygen, /datum/g
gas_overlay = "nitryl"
moles_visible = MOLES_GAS_VISIBLE
dangerous = TRUE
- fusion_power = 1.5
+ fusion_power = 10
/datum/gas/tritium
id = "tritium"
@@ -107,13 +108,15 @@ GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(/datum/gas/oxygen, /datum/g
gas_overlay = "tritium"
moles_visible = MOLES_GAS_VISIBLE
dangerous = TRUE
- fusion_power = 2
+ fusion_power = 1
+
/datum/gas/bz
id = "bz"
specific_heat = 20
name = "BZ"
dangerous = TRUE
- fusion_power = 2
+ fusion_power = 15
+
/datum/gas/stimulum
id = "stim"
specific_heat = 5
@@ -129,6 +132,7 @@ GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(/datum/gas/oxygen, /datum/g
/obj/effect/overlay/gas
icon = 'icons/effects/tile_effects.dmi'
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ anchored = TRUE // should only appear in vis_contents, but to be safe
layer = FLY_LAYER
appearance_flags = TILE_BOUND
diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm
index dd953dcb11..67836746fa 100644
--- a/code/modules/atmospherics/gasmixtures/reactions.dm
+++ b/code/modules/atmospherics/gasmixtures/reactions.dm
@@ -4,15 +4,15 @@
#define PLASMA_MINIMUM_OXYGEN_NEEDED 2
#define PLASMA_MINIMUM_OXYGEN_PLASMA_RATIO 30
#define FIRE_CARBON_ENERGY_RELEASED 100000 //Amount of heat released per mole of burnt carbon into the tile
-#define FIRE_HYDROGEN_ENERGY_RELEASED 280000 // Amount of heat released per mole of burnt hydrogen and/or tritium(hydrogen isotope)
+#define FIRE_HYDROGEN_ENERGY_RELEASED 280000 //Amount of heat released per mole of burnt hydrogen and/or tritium(hydrogen isotope)
#define FIRE_PLASMA_ENERGY_RELEASED 3000000 //Amount of heat released per mole of burnt plasma into the tile
//General assmos defines.
#define WATER_VAPOR_FREEZE 200
#define NITRYL_FORMATION_ENERGY 100000
#define TRITIUM_BURN_OXY_FACTOR 100
#define TRITIUM_BURN_TRIT_FACTOR 10
-#define TRITIUM_BURN_RADIOACTIVITY_FACTOR 50000 //The neutrons gotta go somewhere. Completely arbitrary number.
-#define TRITIUM_MINIMUM_RADIATION_ENERGY 0.1 //minimum 0.01 moles trit or 10 moles oxygen to start producing rads
+#define TRITIUM_BURN_RADIOACTIVITY_FACTOR 50000 //The neutrons gotta go somewhere. Completely arbitrary number.
+#define TRITIUM_MINIMUM_RADIATION_ENERGY 0.1 //minimum 0.01 moles trit or 10 moles oxygen to start producing rads
#define SUPER_SATURATION_THRESHOLD 96
#define STIMULUM_HEAT_SCALE 100000
#define STIMULUM_FIRST_RISE 0.65
@@ -20,14 +20,38 @@
#define STIMULUM_SECOND_RISE 0.0009
#define STIMULUM_ABSOLUTE_DROP 0.00000335
#define REACTION_OPPRESSION_THRESHOLD 5
- //Plasma fusion properties
-#define PLASMA_BINDING_ENERGY 3000000
-#define MAX_CATALYST_EFFICENCY 9
-#define PLASMA_FUSED_COEFFICENT 0.08
-#define CATALYST_COEFFICENT 0.01
-#define FUSION_PURITY_THRESHOLD 0.95
-#define FUSION_HEAT_DROPOFF (20000+T0C)
-#define NOBLIUM_FORMATION_ENERGY 2e9 //1 Mole of Noblium takes the planck energy to condense.
+#define NOBLIUM_FORMATION_ENERGY 2e9 //1 Mole of Noblium takes the planck energy to condense.
+//Plasma fusion properties
+#define FUSION_ENERGY_THRESHOLD 3e9 //Amount of energy it takes to start a fusion reaction
+#define FUSION_TEMPERATURE_THRESHOLD 1000 //Temperature required to start a fusion reaction
+#define FUSION_MOLE_THRESHOLD 250 //Mole count required (tritium/plasma) to start a fusion reaction
+#define FUSION_RELEASE_ENERGY_SUPER 3e9 //Amount of energy released in the fusion process, super tier
+#define FUSION_RELEASE_ENERGY_HIGH 1e9 //Amount of energy released in the fusion process, high tier
+#define FUSION_RELEASE_ENERGY_MID 5e8 //Amount of energy released in the fusion process, mid tier
+#define FUSION_RELEASE_ENERGY_LOW 1e8 //Amount of energy released in the fusion process, low tier
+#define FUSION_MEDIATION_FACTOR 80 //Arbitrary
+#define FUSION_SUPER_TIER 50 //anything above this is super tier
+#define FUSION_HIGH_TIER 20 //anything above this and below 50 is high tier
+#define FUSION_MID_TIER 5 //anything above this and below 20 is mid tier - below this is low tier, but that doesnt need a define
+#define FUSION_ENERGY_DIVISOR_SUPER 25
+#define FUSION_ENERGY_DIVISOR_HIGH 20
+#define FUSION_ENERGY_DIVISOR_MID 10
+#define FUSION_ENERGY_DIVISOR_LOW 2
+#define FUSION_GAS_CREATION_FACTOR_SUPER 0.20 //stimulum and pluoxium - 40% in total
+#define FUSION_GAS_CREATION_FACTOR_HIGH 0.60 //trit - one gas, so its higher than the other two - 60% in total
+#define FUSION_GAS_CREATION_FACTOR_MID 0.45 //BZ and N2O - 90% in total
+#define FUSION_GAS_CREATION_FACTOR_LOW 0.48 //O2 and CO2 - 96% in total
+#define FUSION_MID_TIER_RAD_PROB_FACTOR 2 //probability of radpulse is power ratio * this for whatever tier
+#define FUSION_LOW_TIER_RAD_PROB_FACTOR 5
+#define FUSION_EFFICIENCY_BASE 60 //used in the fusion efficiency calculations
+#define FUSION_EFFICIENCY_DIVISOR 0.6 //ditto
+#define FUSION_RADIATION_FACTOR 15000 //horizontal asymptote
+#define FUSION_RADIATION_CONSTANT 30 //equation is form of (ax) / (x + b), where a = radiation factor and b = radiation constant (https://www.desmos.com/calculator/4i1f296phl)
+#define FUSION_VOLUME_SUPER 100 //volume of the sound the fusion noises make
+#define FUSION_VOLUME_HIGH 50
+#define FUSION_VOLUME_MID 25
+#define FUSION_VOLUME_LOW 10
+
/proc/init_gas_reactions()
var/list/reaction_types = list()
@@ -64,7 +88,7 @@
/datum/gas_reaction/nobliumsupression
priority = INFINITY
- name = "Hyper-Noblium Reaction Supression"
+ name = "Hyper-Noblium Reaction Suppression"
id = "nobstop"
/datum/gas_reaction/nobliumsupression/init_reqs()
@@ -111,7 +135,7 @@
var/list/cached_gases = air.gases //this speeds things up because accessing datum vars is slow
var/temperature = air.temperature
var/list/cached_results = air.reaction_results
- cached_results[id] = 0
+ cached_results["fire"] = 0
var/turf/open/location = isturf(holder) ? holder : null
var/burned_fuel = 0
@@ -131,7 +155,7 @@
ASSERT_GAS(/datum/gas/water_vapor, air) //oxygen+more-or-less hydrogen=H2O
cached_gases[/datum/gas/water_vapor][MOLES] += burned_fuel/TRITIUM_BURN_OXY_FACTOR
- cached_results[id] += burned_fuel
+ cached_results["fire"] += burned_fuel
if(energy_released > 0)
var/new_heat_capacity = air.heat_capacity()
@@ -148,7 +172,7 @@
item.temperature_expose(air, temperature, CELL_VOLUME)
location.temperature_expose(air, temperature, CELL_VOLUME)
- return cached_results[id] ? REACTING : NO_REACTION
+ return cached_results["fire"] ? REACTING : NO_REACTION
//plasma combustion: combustion of oxygen and plasma (treated as hydrocarbons). creates hotspots. exothermic
/datum/gas_reaction/plasmafire
@@ -169,7 +193,7 @@
var/list/cached_gases = air.gases //this speeds things up because accessing datum vars is slow
var/temperature = air.temperature
var/list/cached_results = air.reaction_results
- cached_results[id] = 0
+ cached_results["fire"] = 0
var/turf/open/location = isturf(holder) ? holder : null
//Handle plasma burning
@@ -206,7 +230,7 @@
energy_released += FIRE_PLASMA_ENERGY_RELEASED * (plasma_burn_rate)
- cached_results[id] += (plasma_burn_rate)*(1+oxygen_burn_rate)
+ cached_results["fire"] += (plasma_burn_rate)*(1+oxygen_burn_rate)
if(energy_released > 0)
var/new_heat_capacity = air.heat_capacity()
@@ -223,20 +247,22 @@
item.temperature_expose(air, temperature, CELL_VOLUME)
location.temperature_expose(air, temperature, CELL_VOLUME)
- return cached_results[id] ? REACTING : NO_REACTION
+ return cached_results["fire"] ? REACTING : NO_REACTION
-//fusion: a terrible idea that was fun but broken. Now reworked to be less broken and more interesting. Again.
+//fusion: a terrible idea that was fun but broken. Now reworked to be less broken and more interesting. Again (and again).
/datum/gas_reaction/fusion
- exclude = TRUE
+ exclude = FALSE
priority = 2
name = "Plasmic Fusion"
id = "fusion"
+//Since fusion isn't really intended to happen in successive chains, the requirements are very high
/datum/gas_reaction/fusion/init_reqs()
min_requirements = list(
- "ENER" = PLASMA_BINDING_ENERGY * 1000,
- /datum/gas/plasma = 50,
- /datum/gas/carbon_dioxide = 1
+ "TEMP" = FUSION_TEMPERATURE_THRESHOLD,
+ "ENER" = FUSION_ENERGY_THRESHOLD,
+ /datum/gas/plasma = FUSION_MOLE_THRESHOLD,
+ /datum/gas/tritium = FUSION_MOLE_THRESHOLD
)
/datum/gas_reaction/fusion/react(datum/gas_mixture/air, datum/holder)
@@ -250,46 +276,75 @@
location = get_turf(holder)
var/old_heat_capacity = air.heat_capacity()
- var/reaction_energy
- var/mediation = 100*(air.heat_capacity()-(cached_gases[/datum/gas/plasma][MOLES]*cached_gases[/datum/gas/plasma][GAS_META][META_GAS_SPECIFIC_HEAT]))/(air.total_moles()-cached_gases[/datum/gas/plasma][MOLES]) //This is the average heat capacity of the mixture,not including plasma.
+ var/reaction_energy = 0
+
+ var/mediation = FUSION_MEDIATION_FACTOR*(air.heat_capacity()-(cached_gases[/datum/gas/plasma][MOLES]*cached_gases[/datum/gas/plasma][GAS_META][META_GAS_SPECIFIC_HEAT]))/(air.total_moles()-cached_gases[/datum/gas/plasma][MOLES]) //This is the average specific heat of the mixture,not including plasma.
+
+ var/moles_excluding_plasma = air.total_moles() - cached_gases[/datum/gas/plasma][MOLES]
+ var/plasma_differential = (cached_gases[/datum/gas/plasma][MOLES] - moles_excluding_plasma) / air.total_moles()
+ var/reaction_efficiency = FUSION_EFFICIENCY_BASE ** -((plasma_differential ** 2) / FUSION_EFFICIENCY_DIVISOR) //https://www.desmos.com/calculator/6jjx3vdrvx
+ var/gases_fused = air.total_moles()
+
var/gas_power = 0
for (var/id in cached_gases)
- gas_power += cached_gases[id][GAS_META][META_GAS_FUSION_POWER]*cached_gases[id][MOLES]
- var/plasma_fused = 0
- var/power_ratio = min(gas_power/mediation,100)//100 is a lot, we really don't want to go over this.
- if (power_ratio > 10) //Super-fusion. Fuses everything into one big atom which then turns to tritium instantly. Very dangerous, but super cool.
- var/gases_fused = air.total_moles()
- reaction_energy += gases_fused*PLASMA_BINDING_ENERGY*(gas_power/(mediation*100))
+ gas_power += reaction_efficiency * (cached_gases[id][GAS_META][META_GAS_FUSION_POWER]*cached_gases[id][MOLES])
+
+ var/power_ratio = gas_power/mediation
+ var/radiation_power = (FUSION_RADIATION_FACTOR * power_ratio) / (power_ratio + FUSION_RADIATION_CONSTANT) //https://www.desmos.com/calculator/4i1f296phl
+
+ if (power_ratio > FUSION_SUPER_TIER) //power ratio 50+: SUPER TIER. The gases become so energized that they fuse into stimulum and pluoxium, which is pretty nice! IF you can salvage them, which is going to be hard because this reaction is ridiculously dangerous.
+ reaction_energy += gases_fused * FUSION_RELEASE_ENERGY_SUPER * (power_ratio / FUSION_ENERGY_DIVISOR_SUPER)
for (var/id in cached_gases)
cached_gases[id][MOLES] = 0
- air.assert_gas(/datum/gas/tritium)
- cached_gases[/datum/gas/tritium][MOLES] += gases_fused
- if (prob(power_ratio)) //You really don't want this to happen
- empulse(location, power_ratio*0.5, power_ratio)
- radiation_pulse(location, power_ratio*2000)
- explosion(location,0,1,power_ratio*0.5,power_ratio,TRUE,TRUE)//Bypasses cap. Doesn't blow large hole in station, but produces moderate devestation for long ranges. Be careful with this.
+ air.assert_gases(/datum/gas/stimulum,/datum/gas/pluoxium)
+ cached_gases[/datum/gas/stimulum][MOLES] += gases_fused * FUSION_GAS_CREATION_FACTOR_SUPER //60% of the gas is converted to energy, 40% to stimulum and pluoxium
+ cached_gases[/datum/gas/pluoxium][MOLES] += gases_fused * FUSION_GAS_CREATION_FACTOR_SUPER
+ if (location) //It's going to happen regardless of whether you want it to or not
+ radiation_pulse(location, radiation_power * 2)
+ explosion(location,0,0,10,power_ratio,TRUE,TRUE)//A decent explosion with a huge shockwave. People WILL know you're doing fusion.
+ playsound(location, "sound/effects/supermatter.ogg", FUSION_VOLUME_SUPER, 0)
- else if (power_ratio > 1) //Mediation is overpowered, fusion reaction starts to break down.
- plasma_fused = cached_gases[/datum/gas/plasma][MOLES]
- reaction_energy += plasma_fused*PLASMA_BINDING_ENERGY
- cached_gases[/datum/gas/plasma][MOLES] -= plasma_fused
- cached_gases[/datum/gas/carbon_dioxide][MOLES] = 0
+ else if (power_ratio > FUSION_HIGH_TIER) //power ratio 20-50; High tier. Fuses into one big atom which then turns to tritium instantly. Very dangerous, but super cool.
+ reaction_energy += gases_fused * FUSION_RELEASE_ENERGY_HIGH * (power_ratio / FUSION_ENERGY_DIVISOR_HIGH)
+ for (var/id in cached_gases)
+ cached_gases[id][MOLES] = 0
+ cached_gases[/datum/gas/tritium][MOLES] += gases_fused * FUSION_GAS_CREATION_FACTOR_HIGH //40% of the gas is converted to energy, 60% to tritium
+ if (location)
+ if(prob(power_ratio)) //You really don't want this to happen.
+ radiation_pulse(location, radiation_power)
+ explosion(location,0,0,3,power_ratio * 0.5,TRUE,TRUE)//A tiny explosion with a large shockwave. People will know you're doing fusion.
+ playsound(location, "sound/effects/supermatter.ogg", FUSION_VOLUME_HIGH, 0)
+ else
+ playsound(location, "sound/effects/phasein.ogg", FUSION_VOLUME_HIGH, 0)
+
+ else if (power_ratio > FUSION_MID_TIER) //power_ratio 5 to 20; Mediation is overpowered, fusion reaction starts to break down.
+ reaction_energy += gases_fused * FUSION_RELEASE_ENERGY_MID * (power_ratio / FUSION_ENERGY_DIVISOR_MID)
+ for (var/id in cached_gases)
+ cached_gases[id][MOLES] = 0
air.assert_gases(/datum/gas/bz,/datum/gas/nitrous_oxide)
- cached_gases[/datum/gas/bz][MOLES] += gas_power*0.05
- cached_gases[/datum/gas/nitrous_oxide][MOLES] += gas_power*0.05
+ cached_gases[/datum/gas/bz][MOLES] += gases_fused * FUSION_GAS_CREATION_FACTOR_MID //10% of the gas is converted to energy, 90% to BZ and N2O
+ cached_gases[/datum/gas/nitrous_oxide][MOLES] += gases_fused * FUSION_GAS_CREATION_FACTOR_MID
if (location)
- empulse(location, mediation*0.002, mediation*0.004)
- radiation_pulse(location, power_ratio*(reaction_energy)/(0.3*PLASMA_BINDING_ENERGY))
- else
- reaction_energy += cached_gases[/datum/gas/plasma][MOLES]*PLASMA_BINDING_ENERGY*(gas_power/mediation)
- air.assert_gas(/datum/gas/oxygen)
- cached_gases[/datum/gas/oxygen][MOLES] += gas_power + cached_gases[/datum/gas/plasma][MOLES]
- cached_gases[/datum/gas/plasma][MOLES] = 0
+ if(prob(power_ratio * FUSION_MID_TIER_RAD_PROB_FACTOR)) //Still weak, but don't stand next to it unprotected
+ radiation_pulse(location, radiation_power * 0.5)
+ playsound(location, "sound/effects/supermatter.ogg", FUSION_VOLUME_MID, 0)
+ else
+ playsound(location, "sound/effects/phasein.ogg", FUSION_VOLUME_MID, 0)
+
+ else //power ratio 0 to 5; Gas power is overpowered. Fusion isn't nearly as powerful.
+ reaction_energy += gases_fused * FUSION_RELEASE_ENERGY_LOW * (power_ratio / FUSION_ENERGY_DIVISOR_LOW)
for (var/gas in cached_gases)
- if (cached_gases[gas][GAS_META][META_GAS_FUSION_POWER])
- cached_gases[gas][MOLES] = 0
+ cached_gases[gas][MOLES] = 0
+ air.assert_gases(/datum/gas/oxygen, /datum/gas/carbon_dioxide)
+ cached_gases[/datum/gas/oxygen][MOLES] += gases_fused * FUSION_GAS_CREATION_FACTOR_LOW //4% of the gas is converted to energy, 94% to oxygen and CO2
+ cached_gases[/datum/gas/carbon_dioxide][MOLES] += gases_fused * FUSION_GAS_CREATION_FACTOR_LOW
if (location)
- radiation_pulse(location, (reaction_energy)/(0.3*PLASMA_BINDING_ENERGY))
+ if(prob(power_ratio * FUSION_LOW_TIER_RAD_PROB_FACTOR)) //Weak, but still something to look out for
+ radiation_pulse(location, radiation_power * 0.25)
+ playsound(location, "sound/effects/supermatter.ogg", FUSION_VOLUME_LOW, 0)
+ else
+ playsound(location, "sound/effects/phasein.ogg", FUSION_VOLUME_LOW, 0)
+
if(reaction_energy > 0)
var/new_heat_capacity = air.heat_capacity()
if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
@@ -336,7 +391,7 @@
/datum/gas_reaction/bzformation/init_reqs()
min_requirements = list(
- /datum/gas/tritium = 10,
+ /datum/gas/nitrous_oxide = 10,
/datum/gas/plasma = 10
)
@@ -347,13 +402,13 @@
var/pressure = air.return_pressure()
var/old_heat_capacity = air.heat_capacity()
- var/reaction_efficency = min(1/((pressure/(0.1*ONE_ATMOSPHERE))*(max(cached_gases[/datum/gas/plasma][MOLES]/cached_gases[/datum/gas/tritium][MOLES],1))),cached_gases[/datum/gas/tritium][MOLES],cached_gases[/datum/gas/plasma][MOLES]/2)
+ var/reaction_efficency = min(1/((pressure/(0.1*ONE_ATMOSPHERE))*(max(cached_gases[/datum/gas/plasma][MOLES]/cached_gases[/datum/gas/nitrous_oxide][MOLES],1))),cached_gases[/datum/gas/nitrous_oxide][MOLES],cached_gases[/datum/gas/plasma][MOLES]/2)
var/energy_released = 2*reaction_efficency*FIRE_CARBON_ENERGY_RELEASED
- if ((cached_gases[/datum/gas/tritium][MOLES] - reaction_efficency < 0 )|| (cached_gases[/datum/gas/plasma][MOLES] - (2*reaction_efficency) < 0)) //Shouldn't produce gas from nothing.
+ if ((cached_gases[/datum/gas/nitrous_oxide][MOLES] - reaction_efficency < 0 )|| (cached_gases[/datum/gas/plasma][MOLES] - (2*reaction_efficency) < 0)) //Shouldn't produce gas from nothing.
return NO_REACTION
ASSERT_GAS(/datum/gas/bz,air)
cached_gases[/datum/gas/bz][MOLES] += reaction_efficency
- cached_gases[/datum/gas/tritium][MOLES] -= reaction_efficency
+ cached_gases[/datum/gas/nitrous_oxide][MOLES] -= reaction_efficency
cached_gases[/datum/gas/plasma][MOLES] -= 2*reaction_efficency
@@ -367,6 +422,7 @@
priority = 5
name = "Stimulum formation"
id = "stimformation"
+
/datum/gas_reaction/stimformation/init_reqs()
min_requirements = list(
/datum/gas/tritium = 30,
@@ -441,10 +497,4 @@
#undef STIMULUM_SECOND_RISE
#undef STIMULUM_ABSOLUTE_DROP
#undef REACTION_OPPRESSION_THRESHOLD
-#undef PLASMA_BINDING_ENERGY
-#undef MAX_CATALYST_EFFICENCY
-#undef PLASMA_FUSED_COEFFICENT
-#undef CATALYST_COEFFICENT
-#undef FUSION_PURITY_THRESHOLD
-#undef FUSION_HEAT_DROPOFF
#undef NOBLIUM_FORMATION_ENERGY
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index 7bfacbee26..6e6355ed72 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -61,7 +61,6 @@
desc = "A machine that monitors atmosphere levels. Goes off if the area is dangerous."
icon = 'icons/obj/monitors.dmi'
icon_state = "alarm0"
- anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 4
active_power_usage = 8
diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm
index fdb59ec1cf..7d095869cb 100644
--- a/code/modules/atmospherics/machinery/atmosmachinery.dm
+++ b/code/modules/atmospherics/machinery/atmosmachinery.dm
@@ -38,6 +38,7 @@ Pipelines + Other Objects -> Pipe network
var/construction_type
var/pipe_state //icon_state as a pipe item
+ var/on = FALSE
/obj/machinery/atmospherics/examine(mob/user)
..()
@@ -124,7 +125,7 @@ Pipelines + Other Objects -> Pipe network
pixel_y = (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_Y
layer = initial(layer) + ((piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE)
-/obj/machinery/atmospherics/proc/can_be_node(obj/machinery/atmospherics/target)
+/obj/machinery/atmospherics/proc/can_be_node(obj/machinery/atmospherics/target, iteration)
return connection_check(target, piping_layer)
//Find a connecting /obj/machinery/atmospherics in specified direction
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
index 7f37e049dd..dd593c53bc 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
@@ -1,24 +1,41 @@
//node2, air2, network2 correspond to input
//node1, air1, network1 correspond to output
-
+#define CIRCULATOR_HOT 0
+#define CIRCULATOR_COLD 1
/obj/machinery/atmospherics/components/binary/circulator
name = "circulator/heat exchanger"
desc = "A gas circulator pump and heat exchanger."
- icon_state = "circ1-off"
+ icon_state = "circ-off-0"
- var/side = CIRC_LEFT
- var/status = 0
+ var/active = FALSE
var/last_pressure_delta = 0
- pipe_flags = PIPING_ONE_PER_TURF
+ pipe_flags = PIPING_ONE_PER_TURF | PIPING_DEFAULT_LAYER_ONLY
- anchored = TRUE
density = TRUE
- var/global/const/CIRC_LEFT = 1
- var/global/const/CIRC_RIGHT = 2
+ var/flipped = 0
+ var/mode = CIRCULATOR_HOT
+ var/obj/machinery/power/generator/generator
+
+//default cold circ for mappers
+/obj/machinery/atmospherics/components/binary/circulator/cold
+ mode = CIRCULATOR_COLD
+
+/obj/machinery/atmospherics/components/binary/circulator/Initialize(mapload)
+ .=..()
+ component_parts = list(new /obj/item/circuitboard/machine/circulator)
+
+/obj/machinery/atmospherics/components/binary/circulator/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS )
+
+/obj/machinery/atmospherics/components/binary/circulator/Destroy()
+ if(generator)
+ disconnectFromGenerator()
+ return ..()
/obj/machinery/atmospherics/components/binary/circulator/proc/return_transfer_air()
@@ -57,11 +74,115 @@
/obj/machinery/atmospherics/components/binary/circulator/update_icon()
if(!is_operational())
- icon_state = "circ[side]-p"
+ icon_state = "circ-p-[flipped]"
else if(last_pressure_delta > 0)
if(last_pressure_delta > ONE_ATMOSPHERE)
- icon_state = "circ[side]-run"
+ icon_state = "circ-run-[flipped]"
else
- icon_state = "circ[side]-slow"
+ icon_state = "circ-slow-[flipped]"
else
- icon_state = "circ[side]-off"
+ icon_state = "circ-off-[flipped]"
+
+/obj/machinery/atmospherics/components/binary/circulator/wrench_act(mob/living/user, obj/item/I)
+ if(!panel_open)
+ return
+ anchored = !anchored
+ I.play_tool_sound(src)
+ if(generator)
+ disconnectFromGenerator()
+ to_chat(user, "You [anchored?"secure":"unsecure"] [src].")
+
+
+ var/obj/machinery/atmospherics/node1 = nodes[1]
+ var/obj/machinery/atmospherics/node2 = nodes[2]
+
+ if(node1)
+ node1.disconnect(src)
+ nodes[1] = null
+ nullifyPipenet(parents[1])
+ if(node2)
+ node2.disconnect(src)
+ nodes[2] = null
+ nullifyPipenet(parents[2])
+
+ if(anchored)
+ SetInitDirections()
+ atmosinit()
+ node1 = nodes[1]
+ if(node1)
+ node1.atmosinit()
+ node1.addMember(src)
+ node2 = nodes[2]
+ if(node2)
+ node2.atmosinit()
+ node2.addMember(src)
+ build_network()
+
+ return TRUE
+
+/obj/machinery/atmospherics/components/binary/circulator/SetInitDirections()
+ switch(dir)
+ if(NORTH, SOUTH)
+ initialize_directions = EAST|WEST
+ if(EAST, WEST)
+ initialize_directions = NORTH|SOUTH
+
+/obj/machinery/atmospherics/components/binary/circulator/getNodeConnects()
+ if(flipped)
+ return list(turn(dir, 270), turn(dir, 90))
+ return list(turn(dir, 90), turn(dir, 270))
+
+/obj/machinery/atmospherics/components/binary/circulator/can_be_node(obj/machinery/atmospherics/target)
+ if(anchored)
+ return ..(target)
+ return FALSE
+
+/obj/machinery/atmospherics/components/binary/circulator/multitool_act(mob/living/user, obj/item/I)
+ if(generator)
+ disconnectFromGenerator()
+ mode = !mode
+ to_chat(user, "You set [src] to [mode?"cold":"hot"] mode.")
+ return TRUE
+
+/obj/machinery/atmospherics/components/binary/circulator/screwdriver_act(mob/user, obj/item/I)
+ panel_open = !panel_open
+ I.play_tool_sound(src)
+ to_chat(user, "You [panel_open?"open":"close"] the panel on [src].")
+ return TRUE
+
+/obj/machinery/atmospherics/components/binary/circulator/crowbar_act(mob/user, obj/item/I)
+ default_deconstruction_crowbar(I)
+ return TRUE
+
+/obj/machinery/atmospherics/components/binary/circulator/on_deconstruction()
+ if(generator)
+ disconnectFromGenerator()
+
+/obj/machinery/atmospherics/components/binary/circulator/proc/disconnectFromGenerator()
+ if(mode)
+ generator.cold_circ = null
+ else
+ generator.hot_circ = null
+ generator.update_icon()
+ generator = null
+
+/obj/machinery/atmospherics/components/binary/circulator/setPipingLayer(new_layer)
+ ..()
+ pixel_x = 0
+ pixel_y = 0
+
+/obj/machinery/atmospherics/components/binary/circulator/verb/circulator_flip()
+ set name = "Flip"
+ set category = "Object"
+ set src in oview(1)
+
+ if(!ishuman(usr))
+ return
+
+ if(anchored)
+ to_chat(usr, "[src] is anchored!")
+ return
+
+ flipped = !flipped
+ to_chat(usr, "You flip [src].")
+ update_icon()
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
index 5940cf6209..879668e4d7 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
@@ -20,7 +20,6 @@ Acts like a normal vent, but has an input AND output.
var/id = null
var/datum/radio_frequency/radio_connection
- var/on = FALSE
var/pump_direction = 1 //0 = siphoning, 1 = releasing
var/external_pressure_bound = ONE_ATMOSPHERE
@@ -31,12 +30,12 @@ Acts like a normal vent, but has an input AND output.
//EXT_BOUND: Do not pass external_pressure_bound
//INPUT_MIN: Do not pass input_pressure_min
//OUTPUT_MAX: Do not pass output_pressure_max
-
+
/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
pixel_y = -PIPING_LAYER_P_Y
-
+
/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer3
piping_layer = PIPING_LAYER_MAX
pixel_x = PIPING_LAYER_P_X
@@ -45,12 +44,12 @@ Acts like a normal vent, but has an input AND output.
/obj/machinery/atmospherics/components/binary/dp_vent_pump/on
on = TRUE
icon_state = "dpvent_map_on"
-
+
/obj/machinery/atmospherics/components/binary/dp_vent_pump/on/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
pixel_y = -PIPING_LAYER_P_Y
-
+
/obj/machinery/atmospherics/components/binary/dp_vent_pump/on/layer3
piping_layer = PIPING_LAYER_MAX
pixel_x = PIPING_LAYER_P_X
@@ -62,12 +61,24 @@ Acts like a normal vent, but has an input AND output.
/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume
name = "large dual-port air vent"
-
+
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix
+ id = INCINERATOR_TOXMIX_DP_VENTPUMP
+ frequency = FREQ_AIRLOCK_CONTROL
+
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos
+ id = INCINERATOR_ATMOS_DP_VENTPUMP
+ frequency = FREQ_AIRLOCK_CONTROL
+
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_syndicatelava
+ id = INCINERATOR_SYNDICATELAVA_DP_VENTPUMP
+ frequency = FREQ_AIRLOCK_CONTROL
+
/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
pixel_y = -PIPING_LAYER_P_Y
-
+
/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer3
piping_layer = PIPING_LAYER_MAX
pixel_x = PIPING_LAYER_P_X
@@ -76,12 +87,12 @@ Acts like a normal vent, but has an input AND output.
/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on
on = TRUE
icon_state = "dpvent_map_on"
-
+
/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
pixel_y = -PIPING_LAYER_P_Y
-
+
/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on/layer3
piping_layer = PIPING_LAYER_MAX
pixel_x = PIPING_LAYER_P_X
@@ -216,7 +227,7 @@ Acts like a normal vent, but has an input AND output.
pressure_checks &= ~1
pump_direction = 0
- if("stabalize" in signal.data)
+ if("stabilize" in signal.data)
pressure_checks |= 1
pump_direction = 1
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
index e3f36c0126..329ef33637 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
@@ -16,7 +16,6 @@ Passive gate is similar to the regular pump except:
interaction_flags_machine = INTERACT_MACHINE_OFFLINE | INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON | INTERACT_MACHINE_SET_MACHINE
- var/on = FALSE
var/target_pressure = ONE_ATMOSPHERE
var/frequency = 0
@@ -25,7 +24,7 @@ Passive gate is similar to the regular pump except:
construction_type = /obj/item/pipe/directional
pipe_state = "passivegate"
-
+
/obj/machinery/atmospherics/components/binary/passive_gate/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
index 408ef19aa2..e7df188f70 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
@@ -19,7 +19,6 @@ Thus, the two variables affect pump operation are set in New():
can_unwrench = TRUE
- var/on = FALSE
var/target_pressure = ONE_ATMOSPHERE
var/frequency = 0
@@ -28,7 +27,7 @@ Thus, the two variables affect pump operation are set in New():
construction_type = /obj/item/pipe/directional
pipe_state = "pump"
-
+
/obj/machinery/atmospherics/components/binary/pump/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
@@ -42,7 +41,7 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/components/binary/pump/on
on = TRUE
icon_state = "pump_on_map"
-
+
/obj/machinery/atmospherics/components/binary/pump/on/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
@@ -52,7 +51,7 @@ Thus, the two variables affect pump operation are set in New():
piping_layer = PIPING_LAYER_MAX
pixel_x = PIPING_LAYER_P_X
pixel_y = PIPING_LAYER_P_Y
-
+
/obj/machinery/atmospherics/components/binary/pump/Destroy()
SSradio.remove_object(src,frequency)
if(radio_connection)
@@ -133,8 +132,8 @@ Thus, the two variables affect pump operation are set in New():
switch(action)
if("power")
on = !on
- investigate_log("Pump, [src.name], was turned [on ? "on" : "off"] by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS)
message_admins("Pump, [src.name], turned [on ? "on" : "off"] by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)], [A]")
+ investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS)
. = TRUE
if("pressure")
var/pressure = params["pressure"]
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm
index 50f34e097f..f22ac62106 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm
@@ -13,14 +13,13 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
var/frequency = 0
var/id = null
- var/open = FALSE
var/valve_type = "m" //lets us have a nice, clean, OOP update_icon_nopipes()
construction_type = /obj/item/pipe/binary
pipe_state = "mvalve"
var/switching = FALSE
-
+
/obj/machinery/atmospherics/components/binary/valve/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
@@ -31,15 +30,15 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
pixel_x = PIPING_LAYER_P_X
pixel_y = PIPING_LAYER_P_Y
-/obj/machinery/atmospherics/components/binary/valve/open
- open = TRUE
-
-/obj/machinery/atmospherics/components/binary/valve/open/layer1
+/obj/machinery/atmospherics/components/binary/valve/on
+ on = TRUE
+
+/obj/machinery/atmospherics/components/binary/valve/on/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
pixel_y = -PIPING_LAYER_P_Y
-/obj/machinery/atmospherics/components/binary/valve/open/layer3
+/obj/machinery/atmospherics/components/binary/valve/on/layer3
piping_layer = PIPING_LAYER_MAX
pixel_x = PIPING_LAYER_P_X
pixel_y = PIPING_LAYER_P_Y
@@ -47,11 +46,11 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
/obj/machinery/atmospherics/components/binary/valve/update_icon_nopipes(animation = 0)
normalize_dir()
if(animation)
- flick("[valve_type]valve_[open][!open]",src)
- icon_state = "[valve_type]valve_[open?"on":"off"]"
+ flick("[valve_type]valve_[on][!on]",src)
+ icon_state = "[valve_type]valve_[on?"on":"off"]"
/obj/machinery/atmospherics/components/binary/valve/proc/open()
- open = TRUE
+ on = TRUE
update_icon_nopipes()
update_parents()
var/datum/pipeline/parent1 = parents[1]
@@ -59,7 +58,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
investigate_log("was opened by [usr ? key_name(usr) : "a remote signal"]", INVESTIGATE_ATMOS)
/obj/machinery/atmospherics/components/binary/valve/proc/close()
- open = FALSE
+ on = FALSE
update_icon_nopipes()
investigate_log("was closed by [usr ? key_name(usr) : "a remote signal"]", INVESTIGATE_ATMOS)
@@ -76,14 +75,10 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
return
switching = TRUE
sleep(10)
- if(open)
+ if(on)
close()
else
open()
- var/turf/T = get_turf(src)
- var/area/A = get_area(src)
- investigate_log("Valve, [src.name], was manipiulated by [key_name(usr)] at [x], [y], [z], [A]", "atmos")
- message_admins("Valve, [src.name], was manipulated by [ADMIN_LOOKUPFLW(user)] at [ADMIN_COORDJMP(T)], [A]")
switching = FALSE
/obj/machinery/atmospherics/components/binary/valve/digital // can be controlled by AI
@@ -93,7 +88,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
valve_type = "d"
pipe_state = "dvalve"
interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OFFLINE | INTERACT_MACHINE_OPEN | INTERACT_MACHINE_OPEN_SILICON
-
+
/obj/machinery/atmospherics/components/binary/valve/digital/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
@@ -104,6 +99,19 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
pixel_x = PIPING_LAYER_P_X
pixel_y = PIPING_LAYER_P_Y
+/obj/machinery/atmospherics/components/binary/valve/digital/on
+ on = TRUE
+
+/obj/machinery/atmospherics/components/binary/valve/digital/on/layer1
+ piping_layer = PIPING_LAYER_MIN
+ pixel_x = -PIPING_LAYER_P_X
+ pixel_y = -PIPING_LAYER_P_Y
+
+/obj/machinery/atmospherics/components/binary/valve/digital/on/layer3
+ piping_layer = PIPING_LAYER_MAX
+ pixel_x = PIPING_LAYER_P_X
+ pixel_y = PIPING_LAYER_P_Y
+
/obj/machinery/atmospherics/components/binary/valve/digital/update_icon_nopipes(animation)
if(!is_operational())
normalize_dir()
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
index 536e0f18a2..a3ecda947a 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
@@ -19,7 +19,6 @@ Thus, the two variables affect pump operation are set in New():
can_unwrench = TRUE
- var/on = FALSE
var/transfer_rate = MAX_TRANSFER_RATE
var/frequency = 0
@@ -28,7 +27,7 @@ Thus, the two variables affect pump operation are set in New():
construction_type = /obj/item/pipe/directional
pipe_state = "volumepump"
-
+
/obj/machinery/atmospherics/components/binary/volume_pump/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
@@ -56,7 +55,7 @@ Thus, the two variables affect pump operation are set in New():
piping_layer = PIPING_LAYER_MAX
pixel_x = PIPING_LAYER_P_X
pixel_y = PIPING_LAYER_P_Y
-
+
/obj/machinery/atmospherics/components/binary/volume_pump/update_icon_nopipes()
if(!is_operational())
icon_state = "volpump_off"
@@ -80,7 +79,7 @@ Thus, the two variables affect pump operation are set in New():
if((input_starting_pressure < 0.01) || (output_starting_pressure > 9000))
return
- var/transfer_ratio = min(1, transfer_rate/air1.volume)
+ var/transfer_ratio = transfer_rate/air1.volume
var/datum/gas_mixture/removed = air1.remove_ratio(transfer_ratio)
@@ -129,13 +128,10 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/components/binary/volume_pump/ui_act(action, params)
if(..())
return
- var/turf/T = get_turf(src)
- var/area/A = get_area(src)
switch(action)
if("power")
on = !on
- investigate_log("Volume Pump, [src.name], was turned [on ? "on" : "off"] by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS)
- message_admins("Volume Pump, [src.name], turned [on ? "on" : "off"] by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)], [A]")
+ investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS)
. = TRUE
if("rate")
var/rate = params["rate"]
@@ -186,11 +182,6 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/components/binary/volume_pump/can_unwrench(mob/user)
. = ..()
- var/area/A = get_area(src)
if(. && on && is_operational())
to_chat(user, "You cannot unwrench [src], turn it off first!")
return FALSE
- else
- investigate_log("Volume Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS)
- message_admins("Volume Pump, [src.name], was unwrenched by [ADMIN_LOOKUPFLW(usr)] at [A]")
- return
diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm
index c333651f5a..e31d96a0c2 100644
--- a/code/modules/atmospherics/machinery/components/components_base.dm
+++ b/code/modules/atmospherics/machinery/components/components_base.dm
@@ -73,6 +73,9 @@ Pipenet stuff; housekeeping
P.build_pipeline(src)
/obj/machinery/atmospherics/components/proc/nullifyPipenet(datum/pipeline/reference)
+ if(!reference)
+ CRASH("nullifyPipenet(null) called by [type] on [COORD(src)]")
+ return
var/i = parents.Find(reference)
reference.other_airs -= airs[i]
reference.other_atmosmch -= src
diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
index 8ec10f9d20..4101deb00c 100644
--- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
+++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
@@ -4,7 +4,6 @@
desc = "Very useful for filtering gasses."
density = FALSE
can_unwrench = TRUE
- var/on = FALSE
var/target_pressure = ONE_ATMOSPHERE
var/filter_type = null
var/frequency = 0
@@ -22,11 +21,11 @@
piping_layer = PIPING_LAYER_MAX
pixel_x = PIPING_LAYER_P_X
pixel_y = PIPING_LAYER_P_Y
-
+
/obj/machinery/atmospherics/components/trinary/filter/flipped
icon_state = "filter_off_f"
flipped = TRUE
-
+
/obj/machinery/atmospherics/components/trinary/filter/flipped/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
@@ -58,7 +57,7 @@
/obj/machinery/atmospherics/components/trinary/filter/atmos //Used for atmos waste loops
on = TRUE
icon_state = "filter_on"
-
+
/obj/machinery/atmospherics/components/trinary/filter/atmos/n2
name = "nitrogen filter"
filter_type = "n2"
@@ -78,7 +77,7 @@
/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped //This feels wrong, I know
icon_state = "filter_on_f"
flipped = TRUE
-
+
/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2
name = "nitrogen filter"
filter_type = "n2"
@@ -94,7 +93,7 @@
/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/plasma
name = "plasma filter"
filter_type = "plasma"
-
+
/obj/machinery/atmospherics/components/trinary/filter/update_icon()
cut_overlays()
for(var/direction in GLOB.cardinals)
diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm
index f0c30bfe28..4dd2972526 100644
--- a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm
+++ b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm
@@ -6,8 +6,6 @@
can_unwrench = TRUE
desc = "Very useful for mixing gasses."
- var/on = FALSE
-
var/target_pressure = ONE_ATMOSPHERE
var/node1_concentration = 0.5
var/node2_concentration = 0.5
@@ -26,7 +24,7 @@
piping_layer = PIPING_LAYER_MAX
pixel_x = PIPING_LAYER_P_X
pixel_y = PIPING_LAYER_P_Y
-
+
/obj/machinery/atmospherics/components/trinary/mixer/flipped
icon_state = "mixer_off_f"
flipped = TRUE
@@ -40,7 +38,7 @@
piping_layer = PIPING_LAYER_MAX
pixel_x = PIPING_LAYER_P_X
pixel_y = PIPING_LAYER_P_Y
-
+
/obj/machinery/atmospherics/components/trinary/mixer/airmix //For standard airmix to distro
name = "air mixer"
icon_state = "mixer_on"
@@ -48,19 +46,19 @@
node2_concentration = O2STANDARD
on = TRUE
target_pressure = MAX_OUTPUT_PRESSURE
-
+
/obj/machinery/atmospherics/components/trinary/mixer/airmix/inverse
node1_concentration = O2STANDARD
node2_concentration = N2STANDARD
-
+
/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped
icon_state = "mixer_on_f"
flipped = TRUE
-
+
/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/inverse
node1_concentration = O2STANDARD
node2_concentration = N2STANDARD
-
+
/obj/machinery/atmospherics/components/trinary/mixer/update_icon()
cut_overlays()
for(var/direction in GLOB.cardinals)
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index 90c5641002..cca6c4d15a 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -5,7 +5,6 @@
icon = 'icons/obj/cryogenics.dmi'
icon_state = "pod-off"
density = TRUE
- anchored = TRUE
max_integrity = 350
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 30, "acid" = 30)
layer = ABOVE_WINDOW_LAYER
@@ -14,7 +13,6 @@
pipe_flags = PIPING_ONE_PER_TURF | PIPING_DEFAULT_LAYER_ONLY
occupant_typecache = list(/mob/living/carbon, /mob/living/simple_animal)
- var/on = FALSE
var/autoeject = FALSE
var/volume = 100
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
index 2859ef29e6..b4c37a2140 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
@@ -6,7 +6,6 @@
can_unwrench = TRUE
resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF //really helpful in building gas chambers for xenomorphs
- var/on = FALSE
var/injecting = 0
var/volume_rate = 50
@@ -19,7 +18,7 @@
layer = GAS_SCRUBBER_LAYER
pipe_state = "injector"
-
+
/obj/machinery/atmospherics/components/unary/outlet_injector/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
@@ -75,7 +74,7 @@
/obj/machinery/atmospherics/components/unary/outlet_injector/on
on = TRUE
-
+
/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
index 2ff19218f5..5359e2324e 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
@@ -6,14 +6,12 @@
var/icon_state_on = "cold_on"
var/icon_state_open = "cold_off"
density = TRUE
- anchored = TRUE
max_integrity = 300
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 30)
layer = OBJ_LAYER
circuit = /obj/item/circuitboard/machine/thermomachine
pipe_flags = PIPING_ONE_PER_TURF | PIPING_DEFAULT_LAYER_ONLY
- var/on = FALSE
var/min_temperature = 0
var/max_temperature = 0
var/target_temperature = T20C
@@ -164,11 +162,11 @@
max_temperature = T20C
min_temperature = 170 //actual minimum temperature is defined by RefreshParts()
circuit = /obj/item/circuitboard/machine/thermomachine/freezer
-
+
/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on
on = TRUE
icon_state = "freezer_1"
-
+
/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on/Initialize()
. = ..()
if(target_temperature == initial(target_temperature))
@@ -193,7 +191,7 @@
/obj/machinery/atmospherics/components/unary/thermomachine/heater/on
on = TRUE
icon_state = "heater_1"
-
+
/obj/machinery/atmospherics/components/unary/thermomachine/heater/RefreshParts()
..()
var/L
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
index 4bb1960758..ced4855b1a 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -16,7 +16,6 @@
layer = GAS_SCRUBBER_LAYER
var/id_tag = null
- var/on = FALSE
var/pump_direction = RELEASING
var/pressure_checks = EXT_BOUND
@@ -32,7 +31,7 @@
var/radio_filter_in
pipe_state = "uvent"
-
+
/obj/machinery/atmospherics/components/unary/vent_pump/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
@@ -46,7 +45,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on
on = TRUE
icon_state = "vent_map_on"
-
+
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
@@ -62,7 +61,7 @@
pressure_checks = INT_BOUND
internal_pressure_bound = 4000
external_pressure_bound = 0
-
+
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
@@ -76,7 +75,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on
on = TRUE
icon_state = "vent_map_siphon_on"
-
+
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
@@ -126,8 +125,9 @@
/obj/machinery/atmospherics/components/unary/vent_pump/Destroy()
var/area/A = get_area(src)
- A.air_vent_names -= id_tag
- A.air_vent_info -= id_tag
+ if (A)
+ A.air_vent_names -= id_tag
+ A.air_vent_info -= id_tag
SSradio.remove_object(src,frequency)
radio_connection = null
@@ -136,7 +136,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume
name = "large air vent"
power_channel = EQUIP
-
+
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
@@ -150,7 +150,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/on
on = TRUE
icon_state = "vent_map_on"
-
+
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/on/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
@@ -166,7 +166,7 @@
pressure_checks = INT_BOUND
internal_pressure_bound = 2000
external_pressure_bound = 0
-
+
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
@@ -180,7 +180,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/on
on = TRUE
icon_state = "vent_map_siphon_on"
-
+
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/on/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
@@ -341,7 +341,7 @@
pressure_checks &= ~EXT_BOUND
pump_direction = SIPHONING
- if("stabalize" in signal.data)
+ if("stabilize" in signal.data)
pressure_checks |= EXT_BOUND
pump_direction = RELEASING
@@ -399,7 +399,7 @@
user.visible_message("[user] welds the vent shut.", "You weld the vent shut.", "You hear welding.")
welded = TRUE
else
- user.visible_message("[user] unwelds the vent.", "You unweld the vent.", "You hear welding.")
+ user.visible_message("[user] unwelded the vent.", "You unweld the vent.", "You hear welding.")
welded = FALSE
update_icon()
pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir)
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
index c962eaad6d..7a207cbed5 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
@@ -14,7 +14,6 @@
layer = GAS_SCRUBBER_LAYER
var/id_tag = null
- var/on = FALSE
var/scrubbing = SCRUBBING //0 = siphoning, 1 = scrubbing
var/filter_types = list(/datum/gas/carbon_dioxide)
@@ -29,7 +28,7 @@
var/radio_filter_in
pipe_state = "scrubber"
-
+
/obj/machinery/atmospherics/components/unary/vent_scrubber/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
@@ -52,7 +51,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on
on = TRUE
icon_state = "scrub_map_on"
-
+
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
@@ -65,15 +64,13 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/Destroy()
var/area/A = get_area(src)
- A.air_scrub_names -= id_tag
- A.air_scrub_info -= id_tag
+ if (A)
+ A.air_scrub_names -= id_tag
+ A.air_scrub_info -= id_tag
SSradio.remove_object(src,frequency)
radio_connection = null
-
- for(var/I in adjacent_turfs)
- I = null
-
+ adjacent_turfs.Cut()
return ..()
/obj/machinery/atmospherics/components/unary/vent_scrubber/auto_use_power()
@@ -304,6 +301,11 @@
if(. && on && is_operational())
to_chat(user, "You cannot unwrench [src], turn it off first!")
return FALSE
+
+/obj/machinery/atmospherics/components/unary/vent_scrubber/examine(mob/user)
+ ..()
+ if(welded)
+ to_chat(user, "It seems welded shut.")
/obj/machinery/atmospherics/components/unary/vent_scrubber/can_crawl_through()
return !welded
diff --git a/code/modules/atmospherics/machinery/datum_pipeline.dm b/code/modules/atmospherics/machinery/datum_pipeline.dm
index a4cc2eb337..cfaef38f6c 100644
--- a/code/modules/atmospherics/machinery/datum_pipeline.dm
+++ b/code/modules/atmospherics/machinery/datum_pipeline.dm
@@ -60,7 +60,7 @@
warning("build_pipeline(): [item.type] added to a pipenet while still having one. (pipes leading to the same spot stacking in one turf) Nearby: ([item.x], [item.y], [item.z])")
pipenetwarnings -= 1
if(pipenetwarnings == 0)
- warning("build_pipeline(): further messages about pipenets will be supressed")
+ warning("build_pipeline(): further messages about pipenets will be suppressed")
members += item
possible_expansions += item
@@ -129,6 +129,9 @@
/obj/machinery/atmospherics/components/addMember(obj/machinery/atmospherics/A)
var/datum/pipeline/P = returnPipenet(A)
+ if(!P)
+ CRASH("null.addMember() called by [type] on [COORD(src)]")
+ return
P.addMember(A, src)
@@ -219,7 +222,7 @@
continue
GL += P.return_air()
for(var/obj/machinery/atmospherics/components/binary/valve/V in P.other_atmosmch)
- if(V.open)
+ if(V.on)
PL |= V.parents[1]
PL |= V.parents[2]
for(var/obj/machinery/atmospherics/components/unary/portables_connector/C in P.other_atmosmch)
diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm
index 9a310fb545..b0afefd58a 100644
--- a/code/modules/atmospherics/machinery/other/meter.dm
+++ b/code/modules/atmospherics/machinery/other/meter.dm
@@ -4,7 +4,6 @@
icon = 'icons/obj/atmospherics/pipes/meter.dmi'
icon_state = "meterX"
layer = GAS_PUMP_LAYER
- anchored = TRUE
power_channel = ENVIRON
use_power = IDLE_POWER_USE
idle_power_usage = 2
diff --git a/code/modules/atmospherics/machinery/other/miner.dm b/code/modules/atmospherics/machinery/other/miner.dm
index 61681c0b38..20251418bc 100644
--- a/code/modules/atmospherics/machinery/other/miner.dm
+++ b/code/modules/atmospherics/machinery/other/miner.dm
@@ -10,7 +10,6 @@
desc = "Gasses mined from the gas giant below (above?) flow out through this massive vent."
icon = 'icons/obj/atmospherics/components/miners.dmi'
icon_state = "miner"
- anchored = TRUE
density = FALSE
resistance_flags = INDESTRUCTIBLE|ACID_PROOF|FIRE_PROOF
var/spawn_id = null
diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm
index ee52d89e5b..b087859a47 100644
--- a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm
+++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm
@@ -1,7 +1,6 @@
/obj/machinery/atmospherics/pipe/heat_exchanging
icon = 'icons/obj/atmospherics/pipes/heat.dmi'
level = 2
- var/initialize_directions_he
var/minimum_temperature_difference = 20
var/thermal_conductivity = WINDOW_HEAT_TRANSFER_COEFFICIENT
color = "#404040"
@@ -9,22 +8,18 @@
var/icon_temperature = T20C //stop small changes in temperature causing icon refresh
resistance_flags = LAVA_PROOF | FIRE_PROOF
-/obj/machinery/atmospherics/pipe/heat_exchanging/New()
- ..()
+/obj/machinery/atmospherics/pipe/heat_exchanging/Initialize()
+ . = ..()
add_atom_colour("#404040", FIXED_COLOUR_PRIORITY)
-/obj/machinery/atmospherics/pipe/heat_exchanging/can_be_node(obj/machinery/atmospherics/pipe/heat_exchanging/target)
- if(!istype(target))
- return 0
- if(target.initialize_directions_he & get_dir(target,src))
- return 1
+/obj/machinery/atmospherics/pipe/heat_exchanging/isConnectable(obj/machinery/atmospherics/pipe/heat_exchanging/target, given_layer, HE_type_check = TRUE)
+ if(istype(target, /obj/machinery/atmospherics/pipe/heat_exchanging) != HE_type_check)
+ return FALSE
+ . = ..()
/obj/machinery/atmospherics/pipe/heat_exchanging/hide()
return
-/obj/machinery/atmospherics/pipe/heat_exchanging/GetInitDirections()
- return ..() | initialize_directions_he
-
/obj/machinery/atmospherics/pipe/heat_exchanging/process_atmos()
var/environment_temperature = 0
var/datum/gas_mixture/pipe_air = return_air()
@@ -56,8 +51,6 @@
L.bodytemperature = avg_temp
pipe_air.temperature = avg_temp
-
-
/obj/machinery/atmospherics/pipe/heat_exchanging/process()
if(!parent)
return //machines subsystem fires before atmos is initialized so this prevents race condition runtimes
diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm
index d0bf90c27b..606693ddda 100644
--- a/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm
+++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm
@@ -9,11 +9,9 @@
thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
dir = SOUTH
- initialize_directions = NORTH
- initialize_directions_he = SOUTH
device_type = BINARY
-
+
construction_type = /obj/item/pipe/directional
pipe_state = "junction"
@@ -26,34 +24,18 @@
piping_layer = PIPING_LAYER_MAX
pixel_x = PIPING_LAYER_P_X
pixel_y = PIPING_LAYER_P_Y
-
+
/obj/machinery/atmospherics/pipe/heat_exchanging/junction/SetInitDirections()
switch(dir)
- if(SOUTH)
- initialize_directions = NORTH
- initialize_directions_he = SOUTH
- if(NORTH)
- initialize_directions = SOUTH
- initialize_directions_he = NORTH
- if(EAST)
- initialize_directions = WEST
- initialize_directions_he = EAST
- if(WEST)
- initialize_directions = EAST
- initialize_directions_he = WEST
+ if(NORTH,SOUTH)
+ initialize_directions = SOUTH|NORTH
+ if(EAST,WEST)
+ initialize_directions = WEST|EAST
/obj/machinery/atmospherics/pipe/heat_exchanging/junction/getNodeConnects()
return list(turn(dir, 180), dir)
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction/can_be_node(obj/machinery/atmospherics/target, iteration)
- var/init_dir
- switch(iteration)
- if(1)
- init_dir = target.initialize_directions
- if(2)
- var/obj/machinery/atmospherics/pipe/heat_exchanging/H = target
- if(!istype(H))
- return 0
- init_dir = H.initialize_directions_he
- if(init_dir & get_dir(target,src))
- return 1
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction/isConnectable(obj/machinery/atmospherics/target, given_layer, he_type_check)
+ if(dir == get_dir(target, src))
+ return ..(target, given_layer, FALSE) //we want a normal pipe instead
+ return ..(target, given_layer, TRUE)
diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm
index 9b95840875..6689905cf7 100644
--- a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm
+++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm
@@ -6,13 +6,13 @@
desc = "A manifold composed of regular pipes."
dir = SOUTH
- initialize_directions_he = EAST|NORTH|WEST
+ initialize_directions = EAST|NORTH|WEST
device_type = TRINARY
construction_type = /obj/item/pipe/trinary
pipe_state = "he_manifold"
-
+
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
@@ -26,13 +26,13 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/SetInitDirections()
switch(dir)
if(NORTH)
- initialize_directions_he = EAST|SOUTH|WEST
+ initialize_directions = EAST|SOUTH|WEST
if(SOUTH)
- initialize_directions_he = WEST|NORTH|EAST
+ initialize_directions = WEST|NORTH|EAST
if(EAST)
- initialize_directions_he = SOUTH|WEST|NORTH
+ initialize_directions = SOUTH|WEST|NORTH
if(WEST)
- initialize_directions_he = NORTH|EAST|SOUTH
+ initialize_directions = NORTH|EAST|SOUTH
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/update_icon()
var/invis = invisibility ? "-f" : ""
@@ -53,13 +53,13 @@
name = "4-way pipe manifold"
desc = "A manifold composed of heat-exchanging pipes."
- initialize_directions_he = NORTH|SOUTH|EAST|WEST
+ initialize_directions = NORTH|SOUTH|EAST|WEST
device_type = QUATERNARY
construction_type = /obj/item/pipe/quaternary
pipe_state = "he_manifold4w"
-
+
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
@@ -71,7 +71,7 @@
pixel_y = PIPING_LAYER_P_Y
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/SetInitDirections()
- initialize_directions_he = initial(initialize_directions_he)
+ initialize_directions = initial(initialize_directions)
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/update_icon()
var/invis = invisibility ? "-f" : ""
diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm
index d00304114d..ad137a227d 100644
--- a/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm
+++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm
@@ -5,13 +5,13 @@
desc = "A one meter section of heat-exchanging pipe."
dir = SOUTH
- initialize_directions_he = SOUTH|NORTH
+ initialize_directions = SOUTH|NORTH
device_type = BINARY
construction_type = /obj/item/pipe/binary/bendable
pipe_state = "he"
-
+
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer1
piping_layer = PIPING_LAYER_MIN
pixel_x = -PIPING_LAYER_P_X
@@ -24,12 +24,12 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/SetInitDirections()
if(dir in GLOB.diagonals)
- initialize_directions_he = dir
+ initialize_directions = dir
switch(dir)
if(NORTH,SOUTH)
- initialize_directions_he = SOUTH|NORTH
+ initialize_directions = SOUTH|NORTH
if(EAST,WEST)
- initialize_directions_he = WEST|EAST
+ initialize_directions = WEST|EAST
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/proc/normalize_dir()
if(dir==SOUTH)
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index 132e750343..1771609125 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -437,8 +437,8 @@
danger[gas[GAS_META][META_GAS_NAME]] = gas[MOLES] //ex. "plasma" = 20
if(danger.len)
- message_admins("[ADMIN_LOOKUPFLW(usr)] opened a canister that contains the following: [ADMIN_JMP(src)]")
- log_admin("[key_name(usr)] opened a canister that contains the following at [COORD(src)]:")
+ message_admins("[ADMIN_LOOKUPFLW(usr)] opened a canister that contains the following at [ADMIN_VERBOSEJMP(src)]:")
+ log_admin("[key_name(usr)] opened a canister that contains the following at [AREACOORD(src)]:")
for(var/name in danger)
var/msg = "[name]: [danger[name]] moles."
log_admin(msg)
diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
index 68223d85a2..1a276d03c5 100644
--- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
+++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
@@ -4,7 +4,7 @@
use_power = NO_POWER_USE
max_integrity = 250
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 60, "acid" = 30)
-
+ anchored = FALSE
var/datum/gas_mixture/air_contents
var/obj/machinery/atmospherics/components/unary/portables_connector/connected_port
diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm
index 798b555444..c0658c781d 100644
--- a/code/modules/atmospherics/machinery/portable/pump.dm
+++ b/code/modules/atmospherics/machinery/portable/pump.dm
@@ -58,6 +58,9 @@
air_update_turf() // Update the environment if needed.
/obj/machinery/portable_atmospherics/pump/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
if(is_operational())
if(prob(50 / severity))
on = !on
@@ -65,7 +68,6 @@
direction = PUMP_OUT
pump.target_pressure = rand(0, 100 * ONE_ATMOSPHERE)
update_icon()
- ..()
/obj/machinery/portable_atmospherics/pump/replace_tank(mob/living/user, close_valve)
. = ..()
@@ -112,9 +114,8 @@
var/plasma = air_contents.gases[/datum/gas/plasma]
var/n2o = air_contents.gases[/datum/gas/nitrous_oxide]
if(n2o || plasma)
- var/area/A = get_area(src)
- message_admins("[ADMIN_LOOKUPFLW(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [A][ADMIN_JMP(src)]")
- log_admin("[key_name(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [A][COORD(src)]")
+ message_admins("[ADMIN_LOOKUPFLW(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [ADMIN_VERBOSEJMP(src)]")
+ log_admin("[key_name(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [AREACOORD(src)]")
else if(on && direction == PUMP_OUT)
investigate_log("[key_name(usr)] started a transfer into [holding]. ", INVESTIGATE_ATMOS)
. = TRUE
diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm
index 4bb7b02288..29a454f59a 100644
--- a/code/modules/atmospherics/machinery/portable/scrubber.dm
+++ b/code/modules/atmospherics/machinery/portable/scrubber.dm
@@ -56,11 +56,13 @@
air_update_turf()
/obj/machinery/portable_atmospherics/scrubber/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
if(is_operational())
if(prob(50 / severity))
on = !on
update_icon()
- ..()
/obj/machinery/portable_atmospherics/scrubber/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm
index 87b9736722..9bebcfe546 100644
--- a/code/modules/awaymissions/bluespaceartillery.dm
+++ b/code/modules/awaymissions/bluespaceartillery.dm
@@ -10,7 +10,6 @@
icon_state = "control_boxp1"
icon = 'icons/obj/machines/particle_accelerator.dmi'
density = TRUE
- anchored = TRUE
/obj/machinery/artillerycontrol/process()
if(reload < reload_cooldown)
@@ -47,7 +46,7 @@
return
if(usr.contents.Find(src) || (in_range(src, usr) && isturf(loc)) || issilicon(usr))
priority_announce("Bluespace artillery fire detected. Brace for impact.")
- message_admins("[key_name_admin(usr)] has launched an artillery strike.")
+ message_admins("[ADMIN_LOOKUPFLW(usr)] has launched an artillery strike.")
var/list/L = list()
for(var/turf/T in get_area_turfs(thearea.type))
L+=T
diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm
index 09504c60b7..56f5d63b0c 100644
--- a/code/modules/awaymissions/capture_the_flag.dm
+++ b/code/modules/awaymissions/capture_the_flag.dm
@@ -135,7 +135,6 @@
desc = "Used for running friendly games of capture the flag."
icon = 'icons/obj/device.dmi'
icon_state = "syndbeacon"
- anchored = TRUE
resistance_flags = INDESTRUCTIBLE
var/team = WHITE_TEAM
var/team_span = ""
@@ -495,14 +494,14 @@
W.registered_name = H.real_name
W.update_label(W.registered_name, W.assignment)
- // The shielded hardsuit is already NODROP_1
+ // The shielded hardsuit is already NODROP
no_drops += H.get_item_by_slot(SLOT_GLOVES)
no_drops += H.get_item_by_slot(SLOT_SHOES)
no_drops += H.get_item_by_slot(SLOT_W_UNIFORM)
no_drops += H.get_item_by_slot(SLOT_EARS)
for(var/i in no_drops)
var/obj/item/I = i
- I.flags_1 |= NODROP_1
+ I.item_flags |= NODROP
/datum/outfit/ctf/instagib
r_hand = /obj/item/gun/energy/laser/instakill
@@ -652,7 +651,6 @@
desc = "You should capture this."
icon = 'icons/obj/machines/dominator.dmi'
icon_state = "dominator"
- anchored = TRUE
resistance_flags = INDESTRUCTIBLE
var/obj/machinery/capture_the_flag/controlling
var/team = "none"
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index 889e6f628b..0ee182d9f8 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -37,10 +37,12 @@
if(jobban_isbanned(user, banType))
to_chat(user, "You are jobanned!")
return
+ if(QDELETED(src) || QDELETED(user))
+ return
var/ghost_role = alert("Become [mob_name]? (Warning, You can no longer be cloned!)",,"Yes","No")
if(ghost_role == "No" || !loc)
return
- log_game("[user.ckey] became [mob_name]")
+ log_game("[key_name(user)] became [mob_name]")
create(ckey = user.ckey)
/obj/effect/mob_spawn/Initialize(mapload)
@@ -361,8 +363,9 @@
name = "bartender sleeper"
icon = 'icons/obj/machines/sleeper.dmi'
icon_state = "sleeper"
- flavour_text = "You are a space bartender!"
+ flavour_text = "You are a space bartender! Time to mix drinks and change lives. Smoking space drugs makes it easier to understand your patrons' odd dialect."
assignedrole = "Space Bartender"
+ id_job = "Bartender"
/datum/outfit/spacebartender
name = "Space Bartender"
@@ -373,7 +376,6 @@
glasses = /obj/item/clothing/glasses/sunglasses/reagent
id = /obj/item/card/id
-
/obj/effect/mob_spawn/human/beach
outfit = /datum/outfit/beachbum
@@ -385,14 +387,23 @@
name = "beach bum sleeper"
icon = 'icons/obj/machines/sleeper.dmi'
icon_state = "sleeper"
- flavour_text = "You are a beach bum!"
+ flavour_text = "You're, like, totally a dudebro, bruh. Ch'yea. You came here, like, on spring break, hopin' to pick up some bangin' hot chicks, y'knaw?"
assignedrole = "Beach Bum"
+/obj/effect/mob_spawn/human/beach/alive/lifeguard
+ flavour_text = "You're a spunky lifeguard! It's up to you to make sure nobody drowns or gets eaten by sharks and stuff."
+ mob_gender = "female"
+ name = "lifeguard sleeper"
+ id_job = "Lifeguard"
+ uniform = /obj/item/clothing/under/shorts/red
+
/datum/outfit/beachbum
name = "Beach Bum"
glasses = /obj/item/clothing/glasses/sunglasses
- uniform = /obj/item/clothing/under/shorts/red
r_pocket = /obj/item/storage/wallet/random
+ l_pocket = /obj/item/reagent_containers/food/snacks/pizzaslice/dank;
+ uniform = /obj/item/clothing/under/pants/youngfolksjeans
+ id = /obj/item/card/id
/datum/outfit/beachbum/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index 2293ac8098..5c3e87a367 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -6,7 +6,6 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
icon = 'icons/obj/machines/gateway.dmi'
icon_state = "off"
density = TRUE
- anchored = TRUE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
var/active = 0
var/checkparts = TRUE
diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm
index ae119db9e7..57d8420fa8 100644
--- a/code/modules/awaymissions/mission_code/Academy.dm
+++ b/code/modules/awaymissions/mission_code/Academy.dm
@@ -58,7 +58,7 @@
/obj/item/paper/fluff/awaymissions/academy/grade/failure
name = "Pyromancy Evaluation"
- info = "Current Grade: F. Educator's Notes: No improvement shown despite multiple private lessons. Suggest additional tutilage."
+ info = "Current Grade: F. Educator's Notes: No improvement shown despite multiple private lessons. Suggest additional tutelage."
/obj/singularity/academy
@@ -131,7 +131,7 @@
if(LAZYLEN(candidates))
var/mob/dead/observer/C = pick(candidates)
- message_admins("[key_name_admin(C)] was spawned as Wizard Academy Defender")
+ message_admins("[ADMIN_LOOKUPFLW(C)] was spawned as Wizard Academy Defender")
current_wizard.ghostize() // on the off chance braindead defender gets back in
current_wizard.key = C.key
@@ -273,7 +273,7 @@
var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as [user.real_name] Servant?", ROLE_WIZARD, null, ROLE_WIZARD, 50, H)
if(LAZYLEN(candidates))
var/mob/dead/observer/C = pick(candidates)
- message_admins("[key_name_admin(C)] was spawned as Dice Servant")
+ message_admins("[ADMIN_LOOKUPFLW(C)] was spawned as Dice Servant")
H.key = C.key
var/obj/effect/proc_holder/spell/targeted/summonmob/S = new
diff --git a/code/modules/awaymissions/mission_code/caves.dm b/code/modules/awaymissions/mission_code/caves.dm
index fd2f8f18af..fd2735678d 100644
--- a/code/modules/awaymissions/mission_code/caves.dm
+++ b/code/modules/awaymissions/mission_code/caves.dm
@@ -31,14 +31,14 @@
//caves papers
/obj/item/paper/crumpled/awaymissions/caves/unsafe_area
- info = "
WARNING
Majority of this area is consitered 'unsafe' past this point. Theres an outpost directly south of here where you can get your bearing and travel further down if needed. Traveling in groups is HIGHLY advised, the shit out there can be extremely deadly if you're alone.
"
+ info = "
WARNING
Majority of this area is considered 'unsafe' past this point. Theres an outpost directly south of here where you can get your bearing and travel further down if needed. Traveling in groups is HIGHLY advised, the shit out there can be extremely deadly if you're alone.
"
/obj/item/paper/fluff/awaymissions/caves/omega
name = "Subject Omega Notes"
info = "
Testing Notes
Subject appears unresponsive to most interactions, refusing to move away from the corners or face any scientists. Subject appears to move between the two back corners every observation. A strange humming can be heard from inside the cell, appears to be originating from the subject itself, further testing is necessary to confirm or deny this.
"
/obj/item/paper/fluff/awaymissions/caves/magma
- info = "
Mining is hell down here, you can feel the heat of the magma no matter how thick the suit is. Conditions are barely managble as is, restless nights and horrid work conditions. The ore maybe rich down here, but we've already lost a few men to the faults shifting, god knows how much longer till it all just collapses down and consumes everyone with it.
"
+ info = "
Mining is hell down here, you can feel the heat of the magma no matter how thick the suit is. Conditions are barely manageable as is, restless nights and horrid work conditions. The ore maybe rich down here, but we've already lost a few men to the faults shifting, god knows how much longer till it all just collapses down and consumes everyone with it.
"
/obj/item/paper/fluff/awaymissions/caves/work_notice
name = "work notice"
@@ -48,7 +48,7 @@
name = "shipment notice"
info = "
We were suppose to get a shipment of these special laser rifles and a couple 'nades to help combat the wildlife down here, but its been weeks since we last heard from the caravan carrying the shit down here. At this point we can only assume they fell victim to one of the monster nests or the dumbasses managed to trip into the lava. So much for that shipment, I guess.
"
-/obj/item/paper/fluff/awaymissions/caves/saftey_notice
+/obj/item/paper/fluff/awaymissions/caves/safety_notice
name = "safety notice"
info = "
Some of the miners have gone to laying some mine traps among the lower levels of the mine to keep the monsters at bay. This probably isn't the smartest idea in a cavern like this but the boys seem to get a chuckle out of every distant blast they hear go off, so I guess it works
"
diff --git a/code/modules/awaymissions/mission_code/moonoutpost19.dm b/code/modules/awaymissions/mission_code/moonoutpost19.dm
index b66aa6e64d..c0af9cd08c 100644
--- a/code/modules/awaymissions/mission_code/moonoutpost19.dm
+++ b/code/modules/awaymissions/mission_code/moonoutpost19.dm
@@ -29,8 +29,7 @@
/area/awaymission/moonoutpost19/hive
name = "The Hive"
- always_unpowered = FALSE
- has_gravity = FALSE
+ always_unpowered = TRUE
power_environ = FALSE
power_equip = FALSE
power_light = FALSE
@@ -45,7 +44,7 @@
/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_social
name = "Larva Xenomorph Social Interactions & Capturing Procedure"
- info = "Researcher: Dr. Sakuma Sano Date: 04/06/2554
Report: As expected, all that is left of the monkeys we sent in earlier is a group of xenomorph larvae. It is quite clear that the facehuggers are not selective in their hosts, and so far the gestation process has been shown to have a 100% success rate.
The larvae themselves have been behaving very differently from the lone larva we first observed, and despite shying away from humans they are clearly comfortable with others of their kind. Our previous suspicions on larvae have been confirmed with their demonstration of playfulness: they are not nearly as aggressive or violent when young, before molting to adulthood.
The majority of the play we observed involved a sort of hide-and-seek, and occasionally wrestling by tangling themselves and struggling out of it. While normally we would write these off as instinctual play for honing their skills when they molt, their growth period is so incredibly fast and they are still such adept killers that it would serve no practical purpose. The only explanation for this is perhaps to create bonds and friendships with each other, if that is even possible for such an incredibly hostile race. It may be that they are much more reasonable with each other than other life forms.
It had become clear that now was the best time to extract a xenomorph for dissecting, as these were all still larvae and the queen was still attached to its ovipositor and would be immobile. With the approval of the research director, we sent in our medical robot that had been dubbed 'Head Surgeon' into the containment pen, dropping the shields for only a fraction of a second to allow it entry. The larvae were cautious, but the curiosity of one had him within grabbing range of our robot. It was brought out and quickly euthanized through lethal injection, courtesy of our mechanical doctor."
+ info = "Researcher: Dr. Sakuma Sano Date: 04/06/2554
Report: As expected, all that is left of the monkeys we sent in earlier is a group of xenomorph larvae. It is quite clear that the facehuggers are not selective in their hosts, and so far the gestation process has been shown to have a 100% success rate.
The larvae themselves have been behaving very differently from the lone larva we first observed, and despite shying away from humans they are clearly comfortable with others of their kind. Our previous suspicions on larvae have been confirmed with their demonstration of playfulness: they are not nearly as aggressive or violent when young, before molting to adulthood.
The majority of the play we observed involved a sort of hide-and-seek, and occasionally wrestling by tangling themselves and struggling out of it. While normally we would write these off as instinctual play for honing their skills when they molt, their growth period is so incredibly fast and they are still such adept killers that it would serve no practical purpose. The only explanation for this is perhaps to create bonds and friendships with each other, if that is even possible for such an incredibly hostile race. It may be that they are much more reasonable with each other than other life forms.
It had become clear that now was the best time to extract a xenomorph for dissecting, as these were all still larvae and the queen was still attached to its ovipositor and would be immobile. With the approval of the research director, we sent in our medical robot that had been dubbed 'Head Surgeon' into the containment pen, dropping the shields for only a fraction of a second to allow it entry. The larvae were cautious, but the curiosity of one had him within grabbing range of our robot. It was brought out and quickly euthanized through lethal injection, courtesy of our mechanical doctor."
/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_queen
name = "Queen Xenomorph Physiology & Behavior Observation"
@@ -66,7 +65,7 @@
/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_hivemind
name = "The Hivemind Hypothesis"
info = "Researcher: Dr. Mark Douglas Date: 17/06/2554
Report: Earlier today we have observed a new phenomenon with our subjects. While feeding them our last monkey subject and throwing out the box, the aliens merely looked at us instead of infecting the monkey right away. They looked to be collectively distressed as they would no longer be given hosts, where instead we would move to the next phase of the experiment. When I glanced at the gas tanks and piping leading to their cell, I looked back to see all of them were up against the glass, even the queen! It was as if they all understood what was going to happen, even though we knew only the queen had the cognitive capability to do so.
The only explanation for this is a form of communication between the aliens, but we have seen no such action take place anywhere in the cell until now. We also know that regular drone and hunter xenomorphs have no personality or instinct to survive by themselves. Perhaps the queen has a direct link to them? A form of a commander or overseer that controls their every move? A hivemind?"
-
+
/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_behavior
name = "A Preliminary Study of Alien Behavior"
info = "Researcher: Dr. Sakuma Sano Date: 08/06/2554
Report: The xenomorphs we have come to study here are a remarkable species. They are almost universally aggressive across all castes, showing no remorse or guilt or pause before or after acts of violence. They appear to be a species entirely designed to kill. Oddly enough, even their method of reproduction is a brutal two-for-one method of birthing a new xenomorph and killing its host.
The lone xenomorph we studied only five days ago showed little sign of intelligence. Only a simple drone that flung itself at the safety glass and shields repeatedly and thankfully without success. Once the drone molted into a queen, it became much more calm and calculating, merely looking at us and waiting while building its nest. As the hive grew in size and in numbers, so too did the intelligence of the common hunter and drone. We are still researching how they can communicate with one another and the relationship between the different castes and the queen. We will continue to update our research as we learn more about the species."
@@ -81,11 +80,11 @@
/obj/item/paper/fluff/awaymissions/moonoutpost19/research/evacuation
name = "Evacuation Procedure"
- info = "
In The Event of Xenobiology Breach: Evacuate staff, Lock down Xenobiology, Notify on-site superiors and/or Central Command immediatly.
Current Xenobiology Containment Level:Secure RUN
"
+ info = "
In The Event of Xenobiology Breach: Evacuate staff, Lock down Xenobiology, Notify on-site superiors and/or Central Command immediately.
Current Xenobiology Containment Level:Secure RUN
"
/obj/item/paper/fluff/awaymissions/moonoutpost19/log/personal
name = "Personal Log"
- info = "Log 1: We got our promised supply drop today. We were only meant to get it, what, a week ago? This bloody gateway keeps desyncing itself, and that means subsisting off recycled water and carb packs. No clue where the damn thing connects to on its off days, and HQ say we are 'not to touch it if it isn't linking to command.' We dumped off the assload of crates Jim filled, got our boxes of oxygen, food and drink, and closed the portal.
Log 2: Damn thing is acting up again. Three days no contact this time. I thought I heard clanking noises from it yesterday. Jim is going on about the NT base or some shit. We've been over this before - They don't know we're here, that engineer was too drunk to recognise his suit, especially since I had it painted orange. He's starting to get annoying. We're safe.
Log 3: Gateway synced itself up automatically today. I opened it for an instant to spy through it, got a glimpse of the inside of a transport container. Either HQ's redecorating or something, or there's more than two of these things."
+ info = "Log 1: We got our promised supply drop today. We were only meant to get it, what, a week ago? This bloody gateway keeps desyncing itself, and that means subsisting off recycled water and carb packs. No clue where the damn thing connects to on its off days, and HQ say we are 'not to touch it if it isn't linking to command.' We dumped off the assload of crates Jim filled, got our boxes of oxygen, food and drink, and closed the portal.
Log 2: Damn thing is acting up again. Three days no contact this time. I thought I heard clanking noises from it yesterday. Jim is going on about the NT base or some shit. We've been over this before - They don't know we're here, that engineer was too drunk to recognize his suit, especially since I had it painted orange. He's starting to get annoying. We're safe.
Log 3: Gateway synced itself up automatically today. I opened it for an instant to spy through it, got a glimpse of the inside of a transport container. Either HQ's redecorating or something, or there's more than two of these things."
/obj/item/paper/fluff/awaymissions/moonoutpost19/log/personal_2
name = "Personal Log"
@@ -101,7 +100,7 @@
/obj/item/paper/fluff/awaymissions/moonoutpost19/log/ivan
name = "Personal Log - Ivan Volodin"
- info = "Ivan Volodin Stories:
Entry Won - 28/05/2554: Hello. I am Crazy Ivan. Boss say I must write. I do good job fixing outpost. Is very good job. Much better than mines. Many nice people. I cause no trouble.
Entry Too - 05/06/2554: I am finding problem with Booze-O-Mat. Is not problem. I solve very easy. Use yellow tool to make purple light go off. I am good engineer! Bartender will be very happy.
Entry Tree - 08/06/2554: Bartender is not happy. Security man is not happy. Cannot feel legs, is very cold in freezer. Is not good. Table is jammed into door, have no tools. Is very not good. But, on bright side, found meat! Shall chew to keep spirits up.
Entry Fore - 12/06/2554: Big nasty purple bug looked at me today. Make nervous. Blue wall wire can be broken, then bad thing happens. Very very bad thing. Man in orange spacesuit wave at me today too. He seem nice. Wonder who was?
Entry Fiv - 15/06/2554: I eat cornflakes today. Is good day. Sun shine for a while. Was nice. I also take ride on disposals chute. Was fun, but tiny. Get clog out of pipes, was vodka bottle. Is empty. This make many sads.
Entry Sex: 19/06/2554: Purple bugs jumpy today. When waved, get hiss. Maybe very bad. Maybe just ill. Do not know. Is science problem, is not engineer problem. I eat sandwich. Is glorious job. Wish to never end."
+ info = "Ivan Volodin Stories:
Entry Won - 28/05/2554: Hello. I am Crazy Ivan. Boss say I must write. I do good job fixing outpost. Is very good job. Much better than mines. Many nice people. I cause no trouble.
Entry Too - 05/06/2554: I am finding problem with Booze-O-Mat. Is not problem. I solve very easy. Use yellow tool to make purple light go off. I am good engineer! Bartender will be very happy.
Entry Tree - 08/06/2554: Bartender is not happy. Security man is not happy. Cannot feel legs, is very cold in freezer. Is not good. Table is jammed into door, have no tools. Is very not good. But, on bright side, found meat! Shall chew to keep spirits up.
Entry Fore - 12/06/2554: Big nasty purple bug looked at me today. Make nervous. Blue wall wire can be broken, then bad thing happens. Very very bad thing. Man in orange spacesuit wave at me today too. He seem nice. Wonder who was?
Entry Fiv - 15/06/2554: I eat cornflakes today. Is good day. Sun shine for a while. Was nice. I also take ride on disposals chute. Was fun, but tiny. Get clog out of pipes, was vodka bottle. Is empty. This make many sads.
Entry Sex: 19/06/2554: Purple bugs jumpy today. When waved, get hiss. Maybe very bad. Maybe just ill. Do not know. Is science problem, is not engineer problem. I eat sandwich. Is glorious job. Wish to never end."
/obj/item/paper/fluff/awaymissions/moonoutpost19/log/gerald
name = "Personal Log - Gerald Rosswell"
@@ -118,5 +117,5 @@
/obj/item/paper/fluff/awaymissions/moonoutpost19/goodbye_note
name = "Note"
info = "Bugs break out. I run to here and lock door. I hear door next to me break open and screams. All nice people here dead now. I no want to be eaten, and bottle always said to be coward way out, but person who say that is stupid. Mira, there is no escape for me, tell Alexis and Elena that father will never come home, and that I love you all."
-
+
diff --git a/code/modules/awaymissions/mission_code/murderdome.dm b/code/modules/awaymissions/mission_code/murderdome.dm
new file mode 100644
index 0000000000..2a7cb21841
--- /dev/null
+++ b/code/modules/awaymissions/mission_code/murderdome.dm
@@ -0,0 +1,41 @@
+/obj/structure/window/reinforced/fulltile/indestructable
+ name = "robust window"
+ flags_1 = PREVENT_CLICK_UNDER_1 | NODECONSTRUCT_1
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+
+/obj/structure/grille/indestructable
+ flags_1 = CONDUCT_1 | NODECONSTRUCT_1
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+
+/obj/effect/spawner/structure/window/reinforced/indestructable
+ spawn_list = list(/obj/structure/grille/indestructable, /obj/structure/window/reinforced/fulltile/indestructable)
+
+/obj/structure/barricade/security/murderdome
+ name = "respawnable barrier"
+ desc = "A barrier. Provides cover in firefights."
+ deploy_time = 0
+ deploy_message = 0
+
+/obj/structure/barricade/security/murderdome/make_debris()
+ new /obj/effect/murderdome/dead_barricade(get_turf(src))
+
+/obj/effect/murderdome/dead_barricade
+ name = "dead barrier"
+ desc = "It provided cover in fire fights. And now it's gone."
+ icon = 'icons/obj/objects.dmi'
+ icon_state = "barrier0"
+ alpha = 100
+
+/obj/effect/murderdome/dead_barricade/Initialize()
+ . = ..()
+ addtimer(CALLBACK(src, .proc/respawn), 3 MINUTES)
+
+/obj/effect/murderdome/dead_barricade/proc/respawn()
+ if(!QDELETED(src))
+ new /obj/structure/barricade/security/murderdome(get_turf(src))
+ qdel(src)
+
+/area/awaymission/vr/murderdome
+ name = "Murderdome"
+ requires_power = FALSE
+ dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
index 274658e5ea..b3018d9d1c 100644
--- a/code/modules/awaymissions/mission_code/snowdin.dm
+++ b/code/modules/awaymissions/mission_code/snowdin.dm
@@ -89,7 +89,7 @@
icon_state = "awaycontent22"
/area/awaymission/snowdin/post/broken_shuttle
- name = "Snowdin Outpost - Broken Transist Shuttle"
+ name = "Snowdin Outpost - Broken Transit Shuttle"
icon_state = "awaycontent20"
requires_power = FALSE
@@ -223,8 +223,9 @@
var/list/plasma_parts = list()//a list of the organic parts to be turned into plasma limbs
var/list/robo_parts = list()//keep a reference of robotic parts so we know if we can turn them into a plasmaman
var/mob/living/carbon/human/PP = L
- if(istype(PP.dna.species, /datum/species/plasmaman || /datum/species/android || /datum/species/synth)) //ignore plasmamen/robotic species
- return
+ var/S = PP.dna.species
+ if(istype(S, /datum/species/plasmaman) || istype(S, /datum/species/android) || istype(S, /datum/species/synth)) //ignore plasmamen/robotic species
+ continue
for(var/BP in PP.bodyparts)
var/obj/item/bodypart/NN = BP
@@ -263,7 +264,7 @@
/obj/item/paper/crumpled/ruins/snowdin/foreshadowing
name = "scribbled note"
- info = {"Somnethings gone VERY wrong here. Jouslen has been mumbling about some weird shit in his cabin during the night and he seems always tired when we're working. I tried to confront him about it and he blew up on me,
+ info = {"Something's gone VERY wrong here. Jouslen has been mumbling about some weird shit in his cabin during the night and he seems always tired when we're working. I tried to confront him about it and he blew up on me,
telling me to mind my own business. I reported him to the officer, said he'd look into it. We only got another 2 months here before we're pulled for another assignment, so this shit can't go any quicker.."}
/obj/item/paper/crumpled/ruins/snowdin/misc1
@@ -283,58 +284,58 @@
/obj/item/paper/fluff/awaymissions/snowdin/research_feed
name = "Research Feed"
- info = {"A page full of graphs and other detailed infomation on the seismic activity of the surrounding area."}
+ info = {"A page full of graphs and other detailed information on the seismic activity of the surrounding area."}
//profile of each of the old crewmembers for the outpost
/obj/item/paper/fluff/awaymissions/snowdin/profile/overseer
name = "Personnel Record AOP#01"
- info = {"
Caleb Reed lead several expeditions
among uncharted planets in search of plasma for Nanotrasen, scouring from hot savanas to freezing arctics. Track record is fairly clean with only incidient including the loss of two researchers during the
expedition of _______, where mis-used of explosive ordinance for tunneling causes a cave-in."}
/obj/item/paper/fluff/awaymissions/snowdin/profile/sec1
name = "Personnel Record AOP#02"
- info = {"
James Reed has been a part
of Nanotrasen's security force for over 20 years, first joining in 22XX. A clean record and unwavering loyalty to the corperation through numerous deployments to various sites makes him a valuable asset to Natotrasen
when it comes to keeping the peace while prioritizing Nanotrasen privacy matters. "}
/obj/item/paper/fluff/awaymissions/snowdin/profile/hydro1
name = "Personnel Record AOP#03"
- info = {"
Katherine Esterdeen is a recent
graduate with a major in Botany and a PH.D in Ecology. Having a clean record and eager to work, Esterdeen seems to be the right fit for maintaining plants in the middle of nowhere."}
/obj/item/paper/fluff/awaymissions/snowdin/profile/engi1
name = "Personnel Record AOP#04"
- info = {"
Recently certified to be a full-time Journeyman, Rachel has
been assigned various construction projects in the past 5 years. Competent and has no past infractions, should be of little concern."}
/obj/item/paper/fluff/awaymissions/snowdin/profile/research1
name = "Personnel Record AOP#05"
- info = {"
"}
/obj/item/paper/fluff/awaymissions/snowdin/secnotice
name = "Security Notice"
- info = {"YOu have been assigned to this Arctic Post with intention of protecting Nanotrasen assets and ensuring vital infomation is kept secure while the stationed crew obeys protocal. The picked
+ info = {"YOu have been assigned to this Arctic Post with intention of protecting Nanotrasen assets and ensuring vital information is kept secure while the stationed crew obeys protocol. The picked
staff for this post have been pre-screened with no prior incidients on record, but incase of an issue you have been given a single holding cell and instructions to contact Central to terminate the
offending crewmember."}
/obj/item/paper/fluff/awaymissions/snowdin/mining
name = "Assignment Notice"
- info = {"This cold-ass planet is the new-age equivilant of striking gold. Huge deposits of plasma and literal streams of plasma run through the caverns under all this ice and we're here to mine it all.\
+ info = {"This cold-ass planet is the new-age equivalent of striking gold. Huge deposits of plasma and literal streams of plasma run through the caverns under all this ice and we're here to mine it all.\
Nanotrasen pays by the pound, so get minin' boys!"}
/obj/item/paper/crumpled/ruins/snowdin/lootstructures
name = "scribbled note"
- info = {"There's some ruins scattered along the cavern, their walls seem to be made of some sort of super-condensned mixture of ice and snow. We've already barricaded up the ones we've found so far,
+ info = {"There's some ruins scattered along the cavern, their walls seem to be made of some sort of super-condensed mixture of ice and snow. We've already barricaded up the ones we've found so far,
since we keep hearing some strange noises from inside. Besides, what sort of fool would wrecklessly run into ancient ruins full of monsters for some old gear, anyway?"}
/obj/item/paper/crumpled/ruins/snowdin/shovel
@@ -388,7 +389,7 @@
DELAY 30
SAY Nanotrasen is pleased to have you working in one of the many top-of-the-line research posts within the $%@!! sector!
DELAY 30
- SAY Further job assignment infomation can be found at your local security post! Have a secure day!
+ SAY Further job assignment information can be found at your local security post! Have a secure day!
DELAY 20;"}
/obj/item/disk/holodisk/snowdin/overrun
@@ -529,7 +530,7 @@
/obj/item/gun/ballistic/automatic/c20r/unrestricted = 16,
/obj/item/gun/magic/wand/resurrection/inert = 15,
/obj/item/gun/magic/wand/resurrection = 10,
- /obj/item/radio/uplink/old = 2,
+ /obj/item/uplink/old = 2,
/obj/item/book/granter/spell/charge = 12,
/obj/item/grenade/clusterbuster/spawner_manhacks = 15,
/obj/item/book/granter/spell/fireball = 10,
@@ -558,7 +559,7 @@
/obj/item/clothing/under/syndicate/coldres
name = "insulated tactical turtleneck"
- desc = "A non-descript and slightly suspicious-looking turtleneck with digital camouflage cargo pants. The interior has been padded with special insulation for both warmth and protection."
+ desc = "A nondescript and slightly suspicious-looking turtleneck with digital camouflage cargo pants. The interior has been padded with special insulation for both warmth and protection."
armor = list("melee" = 20, "bullet" = 10, "laser" = 0,"energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25)
cold_protection = CHEST|GROIN|ARMS|LEGS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
@@ -606,6 +607,15 @@
id = /obj/item/card/id/syndicate
implants = list(/obj/item/implant/exile)
+/datum/outfit/vr/snowtide
+ name = "Snowdin Outfit"
+ shoes = /obj/item/clothing/shoes/winterboots
+ suit = /obj/item/clothing/suit/hooded/wintercoat
+ back = /obj/item/storage/backpack
+ mask = /obj/item/clothing/mask/breath
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
+ internals_slot = SLOT_R_STORE
+
/obj/effect/mob_spawn/human/syndicatesoldier/coldres/alive/female
mob_gender = FEMALE
@@ -666,4 +676,5 @@
/obj/effect/turf_decal/snowdin_station_sign/up/seven
icon_state = "AOPU7"
-
+/obj/effect/landmark/vr_spawn/snowdin
+ vr_outfit = /datum/outfit/vr/snowtide
diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm
index ba06b96959..acb329b5c5 100644
--- a/code/modules/awaymissions/mission_code/wildwest.dm
+++ b/code/modules/awaymissions/mission_code/wildwest.dm
@@ -63,7 +63,6 @@
icon = 'icons/obj/device.dmi'
icon_state = "syndbeacon"
- anchored = TRUE
density = TRUE
use_power = NO_POWER_USE
diff --git a/code/modules/awaymissions/signpost.dm b/code/modules/awaymissions/signpost.dm
index fb542d92b9..4d85d947c2 100644
--- a/code/modules/awaymissions/signpost.dm
+++ b/code/modules/awaymissions/signpost.dm
@@ -7,33 +7,55 @@
var/question = "Travel back?"
var/list/zlevels
-/obj/structure/signpost/New()
+/obj/structure/signpost/Initialize()
. = ..()
set_light(2)
zlevels = SSmapping.levels_by_trait(ZTRAIT_STATION)
-/obj/structure/signpost/attackby(obj/item/W, mob/user, params)
- return attack_hand(user)
-
-/obj/structure/signpost/attack_hand(mob/user)
+/obj/structure/signpost/interact(mob/user)
. = ..()
if(.)
return
- switch(alert(question,name,"Yes","No"))
- if("Yes")
- var/turf/T = find_safe_turf(zlevels=zlevels)
+ if(alert(question,name,"Yes","No") == "Yes" && Adjacent(user))
+ var/turf/T = find_safe_turf(zlevels=zlevels)
- if(T)
- user.forceMove(T)
- to_chat(user, "You blink and find yourself in [get_area_name(T)].")
- else
- to_chat(user, "Nothing happens. You feel that this is a bad sign.")
- if("No")
- return
+ if(T)
+ var/atom/movable/AM = user.pulling
+ if(AM)
+ AM.forceMove(T)
+ user.forceMove(T)
+ if(AM)
+ user.start_pulling(AM)
+ to_chat(user, "You blink and find yourself in [get_area_name(T)].")
+ else
+ to_chat(user, "Nothing happens. You feel that this is a bad sign.")
+
+/obj/structure/signpost/attackby(obj/item/W, mob/user, params)
+ return interact(user)
+
+/obj/structure/signpost/attack_paw(mob/user)
+ return interact(user)
+
+/obj/structure/signpost/attack_hulk(mob/user, does_attack_animation = 0)
+ return interact(user)
+
+/obj/structure/signpost/attack_larva(mob/user)
+ return interact(user)
+
+/obj/structure/signpost/attack_robot(mob/user)
+ if (Adjacent(user))
+ return interact(user)
+
+/obj/structure/signpost/attack_slime(mob/user)
+ return interact(user)
+
+/obj/structure/signpost/attack_animal(mob/user)
+ return interact(user)
/obj/structure/signpost/salvation
name = "\proper salvation"
desc = "In the darkest times, we will find our way home."
+ resistance_flags = INDESTRUCTIBLE
/obj/structure/signpost/exit
name = "exit"
@@ -41,7 +63,7 @@
exit the area."
question = "Leave? You might never come back."
-/obj/structure/signpost/exit/New()
+/obj/structure/signpost/exit/Initialize()
. = ..()
zlevels = list()
for(var/i in 1 to world.maxz)
diff --git a/code/modules/awaymissions/super_secret_room.dm b/code/modules/awaymissions/super_secret_room.dm
index 65abae44c5..3903df9686 100644
--- a/code/modules/awaymissions/super_secret_room.dm
+++ b/code/modules/awaymissions/super_secret_room.dm
@@ -5,6 +5,7 @@
icon = 'icons/obj/structures.dmi'
icon_state = "speaking_tile"
layer = 5
+ resistance_flags = INDESTRUCTIBLE
var/speaking = FALSE
var/times_spoken_to = 0
var/list/shenanigans = list()
@@ -88,6 +89,27 @@
speaking = FALSE
times_spoken_to++
+/obj/structure/speaking_tile/attackby(obj/item/W, mob/user, params)
+ return interact(user)
+
+/obj/structure/speaking_tile/attack_paw(mob/user)
+ return interact(user)
+
+/obj/structure/speaking_tile/attack_hulk(mob/user, does_attack_animation = 0)
+ return interact(user)
+
+/obj/structure/speaking_tile/attack_larva(mob/user)
+ return interact(user)
+
+/obj/structure/speaking_tile/attack_ai(mob/user)
+ return interact(user)
+
+/obj/structure/speaking_tile/attack_slime(mob/user)
+ return interact(user)
+
+/obj/structure/speaking_tile/attack_animal(mob/user)
+ return interact(user)
+
/obj/structure/speaking_tile/proc/SpeakPeace(list/statements)
for(var/i in 1 to statements.len)
say("[statements[i]]")
diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm
new file mode 100644
index 0000000000..08bd74acad
--- /dev/null
+++ b/code/modules/cargo/bounties/assistant.dm
@@ -0,0 +1,270 @@
+/datum/bounty/item/assistant/strange_object
+ name = "Strange Object"
+ description = "Nanotrasen has taken an interest in strange objects. Find one in maint, and ship it off to CentCom right away."
+ reward = 1200
+ wanted_types = list(/obj/item/relic)
+
+/datum/bounty/item/assistant/scooter
+ name = "Scooter"
+ description = "Nanotrasen has determined walking to be wasteful. Ship a scooter to CentCom to speed operations up."
+ reward = 1080 // the mat hoffman
+ wanted_types = list(/obj/vehicle/ridden/scooter)
+ include_subtypes = FALSE
+
+/datum/bounty/item/assistant/skateboard
+ name = "Skateboard"
+ description = "Nanotrasen has determined walking to be a wasteful. Ship a skateboard to CentCom to speed operations up."
+ reward = 900 // the tony hawk
+ wanted_types = list(/obj/vehicle/ridden/scooter/skateboard)
+
+/datum/bounty/item/assistant/stunprod
+ name = "Stunprod"
+ description = "CentCom demands a stunprod to use against dissidents. Craft one, then ship it."
+ reward = 1300
+ wanted_types = list(/obj/item/melee/baton/cattleprod)
+
+/datum/bounty/item/assistant/soap
+ name = "Soap"
+ description = "Soap has gone missing from CentCom's bathrooms and nobody knows who took it. Replace it and be the hero CentCom needs."
+ reward = 2000
+ required_count = 3
+ wanted_types = list(/obj/item/soap)
+
+/datum/bounty/item/assistant/spear
+ name = "Spears"
+ description = "CentCom's security forces are going through budget cuts. You will be paid if you ship a set of spears."
+ reward = 2000
+ required_count = 5
+ wanted_types = list(/obj/item/twohanded/spear)
+
+/datum/bounty/item/assistant/toolbox
+ name = "Toolboxes"
+ description = "There's an absence of robustness at Central Command. Hurry up and ship some toolboxes as a solution."
+ reward = 2000
+ required_count = 6
+ wanted_types = list(/obj/item/storage/toolbox)
+
+/datum/bounty/item/assistant/statue
+ name = "Statue"
+ description = "Central Command would like to commision an artsy statue for the lobby. Ship one out, when possible."
+ reward = 2000
+ wanted_types = list(/obj/structure/statue)
+
+/datum/bounty/item/assistant/clown_box
+ name = "Clown Box"
+ description = "The universe needs laughter. Stamp cardboard with a clown stamp and ship it out."
+ reward = 1500
+ wanted_types = list(/obj/item/storage/box/clown)
+
+/datum/bounty/item/assistant/cheesiehonkers
+ name = "Cheesie Honkers"
+ description = "Apparently the company that makes Cheesie Honkers is going out of business soon. CentCom wants to stock up before it happens!"
+ reward = 1200
+ required_count = 3
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/cheesiehonkers)
+
+/datum/bounty/item/assistant/baseball_bat
+ name = "Baseball Bat"
+ description = "Baseball fever is going on at CentCom! Be a dear and ship them some baseball bats, so that management can live out their childhood dream."
+ reward = 2000
+ required_count = 5
+ wanted_types = list(/obj/item/melee/baseball_bat)
+
+/datum/bounty/item/assistant/extendohand
+ name = "Extendo-Hand"
+ description = "Commander Betsy is getting old, and can't bend over to get the telescreen remote anymore. Management has requested an extendo-hand to help her out."
+ reward = 2500
+ wanted_types = list(/obj/item/extendohand)
+
+/datum/bounty/item/assistant/donut
+ name = "Donuts"
+ description = "CentCom's security forces are facing heavy losses against the Syndicate. Ship donuts to raise morale."
+ reward = 3000
+ required_count = 10
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/donut)
+
+/datum/bounty/item/assistant/donkpocket
+ name = "Donk-Pockets"
+ description = "Consumer safety recall: Warning. Donk-Pockets manufactured in the past year contain hazardous lizard biomatter. Return units to CentCom immediately."
+ reward = 3000
+ required_count = 10
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/donkpocket)
+
+/datum/bounty/item/assistant/briefcase
+ name = "Briefcase"
+ description = "Central Command will be holding a business convention this year. Ship a few briefcases in support."
+ reward = 2500
+ required_count = 5
+ wanted_types = list(/obj/item/storage/briefcase)
+
+/datum/bounty/item/assistant/sunglasses
+ name = "Sunglasses"
+ description = "A famous blues duo is passing through the sector, but they've lost their shades and they can't perform. Ship new sunglasses to CentCom to rectify this."
+ reward = 3000
+ required_count = 2
+ wanted_types = list(/obj/item/clothing/glasses/sunglasses)
+
+/datum/bounty/item/assistant/gondola_hide
+ name = "Gondola Hide"
+ description = "Central Command has recently learned of strange creatures called Gondolas. If you catch one, ship its hide back to CentCom."
+ reward = 5000
+ wanted_types = list(/obj/item/stack/sheet/animalhide/gondola)
+
+/datum/bounty/item/assistant/monkey_hide
+ name = "Monkey Hide"
+ description = "One of the scientists at CentCom is interested in testing products on monkey skin. Your mission is to acquire monkey's hide and ship it."
+ reward = 1500
+ wanted_types = list(/obj/item/stack/sheet/animalhide/monkey)
+
+/datum/bounty/item/assistant/heart
+ name = "Heart"
+ description = "Commander Johnson is in critical condition after suffering a heart attack. Doctors say he needs a new heart fast. Ship one, pronto!"
+ reward = 3000
+ wanted_types = list(/obj/item/organ/heart)
+
+/datum/bounty/item/assistant/lung
+ name = "Lungs"
+ description = "A recent explosion at Central Command has left multiple staff with punctured lungs. Ship spare lungs to be rewarded."
+ reward = 3000
+ required_count = 1
+ wanted_types = list(/obj/item/organ/lungs)
+
+/datum/bounty/item/assistant/appendix
+ name = "Appendix"
+ description = "Chef Gibb of Central Command wants to prepare a meal using a very special delicacy: an appendix. If you ship one, he'll pay."
+ reward = 3000
+ wanted_types = list(/obj/item/organ/appendix)
+
+/datum/bounty/item/assistant/lizard_tail
+ name = "Lizard Tail"
+ description = "The Wizard Federation has made off with Nanotrasen's supply of lizard tails. While CentCom is dealing with the wizards, can the station spare a tail of their own?"
+ reward = 3000
+ wanted_types = list(/obj/item/organ/tail/lizard)
+
+/datum/bounty/item/assistant/shard
+ name = "Shards"
+ description = "A killer clown has been stalking CentCom, and staff have been unable to catch her because she's not wearing shoes. Please ship some shards so that a booby trap can be constructed."
+ reward = 1500
+ required_count = 15
+ wanted_types = list(/obj/item/shard)
+
+/datum/bounty/item/assistant/comfy_chair
+ name = "Comfy Chairs"
+ description = "Commander Pat is unhappy with his chair. He claims it hurts his back. Ship some alternatives out to humor him. "
+ reward = 1500
+ required_count = 5
+ wanted_types = list(/obj/structure/chair/comfy)
+
+/datum/bounty/item/assistant/revolver
+ name = "Revolver"
+ description = "Captain Johann of station 12 has challenged Captain Vic of station 11 to a duel. He's asked for help securing an appropriate revolver to use."
+ reward = 2000
+ wanted_types = list(/obj/item/gun/ballistic/revolver)
+
+/datum/bounty/item/assistant/hand_tele
+ name = "Hand Tele"
+ description = "Central Command has come up with a genius idea: Why not teleport cargo rather than ship it? Send over a hand tele, receive payment, then wait 6-8 years while they deliberate."
+ reward = 2000
+ wanted_types = list(/obj/item/hand_tele)
+
+/datum/bounty/item/assistant/geranium
+ name = "Geraniums"
+ description = "Commander Zot has the hots for Commander Zena. Send a shipment of geraniums - her favorite flower - and he'll happily reward you."
+ reward = 4000
+ required_count = 3
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/poppy/geranium)
+
+/datum/bounty/item/assistant/poppy
+ name = "Poppies"
+ description = "Commander Zot really wants to sweep Security Officer Olivia off her feet. Send a shipment of Poppies - her favorite flower - and he'll happily reward you."
+ reward = 1000
+ required_count = 3
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/poppy)
+ include_subtypes = FALSE
+
+/datum/bounty/item/assistant/shadyjims
+ name = "Shady Jim's"
+ description = "There's an irate officer at CentCom demanding that he receive a box of Shady Jim's cigarettes. Please ship one. He's starting to make threats."
+ reward = 500
+ wanted_types = list(/obj/item/storage/fancy/cigarettes/cigpack_shadyjims)
+
+/datum/bounty/item/assistant/potted_plants
+ name = "Potted Plants"
+ description = "Central Command is looking to commission a new BirdBoat-class station. You've been ordered to supply the potted plants."
+ reward = 2000
+ required_count = 8
+ wanted_types = list(/obj/item/twohanded/required/kirbyplants)
+
+/datum/bounty/item/assistant/earmuffs
+ name = "Earmuffs"
+ description = "Central Command is getting tired of your station's messages. They've ordered that you ship some earmuffs to lessen the annoyance."
+ reward = 1000
+ wanted_types = list(/obj/item/clothing/ears/earmuffs)
+
+/datum/bounty/item/assistant/handcuffs
+ name = "Handcuffs"
+ description = "A large influx of escaped convicts have arrived at Central Command. Now is the perfect time to ship out spare handcuffs (or restraints)."
+ reward = 1000
+ required_count = 5
+ wanted_types = list(/obj/item/restraints/handcuffs)
+
+/datum/bounty/item/assistant/monkey_cubes
+ name = "Monkey Cubes"
+ description = "Due to a recent genetics accident, Central Command is in serious need of monkeys. Your mission is to ship monkey cubes."
+ reward = 2000
+ required_count = 3
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/monkeycube)
+
+/datum/bounty/item/assistant/chainsaw
+ name = "Chainsaw"
+ description = "The chef at CentCom is having trouble butchering her animals. She requests one chainsaw, please."
+ reward = 2500
+ wanted_types = list(/obj/item/twohanded/required/chainsaw)
+
+/datum/bounty/item/assistant/ied
+ name = "IED"
+ description = "Nanotrasen's maximum security prison at CentCom is undergoing personnel training. Ship a handful of IEDs to serve as a training tools."
+ reward = 2000
+ required_count = 3
+ wanted_types = list(/obj/item/grenade/iedcasing)
+
+/datum/bounty/item/assistant/bonfire
+ name = "Lit Bonfire"
+ description = "Space heaters are malfunctioning and the cargo crew of Central Command is starting to feel cold. Ship a lit bonfire to warm them up."
+ reward = 5000
+ wanted_types = list(/obj/structure/bonfire)
+
+/datum/bounty/item/assistant/bonfire/applies_to(obj/O)
+ if(!..())
+ return FALSE
+ var/obj/structure/bonfire/B = O
+ return !!B.burning
+
+/datum/bounty/item/assistant/plasma_tank
+ name = "Full Tank of Plasma"
+ description = "Station 12 has requested supplies to set up a singularity engine. In particular, they request 28 moles of plasma."
+ reward = 2500
+ wanted_types = list(/obj/item/tank)
+ var/moles_required = 20 // A full tank is 28 moles, but CentCom ignores that fact.
+
+/datum/bounty/item/assistant/plasma_tank/applies_to(obj/O)
+ if(!..())
+ return FALSE
+ var/obj/item/tank/T = O
+ if(!T.air_contents.gases[/datum/gas/plasma])
+ return FALSE
+ return T.air_contents.gases[/datum/gas/plasma][MOLES] >= moles_required
+
+/datum/bounty/item/assistant/corgimeat
+ name = "Raw Corgi Meat"
+ description = "The Syndicate recently stole all of CentCom's corgi meat. Ship out a replacement immediately."
+ reward = 3000
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/meat/slab/corgi)
+
+/datum/bounty/item/chef/action_figures
+ name = "Action Figures"
+ description = "The vice president's son saw an ad for action figures on the telescreen and now he won't shut up about them. Ship some to ease his complaints."
+ reward = 4000
+ required_count = 5
+ wanted_types = list(/obj/item/toy/figure)
+
diff --git a/code/modules/cargo/bounties/chef.dm b/code/modules/cargo/bounties/chef.dm
new file mode 100644
index 0000000000..da296911e7
--- /dev/null
+++ b/code/modules/cargo/bounties/chef.dm
@@ -0,0 +1,138 @@
+/datum/bounty/item/chef/birthday_cake
+ name = "Birthday Cake"
+ description = "Nanotrasen's birthday is coming up! Ship them a birthday cake to celebrate!"
+ reward = 4000
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/store/cake/birthday, /obj/item/reagent_containers/food/snacks/cakeslice/birthday)
+
+/datum/bounty/item/chef/soup
+ name = "Soup"
+ description = "To quell the homeless uprising, Nanotrasen will be serving soup to all underpaid workers. Ship any type of soup."
+ reward = 3000
+ required_count = 3
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/soup)
+
+/datum/bounty/item/chef/popcorn
+ name = "Popcorn Bags"
+ description = "Upper management wants to host a movie night. Ship bags of popcorn for the occasion."
+ reward = 3000
+ required_count = 3
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/popcorn)
+
+/datum/bounty/item/chef/onionrings
+ name = "Onion Rings"
+ description = "Nanotrasen is remembering Saturn day. Ship onion rings to show the station's support."
+ reward = 3000
+ required_count = 3
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/onionrings)
+
+/datum/bounty/item/chef/icecreamsandwich
+ name = "Ice Cream Sandwiches"
+ description = "Upper management has been screaming non-stop for ice cream. Please send some."
+ reward = 4000
+ required_count = 3
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/icecreamsandwich)
+
+/datum/bounty/item/chef/bread
+ name = "Bread"
+ description = "Problems with central planning have led to bread prices skyrocketing. Ship some bread to ease tensions."
+ reward = 1000
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/store/bread, /obj/item/reagent_containers/food/snacks/breadslice, /obj/item/reagent_containers/food/snacks/bun, /obj/item/reagent_containers/food/snacks/pizzabread, /obj/item/reagent_containers/food/snacks/rawpastrybase)
+
+/datum/bounty/item/chef/pie
+ name = "Pie"
+ description = "3.14159? No! CentCom management wants edible pie! Ship a whole one."
+ reward = 3142
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/pie)
+
+/datum/bounty/item/chef/salad
+ name = "Salad or Rice Bowls"
+ description = "CentCom management is going on a health binge. Your order is to ship salad or rice bowls."
+ reward = 3000
+ required_count = 3
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/salad)
+
+/datum/bounty/item/chef/carrotfries
+ name = "Carrot Fries"
+ description = "Night sight can mean life or death! A shipment of carrot fries is the order."
+ reward = 3500
+ required_count = 3
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/carrotfries)
+
+/datum/bounty/item/chef/superbite
+ name = "Super Bite Burger"
+ description = "Commander Tubbs thinks he can set a competitive eating world record. All he needs is a super bite burger shipped to him."
+ reward = 12000
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/burger/superbite)
+
+/datum/bounty/item/chef/poppypretzel
+ name = "Poppy Pretzel"
+ description = "Central Command needs a reason to fire their HR head. Send over a poppy pretzel to force a failed drug test."
+ reward = 3000
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/poppypretzel)
+
+/datum/bounty/item/chef/cubancarp
+ name = "Cuban Carp"
+ description = "To celebrate the birth of Castro XXVII, ship one cuban carp to CentCom."
+ reward = 8000
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/cubancarp)
+
+/datum/bounty/item/chef/hotdog
+ name = "Hot Dog"
+ description = "Nanotrasen is conducting taste tests to determine the best hot dog recipe. Ship your station's version to participate."
+ reward = 8000
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/hotdog)
+
+/datum/bounty/item/chef/lemon
+ name = "Lemons"
+ description = "A commander claims he can turn lemons into money. Ship him a few and he'll deposit the money into the station's account."
+ reward = 4444
+ required_count = 10
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/citrus/lemon)
+
+/datum/bounty/item/chef/eggplantparm
+ name = "Eggplant Parmigianas"
+ description = "A famous singer will be arriving at CentCom, and their contract demands that they only be served Eggplant Parmigiana. Ship some, please!"
+ reward = 3500
+ required_count = 3
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/eggplantparm)
+
+/datum/bounty/item/chef/muffin
+ name = "Muffins"
+ description = "The Muffin Man is visiting CentCom, but he's forgotten his muffins! Your order is to rectify this."
+ reward = 3000
+ required_count = 3
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/muffin)
+
+/datum/bounty/item/chef/chawanmushi
+ name = "Chawanmushi"
+ description = "Nanotrasen wants to improve relations with its sister company, Japanotrasen. Ship Chawanmushi immediately."
+ reward = 8000
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/chawanmushi)
+
+/datum/bounty/item/chef/kebab
+ name = "Kebabs"
+ description = "Remove all kebab from station you are best food. Ship to CentCom to remove from the premises."
+ reward = 3500
+ required_count = 3
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/kebab)
+
+/datum/bounty/item/chef/soylentgreen
+ name = "Soylent Green"
+ description = "CentCom has heard wonderful things about the product 'Soylent Green', and would love to try some. If you endulge them, expect a pleasant bonus."
+ reward = 5000
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/soylentgreen)
+
+/datum/bounty/item/chef/pancakes
+ name = "Pancakes"
+ description = "Here at Nanotrasen we consider employees to be family. And you know what families love? Pancakes. Ship a baker's dozen."
+ reward = 5000
+ required_count = 13
+ wanted_types = list(/datum/crafting_recipe/food/pancakes)
+
+/datum/bounty/item/chef/nuggies
+ name = "Chicken Nuggets"
+ description = "The vice president's son won't shut up about chicken nuggies. Would you mind shipping some?"
+ reward = 4000
+ required_count = 6
+ wanted_types = list(/obj/item/reagent_containers/food/snacks/nugget)
+
diff --git a/code/modules/cargo/bounties/item.dm b/code/modules/cargo/bounties/item.dm
new file mode 100644
index 0000000000..edaf5d96fc
--- /dev/null
+++ b/code/modules/cargo/bounties/item.dm
@@ -0,0 +1,35 @@
+/datum/bounty/item
+ var/required_count = 1
+ var/shipped_count = 0
+ var/list/wanted_types // Types accepted for the bounty.
+ var/include_subtypes = TRUE // Set to FALSE to make the datum apply only to a strict type.
+ var/list/exclude_types // Types excluded.
+
+/datum/bounty/item/New()
+ ..()
+ wanted_types = typecacheof(wanted_types)
+ exclude_types = typecacheof(exclude_types)
+
+/datum/bounty/item/completion_string()
+ return {"[shipped_count]/[required_count]"}
+
+/datum/bounty/item/can_claim()
+ return ..() && shipped_count >= required_count
+
+/datum/bounty/item/applies_to(obj/O)
+ if(!include_subtypes && !(O.type in wanted_types))
+ return FALSE
+ if(include_subtypes && (!is_type_in_typecache(O, wanted_types) || is_type_in_typecache(O, exclude_types)))
+ return FALSE
+ if(O.flags_1 & HOLOGRAM_1)
+ return FALSE
+ return shipped_count < required_count
+
+/datum/bounty/item/ship(obj/O)
+ if(!applies_to(O))
+ return
+ shipped_count += 1
+
+/datum/bounty/item/compatible_with(datum/other_bounty)
+ return type != other_bounty.type
+
diff --git a/code/modules/cargo/bounties/mech.dm b/code/modules/cargo/bounties/mech.dm
new file mode 100644
index 0000000000..c331e97266
--- /dev/null
+++ b/code/modules/cargo/bounties/mech.dm
@@ -0,0 +1,40 @@
+/datum/bounty/item/mech/New()
+ ..()
+ description = "Upper management has requested one [name] mech be sent as soon as possible. Ship it to receive a large payment."
+
+/datum/bounty/item/mech/ship(obj/O)
+ if(!applies_to(O))
+ return
+ if(istype(O, /obj/mecha))
+ var/obj/mecha/M = O
+ M.wreckage = null // So the mech doesn't explode.
+ ..()
+
+/datum/bounty/item/mech/mark_high_priority(scale_reward)
+ return ..(max(scale_reward * 0.7, 1.2))
+
+/datum/bounty/item/mech/ripley
+ name = "APLU \"Ripley\""
+ reward = 13000
+ wanted_types = list(/obj/mecha/working/ripley)
+
+/datum/bounty/item/mech/odysseus
+ name = "Odysseus"
+ reward = 11000
+ wanted_types = list(/obj/mecha/medical/odysseus)
+
+/datum/bounty/item/mech/gygax
+ name = "Gygax"
+ reward = 28000
+ wanted_types = list(/obj/mecha/combat/gygax)
+
+/datum/bounty/item/mech/durand
+ name = "Durand"
+ reward = 20000
+ wanted_types = list(/obj/mecha/combat/durand)
+
+/datum/bounty/item/mech/phazon
+ name = "Phazon"
+ reward = 50000
+ wanted_types = list(/obj/mecha/combat/phazon)
+
diff --git a/code/modules/cargo/bounties/reagent.dm b/code/modules/cargo/bounties/reagent.dm
new file mode 100644
index 0000000000..3f458e2b12
--- /dev/null
+++ b/code/modules/cargo/bounties/reagent.dm
@@ -0,0 +1,172 @@
+/datum/bounty/reagent
+ var/required_volume = 10
+ var/shipped_volume = 0
+ var/datum/reagent/wanted_reagent
+
+/datum/bounty/reagent/completion_string()
+ return {"[round(shipped_volume)]/[required_volume] Units"}
+
+/datum/bounty/reagent/can_claim()
+ return ..() && shipped_volume >= required_volume
+
+/datum/bounty/reagent/applies_to(obj/O)
+ if(!istype(O, /obj/item/reagent_containers))
+ return FALSE
+ if(!O.reagents || !O.reagents.has_reagent(wanted_reagent.id))
+ return FALSE
+ if(O.flags_1 & HOLOGRAM_1)
+ return FALSE
+ return shipped_volume < required_volume
+
+/datum/bounty/reagent/ship(obj/O)
+ if(!applies_to(O))
+ return
+ shipped_volume += O.reagents.get_reagent_amount(wanted_reagent.id)
+ if(shipped_volume > required_volume)
+ shipped_volume = required_volume
+
+/datum/bounty/reagent/compatible_with(other_bounty)
+ if(!istype(other_bounty, /datum/bounty/reagent))
+ return TRUE
+ var/datum/bounty/reagent/R = other_bounty
+ return wanted_reagent.id != R.wanted_reagent.id
+
+/datum/bounty/reagent/simple_drink
+ name = "Simple Drink"
+ reward = 1500
+
+datum/bounty/reagent/simple_drink/New()
+ // Don't worry about making this comprehensive. It doesn't matter if some drinks are skipped.
+ var/static/list/possible_reagents = list(\
+ /datum/reagent/consumable/ethanol/antifreeze,\
+ /datum/reagent/consumable/ethanol/andalusia,\
+ /datum/reagent/consumable/tea/arnold_palmer,\
+ /datum/reagent/consumable/ethanol/b52,\
+ /datum/reagent/consumable/ethanol/bananahonk,\
+ /datum/reagent/consumable/ethanol/beepsky_smash,\
+ /datum/reagent/consumable/ethanol/between_the_sheets,\
+ /datum/reagent/consumable/ethanol/bilk,\
+ /datum/reagent/consumable/ethanol/black_russian,\
+ /datum/reagent/consumable/ethanol/bloody_mary,\
+ /datum/reagent/consumable/ethanol/brave_bull,\
+ /datum/reagent/consumable/ethanol/martini,\
+ /datum/reagent/consumable/ethanol/cuba_libre,\
+ /datum/reagent/consumable/ethanol/eggnog,\
+ /datum/reagent/consumable/ethanol/erikasurprise,\
+ /datum/reagent/consumable/ethanol/ginfizz,\
+ /datum/reagent/consumable/ethanol/gintonic,\
+ /datum/reagent/consumable/ethanol/grappa,\
+ /datum/reagent/consumable/ethanol/grog,\
+ /datum/reagent/consumable/ethanol/hooch,\
+ /datum/reagent/consumable/ethanol/iced_beer,\
+ /datum/reagent/consumable/ethanol/irishcarbomb,\
+ /datum/reagent/consumable/ethanol/manhattan,\
+ /datum/reagent/consumable/ethanol/margarita,\
+ /datum/reagent/consumable/ethanol/gargle_blaster,\
+ /datum/reagent/consumable/ethanol/rum_coke,\
+ /datum/reagent/consumable/ethanol/screwdrivercocktail,\
+ /datum/reagent/consumable/ethanol/snowwhite,\
+ /datum/reagent/consumable/soy_latte,\
+ /datum/reagent/consumable/cafe_latte,\
+ /datum/reagent/consumable/ethanol/syndicatebomb,\
+ /datum/reagent/consumable/ethanol/tequila_sunrise,\
+ /datum/reagent/consumable/ethanol/manly_dorf,\
+ /datum/reagent/consumable/ethanol/thirteenloko,\
+ /datum/reagent/consumable/triple_citrus,\
+ /datum/reagent/consumable/ethanol/vodkamartini,\
+ /datum/reagent/consumable/ethanol/whiskeysoda,\
+ /datum/reagent/consumable/ethanol/beer/green,\
+ /datum/reagent/consumable/ethanol/demonsblood,\
+ /datum/reagent/consumable/ethanol/crevice_spike,\
+ /datum/reagent/consumable/ethanol/singulo,\
+ /datum/reagent/consumable/ethanol/whiskey_sour)
+
+ var/reagent_type = pick(possible_reagents)
+ wanted_reagent = new reagent_type
+ name = wanted_reagent.name
+ description = "CentCom is thirsty! Send a shipment of [name] to CentCom to quench the company's thirst."
+ reward += rand(0, 2) * 500
+
+/datum/bounty/reagent/complex_drink
+ name = "Complex Drink"
+ reward = 4000
+
+datum/bounty/reagent/complex_drink/New()
+ // Don't worry about making this comprehensive. It doesn't matter if some drinks are skipped.
+ var/static/list/possible_reagents = list(\
+ /datum/reagent/consumable/ethanol/atomicbomb,\
+ /datum/reagent/consumable/ethanol/bacchus_blessing,\
+ /datum/reagent/consumable/ethanol/bastion_bourbon,\
+ /datum/reagent/consumable/ethanol/booger,\
+ /datum/reagent/consumable/ethanol/hippies_delight,\
+ /datum/reagent/consumable/ethanol/drunkenblumpkin,\
+ /datum/reagent/consumable/ethanol/fetching_fizz,\
+ /datum/reagent/consumable/ethanol/goldschlager,\
+ /datum/reagent/consumable/ethanol/hearty_punch,\
+ /datum/reagent/consumable/ethanol/manhattan_proj,\
+ /datum/reagent/consumable/ethanol/narsour,\
+ /datum/reagent/consumable/ethanol/neurotoxin,\
+ /datum/reagent/consumable/ethanol/patron,\
+ /datum/reagent/consumable/ethanol/quadruple_sec,\
+ /datum/reagent/consumable/ethanol/quintuple_sec,\
+ /datum/reagent/consumable/bluecherryshake,\
+ /datum/reagent/consumable/doctor_delight,\
+ /datum/reagent/consumable/ethanol/silencer)
+
+ var/reagent_type = pick(possible_reagents)
+ wanted_reagent = new reagent_type
+ name = wanted_reagent.name
+ description = "CentCom is offering a reward for talented mixologists. Ship a container of [name] to claim the prize."
+ reward += rand(0, 4) * 500
+
+/datum/bounty/reagent/chemical
+ name = "Chemical"
+ reward = 4000
+ required_volume = 30
+
+datum/bounty/reagent/chemical/New()
+ // Don't worry about making this comprehensive. It doesn't matter if some chems are skipped.
+ var/static/list/possible_reagents = list(\
+ /datum/reagent/medicine/leporazine,\
+ /datum/reagent/medicine/clonexadone,\
+ /datum/reagent/medicine/pyroxadone,\
+ /datum/reagent/medicine/rezadone,\
+ /datum/reagent/medicine/mine_salve,\
+ /datum/reagent/medicine/pen_acid,\
+ /datum/reagent/medicine/perfluorodecalin,\
+ /datum/reagent/medicine/ephedrine,\
+ /datum/reagent/medicine/diphenhydramine,\
+ /datum/reagent/medicine/atropine,\
+ /datum/reagent/medicine/strange_reagent,\
+ /datum/reagent/medicine/regen_jelly,\
+ /datum/reagent/drug/space_drugs,\
+ /datum/reagent/drug/crank,\
+ /datum/reagent/drug/krokodil,\
+ /datum/reagent/drug/methamphetamine,\
+ /datum/reagent/drug/bath_salts,\
+ /datum/reagent/drug/aranesp,\
+ /datum/reagent/nitroglycerin,\
+ /datum/reagent/blackpowder,\
+ /datum/reagent/napalm,\
+ /datum/reagent/teslium,\
+ /datum/reagent/firefighting_foam,\
+ /datum/reagent/consumable/honey,\
+ /datum/reagent/consumable/mayonnaise,\
+ /datum/reagent/consumable/frostoil,\
+ /datum/reagent/toxin/slimejelly,\
+ /datum/reagent/toxin/itching_powder,\
+ /datum/reagent/toxin/amanitin,\
+ /datum/reagent/toxin/coniine,\
+ /datum/reagent/toxin/cyanide,\
+ /datum/reagent/toxin/heparin,\
+ /datum/reagent/toxin/skewium,\
+ /datum/reagent/toxin/anacea,\
+ /datum/reagent/toxin/mimesbane,\
+ /datum/reagent/pax)
+
+ var/reagent_type = pick(possible_reagents)
+ wanted_reagent = new reagent_type
+ name = wanted_reagent.name
+ description = "CentCom is in desperate need of the chemical [name]. Ship a container of it to be rewarded."
+ reward += rand(0, 4) * 500
+
diff --git a/code/modules/cargo/bounties/science.dm b/code/modules/cargo/bounties/science.dm
new file mode 100644
index 0000000000..a2b8676ce0
--- /dev/null
+++ b/code/modules/cargo/bounties/science.dm
@@ -0,0 +1,72 @@
+/datum/bounty/item/science/boh
+ name = "Bag of Holding"
+ description = "Nanotrasen would make good use of high-capacity backpacks. If you have any, please ship them."
+ reward = 10000
+ wanted_types = list(/obj/item/storage/backpack/holding)
+
+/datum/bounty/item/science/tboh
+ name = "Trash Bag of Holding"
+ description = "Nanotrasen would make good use of high-capacity trash bags. If you have any, please ship them."
+ reward = 10000
+ wanted_types = list(/obj/item/storage/backpack/holding)
+
+/datum/bounty/item/science/bluespace_syringe
+ name = "Bluespace Syringe"
+ description = "Nanotrasen would make good use of high-capacity syringes. If you have any, please ship them."
+ reward = 10000
+ wanted_types = list(/obj/item/reagent_containers/syringe/bluespace)
+
+/datum/bounty/item/science/bluespace_body_bag
+ name = "Bluespace Body Bag"
+ description = "Nanotrasen would make good use of high-capacity body bags. If you have any, please ship them."
+ reward = 10000
+ wanted_types = list(/obj/item/bodybag/bluespace)
+
+/datum/bounty/item/science/nightvision_goggles
+ name = "Night Vision Goggles"
+ description = "An electrical storm has busted all the lights at CentCom. While management is waiting for replacements, perhaps some night vision goggles can be shipped?"
+ reward = 10000
+ wanted_types = list(/obj/item/clothing/glasses/night, /obj/item/clothing/glasses/meson/night, /obj/item/clothing/glasses/hud/health/night, /obj/item/clothing/glasses/hud/security/night, /obj/item/clothing/glasses/hud/diagnostic/night)
+
+/datum/bounty/item/science/experimental_welding_tool
+ name = "Experimental Welding Tool"
+ description = "A recent accident has left most of CentCom's welding tools exploded. Ship replacements to be rewarded."
+ reward = 10000
+ required_count = 3
+ wanted_types = list(/obj/item/weldingtool/experimental)
+
+/datum/bounty/item/science/cryostasis_beaker
+ name = "Cryostasis Beaker"
+ description = "Chemists at Central Command have discovered a new chemical that can only be held in cryostasis beakers. The only problem is they don't have any! Rectify this to receive payment."
+ reward = 10000
+ wanted_types = list(/obj/item/reagent_containers/glass/beaker/noreact)
+
+/datum/bounty/item/science/diamond_drill
+ name = "Diamond Mining Drill"
+ description = "Central Command is willing to pay three months salary in exchange for one diamond mining drill."
+ reward = 15000
+ wanted_types = list(/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill)
+
+/datum/bounty/item/science/floor_buffer
+ name = "Floor Buffer Upgrade"
+ description = "One of CentCom's janitors made a small fortune betting on carp races. Now they'd like to commission an upgrade to their floor buffer."
+ reward = 10000
+ wanted_types = list(/obj/item/janiupgrade)
+
+/datum/bounty/item/science/flightsuit
+ name = "Flight Suit"
+ description = "According to all known laws of physics, flight suits are cool. CentCom will pay at a premium for them, so get shipping!"
+ reward = 30000
+ wanted_types = list(/obj/item/clothing/suit/space/hardsuit/flightsuit)
+
+/datum/bounty/item/science/advanced_mop
+ name = "Advanced Mop"
+ description = "Excuse me. I'd like to request $17 for a push broom rebristling. Either that, or an advanced mop."
+ reward = 10000
+ wanted_types = list(/obj/item/mop/advanced)
+
+/datum/bounty/item/science/advanced_egun
+ name = "Advanced Energy Gun"
+ description = "With the price of rechargers on the rise, upper management is interested in purchasing guns that are self-powered. If you ship one, they'll pay."
+ reward = 10000
+ wanted_types = list(/obj/item/gun/energy/e_gun/nuclear)
diff --git a/code/modules/cargo/bounties/security.dm b/code/modules/cargo/bounties/security.dm
new file mode 100644
index 0000000000..d4ef29e194
--- /dev/null
+++ b/code/modules/cargo/bounties/security.dm
@@ -0,0 +1,62 @@
+/datum/bounty/item/security/headset
+ name = "Security Headset"
+ description = "Nanotrasen wants to ensure that their encryption is working correctly. Ship them a security headset so that they can check."
+ reward = 800
+ wanted_types = list(/obj/item/radio/headset/headset_sec, /obj/item/radio/headset/heads/hos)
+
+/datum/bounty/item/security/securitybelt
+ name = "Security Belt"
+ description = "CentCom is having difficulties with their security belts. Ship one from the station to receive compensation."
+ reward = 800
+ wanted_types = list(/obj/item/storage/belt/security)
+
+/datum/bounty/item/security/sechuds
+ name = "Security HUDSunglasses"
+ description = "CentCom screwed up and ordered the wrong type of security sunglasses. They request the station ship some of theirs."
+ reward = 800
+ wanted_types = list(/obj/item/clothing/glasses/hud/security/sunglasses)
+
+/datum/bounty/item/security/riotshotgun
+ name = "Riot Shotguns"
+ description = "Hooligans have boarded CentCom! Ship riot shotguns quick, or things are going to get dirty."
+ reward = 5000
+ required_count = 2
+ wanted_types = list(/obj/item/gun/ballistic/shotgun/riot)
+
+/datum/bounty/item/security/pinpointer
+ name = "Nuclear Pinpointer"
+ description = "There's a teeny-tiny itty-bitty chance CentCom may have lost a nuke disk. Can the station spare a pinpointer to help out?"
+ reward = 1500
+ wanted_types = list(/obj/item/pinpointer/nuke)
+
+/datum/bounty/item/security/captains_spare
+ name = "Captain's Spare"
+ description = "Captain Bart of Station 12 has forgotten his ID! Ship him your station's spare, would you?"
+ reward = 1500
+ wanted_types = list(/obj/item/card/id/captains_spare)
+
+/datum/bounty/item/security/hardsuit
+ name = "Security Hardsuit"
+ description = "Space pirates are heading towards CentCom! Quick! Ship a security hardsuit to aid the fight!"
+ reward = 2000
+ wanted_types = list(/obj/item/clothing/suit/space/hardsuit/security)
+
+/datum/bounty/item/security/krav_maga
+ name = "Krav Maga Gloves"
+ description = "Chef Howerwitz of CentCom is trying to take a kung-fu Pizza out of the oven, but his mitts aren't up to the task. Ship them a pair of Krav Maga gloves to do the job right."
+ reward = 2000
+ wanted_types = list(/obj/item/clothing/gloves/krav_maga)
+
+/datum/bounty/item/security/recharger
+ name = "Rechargers"
+ description = "Nanotrasen military academy is conducting marksmanship exercises. They request that rechargers be shipped."
+ reward = 2000
+ required_count = 3
+ wanted_types = list(/obj/machinery/recharger)
+
+/datum/bounty/item/security/sabre
+ name = "Officer's Sabre"
+ description = "A 3-hour LARP session will be held at CentCom in the upcoming months. A shipped officer's sabre would make a good prop."
+ reward = 2500
+ wanted_types = list(/obj/item/melee/sabre)
+
diff --git a/code/modules/cargo/bounties/slime.dm b/code/modules/cargo/bounties/slime.dm
new file mode 100644
index 0000000000..4aa0797c70
--- /dev/null
+++ b/code/modules/cargo/bounties/slime.dm
@@ -0,0 +1,39 @@
+/datum/bounty/item/slime
+ reward = 3000
+
+/datum/bounty/item/slime/New()
+ ..()
+ description = "Nanotrasen's science lead is hunting for the rare and exotic [name]. A bounty has been offered for finding it."
+ reward += rand(0, 4) * 500
+
+/datum/bounty/item/slime/green
+ name = "Green Slime Extract"
+ wanted_types = list(/obj/item/slime_extract/green)
+
+/datum/bounty/item/slime/pink
+ name = "Pink Slime Extract"
+ wanted_types = list(/obj/item/slime_extract/pink)
+
+/datum/bounty/item/slime/gold
+ name = "Gold Slime Extract"
+ wanted_types = list(/obj/item/slime_extract/gold)
+
+/datum/bounty/item/slime/oil
+ name = "Oil Slime Extract"
+ wanted_types = list(/obj/item/slime_extract/oil)
+
+/datum/bounty/item/slime/black
+ name = "Black Slime Extract"
+ wanted_types = list(/obj/item/slime_extract/black)
+
+/datum/bounty/item/slime/lightpink
+ name = "Light Pink Slime Extract"
+ wanted_types = list(/obj/item/slime_extract/lightpink)
+
+/datum/bounty/item/slime/adamantine
+ name = "Adamantine Slime Extract"
+ wanted_types = list(/obj/item/slime_extract/adamantine)
+
+/datum/bounty/item/slime/rainbow
+ name = "Rainbow Slime Extract"
+ wanted_types = list(/obj/item/slime_extract/rainbow)
diff --git a/code/modules/cargo/bounties/special.dm b/code/modules/cargo/bounties/special.dm
new file mode 100644
index 0000000000..42c9ab8202
--- /dev/null
+++ b/code/modules/cargo/bounties/special.dm
@@ -0,0 +1,41 @@
+/datum/bounty/item/alien_organs
+ name = "Alien Organs"
+ description = "Nanotrasen is interested in studying Xenomorph biology. Ship a set of organs to be thoroughly compensated."
+ reward = 25000
+ required_count = 3
+ wanted_types = list(/obj/item/organ/brain/alien, /obj/item/organ/alien, /obj/item/organ/body_egg/alien_embryo)
+
+/datum/bounty/item/syndicate_documents
+ name = "Syndicate Documents"
+ description = "Intel regarding the syndicate is highly prized at CentCom. If you find syndicate documents, ship them. You could save lives."
+ reward = 10000
+ wanted_types = list(/obj/item/documents/syndicate, /obj/item/documents/photocopy)
+
+/datum/bounty/item/syndicate_documents/applies_to(obj/O)
+ if(!..())
+ return FALSE
+ if(istype(O, /obj/item/documents/photocopy))
+ var/obj/item/documents/photocopy/Copy = O
+ return (Copy.copy_type && ispath(Copy.copy_type, /obj/item/documents/syndicate))
+ return TRUE
+
+/datum/bounty/more_bounties
+ name = "More Bounties"
+ description = "Complete enough bounties and CentCom will issue new ones!"
+ reward = 3 // number of bounties
+ var/required_bounties = 5
+
+/datum/bounty/more_bounties/can_claim()
+ return ..() && completed_bounty_count() >= required_bounties
+
+/datum/bounty/more_bounties/completion_string()
+ return "[min(required_bounties, completed_bounty_count())]/[required_bounties] Bounties"
+
+/datum/bounty/more_bounties/reward_string()
+ return "Up to [reward] new bounties"
+
+/datum/bounty/more_bounties/claim()
+ if(can_claim())
+ claimed = TRUE
+ for(var/i = 0; i < reward; ++i)
+ try_add_bounty(random_bounty())
diff --git a/code/modules/cargo/bounties/virus.dm b/code/modules/cargo/bounties/virus.dm
new file mode 100644
index 0000000000..8f078a2668
--- /dev/null
+++ b/code/modules/cargo/bounties/virus.dm
@@ -0,0 +1,81 @@
+/datum/bounty/virus
+ reward = 5000
+ var/shipped = FALSE
+ var/stat_value = 0
+ var/stat_name = ""
+
+/datum/bounty/virus/New()
+ ..()
+ stat_value = rand(4, 11)
+ if(rand(3) == 1)
+ stat_value *= -1
+ name = "Virus ([stat_name] of [stat_value])"
+ description = "Nanotrasen is interested in a virus with a [stat_name] stat of exactly [stat_value]. Central Command will pay handsomely for such a virus."
+ reward += rand(0, 4) * 500
+
+/datum/bounty/virus/completion_string()
+ return shipped ? "Shipped" : "Not Shipped"
+
+/datum/bounty/virus/can_claim()
+ return ..() && shipped
+
+/datum/bounty/virus/applies_to(obj/O)
+ if(shipped)
+ return FALSE
+ if(O.flags_1 & HOLOGRAM_1)
+ return FALSE
+ if(!istype(O, /obj/item/reagent_containers || !O.reagents || !O.reagents.reagent_list))
+ return FALSE
+ var/datum/reagent/blood/B = locate() in O.reagents.reagent_list
+ if(!B)
+ return FALSE
+ for(var/V in B.get_diseases())
+ if(!istype(V, /datum/disease/advance))
+ continue
+ if(accepts_virus(V))
+ return TRUE
+ return FALSE
+
+/datum/bounty/virus/ship(obj/O)
+ if(!applies_to(O))
+ return
+ shipped = TRUE
+
+/datum/bounty/virus/compatible_with(datum/other_bounty)
+ if(!istype(other_bounty, /datum/bounty/virus))
+ return TRUE
+ var/datum/bounty/virus/V = other_bounty
+ return type != V.type || stat_value != V.stat_value
+
+
+/datum/bounty/virus/proc/accepts_virus(V)
+ return TRUE
+
+/datum/bounty/virus/resistance
+ stat_name = "resistance"
+
+/datum/bounty/virus/resistance/accepts_virus(V)
+ var/datum/disease/advance/A = V
+ return A.totalResistance() == stat_value
+
+/datum/bounty/virus/stage_speed
+ stat_name = "stage speed"
+
+/datum/bounty/virus/stage_speed/accepts_virus(V)
+ var/datum/disease/advance/A = V
+ return A.totalStageSpeed() == stat_value
+
+/datum/bounty/virus/stealth
+ stat_name = "stealth"
+
+/datum/bounty/virus/stealth/accepts_virus(V)
+ var/datum/disease/advance/A = V
+ return A.totalStealth() == stat_value
+
+/datum/bounty/virus/transmit
+ stat_name = "transmissible"
+
+/datum/bounty/virus/transmit/accepts_virus(V)
+ var/datum/disease/advance/A = V
+ return A.totalTransmittable() == stat_value
+
diff --git a/code/modules/cargo/bounty.dm b/code/modules/cargo/bounty.dm
new file mode 100644
index 0000000000..6153fd7678
--- /dev/null
+++ b/code/modules/cargo/bounty.dm
@@ -0,0 +1,148 @@
+GLOBAL_LIST_EMPTY(bounties_list)
+
+/datum/bounty
+ var/name
+ var/description
+ var/reward = 1000 // In credits.
+ var/claimed = FALSE
+ var/high_priority = FALSE
+
+// Displayed on bounty UI screen.
+/datum/bounty/proc/completion_string()
+ return ""
+
+// Displayed on bounty UI screen.
+/datum/bounty/proc/reward_string()
+ return "[reward] Credits"
+
+/datum/bounty/proc/can_claim()
+ return !claimed
+
+// Called when the claim button is clicked. Override to provide fancy rewards.
+/datum/bounty/proc/claim()
+ if(can_claim())
+ SSshuttle.points += reward
+ claimed = TRUE
+
+// If an item sent in the cargo shuttle can satisfy the bounty.
+/datum/bounty/proc/applies_to(obj/O)
+ return FALSE
+
+// Called when an object is shipped on the cargo shuttle.
+/datum/bounty/proc/ship(obj/O)
+ return
+
+// When randomly generating the bounty list, duplicate bounties must be avoided.
+// This proc is used to determine if two bounties are duplicates, or incompatible in general.
+/datum/bounty/proc/compatible_with(other_bounty)
+ return TRUE
+
+/datum/bounty/proc/mark_high_priority(scale_reward = 2)
+ if(high_priority)
+ return
+ high_priority = TRUE
+ reward = round(reward * scale_reward)
+
+// This proc is called when the shuttle docks at CentCom.
+// It handles items shipped for bounties.
+/proc/bounty_ship_item_and_contents(atom/movable/AM, dry_run=FALSE)
+ if(!GLOB.bounties_list.len)
+ setup_bounties()
+
+ var/list/matched_one = FALSE
+ for(var/thing in reverseRange(AM.GetAllContents()))
+ var/matched_this = FALSE
+ for(var/datum/bounty/B in GLOB.bounties_list)
+ if(B.applies_to(thing))
+ matched_one = TRUE
+ matched_this = TRUE
+ if(!dry_run)
+ B.ship(thing)
+ if(!dry_run && matched_this)
+ qdel(thing)
+ return matched_one
+
+// Returns FALSE if the bounty is incompatible with the current bounties.
+/proc/try_add_bounty(datum/bounty/new_bounty)
+ if(!new_bounty || !new_bounty.name || !new_bounty.description)
+ return FALSE
+ for(var/i in GLOB.bounties_list)
+ var/datum/bounty/B = i
+ if(!B.compatible_with(new_bounty) || !new_bounty.compatible_with(B))
+ return FALSE
+ GLOB.bounties_list += new_bounty
+ return TRUE
+
+// Returns a new bounty of random type, but does not add it to GLOB.bounties_list.
+/proc/random_bounty()
+ switch(rand(1, 9))
+ if(1)
+ var/subtype = pick(subtypesof(/datum/bounty/item/assistant))
+ return new subtype
+ if(2)
+ var/subtype = pick(subtypesof(/datum/bounty/item/mech))
+ return new subtype
+ if(3)
+ var/subtype = pick(subtypesof(/datum/bounty/item/chef))
+ return new subtype
+ if(4)
+ var/subtype = pick(subtypesof(/datum/bounty/item/security))
+ return new subtype
+ if(5)
+ if(rand(2) == 1)
+ return new /datum/bounty/reagent/simple_drink
+ return new /datum/bounty/reagent/complex_drink
+ if(6)
+ return new /datum/bounty/reagent/chemical
+ if(7)
+ var/subtype = pick(subtypesof(/datum/bounty/virus))
+ return new subtype
+ if(8)
+ var/subtype = pick(subtypesof(/datum/bounty/item/science))
+ return new subtype
+ if(9)
+ var/subtype = pick(subtypesof(/datum/bounty/item/slime))
+ return new subtype
+
+// Called lazily at startup to populate GLOB.bounties_list with random bounties.
+/proc/setup_bounties()
+ for(var/i = 0; i < 3; ++i)
+ var/subtype = pick(subtypesof(/datum/bounty/item/assistant))
+ try_add_bounty(new subtype)
+
+ for(var/i = 0; i < 1; ++i)
+ var/list/subtype = pick(subtypesof(/datum/bounty/item/mech))
+ try_add_bounty(new subtype)
+
+ for(var/i = 0; i < 2; ++i)
+ var/list/subtype = pick(subtypesof(/datum/bounty/item/chef))
+ try_add_bounty(new subtype)
+
+ for(var/i = 0; i < 1; ++i)
+ var/list/subtype = pick(subtypesof(/datum/bounty/item/security))
+ try_add_bounty(new subtype)
+
+ try_add_bounty(new /datum/bounty/reagent/simple_drink)
+ try_add_bounty(new /datum/bounty/reagent/complex_drink)
+ try_add_bounty(new /datum/bounty/reagent/chemical)
+
+ for(var/i = 0; i < 1; ++i)
+ var/list/subtype = pick(subtypesof(/datum/bounty/virus))
+ try_add_bounty(new subtype)
+
+ var/datum/bounty/B = pick(GLOB.bounties_list)
+ B.mark_high_priority()
+
+ // Generate these last so they can't be high priority.
+ try_add_bounty(new /datum/bounty/item/alien_organs)
+ try_add_bounty(new /datum/bounty/item/syndicate_documents)
+ try_add_bounty(new /datum/bounty/more_bounties)
+
+/proc/completed_bounty_count()
+ var/count = 0
+ for(var/i in GLOB.bounties_list)
+ var/datum/bounty/B = i
+ if(B.claimed)
+ ++count
+ return count
+
diff --git a/code/modules/cargo/bounty_console.dm b/code/modules/cargo/bounty_console.dm
new file mode 100644
index 0000000000..2e5d943dd6
--- /dev/null
+++ b/code/modules/cargo/bounty_console.dm
@@ -0,0 +1,94 @@
+#define PRINTER_TIMEOUT 10
+
+/obj/machinery/computer/bounty
+ name = "Nanotrasen bounty console"
+ desc = "Used to check and claim bounties offered by Nanotrasen"
+ icon_screen = "bounty"
+ circuit = /obj/item/circuitboard/computer/bounty
+ light_color = "#E2853D"//orange
+ var/printer_ready = 0 //cooldown var
+
+/obj/machinery/computer/bounty/Initialize()
+ . = ..()
+ printer_ready = world.time + PRINTER_TIMEOUT
+
+/obj/machinery/computer/bounty/proc/print_paper()
+ new /obj/item/paper/bounty_printout(loc)
+
+/obj/item/paper/bounty_printout
+ name = "paper - Bounties"
+
+/obj/item/paper/bounty_printout/Initialize()
+ . = ..()
+ info = "
Nanotrasen Cargo Bounties
"
+ for(var/datum/bounty/B in GLOB.bounties_list)
+ if(B.claimed)
+ continue
+ info += "
[B.name]
"
+ info += "
Reward: [B.reward_string()]
"
+ info += "
Completed: [B.completion_string()]
"
+
+/obj/machinery/computer/bounty/ui_interact(mob/user)
+ . = ..()
+
+ if(!GLOB.bounties_list.len)
+ setup_bounties()
+
+ var/dat = ""
+ dat += "Refresh"
+ dat += "Print Paper"
+ dat += "
"
+ qdel(query_library_list_books)
+ if(QDELETED(user))
+ return
dat += " "
dat += "\[Go Back\] "
var/datum/browser/popup = new(user, "publiclibrary", name, 600, 400)
@@ -135,6 +141,7 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
GLOB.cachedbooks = list()
var/datum/DBQuery/query_library_cache = SSdbcore.NewQuery("SELECT id, author, title, category FROM [format_table_name("library")] WHERE isnull(deleted)")
if(!query_library_cache.Execute())
+ qdel(query_library_cache)
return
while(query_library_cache.NextRow())
var/datum/cachedbook/newbook = new()
@@ -143,6 +150,7 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
newbook.title = query_library_cache.item[3]
newbook.category = query_library_cache.item[4]
GLOB.cachedbooks += newbook
+ qdel(query_library_cache)
@@ -414,12 +422,15 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
var/sqlauthor = sanitizeSQL(scanner.cache.author)
var/sqlcontent = sanitizeSQL(scanner.cache.dat)
var/sqlcategory = sanitizeSQL(upload_category)
+ var/msg = "[key_name(usr)] has uploaded the book titled [scanner.cache.name], [length(scanner.cache.dat)] signs"
var/datum/DBQuery/query_library_upload = SSdbcore.NewQuery("INSERT INTO [format_table_name("library")] (author, title, content, category, ckey, datetime, round_id_created) VALUES ('[sqlauthor]', '[sqltitle]', '[sqlcontent]', '[sqlcategory]', '[usr.ckey]', Now(), '[GLOB.round_id]')")
if(!query_library_upload.Execute())
+ qdel(query_library_upload)
alert("Database error encountered uploading to Archive")
return
else
- log_game("[usr.name]/[usr.key] has uploaded the book titled [scanner.cache.name], [length(scanner.cache.dat)] signs")
+ log_game(msg)
+ qdel(query_library_upload)
alert("Upload Complete. Uploaded title will be unavailable for printing for a short period")
if(href_list["newspost"])
if(!GLOB.news_network)
@@ -452,20 +463,23 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
cooldown = world.time + PRINTER_COOLDOWN
var/datum/DBQuery/query_library_print = SSdbcore.NewQuery("SELECT * FROM [format_table_name("library")] WHERE id=[sqlid] AND isnull(deleted)")
if(!query_library_print.Execute())
+ qdel(query_library_print)
say("PRINTER ERROR! Failed to print document (0x0000000F)")
return
while(query_library_print.NextRow())
var/author = query_library_print.item[2]
var/title = query_library_print.item[3]
var/content = query_library_print.item[4]
- var/obj/item/book/B = new(get_turf(src))
- B.name = "Book: [title]"
- B.title = title
- B.author = author
- B.dat = content
- B.icon_state = "book[rand(1,8)]"
- visible_message("[src]'s printer hums as it produces a completely bound book. How did it do that?")
+ if(!QDELETED(src))
+ var/obj/item/book/B = new(get_turf(src))
+ B.name = "Book: [title]"
+ B.title = title
+ B.author = author
+ B.dat = content
+ B.icon_state = "book[rand(1,8)]"
+ visible_message("[src]'s printer hums as it produces a completely bound book. How did it do that?")
break
+ qdel(query_library_print)
if(href_list["printbible"])
if(cooldown < world.time)
var/obj/item/storage/book/bible/B = new /obj/item/storage/book/bible(src.loc)
@@ -494,7 +508,6 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
icon = 'icons/obj/library.dmi'
icon_state = "bigscanner"
desc = "It servers the purpose of scanning stuff."
- anchored = TRUE
density = TRUE
var/obj/item/book/cache // Last scanned book
@@ -553,7 +566,6 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
icon = 'icons/obj/library.dmi'
icon_state = "binder"
desc = "Only intended for binding paper products."
- anchored = TRUE
density = TRUE
var/busy = FALSE
diff --git a/code/modules/library/random_books.dm b/code/modules/library/random_books.dm
index e101a7143a..8fd12f6157 100644
--- a/code/modules/library/random_books.dm
+++ b/code/modules/library/random_books.dm
@@ -60,8 +60,7 @@
B.dat = query_get_random_books.item[4]
B.name = "Book: [B.title]"
B.icon_state= "book[rand(1,8)]"
- else
- return
+ qdel(query_get_random_books)
/obj/structure/bookcase/random/fiction
name = "bookcase (Fiction)"
diff --git a/code/modules/library/soapstone.dm b/code/modules/library/soapstone.dm
index 17df503765..e51103937f 100644
--- a/code/modules/library/soapstone.dm
+++ b/code/modules/library/soapstone.dm
@@ -56,7 +56,7 @@
playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1)
user.visible_message("[user] starts engraving a message into [T]...", "You start engraving a message into [T]...", "You hear a chipping sound.")
if(can_use() && do_after(user, tool_speed, target = T) && can_use()) //This looks messy but it's actually really clever!
- if(!locate(/obj/structure/chisel_message in T))
+ if(!locate(/obj/structure/chisel_message) in T)
user.visible_message("[user] leaves a message for future spacemen!", "You engrave a message into [T]!", "You hear a chipping sound.")
playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1)
var/obj/structure/chisel_message/M = new(T)
diff --git a/code/modules/lighting/lighting_atom.dm b/code/modules/lighting/lighting_atom.dm
index 537326fc45..89ec6a3a7e 100644
--- a/code/modules/lighting/lighting_atom.dm
+++ b/code/modules/lighting/lighting_atom.dm
@@ -23,7 +23,7 @@
if (l_color != NONSENSICAL_VALUE)
light_color = l_color
- SendSignal(COMSIG_ATOM_SET_LIGHT, l_range, l_power, l_color)
+ SEND_SIGNAL(src, COMSIG_ATOM_SET_LIGHT, l_range, l_power, l_color)
update_light()
diff --git a/code/modules/lighting/lighting_object.dm b/code/modules/lighting/lighting_object.dm
index fe25dc9439..c0c5a411e7 100644
--- a/code/modules/lighting/lighting_object.dm
+++ b/code/modules/lighting/lighting_object.dm
@@ -11,8 +11,6 @@
layer = LIGHTING_LAYER
invisibility = INVISIBILITY_LIGHTING
- blend_mode = BLEND_ADD
-
var/needs_update = FALSE
var/turf/myturf
diff --git a/code/modules/lighting/lighting_source.dm b/code/modules/lighting/lighting_source.dm
index a6c28b4146..59ce11baeb 100644
--- a/code/modules/lighting/lighting_source.dm
+++ b/code/modules/lighting/lighting_source.dm
@@ -56,10 +56,10 @@
if (top_atom)
LAZYREMOVE(top_atom.light_sources, src)
-
+
if (needs_update)
GLOB.lighting_update_lights -= src
-
+
. = ..()
// Yes this doesn't align correctly on anything other than 4 width tabs.
@@ -116,7 +116,6 @@
. = LUM_FALLOFF(C, pixel_turf); \
. *= light_power; \
var/OLD = effect_str[C]; \
- \
effect_str[C] = .; \
\
C.update_lumcount \
@@ -126,7 +125,6 @@
(. * lum_b) - (OLD * applied_lum_b) \
);
-
#define REMOVE_CORNER(C) \
. = -effect_str[C]; \
C.update_lumcount \
@@ -167,8 +165,9 @@
/datum/light_source/proc/update_corners()
var/update = FALSE
+ var/atom/source_atom = src.source_atom
- if (!source_atom || QDELETED(source_atom))
+ if (QDELETED(source_atom))
qdel(src)
return
diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm
index b5b2091eb9..2cc5a74b6b 100644
--- a/code/modules/mapping/map_template.dm
+++ b/code/modules/mapping/map_template.dm
@@ -57,12 +57,11 @@
if(!bounds)
return FALSE
- smooth_zlevel(world.maxz)
repopulate_sorted_areas()
- SSlighting.initialize_lighting_objects(block(locate(bounds[MAP_MINX], bounds[MAP_MINY], bounds[MAP_MINZ]),locate(bounds[MAP_MAXX], bounds[MAP_MAXY], bounds[MAP_MAXZ])))
//initialize things that are normally initialized after map load
initTemplateBounds(bounds)
+ smooth_zlevel(world.maxz)
log_game("Z-level [name] loaded at at [x],[y],[world.maxz]")
return level
diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm
index 9fed915c98..8a7f5cb91e 100644
--- a/code/modules/mapping/mapping_helpers.dm
+++ b/code/modules/mapping/mapping_helpers.dm
@@ -9,7 +9,7 @@
var/list/baseturf_to_replace
var/baseturf
-
+
layer = POINT_LAYER
/obj/effect/baseturf_helper/Initialize()
@@ -30,7 +30,7 @@
var/area/our_area = get_area(src)
for(var/i in get_area_turfs(our_area, z))
replace_baseturf(i)
-
+
qdel(src)
/obj/effect/baseturf_helper/proc/replace_baseturf(turf/thing)
@@ -108,11 +108,11 @@
var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc
if(airlock)
if(airlock.cyclelinkeddir)
- log_world("### MAP WARNING, [src] at [COORD(src)] tried to set [airlock] cyclelinkeddir, but it's already set!")
+ log_world("### MAP WARNING, [src] at [AREACOORD(src)] tried to set [airlock] cyclelinkeddir, but it's already set!")
else
airlock.cyclelinkeddir = dir
else
- log_world("### MAP WARNING, [src] failed to find an airlock at [COORD(src)]")
+ log_world("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]")
/obj/effect/mapping_helpers/airlock/locked
@@ -127,11 +127,11 @@
var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc
if(airlock)
if(airlock.locked)
- log_world("### MAP WARNING, [src] at [COORD(src)] tried to bolt [airlock] but it's already locked!")
+ log_world("### MAP WARNING, [src] at [AREACOORD(src)] tried to bolt [airlock] but it's already locked!")
else
airlock.locked = TRUE
else
- log_world("### MAP WARNING, [src] failed to find an airlock at [COORD(src)]")
+ log_world("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]")
//needs to do its thing before spawn_rivers() is called
diff --git a/code/modules/mapping/reader.dm b/code/modules/mapping/reader.dm
index 381ce4bffe..dfc75c32ee 100644
--- a/code/modules/mapping/reader.dm
+++ b/code/modules/mapping/reader.dm
@@ -73,7 +73,7 @@ GLOBAL_DATUM_INIT(_preloader, /dmm_suite/preloader, new)
if(!key_len)
key_len = length(key)
else
- throw EXCEPTION("Inconsistant key length in DMM")
+ throw EXCEPTION("Inconsistent key length in DMM")
if(!measureOnly)
grid_models[key] = dmmRegex.group[2]
diff --git a/code/modules/mapping/space_management/space_reservation.dm b/code/modules/mapping/space_management/space_reservation.dm
new file mode 100644
index 0000000000..83147d5df7
--- /dev/null
+++ b/code/modules/mapping/space_management/space_reservation.dm
@@ -0,0 +1,70 @@
+
+//Yes, they can only be rectangular.
+//Yes, I'm sorry.
+/datum/turf_reservation
+ var/list/reserved_turfs = list()
+ var/bottom_left_coords[3]
+ var/top_right_coords[3]
+ var/wipe_reservation_on_release = TRUE
+ var/turf_type = /turf/open/space
+
+/datum/turf_reservation/transit
+ turf_type = /turf/open/space/transit
+
+/datum/turf_reservation/proc/Release()
+ var/v = reserved_turfs.Copy()
+ for(var/i in reserved_turfs)
+ reserved_turfs -= i
+ SSmapping.used_turfs -= i
+ SSmapping.reserve_turfs(v)
+
+/datum/turf_reservation/proc/Reserve(width, height, zlevel)
+ if(width > world.maxx || height > world.maxy || width < 1 || height < 1)
+ return FALSE
+ var/list/avail = SSmapping.unused_turfs["[zlevel]"]
+ var/turf/BL
+ var/turf/TR
+ var/list/turf/final = list()
+ var/passing = FALSE
+ for(var/i in avail)
+ CHECK_TICK
+ BL = i
+ if(!(BL.flags_1 & UNUSED_RESERVATION_TURF_1))
+ continue
+ if(BL.x + width > world.maxx || BL.y + height > world.maxy)
+ continue
+ TR = locate(BL.x + width - 1, BL.y + height - 1, BL.z)
+ if(!(TR.flags_1 & UNUSED_RESERVATION_TURF_1))
+ continue
+ final = block(BL, TR)
+ if(!final)
+ continue
+ passing = TRUE
+ for(var/I in final)
+ var/turf/checking = I
+ if(!(checking.flags_1 & UNUSED_RESERVATION_TURF_1))
+ passing = FALSE
+ break
+ if(!passing)
+ continue
+ break
+ if(!passing || !istype(BL) || !istype(TR))
+ return FALSE
+ bottom_left_coords = list(BL.x, BL.y, BL.z)
+ top_right_coords = list(TR.x, TR.y, TR.z)
+ for(var/i in final)
+ var/turf/T = i
+ reserved_turfs |= T
+ T.flags_1 &= ~UNUSED_RESERVATION_TURF_1
+ SSmapping.unused_turfs["[T.z]"] -= T
+ SSmapping.used_turfs[T] = src
+ T.ChangeTurf(turf_type, turf_type)
+ return TRUE
+
+/datum/turf_reservation/New()
+ LAZYADD(SSmapping.turf_reservations, src)
+
+/datum/turf_reservation/Destroy()
+ Release()
+ LAZYREMOVE(SSmapping.turf_reservations, src)
+ return ..()
diff --git a/code/modules/mapping/space_management/zlevel_manager.dm b/code/modules/mapping/space_management/zlevel_manager.dm
index a0d84c55dd..6129c5fd2b 100644
--- a/code/modules/mapping/space_management/zlevel_manager.dm
+++ b/code/modules/mapping/space_management/zlevel_manager.dm
@@ -17,6 +17,7 @@
z_list += S
/datum/controller/subsystem/mapping/proc/add_new_zlevel(name, traits = list(), z_type = /datum/space_level)
+ SEND_GLOBAL_SIGNAL(COMSIG_GLOB_NEW_Z, args)
var/new_z = z_list.len + 1
if (world.maxz < new_z)
world.incrementMaxZ()
diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm
index e80941c405..2c001571a1 100644
--- a/code/modules/mining/aux_base.dm
+++ b/code/modules/mining/aux_base.dm
@@ -224,7 +224,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
if(BAD_ZLEVEL)
to_chat(user, "This uplink can only be used in a designed mining zone.")
if(BAD_AREA)
- to_chat(user, "Unable to acquire a targeting lock. Find an area clear of stuctures or entirely within one.")
+ to_chat(user, "Unable to acquire a targeting lock. Find an area clear of structures or entirely within one.")
if(BAD_COORDS)
to_chat(user, "Location is too close to the edge of the station's scanning range. Move several paces away and try again.")
if(BAD_TURF)
@@ -253,13 +253,14 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
place.ScrapeAway()
return ..()
-obj/docking_port/stationary/public_mining_dock
+/obj/docking_port/stationary/public_mining_dock
name = "public mining base dock"
id = "disabled" //The Aux Base has to leave before this can be used as a dock.
//Should be checked on the map to ensure it matchs the mining shuttle dimensions.
dwidth = 3
width = 7
height = 5
+ area_type = /area/construction/mining/aux_base
/obj/structure/mining_shuttle_beacon
name = "mining shuttle beacon"
@@ -322,7 +323,7 @@ obj/docking_port/stationary/public_mining_dock
break
if(!Mport)
- to_chat(user, "This station is not equipped with an approprite mining shuttle. Please contact Nanotrasen Support.")
+ to_chat(user, "This station is not equipped with an appropriate mining shuttle. Please contact Nanotrasen Support.")
return
var/obj/docking_port/mobile/mining_shuttle
diff --git a/code/modules/mining/equipment/goliath_hide.dm b/code/modules/mining/equipment/goliath_hide.dm
index 85feaecf73..48f0ca0be5 100644
--- a/code/modules/mining/equipment/goliath_hide.dm
+++ b/code/modules/mining/equipment/goliath_hide.dm
@@ -7,6 +7,6 @@
singular_name = "hide plate"
max_amount = 6
novariants = FALSE
- flags_1 = NOBLUDGEON_1
+ item_flags = NOBLUDGEON
w_class = WEIGHT_CLASS_NORMAL
- layer = MOB_LAYER
\ No newline at end of file
+ layer = MOB_LAYER
diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm
index 558147af23..7cf16f6064 100644
--- a/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/code/modules/mining/equipment/kinetic_crusher.dm
@@ -381,7 +381,7 @@
/obj/item/crusher_trophy/blaster_tubes/on_mark_detonation(mob/living/target, mob/living/user)
deadly_shot = TRUE
- addtimer(CALLBACK(src, .proc/reset_deadly_shot), 300, TIMER_OVERRIDE)
+ addtimer(CALLBACK(src, .proc/reset_deadly_shot), 300, TIMER_UNIQUE|TIMER_OVERRIDE)
/obj/item/crusher_trophy/blaster_tubes/proc/reset_deadly_shot()
deadly_shot = FALSE
diff --git a/code/modules/mining/equipment/lazarus_injector.dm b/code/modules/mining/equipment/lazarus_injector.dm
index 1af66e37d6..6947b5b23f 100644
--- a/code/modules/mining/equipment/lazarus_injector.dm
+++ b/code/modules/mining/equipment/lazarus_injector.dm
@@ -34,7 +34,7 @@
H.robust_searching = 1
H.friends += user
H.attack_same = 1
- log_game("[user] has revived hostile mob [target] with a malfunctioning lazarus injector")
+ log_game("[key_name(user)] has revived hostile mob [key_name(target)] with a malfunctioning lazarus injector")
else
H.attack_same = 0
loaded = 0
@@ -51,6 +51,9 @@
return
/obj/item/lazarus_injector/emp_act()
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
if(!malfunctioning)
malfunctioning = 1
diff --git a/code/modules/mining/equipment/mineral_scanner.dm b/code/modules/mining/equipment/mineral_scanner.dm
index d7cdba8f7b..9ccb7c0efc 100644
--- a/code/modules/mining/equipment/mineral_scanner.dm
+++ b/code/modules/mining/equipment/mineral_scanner.dm
@@ -2,6 +2,7 @@
/obj/item/mining_scanner
desc = "A scanner that checks surrounding rock for useful minerals; it can also be used to stop gibtonite detonations."
name = "manual mining scanner"
+ icon = 'icons/obj/device.dmi'
icon_state = "mining1"
item_state = "analyzer"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm
index cd6afa20f7..ca313182b6 100644
--- a/code/modules/mining/equipment/mining_tools.dm
+++ b/code/modules/mining/equipment/mining_tools.dm
@@ -63,7 +63,8 @@
/obj/item/pickaxe/drill/cyborg
name = "cyborg mining drill"
desc = "An integrated electric mining drill."
- flags_1 = NODROP_1
+ item_flags = NODROP
+ flags_1 = NONE
/obj/item/pickaxe/drill/diamonddrill
name = "diamond-tipped mining drill"
diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm
index 7fa6721c0f..43be61dd77 100644
--- a/code/modules/mining/equipment/regenerative_core.dm
+++ b/code/modules/mining/equipment/regenerative_core.dm
@@ -21,7 +21,7 @@
name = "regenerative core"
desc = "All that remains of a hivelord. It can be used to heal completely, but it will rapidly decay into uselessness."
icon_state = "roro core 2"
- flags_1 = NOBLUDGEON_1
+ item_flags = NOBLUDGEON
slot = "hivecore"
force = 0
actions_types = list(/datum/action/item_action/organ_action/use)
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index 8ad4053f6a..3005a29dcd 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -4,7 +4,7 @@
icon_state = "away"
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
requires_power = FALSE
- has_gravity = TRUE
+ has_gravity = STANDARD_GRAVITY
valid_territory = FALSE
//Survival Capsule
@@ -57,12 +57,12 @@
used = FALSE
return
- playsound(get_turf(src), 'sound/effects/phasein.ogg', 100, 1)
+ playsound(src, 'sound/effects/phasein.ogg', 100, 1)
var/turf/T = deploy_location
if(!is_mining_level(T.z)) //only report capsules away from the mining/lavaland level
- message_admins("[ADMIN_LOOKUPFLW(usr)] activated a bluespace capsule away from the mining level! [ADMIN_JMP(T)]")
- log_admin("[key_name(usr)] activated a bluespace capsule away from the mining level at [get_area(T)][COORD(T)]")
+ message_admins("[ADMIN_LOOKUPFLW(usr)] activated a bluespace capsule away from the mining level! [ADMIN_VERBOSEJMP(T)]")
+ log_admin("[key_name(usr)] activated a bluespace capsule away from the mining level at [AREACOORD(T)]")
template.load(deploy_location, centered = TRUE)
new /obj/effect/particle_effect/smoke(get_turf(src))
qdel(src)
diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm
index b8ae25a87a..5e2e8bdd5a 100644
--- a/code/modules/mining/equipment/wormhole_jaunter.dm
+++ b/code/modules/mining/equipment/wormhole_jaunter.dm
@@ -20,7 +20,7 @@
/obj/item/wormhole_jaunter/proc/turf_check(mob/user)
var/turf/device_turf = get_turf(user)
- if(!device_turf || is_centcom_level(device_turf.z) || is_transit_level(device_turf.z))
+ if(!device_turf || is_centcom_level(device_turf.z) || is_reserved_level(device_turf.z))
to_chat(user, "You're having difficulties getting the [src.name] to work.")
return FALSE
return TRUE
@@ -51,18 +51,23 @@
qdel(src)
/obj/item/wormhole_jaunter/emp_act(power)
- var/triggered = FALSE
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
- if(usr.get_item_by_slot(SLOT_BELT) == src)
- if(power == 1)
- triggered = TRUE
- else if(power == 2 && prob(50))
- triggered = TRUE
+ var/mob/M = loc
+ if(istype(M))
+ var/triggered = FALSE
+ if(M.get_item_by_slot(SLOT_BELT) == src)
+ if(power == 1)
+ triggered = TRUE
+ else if(power == 2 && prob(50))
+ triggered = TRUE
- if(triggered)
- usr.visible_message("[src] overloads and activates!")
- SSblackbox.record_feedback("tally", "jaunter", 1, "EMP") // EMP accidental activation
- activate(usr)
+ if(triggered)
+ M.visible_message("[src] overloads and activates!")
+ SSblackbox.record_feedback("tally", "jaunter", 1, "EMP") // EMP accidental activation
+ activate(M)
/obj/item/wormhole_jaunter/proc/chasm_react(mob/user)
if(user.get_item_by_slot(SLOT_BELT) == src)
diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm
index a6cbbfcedd..d6ea55855d 100644
--- a/code/modules/mining/fulton.dm
+++ b/code/modules/mining/fulton.dm
@@ -63,7 +63,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
to_chat(user, "You attach the pack to [A] and activate it.")
if(loc == user && istype(user.back, /obj/item/storage/backpack))
var/obj/item/storage/backpack/B = user.back
- B.SendSignal(COMSIG_TRY_STORAGE_INSERT, src, user, FALSE, FALSE)
+ SEND_SIGNAL(B, COMSIG_TRY_STORAGE_INSERT, src, user, FALSE, FALSE)
uses_left--
if(uses_left <= 0)
user.transferItemToLoc(src, A, TRUE)
diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm
index 43faa48337..765f9d92e0 100644
--- a/code/modules/mining/laborcamp/laborstacker.dm
+++ b/code/modules/mining/laborcamp/laborstacker.dm
@@ -1,3 +1,5 @@
+GLOBAL_LIST(labor_sheet_values)
+
/**********************Prisoners' Console**************************/
/obj/machinery/mineral/labor_claim_console
@@ -6,7 +8,6 @@
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "console"
density = FALSE
- anchored = TRUE
var/obj/machinery/mineral/stacking_machine/laborstacker/stacking_machine = null
var/machinedir = SOUTH
var/obj/item/card/id/prisoner/inserted_id
@@ -21,6 +22,18 @@
Radio.listening = FALSE
locate_stacking_machine()
+ if(!GLOB.labor_sheet_values)
+ var/sheet_list = list()
+ for(var/sheet_type in subtypesof(/obj/item/stack/sheet))
+ var/obj/item/stack/sheet/sheet = sheet_type
+ if(!initial(sheet.point_value) || (initial(sheet.merge_type) && initial(sheet.merge_type) != sheet_type)) //ignore no-value sheets and x/fifty subtypes
+ continue
+ sheet_list += list(list("ore" = initial(sheet.name), "value" = initial(sheet.point_value)))
+ GLOB.labor_sheet_values = sortList(sheet_list, /proc/cmp_sheet_list)
+
+/proc/cmp_sheet_list(list/a, list/b)
+ return a["value"] - b["value"]
+
/obj/machinery/mineral/labor_claim_console/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/card/id/prisoner))
if(!inserted_id)
@@ -53,16 +66,10 @@
if(check_auth())
can_go_home = TRUE
- var/list/ores = list()
if(stacking_machine)
data["unclaimed_points"] = stacking_machine.points
- for(var/ore in stacking_machine.ore_values)
- var/list/O = list()
- O["ore"] = ore
- O["value"] = stacking_machine.ore_values[ore]
- ores += list(O)
- data["ores"] = ores
+ data["ores"] = GLOB.labor_sheet_values
data["can_go_home"] = can_go_home
return data
@@ -93,11 +100,11 @@
if(!alone_in_area(get_area(src), usr))
to_chat(usr, "Prisoners are only allowed to be released while alone.")
else
- switch(SSshuttle.moveShuttle("laborcamp","laborcamp_home"))
+ switch(SSshuttle.moveShuttle("laborcamp", "laborcamp_home", TRUE))
if(1)
- to_chat(usr, "Shuttle not found")
+ to_chat(usr, "Shuttle not found.")
if(2)
- to_chat(usr, "Shuttle already at station")
+ to_chat(usr, "Shuttle already at station.")
if(3)
to_chat(usr, "No permission to dock could be granted.")
else
@@ -128,15 +135,10 @@
/obj/machinery/mineral/stacking_machine/laborstacker
- var/points = 0 //The unclaimed value of ore stacked. Value for each ore loosely relative to its rarity.
- var/list/ore_values = list("glass" = 1, "metal" = 2, "reinforced glass" = 4, "gold" = 20, "silver" = 20, "uranium" = 20, "titanium" = 20, "solid plasma" = 20, "plasteel" = 23, "plasma glass" = 23, "diamond" = 25, "bluespace polycrystal" = 30, "plastitanium" = 45, "bananium" = 50)
+ var/points = 0 //The unclaimed value of ore stacked.
/obj/machinery/mineral/stacking_machine/laborstacker/process_sheet(obj/item/stack/sheet/inp)
- if(istype(inp))
- var/n = inp.name
- var/a = inp.amount
- if(n in ore_values)
- points += ore_values[n] * a
+ points += inp.point_value * inp.amount
..()
@@ -147,7 +149,6 @@
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "console"
density = FALSE
- anchored = TRUE
/obj/machinery/mineral/labor_points_checker/attack_hand(mob/user)
. = ..()
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index dbd08fe860..79adcdf9d8 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -11,7 +11,7 @@
desc = "It's watching you suspiciously."
/obj/structure/closet/crate/necropolis/tendril/PopulateContents()
- var/loot = rand(1,27)
+ var/loot = rand(1,28)
switch(loot)
if(1)
new /obj/item/shared_storage/red(src)
@@ -75,6 +75,8 @@
if(27)
new /obj/item/borg/upgrade/modkit/lifesteal(src)
new /obj/item/bedsheet/cult(src)
+ if(28)
+ new /obj/item/clothing/neck/necklace/memento_mori(src)
//KA modkit design discs
/obj/item/disk/design_disk/modkit_disc
@@ -187,11 +189,69 @@
activated()
/obj/item/rod_of_asclepius/proc/activated()
- flags_1 = NODROP_1 | DROPDEL_1
+ item_flags = NODROP | DROPDEL
desc = "A short wooden rod with a mystical snake inseparably gripping itself and the rod to your forearm. It flows with a healing energy that disperses amongst yourself and those around you. "
icon_state = "asclepius_active"
activated = TRUE
+//Memento Mori
+/obj/item/clothing/neck/necklace/memento_mori
+ name = "Memento Mori"
+ desc = "A mysterious pendant. An inscription on it says: \"Certain death tomorrow means certain life today.\""
+ icon = 'icons/obj/lavaland/artefacts.dmi'
+ icon_state = "memento_mori"
+ actions_types = list(/datum/action/item_action/hands_free/memento_mori)
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+ var/mob/living/carbon/human/active_owner
+
+/obj/item/clothing/neck/necklace/memento_mori/item_action_slot_check(slot)
+ return slot == SLOT_NECK
+
+/obj/item/clothing/neck/necklace/memento_mori/dropped(mob/user)
+ ..()
+ if(active_owner)
+ mori()
+
+//Just in case
+/obj/item/clothing/neck/necklace/memento_mori/Destroy()
+ if(active_owner)
+ mori()
+ return ..()
+
+/obj/item/clothing/neck/necklace/memento_mori/proc/memento(mob/living/carbon/human/user)
+ to_chat(user, "You feel your life being drained by the pendant...")
+ if(do_after(user, 40, target = user))
+ to_chat(user, "Your lifeforce is now linked to the pendant! You feel like removing it would kill you, and yet you instinctively know that until then, you won't die.")
+ user.add_trait(TRAIT_NODEATH, "memento_mori")
+ user.add_trait(TRAIT_NOHARDCRIT, "memento_mori")
+ user.add_trait(TRAIT_NOCRITDAMAGE, "memento_mori")
+ icon_state = "memento_mori_active"
+ active_owner = user
+
+/obj/item/clothing/neck/necklace/memento_mori/proc/mori()
+ icon_state = "memento_mori"
+ if(!active_owner)
+ return
+ var/mob/living/carbon/human/H = active_owner //to avoid infinite looping when dust unequips the pendant
+ active_owner = null
+ to_chat(H, "You feel your life rapidly slipping away from you!")
+ H.dust(TRUE, TRUE)
+
+/datum/action/item_action/hands_free/memento_mori
+ check_flags = NONE
+ name = "Memento Mori"
+ desc = "Bind your life to the pendant."
+
+/datum/action/item_action/hands_free/memento_mori/Trigger()
+ var/obj/item/clothing/neck/necklace/memento_mori/MM = target
+ if(!MM.active_owner)
+ if(ishuman(owner))
+ MM.memento(owner)
+ else
+ to_chat(owner, "You try to free your lifeforce from the pendant...")
+ if(do_after(owner, 40, target = owner))
+ MM.mori()
+
//Wisp Lantern
/obj/item/wisp_lantern
name = "spooky lantern"
@@ -206,26 +266,29 @@
/obj/item/wisp_lantern/attack_self(mob/user)
if(!wisp)
to_chat(user, "The wisp has gone missing!")
+ icon_state = "lantern"
return
+
if(wisp.loc == src)
to_chat(user, "You release the wisp. It begins to bob around your head.")
- user.sight |= SEE_MOBS
icon_state = "lantern"
wisp.orbit(user, 20)
+ user.update_sight()
SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Freed")
else
to_chat(user, "You return the wisp to the lantern.")
+ var/mob/target
if(wisp.orbiting)
- var/atom/A = wisp.orbiting.orbiting
- if(isliving(A))
- var/mob/living/M = A
- M.sight &= ~SEE_MOBS
- to_chat(M, "Your vision returns to normal.")
-
+ target = wisp.orbiting.orbiting
wisp.stop_orbit()
wisp.forceMove(src)
+
+ if (istype(target))
+ target.update_sight()
+ to_chat(target, "Your vision returns to normal.")
+
icon_state = "lantern-blue"
SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Returned")
@@ -248,6 +311,8 @@
icon_state = "orb"
light_range = 7
layer = ABOVE_ALL_MOB_LAYER
+ var/sight_flags = SEE_MOBS
+ var/lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
//Red/Blue Cubes
/obj/item/warp_cube
@@ -307,6 +372,7 @@
/obj/effect/warp_cube
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ anchored = TRUE
/obj/effect/warp_cube/ex_act(severity, target)
return
@@ -322,7 +388,7 @@
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
fire_sound = 'sound/weapons/batonextend.ogg'
max_charges = 1
- flags_1 = NOBLUDGEON_1
+ item_flags = NEEDS_PERMIT | NOBLUDGEON
force = 18
/obj/item/ammo_casing/magic/hook
@@ -529,7 +595,7 @@
to_chat(user, "You unfold the ladder. It extends much farther than you were expecting.")
var/last_ladder = null
for(var/i in 1 to world.maxz)
- if(is_centcom_level(i) || is_transit_level(i) || is_reebe(i) || is_away_level(i))
+ if(is_centcom_level(i) || is_reserved_level(i) || is_reebe(i) || is_away_level(i))
continue
var/turf/T2 = locate(ladder_x, ladder_y, i)
last_ladder = new /obj/structure/ladder/unbreakable/jacob(T2, null, last_ladder)
@@ -855,8 +921,8 @@
var/old_name = T.name
if(T.TerraformTurf(turf_type))
user.visible_message("[user] turns \the [old_name] into [transform_string]!")
- message_admins("[key_name_admin(user)] fired the lava staff at [get_area(target)]. [ADMIN_COORDJMP(T)]")
- log_game("[key_name(user)] fired the lava staff at [get_area(target)] [COORD(T)].")
+ message_admins("[ADMIN_LOOKUPFLW(user)] fired the lava staff at [ADMIN_VERBOSEJMP(T)]")
+ log_game("[key_name(user)] fired the lava staff at [AREACOORD(T)].")
timer = world.time + create_cooldown
playsound(T,'sound/magic/fireball.ogg', 200, 1)
else
@@ -908,7 +974,7 @@
INVOKE_ASYNC(B, /obj/effect/mine/pickup/bloodbath/.proc/mineEffect, H)
to_chat(user, "You shatter the bottle!")
playsound(user.loc, 'sound/effects/glassbr1.ogg', 100, 1)
- message_admins("[key_name_admin(user)][ADMIN_FLW(user)] has activated a bottle of mayhem!")
+ message_admins("[ADMIN_LOOKUPFLW(user)] has activated a bottle of mayhem!")
add_logs(user, null, "activated a bottle of mayhem", src)
qdel(src)
@@ -948,7 +1014,7 @@
var/mob/living/L = choice
- message_admins("[key_name_admin(L)][ADMIN_FLW(L)] has been marked for death by [key_name_admin(user)]!")
+ message_admins("[ADMIN_LOOKUPFLW(L)] has been marked for death by [ADMIN_LOOKUPFLW(user)]!")
var/datum/objective/survive/survive = new
survive.owner = L.mind
@@ -1166,7 +1232,7 @@
INVOKE_ASYNC(src, .proc/prepare_icon_update)
beacon.icon_state = "hierophant_tele_off"
return
- add_logs(user, beacon, "teleported self from ([source.x],[source.y],[source.z]) to")
+ add_logs(user, beacon, "teleported self from [AREACOORD(source)] to")
new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, user)
new /obj/effect/temp_visual/hierophant/telegraph/teleport(source, user)
for(var/t in RANGE_TURFS(1, T))
@@ -1213,7 +1279,7 @@
return
M.visible_message("[M] fades in!")
if(user != M)
- add_logs(user, M, "teleported", null, "from ([source.x],[source.y],[source.z])")
+ add_logs(user, M, "teleported", null, "from [AREACOORD(source)]")
/obj/item/hierophant_club/proc/cardinal_blasts(turf/T, mob/living/user) //fire cardinal cross blasts with a delay
if(!T)
diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm
index c7ba9ad6f4..026170da09 100644
--- a/code/modules/mining/machine_processing.dm
+++ b/code/modules/mining/machine_processing.dm
@@ -17,7 +17,6 @@
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "console"
density = TRUE
- anchored = TRUE
var/obj/machinery/mineral/processing_unit/machine = null
var/machinedir = EAST
speed_process = TRUE
@@ -74,7 +73,6 @@
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "furnace"
density = TRUE
- anchored = TRUE
var/obj/machinery/mineral/CONSOLE = null
var/on = FALSE
var/selected_material = MAT_METAL
@@ -84,7 +82,7 @@
/obj/machinery/mineral/processing_unit/Initialize()
. = ..()
proximity_monitor = new(src, 1)
- AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE), INFINITY, FALSE, list(/obj/item/stack))
+ AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE), INFINITY, TRUE, list(/obj/item/stack))
stored_research = new /datum/techweb/specialized/autounlocking/smelter
/obj/machinery/mineral/processing_unit/Destroy()
diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm
index d4735d1c75..3529214609 100644
--- a/code/modules/mining/machine_redemption.dm
+++ b/code/modules/mining/machine_redemption.dm
@@ -7,7 +7,6 @@
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "ore_redemption"
density = TRUE
- anchored = TRUE
input_dir = NORTH
output_dir = SOUTH
req_access = list(ACCESS_MINERAL_STOREROOM)
diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm
index 0f84d11082..dcc9034e2d 100644
--- a/code/modules/mining/machine_stacking.dm
+++ b/code/modules/mining/machine_stacking.dm
@@ -6,7 +6,6 @@
icon_state = "console"
desc = "Controls a stacking machine... in theory."
density = FALSE
- anchored = TRUE
circuit = /obj/item/circuitboard/machine/stacking_unit_console
var/obj/machinery/mineral/stacking_machine/machine
var/machinedir = SOUTHEAST
@@ -71,7 +70,6 @@
icon_state = "stacker"
desc = "A machine that automatically stacks acquired materials. Controlled by a nearby console."
density = TRUE
- anchored = TRUE
circuit = /obj/item/circuitboard/machine/stacking_machine
var/obj/machinery/mineral/stacking_unit_console/CONSOLE
var/stk_types = list()
@@ -107,8 +105,8 @@
stack_list[inp.type] = s
var/obj/item/stack/sheet/storage = stack_list[inp.type]
storage.amount += inp.amount //Stack the sheets
- qdel(inp) //Let the old sheet garbage collect
while(storage.amount > stack_amt) //Get rid of excessive stackage
var/obj/item/stack/sheet/out = new inp.type(null, stack_amt)
unload_mineral(out)
storage.amount -= stack_amt
+ qdel(inp) //Let the old sheet garbage collect
diff --git a/code/modules/mining/machine_unloading.dm b/code/modules/mining/machine_unloading.dm
index 380509f415..e84c2d6d0d 100644
--- a/code/modules/mining/machine_unloading.dm
+++ b/code/modules/mining/machine_unloading.dm
@@ -6,7 +6,6 @@
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "unloader"
density = TRUE
- anchored = TRUE
input_dir = WEST
output_dir = EAST
speed_process = TRUE
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index 3a188b7ab2..a9230195ac 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -6,11 +6,10 @@
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "mining"
density = TRUE
- anchored = TRUE
circuit = /obj/item/circuitboard/machine/mining_equipment_vendor
var/icon_deny = "mining-deny"
var/obj/item/card/id/inserted_id
- var/list/prize_list = list( //if you add something to this, please, for the love of god, use tabs and not spaces.
+ var/list/prize_list = list( //if you add something to this, please, for the love of god, sort it by price/type. use tabs and not spaces.
new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 10),
new /datum/data/mining_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 100),
new /datum/data/mining_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 300),
@@ -18,9 +17,8 @@
new /datum/data/mining_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, 100),
new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150),
new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 200),
- new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 300),
+ new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 300),
new /datum/data/mining_equipment("Alien Toy", /obj/item/clothing/mask/facehugger/toy, 300),
- new /datum/data/mining_equipment("Advanced Scanner", /obj/item/t_scanner/adv_mining_scanner, 800),
new /datum/data/mining_equipment("Stabilizing Serum", /obj/item/hivelordstabilizer, 400),
new /datum/data/mining_equipment("Fulton Beacon", /obj/item/fulton_core, 400),
new /datum/data/mining_equipment("Shelter Capsule", /obj/item/survivalcapsule, 400),
@@ -30,9 +28,10 @@
new /datum/data/mining_equipment("Survival Medipen", /obj/item/reagent_containers/hypospray/medipen/survival, 500),
new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/storage/firstaid/brute, 600),
new /datum/data/mining_equipment("Tracking Implant Kit", /obj/item/storage/box/minertracker, 600),
- new /datum/data/mining_equipment("Jaunter", /obj/item/wormhole_jaunter, 750),
+ new /datum/data/mining_equipment("Jaunter", /obj/item/wormhole_jaunter, 750),
new /datum/data/mining_equipment("Kinetic Crusher", /obj/item/twohanded/required/kinetic_crusher, 750),
new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 750),
+ new /datum/data/mining_equipment("Advanced Scanner", /obj/item/t_scanner/adv_mining_scanner, 800),
new /datum/data/mining_equipment("Resonator", /obj/item/resonator, 800),
new /datum/data/mining_equipment("Fulton Pack", /obj/item/extraction_pack, 1000),
new /datum/data/mining_equipment("Lazarus Injector", /obj/item/lazarus_injector, 1000),
@@ -46,8 +45,8 @@
new /datum/data/mining_equipment("Jump Boots", /obj/item/clothing/shoes/bhop, 2500),
new /datum/data/mining_equipment("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3000),
new /datum/data/mining_equipment("Nanotrasen Minebot", /mob/living/simple_animal/hostile/mining_drone, 800),
- new /datum/data/mining_equipment("Minebot Melee Upgrade", /obj/item/mine_bot_upgrade, 400),
- new /datum/data/mining_equipment("Minebot Armor Upgrade", /obj/item/mine_bot_upgrade/health, 400),
+ new /datum/data/mining_equipment("Minebot Melee Upgrade", /obj/item/mine_bot_upgrade, 400),
+ new /datum/data/mining_equipment("Minebot Armor Upgrade", /obj/item/mine_bot_upgrade/health, 400),
new /datum/data/mining_equipment("Minebot Cooldown Upgrade", /obj/item/borg/upgrade/modkit/cooldown/minebot, 600),
new /datum/data/mining_equipment("Minebot AI Upgrade", /obj/item/slimepotion/slime/sentience/mining, 1000),
new /datum/data/mining_equipment("KA Minebot Passthrough", /obj/item/borg/upgrade/modkit/minebot_passthrough, 100),
@@ -128,7 +127,7 @@
flick(icon_deny, src)
return
if(prize.cost > inserted_id.mining_points)
- to_chat(usr, "Error: Insufficent points for [prize.equipment_name]!")
+ to_chat(usr, "Error: Insufficient points for [prize.equipment_name]!")
flick(icon_deny, src)
else
inserted_id.mining_points -= prize.cost
@@ -172,8 +171,6 @@
if("Survival Capsule and Explorer's Webbing")
new /obj/item/storage/belt/mining/vendor(drop_location)
if("Resonator Kit")
- new /obj/item/storage/belt/mining/alt(drop_location)
- new /obj/item/t_scanner/adv_mining_scanner(drop_location)
new /obj/item/extinguisher/mini(drop_location)
new /obj/item/resonator(drop_location)
if("Minebot Kit")
@@ -186,8 +183,6 @@
new /obj/item/fulton_core(drop_location)
new /obj/item/stack/marker_beacon/thirty(drop_location)
if("Crusher Kit")
- new /obj/item/storage/belt/mining/alt(drop_location)
- new /obj/item/t_scanner/adv_mining_scanner(drop_location)
new /obj/item/extinguisher/mini(drop_location)
new /obj/item/twohanded/required/kinetic_crusher(drop_location)
if("Mining Conscription Kit")
diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm
index 23d8d816d4..3809514f02 100644
--- a/code/modules/mining/minebot.dm
+++ b/code/modules/mining/minebot.dm
@@ -299,7 +299,7 @@
/obj/item/slimepotion/slime/sentience/mining
name = "minebot AI upgrade"
- desc = "Can be used to grant sentience to minebots. Is incompatable with minebot armor and melee upgrades, and will override them."
+ desc = "Can be used to grant sentience to minebots. It's incompatible with minebot armor and melee upgrades, and will override them."
icon_state = "door_electronics"
icon = 'icons/obj/module.dmi'
sentience_type = SENTIENCE_MINEBOT
diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm
index b7cc0db43f..66b6b94d6c 100644
--- a/code/modules/mining/mint.dm
+++ b/code/modules/mining/mint.dm
@@ -6,7 +6,6 @@
icon = 'icons/obj/economy.dmi'
icon_state = "coinpress0"
density = TRUE
- anchored = TRUE
var/newCoins = 0 //how many coins the machine made in it's last load
var/processing = FALSE
var/chosen = MAT_METAL //which material will be used to make coins
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index 62ef7bde65..9e4e1bbb53 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -263,25 +263,24 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
playsound(src,'sound/effects/hit_on_shattered_glass.ogg',50,1)
icon_state = "Gibtonite active"
var/turf/bombturf = get_turf(src)
- var/area/A = get_area(bombturf)
var/notify_admins = 0
if(z != 5)//Only annoy the admins ingame if we're triggered off the mining zlevel
notify_admins = 1
if(notify_admins)
if(triggered_by == 1)
- message_admins("An explosion has triggered a [name] to detonate at [ADMIN_COORDJMP(bombturf)].")
+ message_admins("An explosion has triggered a [name] to detonate at [ADMIN_VERBOSEJMP(bombturf)].")
else if(triggered_by == 2)
- message_admins("A signal has triggered a [name] to detonate at [ADMIN_COORDJMP(bombturf)]. Igniter attacher: [ADMIN_LOOKUPFLW(attacher)]")
+ message_admins("A signal has triggered a [name] to detonate at [ADMIN_VERBOSEJMP(bombturf)]. Igniter attacher: [ADMIN_LOOKUPFLW(attacher)]")
else
- message_admins("[ADMIN_LOOKUPFLW(attacher)] has triggered a [name] to detonate at [ADMIN_COORDJMP(bombturf)].")
+ message_admins("[ADMIN_LOOKUPFLW(attacher)] has triggered a [name] to detonate at [ADMIN_VERBOSEJMP(bombturf)].")
if(triggered_by == 1)
- log_game("An explosion has primed a [name] for detonation at [A][COORD(bombturf)]")
+ log_game("An explosion has primed a [name] for detonation at [AREACOORD(bombturf)]")
else if(triggered_by == 2)
- log_game("A signal has primed a [name] for detonation at [A][COORD(bombturf)]. Igniter attacher: [key_name(attacher)].")
+ log_game("A signal has primed a [name] for detonation at [AREACOORD(bombturf)]. Igniter attacher: [key_name(attacher)].")
else
user.visible_message("[user] strikes \the [src], causing a chain reaction!", "You strike \the [src], causing a chain reaction.")
- log_game("[key_name(user)] has primed a [name] for detonation at [A][COORD(bombturf)]")
+ log_game("[key_name(user)] has primed a [name] for detonation at [AREACOORD(bombturf)]")
det_timer = addtimer(CALLBACK(src, .proc/detonate, notify_admins), det_time, TIMER_STOPPABLE)
/obj/item/twohanded/required/gibtonite/proc/detonate(notify_admins)
@@ -338,7 +337,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
var/index = sideslist.Find(coinflip)
message_admins("coinflip landed on [coinflip] which is [index] in sideslist")
if (index==2)//tails
- user.visible_message("\the [src] lands on [coinflip]! [user] promply falls over, dead!")
+ user.visible_message("\the [src] lands on [coinflip]! [user] promptly falls over, dead!")
user.adjustOxyLoss(200)
user.death(0)
else
diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm
index 78f4676d4e..b158815dac 100644
--- a/code/modules/mining/satchel_ore_boxdm.dm
+++ b/code/modules/mining/satchel_ore_boxdm.dm
@@ -12,8 +12,8 @@
/obj/structure/ore_box/attackby(obj/item/W, mob/user, params)
if (istype(W, /obj/item/stack/ore))
user.transferItemToLoc(W, src)
- else if(W.SendSignal(COMSIG_CONTAINS_STORAGE))
- W.SendSignal(COMSIG_TRY_STORAGE_TAKE_TYPE, /obj/item/stack/ore, src)
+ else if(SEND_SIGNAL(W, COMSIG_CONTAINS_STORAGE))
+ SEND_SIGNAL(W, COMSIG_TRY_STORAGE_TAKE_TYPE, /obj/item/stack/ore, src)
to_chat(user, "You empty the ore in [W] into \the [src].")
else
return ..()
diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm
index 3daf9c8fe4..30173c0a32 100644
--- a/code/modules/mob/dead/dead.dm
+++ b/code/modules/mob/dead/dead.dm
@@ -6,9 +6,9 @@ INITIALIZE_IMMEDIATE(/mob/dead)
sight = SEE_TURFS | SEE_MOBS | SEE_OBJS | SEE_SELF
/mob/dead/Initialize()
- if(initialized)
+ if(flags_1 & INITIALIZED_1)
stack_trace("Warning: [src]([type]) initialized multiple times!")
- initialized = TRUE
+ flags_1 |= INITIALIZED_1
tag = "mob_[next_mob_id++]"
GLOB.mob_list += src
diff --git a/code/modules/mob/dead/new_player/login.dm b/code/modules/mob/dead/new_player/login.dm
index 8a97180588..c93d9e05aa 100644
--- a/code/modules/mob/dead/new_player/login.dm
+++ b/code/modules/mob/dead/new_player/login.dm
@@ -11,7 +11,7 @@
var/motd = global.config.motd
if(motd)
- to_chat(src, "
[motd]
")
+ to_chat(src, "
[motd]
", handle_whitespace=FALSE)
if(GLOB.admin_notice)
to_chat(src, "Admin Notice:\n \t [GLOB.admin_notice]")
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index 9de78d307d..14bd0ffaab 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -10,7 +10,7 @@
density = FALSE
stat = DEAD
- canmove = 0
+ canmove = FALSE
anchored = TRUE // don't get pushed around
var/mob/living/new_character //for instant transfer once the round is set up
@@ -54,15 +54,19 @@
if(src.client && src.client.holder)
isadmin = 1
var/datum/DBQuery/query_get_new_polls = SSdbcore.NewQuery("SELECT id FROM [format_table_name("poll_question")] WHERE [(isadmin ? "" : "adminonly = false AND")] Now() BETWEEN starttime AND endtime AND id NOT IN (SELECT pollid FROM [format_table_name("poll_vote")] WHERE ckey = \"[ckey]\") AND id NOT IN (SELECT pollid FROM [format_table_name("poll_textreply")] WHERE ckey = \"[ckey]\")")
+ var/rs = REF(src)
if(query_get_new_polls.Execute())
var/newpoll = 0
if(query_get_new_polls.NextRow())
newpoll = 1
if(newpoll)
- output += "
Player poll"
output += "Question: [pollquestion] You can select up to [multiplechoiceoptions] options. If you select more, the first [multiplechoiceoptions] will be saved. "
output += "Poll runs from [pollstarttime] until [pollendtime]
"
@@ -216,22 +237,26 @@
var/datum/DBQuery/query_irv_get_votes = SSdbcore.NewQuery("SELECT optionid FROM [format_table_name("poll_vote")] WHERE pollid = [pollid] AND ckey = '[ckey]'")
if(!query_irv_get_votes.warn_execute())
+ qdel(query_irv_get_votes)
return
var/list/votedfor = list()
while(query_irv_get_votes.NextRow())
votedfor.Add(text2num(query_irv_get_votes.item[1]))
+ qdel(query_irv_get_votes)
var/list/datum/polloption/options = list()
var/datum/DBQuery/query_irv_options = SSdbcore.NewQuery("SELECT id, text FROM [format_table_name("poll_option")] WHERE pollid = [pollid]")
if(!query_irv_options.warn_execute())
+ qdel(query_irv_options)
return
while(query_irv_options.NextRow())
var/datum/polloption/PO = new()
PO.optionid = text2num(query_irv_options.item[1])
PO.optiontext = query_irv_options.item[2]
options["[PO.optionid]"] += PO
+ qdel(query_irv_options)
//if they already voted, use their sort
if (votedfor.len)
@@ -332,10 +357,13 @@
return
var/datum/DBQuery/query_hasvoted = SSdbcore.NewQuery("SELECT id FROM `[format_table_name(table)]` WHERE pollid = [pollid] AND ckey = '[ckey]'")
if(!query_hasvoted.warn_execute())
+ qdel(query_hasvoted)
return
if(query_hasvoted.NextRow())
+ qdel(query_hasvoted)
to_chat(usr, "You've already replied to this poll.")
return
+ qdel(query_hasvoted)
. = "Player"
if(client.holder)
. = client.holder.rank.name
@@ -364,9 +392,12 @@
//validate the poll is actually the right type of poll and its still active
var/datum/DBQuery/query_validate_poll = SSdbcore.NewQuery("SELECT id FROM [format_table_name("poll_question")] WHERE id = [pollid] AND Now() BETWEEN starttime AND endtime AND polltype = '[type]' [(holder ? "" : "AND adminonly = false")]")
if(!query_validate_poll.warn_execute())
+ qdel(query_validate_poll)
return 0
if (!query_validate_poll.NextRow())
+ qdel(query_validate_poll)
return 0
+ qdel(query_validate_poll)
return 1
/mob/dead/new_player/proc/vote_on_irv_poll(pollid, list/votelist)
@@ -397,10 +428,12 @@
//lets collect the options
var/datum/DBQuery/query_irv_id = SSdbcore.NewQuery("SELECT id FROM [format_table_name("poll_option")] WHERE pollid = [pollid]")
if(!query_irv_id.warn_execute())
+ qdel(query_irv_id)
return 0
var/list/optionlist = list()
while (query_irv_id.NextRow())
optionlist += text2num(query_irv_id.item[1])
+ qdel(query_irv_id)
//validate their votes are actually in the list of options and actually numbers
var/list/numberedvotelist = list()
@@ -428,13 +461,18 @@
//now lets delete their old votes (if any)
var/datum/DBQuery/query_irv_del_old = SSdbcore.NewQuery("DELETE FROM [format_table_name("poll_vote")] WHERE pollid = [pollid] AND ckey = '[ckey]'")
if(!query_irv_del_old.warn_execute())
+ qdel(query_irv_del_old)
return 0
+ qdel(query_irv_del_old)
//now to add the new ones.
var/datum/DBQuery/query_irv_vote = SSdbcore.NewQuery("INSERT INTO [format_table_name("poll_vote")] (datetime, pollid, optionid, ckey, ip, adminrank) VALUES [sqlrowlist]")
if(!query_irv_vote.warn_execute())
+ qdel(query_irv_vote)
return 0
- src << browse(null,"window=playerpoll")
+ qdel(query_irv_vote)
+ if(!QDELETED(src))
+ src << browse(null,"window=playerpoll")
return 1
@@ -454,8 +492,11 @@
return
var/datum/DBQuery/query_option_vote = SSdbcore.NewQuery("INSERT INTO [format_table_name("poll_vote")] (datetime, pollid, optionid, ckey, ip, adminrank) VALUES (Now(), [pollid], [optionid], '[ckey]', INET_ATON('[client.address]'), '[adminrank]')")
if(!query_option_vote.warn_execute())
+ qdel(query_option_vote)
return
- usr << browse(null,"window=playerpoll")
+ qdel(query_option_vote)
+ if(!QDELETED(usr))
+ usr << browse(null,"window=playerpoll")
return 1
/mob/dead/new_player/proc/log_text_poll_reply(pollid, replytext)
@@ -481,8 +522,11 @@
return
var/datum/DBQuery/query_text_vote = SSdbcore.NewQuery("INSERT INTO [format_table_name("poll_textreply")] (datetime ,pollid ,ckey ,ip ,replytext ,adminrank) VALUES (Now(), [pollid], '[ckey]', INET_ATON('[client.address]'), '[replytext]', '[adminrank]')")
if(!query_text_vote.warn_execute())
+ qdel(query_text_vote)
return
- usr << browse(null,"window=playerpoll")
+ qdel(query_text_vote)
+ if(!QDELETED(usr))
+ usr << browse(null,"window=playerpoll")
return 1
/mob/dead/new_player/proc/vote_on_numval_poll(pollid, optionid, rating)
@@ -498,18 +542,24 @@
return 0
var/datum/DBQuery/query_numval_hasvoted = SSdbcore.NewQuery("SELECT id FROM [format_table_name("poll_vote")] WHERE optionid = [optionid] AND ckey = '[ckey]'")
if(!query_numval_hasvoted.warn_execute())
+ qdel(query_numval_hasvoted)
return
if(query_numval_hasvoted.NextRow())
+ qdel(query_numval_hasvoted)
to_chat(usr, "You've already replied to this poll.")
return
+ qdel(query_numval_hasvoted)
var/adminrank = "Player"
if(client.holder)
adminrank = client.holder.rank.name
adminrank = sanitizeSQL(adminrank)
var/datum/DBQuery/query_numval_vote = SSdbcore.NewQuery("INSERT INTO [format_table_name("poll_vote")] (datetime ,pollid ,optionid ,ckey ,ip ,adminrank, rating) VALUES (Now(), [pollid], [optionid], '[ckey]', INET_ATON('[client.address]'), '[adminrank]', [(isnull(rating)) ? "null" : rating])")
if(!query_numval_vote.warn_execute())
+ qdel(query_numval_vote)
return
- usr << browse(null,"window=playerpoll")
+ qdel(query_numval_vote)
+ if(!QDELETED(usr))
+ usr << browse(null,"window=playerpoll")
return 1
/mob/dead/new_player/proc/vote_on_multi_poll(pollid, optionid)
@@ -525,26 +575,33 @@
return 0
var/datum/DBQuery/query_multi_choicelen = SSdbcore.NewQuery("SELECT multiplechoiceoptions FROM [format_table_name("poll_question")] WHERE id = [pollid]")
if(!query_multi_choicelen.warn_execute())
+ qdel(query_multi_choicelen)
return 1
var/i
if(query_multi_choicelen.NextRow())
- i = text2num(query_multi_choicelen.item[1])
+ i = text2num(query_multi_choicelen.item[1])
+ qdel(query_multi_choicelen)
var/datum/DBQuery/query_multi_hasvoted = SSdbcore.NewQuery("SELECT id FROM [format_table_name("poll_vote")] WHERE pollid = [pollid] AND ckey = '[ckey]'")
if(!query_multi_hasvoted.warn_execute())
+ qdel(query_multi_hasvoted)
return 1
while(i)
if(query_multi_hasvoted.NextRow())
i--
else
break
+ qdel(query_multi_hasvoted)
if(!i)
return 2
var/adminrank = "Player"
- if(client.holder)
+ if(!QDELETED(client) && client.holder)
adminrank = client.holder.rank.name
adminrank = sanitizeSQL(adminrank)
var/datum/DBQuery/query_multi_vote = SSdbcore.NewQuery("INSERT INTO [format_table_name("poll_vote")] (datetime, pollid, optionid, ckey, ip, adminrank) VALUES (Now(), [pollid], [optionid], '[ckey]', INET_ATON('[client.address]'), '[adminrank]')")
if(!query_multi_vote.warn_execute())
+ qdel(query_multi_vote)
return 1
- usr << browse(null,"window=playerpoll")
+ qdel(query_multi_vote)
+ if(!QDELETED(usr))
+ usr << browse(null,"window=playerpoll")
return 0
diff --git a/code/modules/mob/dead/new_player/sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories.dm
index 8699e02b29..13ede8ef04 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories.dm
@@ -68,7 +68,7 @@
icon = 'icons/mob/human_face.dmi' // default icon for all hairs
/datum/sprite_accessory/hair/short
- name = "Short Hair" // try to capatilize the names please~ // try to spell
+ name = "Short Hair" // try to capitalize the names please~ // try to spell
icon_state = "hair_a" // you do not need to define _s or _l sub-states, game automatically does this for you
/datum/sprite_accessory/hair/shorthair2
@@ -777,6 +777,32 @@
icon_state = "female_commie"
gender = FEMALE
+/datum/sprite_accessory/underwear/swimsuit
+ name = "Ladies Black Swimsuit"
+ icon_state = "swim_black"
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/swimsuit_blue
+ name = "Ladies Blue Swimsuit"
+ icon_state = "swim_blue"
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/swimsuit_green
+ name = "Ladies Green Swimsuit"
+ icon_state = "swim_green"
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/swimsuit_purple
+ name = "Ladies Purple Swimsuit"
+ icon_state = "swim_purple"
+ gender = FEMALE
+
+/datum/sprite_accessory/underwear/swimsuit_red
+ name = "Ladies Red Swimsuit"
+ icon_state = "swim_red"
+ gender = FEMALE
+
+
////////////////////////////
// Undershirt Definitions //
////////////////////////////
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index e11a4fc886..7655e8e1d7 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -79,7 +79,6 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
var/mob/body = loc
if(ismob(body))
T = get_turf(body) //Where is the body located?
- logging = body.logging //preserve our logs by copying them to our ghost
gender = body.gender
if(body.mind && body.mind.name)
@@ -623,7 +622,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
//this is a mob verb instead of atom for performance reasons
//see /mob/verb/examinate() in mob.dm for more info
-//overriden here and in /mob/living for different point span classes and sanity checks
+//overridden here and in /mob/living for different point span classes and sanity checks
/mob/dead/observer/pointed(atom/A as mob|obj|turf in view())
if(!..())
return 0
diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm
index c8cf1a5f1b..7e8a493f7a 100644
--- a/code/modules/mob/dead/observer/say.dm
+++ b/code/modules/mob/dead/observer/say.dm
@@ -1,9 +1,20 @@
/mob/dead/observer/say(message)
message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
-
if (!message)
return
+ var/message_mode = get_message_mode(message)
+ if(client && (message_mode == "admin" || message_mode == "deadmin"))
+ message = copytext(message, 3)
+ if(findtext(message, " ", 1, 2))
+ message = copytext(message, 2)
+
+ if(message_mode == "admin")
+ client.cmd_admin_say(message)
+ else if(message_mode == "deadmin")
+ client.dsay(message)
+ return
+
log_talk(src,"Ghost/[src.key] : [message]", LOGSAY)
if(check_emote(message))
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 4e945b437f..494536ebfa 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -136,7 +136,7 @@
//To appropriately fluff things like "they are holding [I] in their [get_held_index_name(get_held_index_of_item(I))]"
-//Can be overriden to pass off the fluff to something else (eg: science allowing people to add extra robotic limbs, and having this proc react to that
+//Can be overridden to pass off the fluff to something else (eg: science allowing people to add extra robotic limbs, and having this proc react to that
// with say "they are holding [I] in their Nanotrasen Brand Utility Arm - Right Edition" or w/e
/mob/proc/get_held_index_name(i)
var/list/hand = list()
@@ -200,7 +200,7 @@
/mob/proc/put_in_hand_check(obj/item/I)
- if(incapacitated() && !(I.flags_1&ABSTRACT_1)) //Cit change - Changes lying to incapacitated so that it's plausible to pick things up while on the ground
+ if(incapacitated() && !(I.item_flags&ABSTRACT)) //Cit change - Changes lying to incapacitated so that it's plausible to pick things up while on the ground
return FALSE
if(!istype(I))
return FALSE
@@ -272,7 +272,7 @@
/mob/proc/canUnEquip(obj/item/I, force)
if(!I)
return TRUE
- if((I.flags_1 & NODROP_1) && !force)
+ if((I.item_flags & NODROP) && !force)
return FALSE
return TRUE
@@ -312,7 +312,7 @@
if(!I) //If there's nothing to drop, the drop is automatically succesfull. If(unEquip) should generally be used to check for NODROP_1.
return TRUE
- if((I.flags_1 & NODROP_1) && !force)
+ if((I.item_flags & NODROP) && !force)
return FALSE
var/hand_index = get_held_index_of_item(I)
@@ -325,7 +325,7 @@
I.layer = initial(I.layer)
I.plane = initial(I.plane)
I.appearance_flags &= ~NO_CLIENT_COLOR
- if(!no_move && !(I.flags_1 & DROPDEL_1)) //item may be moved/qdel'd immedietely, don't bother moving it
+ if(!no_move && !(I.item_flags & DROPDEL)) //item may be moved/qdel'd immedietely, don't bother moving it
if (isnull(newloc))
I.moveToNullspace()
else
@@ -379,7 +379,7 @@
/mob/living/proc/unequip_everything()
var/list/items = list()
- items |= get_equipped_items()
+ items |= get_equipped_items(TRUE)
for(var/I in items)
dropItemToGround(I)
drop_all_held_items()
@@ -396,7 +396,7 @@
if(equip_delay_self)
return
- if(M.active_storage && M.active_storage.parent && M.active_storage.parent.SendSignal(COMSIG_TRY_STORAGE_INSERT, src,M))
+ if(M.active_storage && M.active_storage.parent && SEND_SIGNAL(M.active_storage.parent, COMSIG_TRY_STORAGE_INSERT, src,M))
return TRUE
var/list/obj/item/possible = list(M.get_inactive_held_item(), M.get_item_by_slot(SLOT_BELT), M.get_item_by_slot(SLOT_GENERC_DEXTROUS_STORAGE), M.get_item_by_slot(SLOT_BACK))
@@ -404,7 +404,7 @@
if(!i)
continue
var/obj/item/I = i
- if(I.SendSignal(COMSIG_TRY_STORAGE_INSERT, src, M))
+ if(SEND_SIGNAL(I, COMSIG_TRY_STORAGE_INSERT, src, M))
return TRUE
to_chat(M, "You are unable to equip that!")
@@ -441,10 +441,7 @@
held_items.len = amt
if(hud_used)
- var/style
- if(client && client.prefs)
- style = ui_style2icon(client.prefs.UI_style)
- hud_used.build_hand_slots(style)
+ hud_used.build_hand_slots()
/mob/living/carbon/human/change_number_of_hands(amt)
diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm
index 05a14ef3b1..393b939448 100644
--- a/code/modules/mob/living/blood.dm
+++ b/code/modules/mob/living/blood.dm
@@ -68,8 +68,9 @@
if(prob(15))
Unconscious(rand(20,60))
to_chat(src, "You feel extremely [word].")
- if(0 to BLOOD_VOLUME_SURVIVE)
- death()
+ if(-INFINITY to BLOOD_VOLUME_SURVIVE)
+ if(!has_trait(TRAIT_NODEATH))
+ death()
var/temp_bleed = 0
//Bleeding out
diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm
index 0052cf923d..d70007452c 100644
--- a/code/modules/mob/living/bloodcrawl.dm
+++ b/code/modules/mob/living/bloodcrawl.dm
@@ -138,7 +138,7 @@
name = "blood crawl"
desc = "You are unable to hold anything while in this form."
icon = 'icons/effects/blood.dmi'
- flags_1 = NODROP_1|ABSTRACT_1
+ item_flags = NODROP | ABSTRACT
/mob/living/proc/exit_blood_effect(obj/effect/decal/cleanable/B)
playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, 1, -1)
diff --git a/code/modules/mob/living/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm
index 802b869d02..bacdc4524b 100644
--- a/code/modules/mob/living/brain/MMI.dm
+++ b/code/modules/mob/living/brain/MMI.dm
@@ -148,6 +148,9 @@
to_chat(brainmob, "Radio is [radio.listening==1 ? "now" : "no longer"] receiving broadcast.")
/obj/item/mmi/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
if(!brainmob || iscyborg(loc))
return
else
@@ -159,7 +162,6 @@
if(3)
brainmob.emp_damage = min(brainmob.emp_damage + rand(0,10), 30)
brainmob.emote("alarm")
- ..()
/obj/item/mmi/Destroy()
if(iscyborg(loc))
diff --git a/code/modules/mob/living/brain/posibrain.dm b/code/modules/mob/living/brain/posibrain.dm
index 9c927560d9..864d5d769c 100644
--- a/code/modules/mob/living/brain/posibrain.dm
+++ b/code/modules/mob/living/brain/posibrain.dm
@@ -34,9 +34,9 @@ GLOBAL_VAR(posibrain_notify_cooldown)
if(istype(ghost))
activate(ghost)
-/obj/item/mmi/posibrain/proc/ping_ghosts(msg, newlymade) // CITADEL EDIT sound change to 'sound/misc/server-ready.ogg'
+/obj/item/mmi/posibrain/proc/ping_ghosts(msg, newlymade)
if(newlymade || GLOB.posibrain_notify_cooldown <= world.time)
- notify_ghosts("[name] [msg] in [get_area(src)]!", ghost_sound = !newlymade ? 'sound/misc/server-ready.ogg':null, enter_link = "(Click to enter)", source = src, action = NOTIFY_ATTACK, flashwindow = FALSE)
+ notify_ghosts("[name] [msg] in [get_area(src)]!", ghost_sound = !newlymade ? 'sound/effects/ghost2.ogg':null, enter_link = "(Click to enter)", source = src, action = NOTIFY_ATTACK, flashwindow = FALSE)
if(!newlymade)
GLOB.posibrain_notify_cooldown = world.time + askDelay
@@ -68,6 +68,7 @@ GLOBAL_VAR(posibrain_notify_cooldown)
else
visible_message(fail_message)
+//ATTACK GHOST IGNORING PARENT RETURN VALUE
/obj/item/mmi/posibrain/attack_ghost(mob/user)
activate(user)
@@ -84,7 +85,7 @@ GLOBAL_VAR(posibrain_notify_cooldown)
/obj/item/mmi/posibrain/proc/activate(mob/user)
if(QDELETED(brainmob))
return
- if(is_occupied() || jobban_isbanned(user,"posibrain"))
+ if(is_occupied() || jobban_isbanned(user,"posibrain") || QDELETED(brainmob) || QDELETED(src) || QDELETED(user))
return
var/posi_ask = alert("Become a [name]? (Warning, You can no longer be cloned, and all past lives will be forgotten!)","Are you positive?","Yes","No")
diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
index 3b400bcbb8..cdc1b08d21 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
@@ -97,7 +97,7 @@ Doesn't work on other aliens/AI.*/
return 0
var/msg = sanitize(input("Message:", "Alien Whisper") as text|null)
if(msg)
- log_talk(user,"AlienWhisper: [key_name(user)]->[M.key] : [msg]",LOGSAY)
+ log_talk(user,"AlienWhisper: [key_name(user)]->[key_name(M)] : [msg]",LOGSAY)
to_chat(M, "You hear a strange, alien voice in your head...[msg]")
to_chat(user, "You said: \"[msg]\" to [M]")
for(var/ded in GLOB.dead_mob_list)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm
index f8cf430d74..fe61c2a8ff 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm
@@ -29,7 +29,7 @@
/obj/effect/proc_holder/alien/royal/praetorian/evolve
name = "Evolve"
- desc = "Produce an interal egg sac capable of spawning children. Only one queen can exist at a time."
+ desc = "Produce an internal egg sac capable of spawning children. Only one queen can exist at a time."
plasma_cost = 500
action_icon_state = "alien_evolve_praetorian"
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index 2216d955c0..eb5e9664d9 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -45,7 +45,7 @@
"}
for(var/i in 1 to held_items.len)
var/obj/item/I = get_item_for_held_index(i)
- dat += " [get_held_index_name(i)]:[(I && !(I.flags_1 & ABSTRACT_1)) ? I : "Empty"]"
+ dat += " [get_held_index_name(i)]:[(I && !(I.item_flags & ABSTRACT)) ? I : "Empty"]"
dat += " Empty Pouches"
if(handcuffed)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
index fb04d174e2..9c61e8aa2d 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
@@ -107,7 +107,7 @@
name = "\improper royal parasite"
desc = "Inject this into one of your grown children to promote her to a Praetorian!"
icon_state = "alien_medal"
- flags_1 = ABSTRACT_1|NODROP_1|DROPDEL_1
+ item_flags = ABSTRACT | NODROP | DROPDEL
icon = 'icons/mob/alien.dmi'
/obj/item/queenpromote/attack(mob/living/M, mob/living/carbon/alien/humanoid/user)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index a2813168c0..c3c74b8631 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -169,11 +169,9 @@
var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors
var/turf/end_T = get_turf(target)
if(start_T && end_T)
- var/start_T_descriptor = "tile in [get_area_name(start_T, TRUE)] ([start_T.x],[start_T.y],[start_T.z])"
- var/end_T_descriptor = "tile at [get_area_name(end_T, TRUE)] ([end_T.x],[end_T.y],[end_T.z])"
- add_logs(src, throwable_mob, "thrown", addition="grab from [start_T_descriptor] towards [end_T_descriptor]")
+ add_logs(src, throwable_mob, "thrown", addition="grab from tile in [AREACOORD(start_T)] towards tile at [AREACOORD(end_T)]")
- else if(!(I.flags_1 & (NODROP_1|ABSTRACT_1)))
+ else if(!(I.item_flags & (NODROP | ABSTRACT)))
thrown_thing = I
dropItemToGround(I)
@@ -202,13 +200,13 @@
[name]
- Head: [(head && !(head.flags_1&ABSTRACT_1)) ? head : "Nothing"]
- Mask: [(wear_mask && !(wear_mask.flags_1&ABSTRACT_1)) ? wear_mask : "Nothing"]
- Neck: [(wear_neck && !(wear_neck.flags_1&ABSTRACT_1)) ? wear_neck : "Nothing"]"}
+ Head: [(head && !(head.item_flags & ABSTRACT)) ? head : "Nothing"]
+ Mask: [(wear_mask && !(wear_mask.item_flags & ABSTRACT)) ? wear_mask : "Nothing"]
+ Neck: [(wear_neck && !(wear_neck.item_flags & ABSTRACT)) ? wear_neck : "Nothing"]"}
for(var/i in 1 to held_items.len)
var/obj/item/I = get_item_for_held_index(i)
- dat += " [get_held_index_name(i)]:
"
@@ -230,7 +230,7 @@
usr.visible_message("[usr] successfully rips [I] out of [usr.p_their()] [L.name]!","You successfully remove [I] from your [L.name].")
if(!has_embedded_objects())
clear_alert("embeddedobject")
- usr.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "embedded")
+ SEND_SIGNAL(usr, COMSIG_CLEAR_MOOD_EVENT, "embedded")
return
if(href_list["item"])
@@ -246,11 +246,11 @@
var/obj/item/place_item = usr.get_active_held_item() // Item to place in the pocket, if it's empty
var/delay_denominator = 1
- if(pocket_item && !(pocket_item.flags_1&ABSTRACT_1))
- if(pocket_item.flags_1 & NODROP_1)
+ if(pocket_item && !(pocket_item.item_flags & ABSTRACT))
+ if(pocket_item.item_flags & NODROP)
to_chat(usr, "You try to empty [src]'s [pocket_side] pocket, it seems to be stuck!")
to_chat(usr, "You try to empty [src]'s [pocket_side] pocket.")
- else if(place_item && place_item.mob_can_equip(src, usr, pocket_id, 1) && !(place_item.flags_1&ABSTRACT_1))
+ else if(place_item && place_item.mob_can_equip(src, usr, pocket_id, 1) && !(place_item.item_flags & ABSTRACT))
to_chat(usr, "You try to place [place_item] into [src]'s [pocket_side] pocket.")
delay_denominator = 4
else
@@ -274,7 +274,7 @@
// Display a warning if the user mocks up
to_chat(src, "You feel your [pocket_side] pocket being fumbled with!")
- ..()
+ ..() //CITADEL CHANGE - removes a tab from behind this ..() so that flavortext can actually be examined
///////HUDs///////
@@ -387,12 +387,12 @@
R = find_record("name", perpname, GLOB.data_core.security)
if(R)
if(href_list["status"])
- var/setcriminal = input(usr, "Specify a new criminal status for this person.", "Security HUD", R.fields["criminal"]) in list("None", "*Arrest*", "Incarcerated", "Parolled", "Discharged", "Cancel")
+ var/setcriminal = input(usr, "Specify a new criminal status for this person.", "Security HUD", R.fields["criminal"]) in list("None", "*Arrest*", "Incarcerated", "Paroled", "Discharged", "Cancel")
if(setcriminal != "Cancel")
if(R)
if(H.canUseHUD())
if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.getorganslot(ORGAN_SLOT_HUD), /obj/item/organ/cyberimp/eyes/hud/security))
- investigate_log("[src.key] has been set from [R.fields["criminal"]] to [setcriminal] by [usr.name] ([usr.key]).", INVESTIGATE_RECORDS)
+ investigate_log("[key_name(src)] has been set from [R.fields["criminal"]] to [setcriminal] by [key_name(usr)].", INVESTIGATE_RECORDS)
R.fields["criminal"] = setcriminal
sec_hud_set_security_status()
return
@@ -434,6 +434,7 @@
return
var/crime = GLOB.data_core.createCrimeEntry(t1, t2, allowed_access, station_time_timestamp())
GLOB.data_core.addMinorCrime(R.fields["id"], crime)
+ investigate_log("New Minor Crime: [t1]: [t2] | Added to [R.fields["name"]] by [key_name(usr)]", INVESTIGATE_RECORDS)
to_chat(usr, "Successfully added a minor crime.")
return
if("Major Crime")
@@ -449,6 +450,7 @@
return
var/crime = GLOB.data_core.createCrimeEntry(t1, t2, allowed_access, station_time_timestamp())
GLOB.data_core.addMajorCrime(R.fields["id"], crime)
+ investigate_log("New Major Crime: [t1]: [t2] | Added to [R.fields["name"]] by [key_name(usr)]", INVESTIGATE_RECORDS)
to_chat(usr, "Successfully added a major crime.")
return
@@ -497,12 +499,12 @@
// If targeting anything else, see if the wear suit is thin enough.
if (!penetrate_thick)
if(above_neck(target_zone))
- if(head && is_type_in_typecache(head, GLOB.typecache_clothing))
+ if(head && istype(head, /obj/item/clothing))
var/obj/item/clothing/CH = head
if (CH.clothing_flags & THICKMATERIAL)
. = 0
else
- if(wear_suit && is_type_in_typecache(wear_suit, GLOB.typecache_clothing))
+ if(wear_suit && istype(wear_suit, /obj/item/clothing))
var/obj/item/clothing/CS = wear_suit
if (CS.clothing_flags & THICKMATERIAL)
. = 0
@@ -588,7 +590,7 @@
threatcount += 5
if("Incarcerated")
threatcount += 2
- if("Parolled")
+ if("Paroled")
threatcount += 2
//Check for dresscode violations
@@ -596,20 +598,16 @@
threatcount += 6 //fuk u antags <3
//Check for nonhuman scum
- if(dna && dna.species.id && !(dna.species.id in list("human" , "lizard", "mammal", "avian", "aquatic", "insect")))
+ if(dna && dna.species.id && dna.species.id != "human")
threatcount += 1
//mindshield implants imply trustworthyness
if(isloyal())
threatcount -= 1
- //Agent cards lower threatlevel. But only enough to openly carry without being busted.
+ //Agent cards lower threatlevel.
if(istype(idcard, /obj/item/card/id/syndicate))
- threatcount -= 2
-
- //CentCom cards lower threat level. Even to emagged bots.
- if(istype(idcard, /obj/item/card/id/centcom) || istype(idcard, /obj/item/card/id/ert))
- threatcount -= 10
+ threatcount -= 5
return threatcount
@@ -664,7 +662,7 @@
return
src.visible_message("[src] performs CPR on [C.name]!", "You perform CPR on [C.name].")
- SendSignal(COMSIG_ADD_MOOD_EVENT, "perform_cpr", /datum/mood_event/perform_cpr)
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "perform_cpr", /datum/mood_event/perform_cpr)
C.cpr_time = world.time
add_logs(src, C, "CPRed")
@@ -678,23 +676,6 @@
else
to_chat(C, "You feel a breath of fresh air... which is a sensation you don't recognise...")
-/mob/living/carbon/human/generateStaticOverlay()
- var/image/staticOverlay = image(icon('icons/effects/effects.dmi', "static"), loc = src)
- staticOverlay.override = 1
- staticOverlays["static"] = staticOverlay
-
- staticOverlay = image(icon('icons/effects/effects.dmi', "blank"), loc = src)
- staticOverlay.override = 1
- staticOverlays["blank"] = staticOverlay
-
- staticOverlay = getLetterImage(src, "H", 1)
- staticOverlay.override = 1
- staticOverlays["letter"] = staticOverlay
-
- staticOverlay = getRandomAnimalImage(src)
- staticOverlay.override = 1
- staticOverlays["animal"] = staticOverlay
-
/mob/living/carbon/human/cuff_resist(obj/item/I)
if(dna && dna.check_mutation(HULK))
say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
@@ -708,7 +689,7 @@
if(strength < CLEAN_STRENGTH_BLOOD)
return
if(gloves)
- if(gloves.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
+ if(SEND_SIGNAL(gloves, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
update_inv_gloves()
else
if(bloody_hands)
@@ -746,9 +727,8 @@
to_chat(src, "You can't do that right now!")
return FALSE
if(!Adjacent(M) && (M.loc != src))
- if((be_close == 0) && (dna.check_mutation(TK)))
- if(tkMaxRangeCheck(src, M))
- return TRUE
+ if((be_close == 0) || (dna.check_mutation(TK) && tkMaxRangeCheck(src, M)))
+ return TRUE
to_chat(src, "You are too far away!")
return FALSE
return TRUE
@@ -937,6 +917,9 @@
/mob/living/carbon/human/species/corporate
race = /datum/species/corporate
+/mob/living/carbon/human/species/dullahan
+ race = /datum/species/dullahan
+
/mob/living/carbon/human/species/fly
race = /datum/species/fly
@@ -1000,18 +983,36 @@
/mob/living/carbon/human/species/golem/plastic
race = /datum/species/golem/plastic
+/mob/living/carbon/human/species/golem/clockwork
+ race = /datum/species/golem/clockwork
+
+/mob/living/carbon/human/species/golem/clockwork/no_scrap
+ race = /datum/species/golem/clockwork/no_scrap
+
/mob/living/carbon/human/species/jelly
race = /datum/species/jelly
/mob/living/carbon/human/species/jelly/slime
race = /datum/species/jelly/slime
+/mob/living/carbon/human/species/jelly/stargazer
+ race = /datum/species/jelly/stargazer
+
+/mob/living/carbon/human/species/jelly/luminescent
+ race = /datum/species/jelly/luminescent
+
/mob/living/carbon/human/species/lizard
race = /datum/species/lizard
/mob/living/carbon/human/species/lizard/ashwalker
race = /datum/species/lizard/ashwalker
+/mob/living/carbon/human/species/moth
+ race = /datum/species/moth
+
+/mob/living/carbon/human/species/mush
+ race = /datum/species/mush
+
/mob/living/carbon/human/species/plasma
race = /datum/species/plasmaman
@@ -1021,6 +1022,9 @@
/mob/living/carbon/human/species/shadow
race = /datum/species/shadow
+/mob/living/carbon/human/species/shadow/nightmare
+ race = /datum/species/shadow/nightmare
+
/mob/living/carbon/human/species/skeleton
race = /datum/species/skeleton
@@ -1030,6 +1034,9 @@
/mob/living/carbon/human/species/synth/military
race = /datum/species/synth/military
+/mob/living/carbon/human/species/vampire
+ race = /datum/species/vampire
+
/mob/living/carbon/human/species/zombie
race = /datum/species/zombie
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 3f1ee1bd0e..acf4b0734c 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -144,7 +144,7 @@
I.forceMove(src)
L.receive_damage(I.w_class*I.embedding.embedded_impact_pain_multiplier)
visible_message("[I] embeds itself in [src]'s [L.name]!","[I] embeds itself in your [L.name]!")
- SendSignal(COMSIG_ADD_MOOD_EVENT, "embedded", /datum/mood_event/embedded)
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "embedded", /datum/mood_event/embedded)
hitpush = FALSE
skipcatch = TRUE //can't catch the now embedded item
@@ -173,7 +173,7 @@
affecting = get_bodypart(ran_zone(user.zone_selected))
var/target_area = parse_zone(check_zone(user.zone_selected)) //our intended target
- I.SendSignal(COMSIG_ITEM_ATTACK_ZONE, src, user, affecting)
+ SEND_SIGNAL(I, COMSIG_ITEM_ATTACK_ZONE, src, user, affecting)
SSblackbox.record_feedback("nested tally", "item_used_for_combat", 1, list("[I.force]", "[I.type]"))
SSblackbox.record_feedback("tally", "zone_targeted", 1, target_area)
@@ -469,6 +469,9 @@
/mob/living/carbon/human/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_CONTENTS)
+ return
var/informed = FALSE
for(var/obj/item/bodypart/L in src.bodyparts)
if(L.status == BODYPART_ROBOTIC)
@@ -482,7 +485,6 @@
if(2)
L.receive_damage(0,5)
Stun(100)
- ..()
/mob/living/carbon/human/acid_act(acidpwr, acid_volume, bodyzone_hit)
var/list/damaged = list()
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 47a866df97..c371465ffa 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -44,7 +44,6 @@
var/name_override //For temporary visible name changes
- var/drunkenness = 0 //Overall drunkenness - check handle_alcohol() in life.dm for effects
var/datum/personal_crafting/handcrafting
var/datum/physiology/physiology
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index f62f6d22c7..5bfbb76e46 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -11,7 +11,7 @@
if (!(lube&GALOSHES_DONT_HELP))
if(has_trait(TRAIT_NOSLIPWATER))
return 0
- if(shoes && is_type_in_typecache(shoes, GLOB.typecache_clothing))
+ if(shoes && istype(shoes, /obj/item/clothing))
var/obj/item/clothing/CS = shoes
if (CS.clothing_flags & NOSLIP)
return 0
@@ -19,7 +19,7 @@
/mob/living/carbon/human/experience_pressure_difference()
playsound(src, 'sound/effects/space_wind.ogg', 50, 1)
- if(shoes && is_type_in_typecache(shoes, GLOB.typecache_clothing))
+ if(shoes && istype(shoes, /obj/item/clothing))
var/obj/item/clothing/S = shoes
if (S.clothing_flags & NOSLIP)
return 0
@@ -67,6 +67,6 @@
S.step_action()
/mob/living/carbon/human/Process_Spacemove(movement_dir = 0) //Temporary laziness thing. Will change to handles by species reee.
- if(..())
- return 1
- return dna.species.space_move(src)
+ if(dna.species.space_move(src))
+ return TRUE
+ return ..()
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index cf8839d086..2216843716 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -48,7 +48,7 @@
return ONE_ATMOSPHERE
if(istype(loc, /obj/item/dogborg/sleeper))
return ONE_ATMOSPHERE //END OF CIT CHANGES
- if (wear_suit && head && is_type_in_typecache(wear_suit, GLOB.typecache_clothing) && is_type_in_typecache(head, GLOB.typecache_clothing))
+ if (wear_suit && head && istype(wear_suit, /obj/item/clothing) && istype(head, /obj/item/clothing))
var/obj/item/clothing/CS = wear_suit
var/obj/item/clothing/CH = head
if (CS.clothing_flags & CH.clothing_flags & STOPSPRESSUREDAMAGE)
@@ -66,14 +66,14 @@
adjust_blurriness(-1)
if (getBrainLoss() >= 60 && !incapacitated(TRUE))
- SendSignal(COMSIG_ADD_MOOD_EVENT, "brain_damage", /datum/mood_event/brain_damage)
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "brain_damage", /datum/mood_event/brain_damage)
if(prob(3))
if(prob(25))
emote("drool")
else
say(pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage"))
else
- SendSignal(COMSIG_CLEAR_MOOD_EVENT, "brain_damage")
+ SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "brain_damage")
/mob/living/carbon/human/handle_mutations_and_radiation()
if(!dna || !dna.species.handle_mutations_and_radiation(src))
@@ -236,8 +236,6 @@
return thermal_protection_flags
/mob/living/carbon/human/proc/get_cold_protection(temperature)
- if(has_trait(TRAIT_RESISTCOLD))
- return TRUE
//CITADEL EDIT Mandatory for vore code.
if(istype(loc, /obj/item/dogborg/sleeper))
return TRUE //freezing to death in sleepers ruins fun.
@@ -293,7 +291,7 @@
if(glasses)
if(glasses.clothing_flags & BLOCK_GAS_SMOKE_EFFECT)
return TRUE
- if(head && is_type_in_typecache(head, GLOB.typecache_clothing))
+ if(head && istype(head, /obj/item/clothing))
var/obj/item/clothing/CH = head
if(CH.clothing_flags & BLOCK_GAS_SMOKE_EFFECT)
return TRUE
@@ -315,7 +313,7 @@
visible_message("[I] falls out of [name]'s [BP.name]!","[I] falls out of your [BP.name]!")
if(!has_embedded_objects())
clear_alert("embeddedobject")
- SendSignal(COMSIG_CLEAR_MOOD_EVENT, "embedded")
+ SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "embedded")
/mob/living/carbon/human/proc/handle_active_genes()
for(var/datum/mutation/human/HM in dna.mutations)
@@ -341,108 +339,8 @@
// Tissues die without blood circulation
adjustBruteLoss(2)
-/*
-Alcohol Poisoning Chart
-Note that all higher effects of alcohol poisoning will inherit effects for smaller amounts (i.e. light poisoning inherts from slight poisoning)
-In addition, severe effects won't always trigger unless the drink is poisonously strong
-All effects don't start immediately, but rather get worse over time; the rate is affected by the imbiber's alcohol tolerance
-
-0: Non-alcoholic
-1-10: Barely classifiable as alcohol - occassional slurring
-11-20: Slight alcohol content - slurring
-21-30: Below average - imbiber begins to look slightly drunk
-31-40: Just below average - no unique effects
-41-50: Average - mild disorientation, imbiber begins to look drunk
-51-60: Just above average - disorientation, vomiting, imbiber begins to look heavily drunk
-61-70: Above average - small chance of blurry vision, imbiber begins to look smashed
-71-80: High alcohol content - blurry vision, imbiber completely shitfaced
-81-90: Extremely high alcohol content - light brain damage, passing out
-91-100: Dangerously toxic - swift death
-*/
-#define BALLMER_POINTS 5
-GLOBAL_LIST_INIT(ballmer_good_msg, list("Hey guys, what if we rolled out a bluespace wiring system so mice can't destroy the powergrid anymore?",
- "Hear me out here. What if, and this is just a theory, we made R&D controllable from our PDAs?",
- "I'm thinking we should roll out a git repository for our research under the AGPLv3 license so that we can share it among the other stations freely.",
- "I dunno about you guys, but IDs and PDAs being separate is clunky as fuck. Maybe we should merge them into a chip in our arms? That way they can't be stolen easily.",
- "Why the fuck aren't we just making every pair of shoes into galoshes? We have the technology."))
-GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put a webserver that's automatically turned on with default admin passwords into every PDA?",
- "So like, you know how we separate our codebase from the master copy that runs on our consumer boxes? What if we merged the two and undid the separation between codebase and server?",
- "Dude, radical idea: H.O.N.K mechs but with no bananium required.",
- "Best idea ever: Disposal pipes instead of hallways."))
-/mob/living/carbon/human/handle_status_effects()
- ..()
- if(drunkenness)
- drunkenness = max(drunkenness - (drunkenness * 0.04), 0)
- if(drunkenness >= 6)
- if(prob(25))
- slurring += 2
- jitteriness = max(jitteriness - 3, 0)
- if(has_trait(TRAIT_DRUNK_HEALING))
- adjustBruteLoss(-0.12, FALSE)
- adjustFireLoss(-0.06, FALSE)
-
- if(drunkenness >= 11 && slurring < 5)
- slurring += 1.2
-
- if(mind && (mind.assigned_role == "Scientist" || mind.assigned_role == "Research Director"))
- if(SSresearch.science_tech)
- if(drunkenness >= 12.9 && drunkenness <= 13.8)
- drunkenness = round(drunkenness, 0.01)
- var/ballmer_percent = 0
- if(drunkenness == 13.35) // why run math if I dont have to
- ballmer_percent = 1
- else
- ballmer_percent = (-abs(drunkenness - 13.35) / 0.9) + 1
- if(prob(5))
- say(pick(GLOB.ballmer_good_msg))
- SSresearch.science_tech.add_points_all(TECHWEB_POINT_TYPE_DEFAULT, (BALLMER_POINTS * ballmer_percent))
- if(drunkenness > 26) // by this point you're into windows ME territory
- if(prob(5))
- SSresearch.science_tech.remove_points_all(TECHWEB_POINT_TYPE_DEFAULT, BALLMER_POINTS)
- say(pick(GLOB.ballmer_windows_me_msg))
-
- if(drunkenness >= 41)
- if(prob(25))
- confused += 2
- Dizzy(10)
- if(has_trait(TRAIT_DRUNK_HEALING)) // effects stack with lower tiers
- adjustBruteLoss(-0.3, FALSE)
- adjustFireLoss(-0.15, FALSE)
-
- if(drunkenness >= 51)
- if(prob(5))
- confused += 10
- vomit()
- Dizzy(25)
-
- if(drunkenness >= 61)
- if(prob(50))
- blur_eyes(5)
- if(has_trait(TRAIT_DRUNK_HEALING))
- adjustBruteLoss(-0.4, FALSE)
- adjustFireLoss(-0.2, FALSE)
-
- if(drunkenness >= 71)
- blur_eyes(5)
-
- if(drunkenness >= 81)
- adjustToxLoss(0.2)
- if(prob(5) && !stat)
- to_chat(src, "Maybe you should lie down for a bit...")
-
- if(drunkenness >= 91)
- adjustBrainLoss(0.4, 60)
- if(prob(20) && !stat)
- if(SSshuttle.emergency.mode == SHUTTLE_DOCKED && is_station_level(z)) //QoL mainly
- to_chat(src, "You're so tired... but you can't miss that shuttle...")
- else
- to_chat(src, "Just a quick nap...")
- Sleeping(900)
-
- if(drunkenness >= 101)
- adjustToxLoss(4) //Let's be honest you shouldn't be alive by now
#undef THERMAL_PROTECTION_HEAD
#undef THERMAL_PROTECTION_CHEST
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 2b5ed79d7b..ac1611b676 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -970,7 +970,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
return FALSE
return equip_delay_self_check(I, H, bypass_equip_delay_self)
if(SLOT_L_STORE)
- if(I.flags_1 & NODROP_1) //Pockets aren't visible, so you can't move NODROP_1 items into them.
+ if(I.item_flags & NODROP) //Pockets aren't visible, so you can't move NODROP_1 items into them.
return FALSE
if(H.l_store)
return FALSE
@@ -986,7 +986,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if( I.w_class <= WEIGHT_CLASS_SMALL || (I.slot_flags & ITEM_SLOT_POCKET) )
return TRUE
if(SLOT_R_STORE)
- if(I.flags_1 & NODROP_1)
+ if(I.item_flags & NODROP)
return FALSE
if(H.r_store)
return FALSE
@@ -1003,7 +1003,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
return TRUE
return FALSE
if(SLOT_S_STORE)
- if(I.flags_1 & NODROP_1)
+ if(I.item_flags & NODROP)
return FALSE
if(H.s_store)
return FALSE
@@ -1040,7 +1040,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
return TRUE
if(SLOT_IN_BACKPACK)
if(H.back)
- if(H.back.SendSignal(COMSIG_TRY_STORAGE_CAN_INSERT, I, H, TRUE))
+ if(SEND_SIGNAL(H.back, COMSIG_TRY_STORAGE_CAN_INSERT, I, H, TRUE))
return TRUE
return FALSE
return FALSE //Unsupported slot
@@ -1088,7 +1088,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_inv_w_uniform()
H.update_inv_wear_suit()
else
- if(H.overeatduration > 500)
+ if(H.overeatduration >= 100)
to_chat(H, "You suddenly feel blubbery!")
H.add_trait(TRAIT_FAT, OBESITY)
H.update_inv_w_uniform()
@@ -1138,22 +1138,22 @@ GLOBAL_LIST_EMPTY(roundstart_races)
switch(H.nutrition)
if(NUTRITION_LEVEL_FULL to INFINITY)
- H.SendSignal(COMSIG_ADD_MOOD_EVENT, "nutrition", /datum/mood_event/nutrition/fat)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "nutrition", /datum/mood_event/nutrition/fat)
H.throw_alert("nutrition", /obj/screen/alert/fat)
if(NUTRITION_LEVEL_WELL_FED to NUTRITION_LEVEL_FULL)
- H.SendSignal(COMSIG_ADD_MOOD_EVENT, "nutrition", /datum/mood_event/nutrition/wellfed)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "nutrition", /datum/mood_event/nutrition/wellfed)
H.clear_alert("nutrition")
if( NUTRITION_LEVEL_FED to NUTRITION_LEVEL_WELL_FED)
- H.SendSignal(COMSIG_ADD_MOOD_EVENT, "nutrition", /datum/mood_event/nutrition/fed)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "nutrition", /datum/mood_event/nutrition/fed)
H.clear_alert("nutrition")
if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_FED)
- H.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "nutrition")
+ SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "nutrition")
H.clear_alert("nutrition")
if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_HUNGRY)
- H.SendSignal(COMSIG_ADD_MOOD_EVENT, "nutrition", /datum/mood_event/nutrition/hungry)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "nutrition", /datum/mood_event/nutrition/hungry)
H.throw_alert("nutrition", /obj/screen/alert/hungry)
if(0 to NUTRITION_LEVEL_STARVING)
- H.SendSignal(COMSIG_ADD_MOOD_EVENT, "nutrition", /datum/mood_event/nutrition/starving)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "nutrition", /datum/mood_event/nutrition/starving)
H.throw_alert("nutrition", /obj/screen/alert/starving)
/datum/species/proc/update_health_hud(mob/living/carbon/human/H)
@@ -1211,8 +1211,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(H.movement_type & FLYING)
flight = 1
- if(H.has_gravity())
- gravity = TRUE
+ gravity = H.has_gravity()
if(!flightpack && gravity) //Check for chemicals and innate speedups and slowdowns if we're moving using our body and not a flying suit
if(H.has_trait(TRAIT_GOTTAGOFAST))
@@ -1260,6 +1259,15 @@ GLOBAL_LIST_EMPTY(roundstart_races)
. += ((health_deficiency-39) / 75) // CIT CHANGE - adds -39 to health deficiency penalty to make the transition to low health movement a little less jarring
else
. += ((health_deficiency-39) / 25) // CIT CHANGE - ditto
+ if(CONFIG_GET(flag/disable_human_mood))
+ var/hungry = (500 - H.nutrition) / 5 //So overeat would be 100 and default level would be 80
+ if((hungry >= 70) && !flight) //Being hungry will still allow you to use a flightsuit/wings.
+ . += hungry / 50
+
+ //Moving in high gravity is very slow (Flying too)
+ if(gravity > STANDARD_GRAVITY)
+ var/grav_force = min(gravity - STANDARD_GRAVITY,3)
+ . += 1 + grav_force
GET_COMPONENT_FROM(mood, /datum/component/mood, H)
if(mood && !flight) //How can depression slow you down if you can just fly away from your problems?
@@ -1273,7 +1281,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(H.has_trait(TRAIT_FAT))
. += (1.5 - flight)
- if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT)
+ if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !H.has_trait(TRAIT_RESISTCOLD))
. += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR
return .
@@ -1414,7 +1422,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(target.w_uniform)
target.w_uniform.add_fingerprint(user)
//var/randomized_zone = ran_zone(user.zone_selected) CIT CHANGE - comments out to prevent compiling errors
- target.SendSignal(COMSIG_HUMAN_DISARM_HIT, user, user.zone_selected)
+ SEND_SIGNAL(target, COMSIG_HUMAN_DISARM_HIT, user, user.zone_selected)
//var/obj/item/bodypart/affecting = target.get_bodypart(randomized_zone) CIT CHANGE - comments this out to prevent compile errors due to the below commented out bit
var/randn = rand(1, 100)
/*if(randn <= 25) CITADEL CHANGE - moves disarm push attempts to right click
@@ -1453,7 +1461,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
playsound(target, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
target.visible_message("[user] attempted to disarm [target]!", \
"[user] attemped to disarm [target]!", null, COMBAT_MESSAGE_RANGE)
-
+ add_logs(user, target, "attempted to disarm")
/datum/species/proc/spec_hitby(atom/movable/AM, mob/living/carbon/human/H)
@@ -1697,9 +1705,11 @@ GLOBAL_LIST_EMPTY(roundstart_races)
// +/- 50 degrees from 310K is the 'safe' zone, where no damage is dealt.
if(H.bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT && !H.has_trait(TRAIT_RESISTHEAT))
//Body temperature is too hot.
+
+ SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "cold")
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "hot", /datum/mood_event/hot)
+
var/burn_damage
- H.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "cold")
- H.SendSignal(COMSIG_ADD_MOOD_EVENT, "hot", /datum/mood_event/hot)
switch(H.bodytemperature)
if(BODYTEMP_HEAT_DAMAGE_LIMIT to 400)
H.throw_alert("temp", /obj/screen/alert/hot, 1)
@@ -1718,9 +1728,9 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.emote("scream")
H.apply_damage(burn_damage, BURN)
- else if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !(GLOB.mutations_list[COLDRES] in H.dna.mutations))
- H.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "hot")
- H.SendSignal(COMSIG_ADD_MOOD_EVENT, "cold", /datum/mood_event/cold)
+ else if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !H.has_trait(TRAIT_RESISTCOLD))
+ SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "hot")
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "cold", /datum/mood_event/cold)
switch(H.bodytemperature)
if(200 to BODYTEMP_COLD_DAMAGE_LIMIT)
H.throw_alert("temp", /obj/screen/alert/cold, 1)
@@ -1734,8 +1744,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
else
H.clear_alert("temp")
- H.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "cold")
- H.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "hot")
+ SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "cold")
+ SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "hot")
var/pressure = environment.return_pressure()
var/adjusted_pressure = H.calculate_affecting_pressure(pressure) //Returns how much pressure actually affects the mob.
@@ -1829,7 +1839,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.adjust_bodytemperature(11)
else
H.adjust_bodytemperature(BODYTEMP_HEATING_MAX + (H.fire_stacks * 12))
- H.SendSignal(COMSIG_ADD_MOOD_EVENT, "on_fire", /datum/mood_event/on_fire)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "on_fire", /datum/mood_event/on_fire)
/datum/species/proc/CanIgniteMob(mob/living/carbon/human/H)
if(H.has_trait(TRAIT_NOFIRE))
@@ -1856,12 +1866,3 @@ GLOBAL_LIST_EMPTY(roundstart_races)
/datum/species/proc/negates_gravity(mob/living/carbon/human/H)
return 0
-
-
-#undef HEAT_DAMAGE_LEVEL_1
-#undef HEAT_DAMAGE_LEVEL_2
-#undef HEAT_DAMAGE_LEVEL_3
-
-#undef COLD_DAMAGE_LEVEL_1
-#undef COLD_DAMAGE_LEVEL_2
-#undef COLD_DAMAGE_LEVEL_3
diff --git a/code/modules/mob/living/carbon/human/species_types/android.dm b/code/modules/mob/living/carbon/human/species_types/android.dm
index 24343f0f00..c4665b5d6d 100644
--- a/code/modules/mob/living/carbon/human/species_types/android.dm
+++ b/code/modules/mob/living/carbon/human/species_types/android.dm
@@ -3,7 +3,7 @@
id = "android"
say_mod = "states"
species_traits = list(NOBLOOD)
- inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOFIRE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_LIMBATTACHMENT)
+ inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_NOFIRE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_LIMBATTACHMENT)
inherent_biotypes = list(MOB_ROBOTIC, MOB_HUMANOID)
meat = null
damage_overlay_type = "synth"
diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm
index ae90bb8597..a266f42f4a 100644
--- a/code/modules/mob/living/carbon/human/species_types/humans.dm
+++ b/code/modules/mob/living/carbon/human/species_types/humans.dm
@@ -24,11 +24,6 @@
H.endTailWag()
. = ..()
-/datum/species/human/space_move(mob/living/carbon/human/H)
- var/obj/item/flightpack/F = H.get_flightpack()
- if(istype(F) && (F.flight) && F.allow_thrust(0.01, src))
- return TRUE
-
/datum/species/human/on_species_gain(mob/living/carbon/human/H, datum/species/old_species)
if(H.dna.features["ears"] == "Cat")
mutantears = /obj/item/organ/ears/cat
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index 6f2fd68ac7..7f5726cf95 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -669,6 +669,8 @@
/datum/action/innate/project_thought/Activate()
var/mob/living/carbon/human/H = owner
+ if(H.stat == DEAD)
+ return
if(!is_species(H, /datum/species/jelly/stargazer))
return
CHECK_DNA_AND_SPECIES(H)
@@ -682,7 +684,7 @@
var/msg = sanitize(input("Message:", "Telepathy") as text|null)
if(msg)
- log_talk(H,"SlimeTelepathy: [key_name(H)]->[M.key] : [msg]",LOGSAY)
+ log_talk(H,"SlimeTelepathy: [key_name(H)]->[key_name(M)] : [msg]",LOGSAY)
to_chat(M, "You hear an alien voice in your head... [msg]")
to_chat(H, "You telepathically said: \"[msg]\" to [M]")
for(var/dead in GLOB.dead_mob_list)
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 67d2b0e5ba..6f5ae6f4eb 100644
--- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
@@ -25,7 +25,7 @@
/datum/species/plasmaman/spec_life(mob/living/carbon/human/H)
var/datum/gas_mixture/environment = H.loc.return_air()
var/atmos_sealed = FALSE
- if (H.wear_suit && H.head && is_type_in_typecache(H.wear_suit, GLOB.typecache_clothing) && is_type_in_typecache(H.head, GLOB.typecache_clothing))
+ if (H.wear_suit && H.head && istype(H.wear_suit, /obj/item/clothing) && istype(H.head, /obj/item/clothing))
var/obj/item/clothing/CS = H.wear_suit
var/obj/item/clothing/CH = H.head
if (CS.clothing_flags & CH.clothing_flags & STOPSPRESSUREDAMAGE)
diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
index 4ef4fe4887..22a44e3fa7 100644
--- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
@@ -171,7 +171,7 @@
armour_penetration = 35
lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi'
- flags_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1
+ item_flags = ABSTRACT | NODROP | DROPDEL
w_class = WEIGHT_CLASS_HUGE
sharpness = IS_SHARP
@@ -216,4 +216,4 @@
playsound(src, 'sound/items/welder.ogg', 50, 1)
#undef HEART_SPECIAL_SHADOWIFY
-#undef HEART_RESPAWN_THRESHHOLD
\ No newline at end of file
+#undef HEART_RESPAWN_THRESHHOLD
diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm
index 59052e2249..59de0755a2 100644
--- a/code/modules/mob/living/carbon/human/species_types/vampire.dm
+++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm
@@ -39,7 +39,7 @@
/datum/species/vampire/spec_life(mob/living/carbon/human/C)
. = ..()
- if(istype(C.loc, /obj/structure/closet/coffin))
+ if(istype(C.loc, /obj/structure/closet/crate/coffin))
C.heal_overall_damage(4,4)
C.adjustToxLoss(-4)
C.adjustOxyLoss(-4)
diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm
index bca70c053c..bc2d6132e1 100644
--- a/code/modules/mob/living/carbon/inventory.dm
+++ b/code/modules/mob/living/carbon/inventory.dm
@@ -72,7 +72,7 @@
put_in_hands(I)
update_inv_hands()
if(SLOT_IN_BACKPACK)
- if(!back.SendSignal(COMSIG_TRY_STORAGE_INSERT, I, src, TRUE))
+ if(!SEND_SIGNAL(back, COMSIG_TRY_STORAGE_INSERT, I, src, TRUE))
not_handled = TRUE
else
not_handled = TRUE
@@ -137,3 +137,6 @@
update_inv_wear_mask()
update_inv_head()
+/mob/living/carbon/proc/get_holding_bodypart_of_item(obj/item/I)
+ var/index = get_held_index_of_item(I)
+ return index && hand_bodyparts[index]
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 814ce0ef0f..ff4b77a4ee 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -156,7 +156,7 @@
adjustOxyLoss(3)
failed_last_breath = 1
throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
- SendSignal(COMSIG_ADD_MOOD_EVENT, "suffocation", /datum/mood_event/suffocation)
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "suffocation", /datum/mood_event/suffocation)
else //Enough oxygen
failed_last_breath = 0
@@ -164,7 +164,7 @@
adjustOxyLoss(-5)
oxygen_used = breath_gases[/datum/gas/oxygen][MOLES]
clear_alert("not_enough_oxy")
- SendSignal(COMSIG_CLEAR_MOOD_EVENT, "suffocation")
+ SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "suffocation")
breath_gases[/datum/gas/oxygen][MOLES] -= oxygen_used
breath_gases[/datum/gas/carbon_dioxide][MOLES] += oxygen_used
@@ -325,6 +325,36 @@
M.adjustBruteLoss(5)
nutrition += 10
+
+/*
+Alcohol Poisoning Chart
+Note that all higher effects of alcohol poisoning will inherit effects for smaller amounts (i.e. light poisoning inherts from slight poisoning)
+In addition, severe effects won't always trigger unless the drink is poisonously strong
+All effects don't start immediately, but rather get worse over time; the rate is affected by the imbiber's alcohol tolerance
+
+0: Non-alcoholic
+1-10: Barely classifiable as alcohol - occassional slurring
+11-20: Slight alcohol content - slurring
+21-30: Below average - imbiber begins to look slightly drunk
+31-40: Just below average - no unique effects
+41-50: Average - mild disorientation, imbiber begins to look drunk
+51-60: Just above average - disorientation, vomiting, imbiber begins to look heavily drunk
+61-70: Above average - small chance of blurry vision, imbiber begins to look smashed
+71-80: High alcohol content - blurry vision, imbiber completely shitfaced
+81-90: Extremely high alcohol content - light brain damage, passing out
+91-100: Dangerously toxic - swift death
+*/
+#define BALLMER_POINTS 5
+GLOBAL_LIST_INIT(ballmer_good_msg, list("Hey guys, what if we rolled out a bluespace wiring system so mice can't destroy the powergrid anymore?",
+ "Hear me out here. What if, and this is just a theory, we made R&D controllable from our PDAs?",
+ "I'm thinking we should roll out a git repository for our research under the AGPLv3 license so that we can share it among the other stations freely.",
+ "I dunno about you guys, but IDs and PDAs being separate is clunky as fuck. Maybe we should merge them into a chip in our arms? That way they can't be stolen easily.",
+ "Why the fuck aren't we just making every pair of shoes into galoshes? We have the technology."))
+GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put a webserver that's automatically turned on with default admin passwords into every PDA?",
+ "So like, you know how we separate our codebase from the master copy that runs on our consumer boxes? What if we merged the two and undid the separation between codebase and server?",
+ "Dude, radical idea: H.O.N.K mechs but with no bananium required.",
+ "Best idea ever: Disposal pipes instead of hallways."))
+
//this updates all special effects: stun, sleeping, knockdown, druggy, stuttering, etc..
/mob/living/carbon/handle_status_effects()
..()
@@ -404,6 +434,77 @@
if(hallucination)
handle_hallucinations()
+ if(drunkenness)
+ drunkenness = max(drunkenness - (drunkenness * 0.04), 0)
+ if(drunkenness >= 6)
+ if(prob(25))
+ slurring += 2
+ jitteriness = max(jitteriness - 3, 0)
+ if(has_trait(TRAIT_DRUNK_HEALING))
+ adjustBruteLoss(-0.12, FALSE)
+ adjustFireLoss(-0.06, FALSE)
+
+ if(drunkenness >= 11 && slurring < 5)
+ slurring += 1.2
+
+ if(mind && (mind.assigned_role == "Scientist" || mind.assigned_role == "Research Director"))
+ if(SSresearch.science_tech)
+ if(drunkenness >= 12.9 && drunkenness <= 13.8)
+ drunkenness = round(drunkenness, 0.01)
+ var/ballmer_percent = 0
+ if(drunkenness == 13.35) // why run math if I dont have to
+ ballmer_percent = 1
+ else
+ ballmer_percent = (-abs(drunkenness - 13.35) / 0.9) + 1
+ if(prob(5))
+ say(pick(GLOB.ballmer_good_msg))
+ SSresearch.science_tech.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = BALLMER_POINTS * ballmer_percent))
+ if(drunkenness > 26) // by this point you're into windows ME territory
+ if(prob(5))
+ SSresearch.science_tech.remove_point_list(list(TECHWEB_POINT_TYPE_GENERIC = BALLMER_POINTS))
+ say(pick(GLOB.ballmer_windows_me_msg))
+
+ if(drunkenness >= 41)
+ if(prob(25))
+ confused += 2
+ Dizzy(10)
+ if(has_trait(TRAIT_DRUNK_HEALING)) // effects stack with lower tiers
+ adjustBruteLoss(-0.3, FALSE)
+ adjustFireLoss(-0.15, FALSE)
+
+ if(drunkenness >= 51)
+ if(prob(5))
+ confused += 10
+ vomit()
+ Dizzy(25)
+
+ if(drunkenness >= 61)
+ if(prob(50))
+ blur_eyes(5)
+ if(has_trait(TRAIT_DRUNK_HEALING))
+ adjustBruteLoss(-0.4, FALSE)
+ adjustFireLoss(-0.2, FALSE)
+
+ if(drunkenness >= 71)
+ blur_eyes(5)
+
+ if(drunkenness >= 81)
+ adjustToxLoss(0.2)
+ if(prob(5) && !stat)
+ to_chat(src, "Maybe you should lie down for a bit...")
+
+ if(drunkenness >= 91)
+ adjustBrainLoss(0.4, 60)
+ if(prob(20) && !stat)
+ if(SSshuttle.emergency.mode == SHUTTLE_DOCKED && is_station_level(z)) //QoL mainly
+ to_chat(src, "You're so tired... but you can't miss that shuttle...")
+ else
+ to_chat(src, "Just a quick nap...")
+ Sleeping(900)
+
+ if(drunkenness >= 101)
+ adjustToxLoss(4) //Let's be honest you shouldn't be alive by now
+
//used in human and monkey handle_environment()
/mob/living/carbon/proc/natural_bodytemperature_stabilization()
var/body_temperature_difference = BODYTEMP_NORMAL - bodytemperature
diff --git a/code/modules/mob/living/carbon/monkey/combat.dm b/code/modules/mob/living/carbon/monkey/combat.dm
index ed60456b67..303057d376 100644
--- a/code/modules/mob/living/carbon/monkey/combat.dm
+++ b/code/modules/mob/living/carbon/monkey/combat.dm
@@ -133,7 +133,7 @@
/mob/living/carbon/monkey/proc/handle_combat()
if(pickupTarget)
- if(restrained() || blacklistItems[pickupTarget] || (pickupTarget.flags_1 & NODROP_1))
+ if(restrained() || blacklistItems[pickupTarget] || (pickupTarget.item_flags & NODROP))
pickupTarget = null
else
pickupTimer++
@@ -220,12 +220,12 @@
return TRUE
if(target && target.stat == CONSCIOUS) // make sure target exists
- if(Adjacent(target) && isturf(target.loc)) // if right next to perp
+ if(Adjacent(target) && isturf(target.loc) && !IsDeadOrIncap()) // if right next to perp
// check if target has a weapon
var/obj/item/W
for(var/obj/item/I in target.held_items)
- if(!(I.flags_1 & ABSTRACT_1))
+ if(!(I.item_flags & ABSTRACT))
W = I
break
diff --git a/code/modules/mob/living/carbon/monkey/inventory.dm b/code/modules/mob/living/carbon/monkey/inventory.dm
index 113d2a6e2f..fdc28d13a0 100644
--- a/code/modules/mob/living/carbon/monkey/inventory.dm
+++ b/code/modules/mob/living/carbon/monkey/inventory.dm
@@ -29,3 +29,6 @@
return FALSE
return TRUE
return FALSE //Unsupported slot
+
+
+
diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm
index 879aa82750..1ddea78bf2 100644
--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ b/code/modules/mob/living/carbon/monkey/life.dm
@@ -1,10 +1,4 @@
-#define HEAT_DAMAGE_LEVEL_1 2 //Amount of damage applied when your body temperature just passes the 360.15k safety point
-#define HEAT_DAMAGE_LEVEL_2 3 //Amount of damage applied when your body temperature passes the 400K point
-#define HEAT_DAMAGE_LEVEL_3 10 //Amount of damage applied when your body temperature passes the 460K point and you are on fire
-#define COLD_DAMAGE_LEVEL_1 0.5 //Amount of damage applied when your body temperature just passes the 260.15k safety point
-#define COLD_DAMAGE_LEVEL_2 1.5 //Amount of damage applied when your body temperature passes the 200K point
-#define COLD_DAMAGE_LEVEL_3 3 //Amount of damage applied when your body temperature passes the 120K point
/mob/living/carbon/monkey
@@ -87,7 +81,7 @@
adjust_bodytemperature(min((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR, BODYTEMP_HEATING_MAX))
- if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT)
+ if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT && !has_trait(TRAIT_RESISTHEAT))
switch(bodytemperature)
if(360 to 400)
throw_alert("temp", /obj/screen/alert/hot, 1)
@@ -102,7 +96,7 @@
else
apply_damage(HEAT_DAMAGE_LEVEL_2, BURN)
- else if(bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT)
+ else if(bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !has_trait(TRAIT_RESISTCOLD))
if(!istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell))
switch(bodytemperature)
if(200 to 260)
@@ -175,12 +169,4 @@
I.take_damage(fire_stacks, BURN, "fire", 0)
adjust_bodytemperature(BODYTEMP_HEATING_MAX)
- SendSignal(COMSIG_ADD_MOOD_EVENT, "on_fire", /datum/mood_event/on_fire)
-
-#undef HEAT_DAMAGE_LEVEL_1
-#undef HEAT_DAMAGE_LEVEL_2
-#undef HEAT_DAMAGE_LEVEL_3
-
-#undef COLD_DAMAGE_LEVEL_1
-#undef COLD_DAMAGE_LEVEL_2
-#undef COLD_DAMAGE_LEVEL_3
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "on_fire", /datum/mood_event/on_fire)
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index 28ba50a308..d1d9c4370e 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -33,9 +33,10 @@
. = ..()
if (cubespawned)
- if (LAZYLEN(SSmobs.cubemonkeys) > SSmobs.cubemonkeycap)
+ var/cap = CONFIG_GET(number/monkeycap)
+ if (LAZYLEN(SSmobs.cubemonkeys) > cap)
if (spawner)
- to_chat(spawner, "Bluespace harmonics prevent the spawning of more than [SSmobs.cubemonkeycap] monkeys on the station at one time!")
+ to_chat(spawner, "Bluespace harmonics prevent the spawning of more than [cap] monkeys on the station at one time!")
return INITIALIZE_HINT_QDEL
SSmobs.cubemonkeys += src
diff --git a/code/modules/mob/living/carbon/status_procs.dm b/code/modules/mob/living/carbon/status_procs.dm
index 1d619364e0..d850efcee6 100644
--- a/code/modules/mob/living/carbon/status_procs.dm
+++ b/code/modules/mob/living/carbon/status_procs.dm
@@ -45,11 +45,11 @@
if(druggy)
overlay_fullscreen("high", /obj/screen/fullscreen/high)
throw_alert("high", /obj/screen/alert/high)
- SendSignal(COMSIG_ADD_MOOD_EVENT, "high", /datum/mood_event/drugs/high)
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "high", /datum/mood_event/drugs/high)
else
clear_fullscreen("high")
clear_alert("high")
- SendSignal(COMSIG_CLEAR_MOOD_EVENT, "high")
+ SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "high")
/mob/living/carbon/set_drugginess(amount)
druggy = max(amount, 0)
diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm
index af685e91cb..212b96e6d9 100644
--- a/code/modules/mob/living/carbon/update_icons.dm
+++ b/code/modules/mob/living/carbon/update_icons.dm
@@ -124,7 +124,7 @@
if(wear_mask)
if(!(head && (head.flags_inv & HIDEMASK)))
- overlays_standing[FACEMASK_LAYER] = wear_mask.build_worn_icon(state = wear_mask.icon_state, default_layer = FACEMASK_LAYER, default_icon_file = ((wear_mask.icon_override) ? wear_mask.icon_override : 'icons/mob/mask.dmi'))
+ overlays_standing[FACEMASK_LAYER] = wear_mask.build_worn_icon(state = wear_mask.icon_state, default_layer = FACEMASK_LAYER, default_icon_file = 'icons/mob/mask.dmi')
update_hud_wear_mask(wear_mask)
apply_overlay(FACEMASK_LAYER)
@@ -138,7 +138,7 @@
if(wear_neck)
if(!(head && (head.flags_inv & HIDENECK)))
- overlays_standing[NECK_LAYER] = wear_neck.build_worn_icon(state = wear_neck.icon_state, default_layer = NECK_LAYER, default_icon_file = ((wear_neck.icon_override) ? wear_neck.icon_override : 'icons/mob/neck.dmi'))
+ overlays_standing[NECK_LAYER] = wear_neck.build_worn_icon(state = wear_neck.icon_state, default_layer = NECK_LAYER, default_icon_file = 'icons/mob/neck.dmi')
update_hud_neck(wear_neck)
apply_overlay(NECK_LAYER)
@@ -151,7 +151,7 @@
inv.update_icon()
if(back)
- overlays_standing[BACK_LAYER] = back.build_worn_icon(state = back.icon_state, default_layer = BACK_LAYER, default_icon_file = ((back.icon_override) ? back.icon_override : 'icons/mob/back.dmi'))
+ overlays_standing[BACK_LAYER] = back.build_worn_icon(state = back.icon_state, default_layer = BACK_LAYER, default_icon_file = 'icons/mob/back.dmi')
update_hud_back(back)
apply_overlay(BACK_LAYER)
@@ -167,7 +167,7 @@
inv.update_icon()
if(head)
- overlays_standing[HEAD_LAYER] = head.build_worn_icon(state = head.icon_state, default_layer = HEAD_LAYER, default_icon_file = ((head.icon_override) ? head.icon_override : 'icons/mob/head.dmi'))
+ overlays_standing[HEAD_LAYER] = head.build_worn_icon(state = head.icon_state, default_layer = HEAD_LAYER, default_icon_file = 'icons/mob/head.dmi')
update_hud_head(head)
apply_overlay(HEAD_LAYER)
@@ -235,22 +235,11 @@
if(limb_icon_cache[icon_render_key])
load_limb_from_cache()
return
- //Taur code goes here, since humans just inherit this proc
- var/is_taur = FALSE
- if(ishuman(src))
- var/mob/living/carbon/human/H = src
- if(("taur" in H.dna.species.mutant_bodyparts) && (H.dna.features["taur"] != "None"))
- is_taur = TRUE
//GENERATE NEW LIMBS
var/list/new_limbs = list()
for(var/X in bodyparts)
var/obj/item/bodypart/BP = X
-
- if(istype(BP, /obj/item/bodypart/r_leg) || istype(BP, /obj/item/bodypart/l_leg))
- if(is_taur)
- continue
-
new_limbs += BP.get_limb_icon()
if(new_limbs.len)
overlays_standing[BODYPARTS_LAYER] = new_limbs
diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm
index 011fa23230..dfc81396e7 100644
--- a/code/modules/mob/living/damage_procs.dm
+++ b/code/modules/mob/living/damage_procs.dm
@@ -27,9 +27,6 @@
adjustStaminaLoss(damage * hit_percent)
if(BRAIN)
adjustBrainLoss(damage * hit_percent)
- //citadel code
- if(AROUSAL)
- adjustArousalLoss(damage * hit_percent)
return 1
/mob/living/proc/apply_damage_type(damage = 0, damagetype = BRUTE) //like apply damage except it always uses the damage procs
@@ -48,9 +45,6 @@
return adjustStaminaLoss(damage)
if(BRAIN)
return adjustBrainLoss(damage)
- //citadel code
- if(AROUSAL)
- return adjustArousalLoss(damage)
/mob/living/proc/get_damage_amount(damagetype = BRUTE)
switch(damagetype)
@@ -68,12 +62,9 @@
return getStaminaLoss()
if(BRAIN)
return getBrainLoss()
- //citadel code
- if(AROUSAL)
- return getArousalLoss()
-/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, def_zone = null, blocked = FALSE, stamina = 0, brain = 0, arousal = 0)
+/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, def_zone = null, blocked = FALSE, stamina = 0, brain = 0)
if(blocked >= 100)
return 0
if(brute)
@@ -90,9 +81,6 @@
apply_damage(stamina, STAMINA, def_zone, blocked)
if(brain)
apply_damage(brain, BRAIN, def_zone, blocked)
- //citadel code
- if(arousal)
- apply_damage(arousal, AROUSAL, def_zone, blocked)
return 1
diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
index ee16e4103f..35c2abac9c 100644
--- a/code/modules/mob/living/death.dm
+++ b/code/modules/mob/living/death.dm
@@ -26,8 +26,11 @@
/mob/living/proc/spread_bodyparts()
return
-/mob/living/dust(just_ash = FALSE)
- death(1)
+/mob/living/dust(just_ash = FALSE, drop_items = FALSE)
+ death(TRUE)
+
+ if(drop_items)
+ unequip_everything()
if(buckled)
buckled.unbuckle_mob(src,force=1)
@@ -51,7 +54,7 @@
var/turf/T = get_turf(src)
for(var/obj/item/I in contents)
I.on_mob_death(src, gibbed)
- if(mind && mind.name && mind.active && (!(T.flags_1 & NO_DEATHRATTLE_1)))
+ if(mind && mind.name && mind.active && !istype(T.loc, /area/ctf))
var/rendered = "[mind.name] has died at [get_area_name(T)]."
deadchat_broadcast(rendered, follow_target = src, turf_target = T, message_type=DEADCHAT_DEATHRATTLE)
if(mind)
@@ -71,6 +74,7 @@
update_canmove()
med_hud_set_health()
med_hud_set_status()
+ addtimer(CALLBACK(src, .proc/med_hud_set_status), (DEFIB_TIME_LIMIT * 10) + 1)
stop_pulling()
if (client)
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index 6aa25a2701..458c19edfb 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -58,6 +58,11 @@
message = "coughs!"
emote_type = EMOTE_AUDIBLE
+/datum/emote/living/cough/can_run_emote(mob/user, status_check = TRUE)
+ . = ..()
+ if(user.reagents.get_reagent("menthol") || user.reagents.get_reagent("peppermint_patty"))
+ return FALSE
+
/datum/emote/living/dance
key = "dance"
key_third_person = "dances"
@@ -407,6 +412,8 @@
if(jobban_isbanned(user, "emote"))
to_chat(user, "You cannot send custom emotes (banned).")
return FALSE
+ else if(QDELETED(user))
+ return FALSE
else if(user.client && user.client.prefs.muted & MUTE_IC)
to_chat(user, "You cannot send IC messages (muted).")
return FALSE
diff --git a/code/modules/mob/living/inhand_holder.dm b/code/modules/mob/living/inhand_holder.dm
index 711866d733..420c59b22d 100644
--- a/code/modules/mob/living/inhand_holder.dm
+++ b/code/modules/mob/living/inhand_holder.dm
@@ -5,7 +5,7 @@
desc = "Yell at coderbrush."
icon = null
icon_state = ""
- flags_1 = DROPDEL_1
+ item_flags = DROPDEL
var/mob/living/held_mob
var/can_head = TRUE
var/destroying = FALSE
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index 47eb649d93..817e3c3f3b 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -7,31 +7,32 @@
if((movement_type & FLYING) && !floating) //TODO: Better floating
float(on = TRUE)
- if (client || registered_z) // This is a temporary error tracker to make sure we've caught everything
+ if (client)
var/turf/T = get_turf(src)
- if (client && registered_z != T.z)
+ if(!T)
+ for(var/obj/effect/landmark/error/E in GLOB.landmarks_list)
+ forceMove(E.loc)
+ break
+ var/msg = "[key_name_admin(src)] [ADMIN_JMP(src)] was found to have no .loc with an attached client, if the cause is unknown it would be wise to ask how this was accomplished."
+ message_admins(msg)
+ send2irc_adminless_only("Mob", msg, R_ADMIN)
+ log_game("[key_name(src)] was found to have no .loc with an attached client.")
+
+ // This is a temporary error tracker to make sure we've caught everything
+ else if (registered_z != T.z)
#ifdef TESTING
message_admins("[src] [ADMIN_FLW(src)] has somehow ended up in Z-level [T.z] despite being registered in Z-level [registered_z]. If you could ask them how that happened and notify coderbus, it would be appreciated.")
#endif
log_game("Z-TRACKING: [src] has somehow ended up in Z-level [T.z] despite being registered in Z-level [registered_z].")
update_z(T.z)
- else if (!client && registered_z)
- log_game("Z-TRACKING: [src] of type [src.type] has a Z-registration despite not having a client.")
- update_z(null)
+ else if (registered_z)
+ log_game("Z-TRACKING: [src] of type [src.type] has a Z-registration despite not having a client.")
+ update_z(null)
if (notransform)
return
if(!loc)
- if(client)
- for(var/obj/effect/landmark/error/E in GLOB.landmarks_list)
- forceMove(E.loc)
- break
- var/msg = "[key_name_admin(src)] was found to have no .loc with an attached client, if the cause is unknown it would be wise to ask how this was accomplished."
- message_admins(msg)
- send2irc_adminless_only("Mob", msg, R_ADMIN)
- log_game("[key_name(src)] was found to have no .loc with an attached client.")
- else
- return
+ return
var/datum/gas_mixture/environment = loc.return_air()
if(stat != DEAD)
@@ -57,7 +58,7 @@
//stuff in the stomach
handle_stomach()
- update_gravity(mob_has_gravity())
+ handle_gravity()
if(machine)
machine.check_eye(src)
@@ -109,7 +110,7 @@
ExtinguishMob() //If there's no oxygen in the tile we're on, put out the fire
return
var/turf/location = get_turf(src)
- location.hotspot_expose(700, 50, 1)
+ location.hotspot_expose(700, 10, 1)
/mob/living/proc/handle_stomach()
return
@@ -136,3 +137,26 @@
/mob/living/proc/update_damage_hud()
return
+
+/mob/living/proc/handle_gravity()
+ var/gravity = mob_has_gravity()
+ update_gravity(gravity)
+
+ if(gravity > STANDARD_GRAVITY)
+ gravity_animate()
+ handle_high_gravity(gravity)
+
+/mob/living/proc/gravity_animate()
+ if(!get_filter("gravity"))
+ add_filter("gravity",1,list("type"="motion_blur", "x"=0, "y"=0))
+ INVOKE_ASYNC(src, .proc/gravity_pulse_animation)
+
+/mob/living/proc/gravity_pulse_animation()
+ animate(get_filter("gravity"), y = 1, time = 10)
+ sleep(10)
+ animate(get_filter("gravity"), y = 0, time = 10)
+
+/mob/living/proc/handle_high_gravity(gravity)
+ if(gravity >= GRAVITY_DAMAGE_TRESHOLD) //Aka gravity values of 3 or more
+ var/grav_stregth = gravity - GRAVITY_DAMAGE_TRESHOLD
+ adjustBruteLoss(min(grav_stregth,3))
\ No newline at end of file
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index abf8302590..24627f7eec 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1,15 +1,5 @@
/mob/living/Initialize()
. = ..()
- generateStaticOverlay()
- if(staticOverlays.len)
- for(var/mob/living/simple_animal/drone/D in GLOB.player_list)
- if(D && D.seeStatic)
- if(D.staticChoice in staticOverlays)
- D.staticOverlays |= staticOverlays[D.staticChoice]
- D.client.images |= staticOverlays[D.staticChoice]
- else //no choice? force static
- D.staticOverlays |= staticOverlays["static"]
- D.client.images |= staticOverlays["static"]
if(unique_name)
name = "[name] ([rand(1, 1000)])"
real_name = name
@@ -40,47 +30,14 @@
if(buckled)
buckled.unbuckle_mob(src,force=1)
- for(var/mob/living/simple_animal/drone/D in GLOB.player_list)
- for(var/image/I in staticOverlays)
- D.staticOverlays.Remove(I)
- D.client.images.Remove(I)
- qdel(I)
- staticOverlays.len = 0
remove_from_all_data_huds()
GLOB.mob_living_list -= src
QDEL_LIST(diseases)
return ..()
-/mob/living/ghostize(can_reenter_corpse = 1)
- var/prev_client = client
- . = ..()
- if(.)
- if(ranged_ability && prev_client)
- ranged_ability.remove_mousepointer(prev_client)
-
-
/mob/living/proc/OpenCraftingMenu()
return
-/mob/living/proc/generateStaticOverlay()
- staticOverlays.Add(list("static", "blank", "letter", "animal"))
- var/image/staticOverlay = image(getStaticIcon(new/icon(icon,icon_state)), loc = src)
- staticOverlay.override = 1
- staticOverlays["static"] = staticOverlay
-
- staticOverlay = image(getBlankIcon(new/icon(icon, icon_state)), loc = src)
- staticOverlay.override = 1
- staticOverlays["blank"] = staticOverlay
-
- staticOverlay = getLetterImage(src)
- staticOverlay.override = 1
- staticOverlays["letter"] = staticOverlay
-
- staticOverlay = getRandomAnimalImage(src)
- staticOverlay.override = 1
- staticOverlays["animal"] = staticOverlay
-
-
//Generic Collide(). Override MobCollide() and ObjCollide() instead of this.
/mob/living/Collide(atom/A)
if(..()) //we are thrown onto something
@@ -411,7 +368,7 @@
ret |= contents //add our contents
for(var/i in ret.Copy()) //iterate storage objects
var/atom/A = i
- A.SendSignal(COMSIG_TRY_STORAGE_RETURN_INVENTORY, ret)
+ SEND_SIGNAL(A, COMSIG_TRY_STORAGE_RETURN_INVENTORY, ret)
for(var/obj/item/folder/F in ret.Copy()) //very snowflakey-ly iterate folders
ret |= F.contents
return ret
@@ -491,6 +448,7 @@
heal_overall_damage(INFINITY, INFINITY, INFINITY, FALSE, FALSE, TRUE) //heal brute and burn dmg on both organic and robotic limbs, and update health right away.
ExtinguishMob()
fire_stacks = 0
+ confused = 0
update_canmove()
GET_COMPONENT(mood, /datum/component/mood)
if (mood)
@@ -508,21 +466,6 @@
/mob/living/proc/update_damage_overlays()
return
-/mob/living/proc/Examine_OOC()
- set name = "Examine Meta-Info (OOC)"
- set category = "OOC"
- set src in view()
-
- if(CONFIG_GET(flag/allow_metadata))
- if(client)
- to_chat(src, "[src]'s Metainfo: [client.prefs.metadata]")
- else
- to_chat(src, "[src] does not have any stored information!")
- else
- to_chat(src, "OOC Metadata is not supported by this server!")
-
- return
-
/mob/living/Move(atom/newloc, direct)
if (buckled && buckled.loc != newloc) //not updating position
if (!buckled.anchored)
@@ -646,6 +589,7 @@
return
changeNext_move(CLICK_CD_RESIST)
+ SEND_SIGNAL(src, COMSIG_LIVING_RESIST, src)
//resisting grabs (as if it helps anyone...)
if(!restrained(ignore_grab = 1) && pulledby)
visible_message("[src] resists against [pulledby]'s grip!")
@@ -665,14 +609,6 @@
var/obj/C = loc
C.container_resist(src)
- else if(IsFrozen())
- to_chat(src, "You start breaking out of the ice cube!")
- if(do_mob(src, src, 40))
- if(IsFrozen())
- to_chat(src, "You break out of the ice cube!")
- remove_status_effect(/datum/status_effect/freon)
- update_canmove()
-
else if(canmove)
if(on_fire)
resist_fire() //stop, drop, and roll
@@ -715,9 +651,15 @@
if(!SSticker.HasRoundStarted())
return
if(has_gravity)
- clear_alert("weightless")
+ if(has_gravity == 1)
+ clear_alert("gravity")
+ else
+ if(has_gravity >= GRAVITY_DAMAGE_TRESHOLD)
+ throw_alert("gravity", /obj/screen/alert/veryhighgravity)
+ else
+ throw_alert("gravity", /obj/screen/alert/highgravity)
else
- throw_alert("weightless", /obj/screen/alert/weightless)
+ throw_alert("gravity", /obj/screen/alert/weightless)
if(!override && !is_flying())
float(!has_gravity)
@@ -739,7 +681,7 @@
// The src mob is trying to strip an item from someone
// Override if a certain type of mob should be behave differently when stripping items (can't, for example)
/mob/living/stripPanelUnequip(obj/item/what, mob/who, where)
- if(what.flags_1 & NODROP_1)
+ if(what.item_flags & NODROP)
to_chat(src, "You can't remove \the [what.name], it appears to be stuck!")
return
who.visible_message("[src] tries to remove [who]'s [what.name].", \
@@ -760,7 +702,7 @@
// Override if a certain mob should be behave differently when placing items (can't, for example)
/mob/living/stripPanelEquip(obj/item/what, mob/who, where)
what = src.get_active_held_item()
- if(what && (what.flags_1 & NODROP_1))
+ if(what && (what.item_flags & NODROP))
to_chat(src, "You can't put \the [what.name] on [who], it's stuck to your hand!")
return
if(what)
@@ -873,7 +815,6 @@
return FALSE
return TRUE
-
/mob/living/proc/update_stamina()
return
/*
@@ -953,6 +894,13 @@
apply_effect((amount*RAD_MOB_COEFFICIENT)/max(1, (radiation**2)*RAD_OVERDOSE_REDUCTION), EFFECT_IRRADIATE, blocked)
+/mob/living/anti_magic_check(magic = TRUE, holy = FALSE)
+ . = ..()
+ if(.)
+ return
+ if((magic && has_trait(TRAIT_ANTIMAGIC)) || (holy && has_trait(TRAIT_HOLY)))
+ return src
+
/mob/living/proc/fakefireextinguish()
return
@@ -970,6 +918,7 @@
new/obj/effect/dummy/fire(src)
throw_alert("fire", /obj/screen/alert/fire)
update_fire()
+ SEND_SIGNAL(src, COMSIG_LIVING_IGNITED,src)
return TRUE
return FALSE
@@ -980,7 +929,8 @@
for(var/obj/effect/dummy/fire/F in src)
qdel(F)
clear_alert("fire")
- SendSignal(COMSIG_CLEAR_MOOD_EVENT, "on_fire")
+ SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "on_fire")
+ SEND_SIGNAL(src, COMSIG_LIVING_EXTINGUISHED, src)
update_fire()
/mob/living/proc/adjust_fire_stacks(add_fire_stacks) //Adjusting the amount of fire_stacks we have on person
@@ -1184,8 +1134,16 @@
clear_fullscreen("remote_view", 0)
update_pipe_vision()
+/mob/living/update_mouse_pointer()
+ ..()
+ if (client && ranged_ability && ranged_ability.ranged_mousepointer)
+ client.mouse_pointer_icon = ranged_ability.ranged_mousepointer
+
/mob/living/vv_edit_var(var_name, var_value)
switch(var_name)
+ if ("maxHealth")
+ if (!isnum(var_value) || var_value <= 0)
+ return FALSE
if("stat")
if((stat == DEAD) && (var_value < DEAD))//Bringing the dead back to life
GLOB.dead_mob_list -= src
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 99325838ca..0ce42af01b 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -67,7 +67,7 @@
var/zone = ran_zone(BODY_ZONE_CHEST, 65)//Hits a random part of the body, geared towards the chest
var/dtype = BRUTE
var/volume = I.get_volume_by_throwforce_and_or_w_class()
- I.SendSignal(COMSIG_MOVABLE_IMPACT_ZONE, src, zone)
+ SEND_SIGNAL(I, COMSIG_MOVABLE_IMPACT_ZONE, src, zone)
dtype = I.damtype
if (I.throwforce > 0) //If the weapon's throwforce is greater than zero...
@@ -317,9 +317,11 @@
return shock_damage
/mob/living/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_CONTENTS)
+ return
for(var/obj/O in contents)
O.emp_act(severity)
- ..()
/mob/living/singularity_act()
var/gain = 20
@@ -328,7 +330,7 @@
return(gain)
/mob/living/narsie_act()
- if(status_flags & GODMODE)
+ if(status_flags & GODMODE || QDELETED(src))
return
if(is_servant_of_ratvar(src) && !stat)
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 94b1e64f39..1016387cb5 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -55,7 +55,6 @@
var/mob_size = MOB_SIZE_HUMAN
var/list/mob_biotypes = list(MOB_ORGANIC)
var/metabolism_efficiency = 1 //more or less efficiency to metabolize helpful/harmful reagents and regulate body temperature..
- var/list/image/staticOverlays = list()
var/has_limbs = 0 //does the mob have distinct limbs?(arms,legs, chest,head)
var/list/pipes_shown = list()
diff --git a/code/modules/mob/living/logout.dm b/code/modules/mob/living/logout.dm
index b7e9036a8a..d2c50559c6 100644
--- a/code/modules/mob/living/logout.dm
+++ b/code/modules/mob/living/logout.dm
@@ -1,7 +1,5 @@
/mob/living/Logout()
update_z(null)
- if(ranged_ability && client)
- ranged_ability.remove_mousepointer(client)
..()
if(!key && mind) //key and mind have become separated.
mind.active = 0 //This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body.
\ No newline at end of file
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index a754856991..e25a5e4a85 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -316,16 +316,6 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
return 1
-/mob/living/proc/get_message_mode(message)
- var/key = copytext(message, 1, 2)
- 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))
- return GLOB.department_radio_keys[key_symbol]
-
/mob/living/proc/get_key(message)
var/key = copytext(message, 1, 2)
if(key in GLOB.department_radio_prefixes)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 8664a111ae..91401cbc88 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -74,7 +74,7 @@
var/nuking = FALSE
var/obj/machinery/doomsday_device/doomsday_device
- var/mob/camera/aiEye/eyeobj = new
+ var/mob/camera/aiEye/eyeobj
var/sprint = 10
var/cooldown = 0
var/acceleration = 1
@@ -85,6 +85,13 @@
var/datum/action/innate/deploy_last_shell/redeploy_action = new
var/chnotify = 0
+ var/multicam_allowed = FALSE
+ var/multicam_on = FALSE
+ var/obj/screen/movable/pic_in_pic/ai/master_multicam
+ var/list/multicam_screens = list()
+ var/list/all_eyes = list()
+ var/max_multicams = 6
+
/mob/living/silicon/ai/Initialize(mapload, datum/ai_laws/L, mob/target_ai)
. = ..()
if(!target_ai) //If there is no player/brain inside.
@@ -116,9 +123,8 @@
job = "AI"
- eyeobj.ai = src
- eyeobj.forceMove(src.loc)
- rename_self("ai")
+ create_eye()
+ apply_pref_name("ai")
holo_icon = getHologramIcon(icon('icons/mob/ai.dmi',"default"))
@@ -818,7 +824,7 @@
//apc_override is needed here because AIs use their own APC when depowered
return (GLOB.cameranet && GLOB.cameranet.checkTurfVis(get_turf_pixel(A))) || apc_override
//AI is carded/shunted
- //view(src) returns nothing for carded/shunted AIs and they have x-ray vision so just use get_dist
+ //view(src) returns nothing for carded/shunted AIs and they have X-ray vision so just use get_dist
var/list/viewscale = getviewsize(client.view)
return get_dist(src, A) <= max(viewscale[1]*0.5,viewscale[2]*0.5)
@@ -871,9 +877,12 @@
current = A
if(client)
if(ismovableatom(A))
+ if(A != GLOB.ai_camera_room_landmark)
+ end_multicam()
client.perspective = EYE_PERSPECTIVE
client.eye = A
else
+ end_multicam()
if(isturf(loc))
if(eyeobj)
client.eye = eyeobj
@@ -993,3 +1002,11 @@
. = ..()
if(!target_ai)
target_ai = src //cheat! just give... ourselves as the spawned AI, because that's technically correct
+
+/mob/living/silicon/ai/proc/camera_visibility(mob/camera/aiEye/moved_eye)
+ GLOB.cameranet.visibility(moved_eye, client, all_eyes)
+
+/mob/living/silicon/ai/forceMove(atom/destination)
+ . = ..()
+ if(.)
+ end_multicam()
diff --git a/code/modules/mob/living/silicon/ai/ai_defense.dm b/code/modules/mob/living/silicon/ai/ai_defense.dm
index d07f85ef6a..7c59c2b791 100644
--- a/code/modules/mob/living/silicon/ai/ai_defense.dm
+++ b/code/modules/mob/living/silicon/ai/ai_defense.dm
@@ -22,6 +22,9 @@
return 0
/mob/living/silicon/ai/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
disconnect_shell()
if (prob(30))
switch(pick(1,2))
@@ -29,7 +32,6 @@
view_core()
if(2)
SSshuttle.requestEvac(src,"ALERT: Energy surge detected in AI core! Station integrity may be compromised! Initiati--%m091#ar-BZZT")
- ..()
/mob/living/silicon/ai/ex_act(severity, target)
switch(severity)
diff --git a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
index 815ddb64ea..36ae19b478 100644
--- a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
@@ -18,12 +18,21 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new)
// The object used for the clickable stat() button.
var/obj/effect/statclick/statclick
+ // The object used in vis_contents of obscured turfs
+ var/vis_contents
+ // The image given to the effect in vis_contents on AI clients
+ var/image/obscured
+
+/datum/cameranet/New()
+ vis_contents = new /obj/effect/overlay/camera_static()
+ obscured = new('icons/effects/cameravis.dmi', vis_contents, null, BYOND_LIGHTING_LAYER + 0.1)
+ obscured.plane = BYOND_LIGHTING_PLANE + 1
+
// Checks if a chunk has been Generated in x, y, z.
/datum/cameranet/proc/chunkGenerated(x, y, z)
x &= ~(CHUNK_SIZE - 1)
y &= ~(CHUNK_SIZE - 1)
- var/key = "[x],[y],[z]"
- return (chunks[key])
+ return chunks["[x],[y],[z]"]
// Returns the chunk in the x, y, z.
// If there is no chunk, it creates a new chunk and returns that.
@@ -31,50 +40,59 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new)
x &= ~(CHUNK_SIZE - 1)
y &= ~(CHUNK_SIZE - 1)
var/key = "[x],[y],[z]"
- if(!chunks[key])
- chunks[key] = new /datum/camerachunk(null, x, y, z)
-
- return chunks[key]
+ . = chunks[key]
+ if(!.)
+ chunks[key] = . = new /datum/camerachunk(x, y, z)
// Updates what the aiEye can see. It is recommended you use this when the aiEye moves or it's location is set.
-/datum/cameranet/proc/visibility(mob/camera/aiEye/ai)
- // 0xf = 15
- var/x1 = max(0, ai.x - 16) & ~(CHUNK_SIZE - 1)
- var/y1 = max(0, ai.y - 16) & ~(CHUNK_SIZE - 1)
- var/x2 = min(world.maxx, ai.x + 16) & ~(CHUNK_SIZE - 1)
- var/y2 = min(world.maxy, ai.y + 16) & ~(CHUNK_SIZE - 1)
+/datum/cameranet/proc/visibility(list/moved_eyes, client/C, list/other_eyes)
+ if(!islist(moved_eyes))
+ moved_eyes = moved_eyes ? list(moved_eyes) : list()
+ if(islist(other_eyes))
+ other_eyes = (other_eyes - moved_eyes)
+ else
+ other_eyes = list()
- var/list/visibleChunks = list()
+ for(var/V in moved_eyes)
+ var/mob/camera/aiEye/eye = V
+ var/static_range = eye.static_visibility_range
+ var/x1 = max(0, eye.x - static_range) & ~(CHUNK_SIZE - 1)
+ var/y1 = max(0, eye.y - static_range) & ~(CHUNK_SIZE - 1)
+ var/x2 = min(world.maxx, eye.x + static_range) & ~(CHUNK_SIZE - 1)
+ var/y2 = min(world.maxy, eye.y + static_range) & ~(CHUNK_SIZE - 1)
- for(var/x = x1; x <= x2; x += CHUNK_SIZE)
- for(var/y = y1; y <= y2; y += CHUNK_SIZE)
- visibleChunks |= getCameraChunk(x, y, ai.z)
+ var/list/visibleChunks = list()
- var/list/remove = ai.visibleCameraChunks - visibleChunks
- var/list/add = visibleChunks - ai.visibleCameraChunks
+ for(var/x = x1; x <= x2; x += CHUNK_SIZE)
+ for(var/y = y1; y <= y2; y += CHUNK_SIZE)
+ visibleChunks |= getCameraChunk(x, y, eye.z)
- for(var/chunk in remove)
- var/datum/camerachunk/c = chunk
- c.remove(ai)
+ var/list/remove = eye.visibleCameraChunks - visibleChunks
+ var/list/add = visibleChunks - eye.visibleCameraChunks
- for(var/chunk in add)
- var/datum/camerachunk/c = chunk
- c.add(ai)
+ for(var/chunk in remove)
+ var/datum/camerachunk/c = chunk
+ c.remove(eye)
+
+ for(var/chunk in add)
+ var/datum/camerachunk/c = chunk
+ c.add(eye)
+
+ if(C)
+ C.images += obscured
// Updates the chunks that the turf is located in. Use this when obstacles are destroyed or when doors open.
/datum/cameranet/proc/updateVisibility(atom/A, opacity_check = 1)
-
if(!SSticker || (opacity_check && !A.opacity))
return
majorChunkChange(A, 2)
/datum/cameranet/proc/updateChunk(x, y, z)
- // 0xf = 15
- if(!chunkGenerated(x, y, z))
+ var/datum/camerachunk/chunk = chunkGenerated(x, y, z)
+ if (!chunk)
return
- var/datum/camerachunk/chunk = getCameraChunk(x, y, z)
chunk.hasChanged()
// Removes a camera from a chunk.
@@ -101,7 +119,6 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new)
// If you want to update the chunks around an object, without adding/removing a camera, use choice 2.
/datum/cameranet/proc/majorChunkChange(atom/c, choice)
- // 0xf = 15
if(!c)
return
@@ -113,8 +130,8 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new)
var/y2 = min(world.maxy, T.y + (CHUNK_SIZE / 2)) & ~(CHUNK_SIZE - 1)
for(var/x = x1; x <= x2; x += CHUNK_SIZE)
for(var/y = y1; y <= y2; y += CHUNK_SIZE)
- if(chunkGenerated(x, y, T.z))
- var/datum/camerachunk/chunk = getCameraChunk(x, y, T.z)
+ var/datum/camerachunk/chunk = chunkGenerated(x, y, T.z)
+ if(chunk)
if(choice == 0)
// Remove the camera.
chunk.cameras -= c
@@ -126,14 +143,12 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new)
// Will check if a mob is on a viewable turf. Returns 1 if it is, otherwise returns 0.
/datum/cameranet/proc/checkCameraVis(mob/living/target)
-
- // 0xf = 15
var/turf/position = get_turf(target)
return checkTurfVis(position)
/datum/cameranet/proc/checkTurfVis(turf/position)
- var/datum/camerachunk/chunk = getCameraChunk(position.x, position.y, position.z)
+ var/datum/camerachunk/chunk = chunkGenerated(position.x, position.y, position.z)
if(chunk)
if(chunk.changed)
chunk.hasChanged(1) // Update now, no matter if it's visible or not.
@@ -146,3 +161,17 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new)
statclick = new/obj/effect/statclick/debug(null, "Initializing...", src)
stat(name, statclick.update("Cameras: [GLOB.cameranet.cameras.len] | Chunks: [GLOB.cameranet.chunks.len]"))
+
+/obj/effect/overlay/camera_static
+ name = "static"
+ icon = null
+ icon_state = null
+ anchored = TRUE // should only appear in vis_contents, but to be safe
+ appearance_flags = RESET_TRANSFORM | TILE_BOUND
+ // this combination makes the static block clicks to everything below it,
+ // without appearing in the right-click menu for non-AI clients
+ mouse_opacity = MOUSE_OPACITY_ICON
+ invisibility = INVISIBILITY_ABSTRACT
+
+ layer = BYOND_LIGHTING_LAYER + 0.1
+ plane = BYOND_LIGHTING_PLANE + 1
diff --git a/code/modules/mob/living/silicon/ai/freelook/chunk.dm b/code/modules/mob/living/silicon/ai/freelook/chunk.dm
index f062c7e010..9a84616fbf 100644
--- a/code/modules/mob/living/silicon/ai/freelook/chunk.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/chunk.dm
@@ -8,11 +8,9 @@
/datum/camerachunk
var/list/obscuredTurfs = list()
var/list/visibleTurfs = list()
- var/list/obscured = list()
var/list/cameras = list()
var/list/turfs = list()
var/list/seenby = list()
- var/visible = FALSE
var/changed = 0
var/x = 0
var/y = 0
@@ -21,11 +19,7 @@
// Add an AI eye to the chunk, then update if changed.
/datum/camerachunk/proc/add(mob/camera/aiEye/eye)
- var/client/client = eye.GetViewerClient()
- if(client)
- client.images += obscured
eye.visibleCameraChunks += src
- visible++
seenby += eye
if(changed)
update()
@@ -33,13 +27,8 @@
// Remove an AI eye from the chunk, then update if changed.
/datum/camerachunk/proc/remove(mob/camera/aiEye/eye)
- var/client/client = eye.GetViewerClient()
- if(client)
- client.images -= obscured
eye.visibleCameraChunks -= src
seenby -= eye
- if(visible > 0)
- visible--
// Called when a chunk has changed. I.E: A wall was deleted.
@@ -52,7 +41,7 @@
// instead be flagged to update the next time an AI Eye moves near it.
/datum/camerachunk/proc/hasChanged(update_now = 0)
- if(visible || update_now)
+ if(seenby.len || update_now)
addtimer(CALLBACK(src, .proc/update), UPDATE_BUFFER, TIMER_UNIQUE)
else
changed = 1
@@ -92,41 +81,18 @@
for(var/turf in visAdded)
var/turf/t = turf
- if(t.obscured)
- obscured -= t.obscured
- for(var/eye in seenby)
- var/mob/camera/aiEye/m = eye
- if(!m)
- continue
- var/client/client = m.GetViewerClient()
- if(client)
- client.images -= t.obscured
+ t.vis_contents -= GLOB.cameranet.vis_contents
for(var/turf in visRemoved)
var/turf/t = turf
- if(obscuredTurfs[t])
- if(!t.obscured)
- t.obscured = image('icons/effects/cameravis.dmi', t, null, BYOND_LIGHTING_LAYER+0.1)
- t.obscured.pixel_x = -t.pixel_x
- t.obscured.pixel_y = -t.pixel_y
- t.obscured.plane = BYOND_LIGHTING_PLANE+0.1
- obscured += t.obscured
- for(var/eye in seenby)
- var/mob/camera/aiEye/m = eye
- if(!m)
- seenby -= m
- continue
- var/client/client = m.GetViewerClient()
- if(client)
- client.images += t.obscured
+ if(obscuredTurfs[t] && !istype(t, /turf/open/ai_visible))
+ t.vis_contents += GLOB.cameranet.vis_contents
changed = 0
// Create a new camera chunk, since the chunks are made as they are needed.
-/datum/camerachunk/New(loc, x, y, z)
-
- // 0xf = 15
+/datum/camerachunk/New(x, y, z)
x &= ~(CHUNK_SIZE - 1)
y &= ~(CHUNK_SIZE - 1)
@@ -162,12 +128,7 @@
for(var/turf in obscuredTurfs)
var/turf/t = turf
- if(!t.obscured)
- t.obscured = image('icons/effects/cameravis.dmi', t, null, BYOND_LIGHTING_LAYER+0.1)
- t.obscured.pixel_x = -t.pixel_x
- t.obscured.pixel_y = -t.pixel_y
- t.obscured.plane = BYOND_LIGHTING_PLANE+0.1
- obscured += t.obscured
+ t.vis_contents += GLOB.cameranet.vis_contents
#undef UPDATE_BUFFER
#undef CHUNK_SIZE
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index b5b1bd082b..c2c395cabb 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -11,6 +11,7 @@
var/mob/living/silicon/ai/ai = null
var/relay_speech = FALSE
var/use_static = TRUE
+ var/static_visibility_range = 16
// Use this when setting the aiEye's location.
// It will also stream the chunk that the new loc is in.
@@ -25,8 +26,8 @@
else
moveToNullspace() // ????
if(use_static)
- GLOB.cameranet.visibility(src)
- if(ai.client)
+ ai.camera_visibility(src)
+ if(ai.client && !ai.multicam_on)
ai.client.eye = src
update_parallax_contents()
//Holopad
@@ -35,6 +36,8 @@
H.move_hologram(ai, T)
if(ai.camera_light_on)
ai.light_cameras()
+ if(ai.master_multicam)
+ ai.master_multicam.refresh_view()
/mob/camera/aiEye/Move()
return 0
@@ -45,20 +48,25 @@
return null
/mob/camera/aiEye/proc/RemoveImages()
- if(use_static)
- for(var/datum/camerachunk/chunk in visibleCameraChunks)
- chunk.remove(src)
+ var/client/C = GetViewerClient()
+ if(C && use_static)
+ C.images -= GLOB.cameranet.obscured
/mob/camera/aiEye/Destroy()
- ai = null
+ if(ai)
+ ai.all_eyes -= src
+ ai = null
+ for(var/V in visibleCameraChunks)
+ var/datum/camerachunk/c = V
+ c.remove(src)
return ..()
/atom/proc/move_camera_by_click()
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
- if(AI.eyeobj && AI.client.eye == AI.eyeobj)
+ if(AI.eyeobj && (AI.multicam_on || (AI.client.eye == AI.eyeobj)) && (AI.eyeobj.z == z))
AI.cameraFollow = null
- if (isturf(src.loc) || isturf(src))
+ if (isturf(loc) || isturf(src))
AI.eyeobj.setLoc(src)
// This will move the AIEye. It will also cause lights near the eye to light up, if toggled.
@@ -88,19 +96,29 @@
// Return to the Core.
/mob/living/silicon/ai/proc/view_core()
-
- current = null
+ if(istype(current,/obj/machinery/holopad))
+ var/obj/machinery/holopad/H = current
+ H.clear_holo(src)
+ else
+ current = null
cameraFollow = null
unset_machine()
if(!eyeobj || !eyeobj.loc || QDELETED(eyeobj))
to_chat(src, "ERROR: Eyeobj not found. Creating new eye...")
- eyeobj = new(loc)
- eyeobj.ai = src
- eyeobj.name = "[src.name] (AI Eye)" // Give it a name
+ create_eye()
eyeobj.setLoc(loc)
+/mob/living/silicon/ai/proc/create_eye()
+ if(eyeobj)
+ return
+ eyeobj = new /mob/camera/aiEye()
+ all_eyes += eyeobj
+ eyeobj.ai = src
+ eyeobj.setLoc(loc)
+ eyeobj.name = "[name] (AI Eye)"
+
/mob/living/silicon/ai/verb/toggle_acceleration()
set category = "AI Commands"
set name = "Toggle Camera Acceleration"
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index a060c899d9..0fd33110b6 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -96,6 +96,7 @@
/mob/living/silicon/ai/proc/start_RestorePowerRoutine()
to_chat(src, "Backup battery online. Scanners, camera, and radio interface offline. Beginning fault-detection.")
+ end_multicam()
sleep(50)
var/turf/T = get_turf(src)
var/area/AIarea = get_area(src)
diff --git a/code/modules/mob/living/silicon/ai/login.dm b/code/modules/mob/living/silicon/ai/login.dm
index c771f60aa2..2dc9a1fb1c 100644
--- a/code/modules/mob/living/silicon/ai/login.dm
+++ b/code/modules/mob/living/silicon/ai/login.dm
@@ -4,4 +4,6 @@
for(var/obj/machinery/ai_status_display/O in GLOB.ai_status_displays) //change status
O.mode = 1
O.emotion = "Neutral"
+ if(multicam_on)
+ end_multicam()
view_core()
diff --git a/code/modules/mob/living/silicon/ai/multicam.dm b/code/modules/mob/living/silicon/ai/multicam.dm
new file mode 100644
index 0000000000..d77e7f8a40
--- /dev/null
+++ b/code/modules/mob/living/silicon/ai/multicam.dm
@@ -0,0 +1,262 @@
+//Picture in picture
+
+/obj/screen/movable/pic_in_pic/ai
+ var/mob/living/silicon/ai/ai
+ var/mutable_appearance/highlighted_background
+ var/highlighted = FALSE
+ var/mob/camera/aiEye/pic_in_pic/aiEye
+
+/obj/screen/movable/pic_in_pic/ai/Initialize()
+ . = ..()
+ aiEye = new /mob/camera/aiEye/pic_in_pic()
+ aiEye.screen = src
+
+/obj/screen/movable/pic_in_pic/ai/Destroy()
+ set_ai(null)
+ QDEL_NULL(aiEye)
+ return ..()
+
+/obj/screen/movable/pic_in_pic/ai/Click()
+ ..()
+ if(ai)
+ ai.select_main_multicam_window(src)
+
+/obj/screen/movable/pic_in_pic/ai/make_backgrounds()
+ ..()
+ highlighted_background = new /mutable_appearance()
+ highlighted_background.icon = 'icons/misc/pic_in_pic.dmi'
+ highlighted_background.icon_state = "background_highlight"
+ highlighted_background.layer = SPACE_LAYER
+
+/obj/screen/movable/pic_in_pic/ai/add_background()
+ if((width > 0) && (height > 0))
+ var/matrix/M = matrix()
+ M.Scale(width + 0.5, height + 0.5)
+ M.Translate((width-1)/2 * world.icon_size, (height-1)/2 * world.icon_size)
+ highlighted_background.transform = M
+ standard_background.transform = M
+ add_overlay(highlighted ? highlighted_background : standard_background)
+
+/obj/screen/movable/pic_in_pic/ai/set_view_size(width, height, do_refresh = TRUE)
+ aiEye.static_visibility_range = (round(max(width, height) / 2) + 1)
+ if(ai)
+ ai.camera_visibility(aiEye)
+ ..()
+
+/obj/screen/movable/pic_in_pic/ai/set_view_center(atom/target, do_refresh = TRUE)
+ ..()
+ aiEye.setLoc(get_turf(target))
+
+/obj/screen/movable/pic_in_pic/ai/refresh_view()
+ ..()
+ aiEye.setLoc(get_turf(center))
+
+/obj/screen/movable/pic_in_pic/ai/proc/highlight()
+ if(highlighted)
+ return
+ highlighted = TRUE
+ cut_overlay(standard_background)
+ add_overlay(highlighted_background)
+
+/obj/screen/movable/pic_in_pic/ai/proc/unhighlight()
+ if(!highlighted)
+ return
+ highlighted = FALSE
+ cut_overlay(highlighted_background)
+ add_overlay(standard_background)
+
+/obj/screen/movable/pic_in_pic/ai/proc/set_ai(mob/living/silicon/ai/new_ai)
+ if(ai)
+ ai.multicam_screens -= src
+ ai.all_eyes -= aiEye
+ if(ai.master_multicam == src)
+ ai.master_multicam = null
+ if(ai.multicam_on)
+ unshow_to(ai.client)
+ ai = new_ai
+ if(new_ai)
+ new_ai.multicam_screens += src
+ ai.all_eyes += aiEye
+ if(new_ai.multicam_on)
+ show_to(new_ai.client)
+
+//Turf, area, and landmark for the viewing room
+
+/turf/open/ai_visible
+ name = ""
+ icon = 'icons/misc/pic_in_pic.dmi'
+ icon_state = "room_background"
+ flags_1 = NOJAUNT_1
+
+/area/ai_multicam_room
+ name = "ai_multicam_room"
+ icon_state = "ai_camera_room"
+ dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
+ valid_territory = FALSE
+ ambientsounds = list()
+ blob_allowed = FALSE
+ noteleport = TRUE
+ hidden = TRUE
+ safe = TRUE
+
+GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room)
+
+/obj/effect/landmark/ai_multicam_room
+ name = "ai camera room"
+ icon = 'icons/mob/landmarks.dmi'
+ icon_state = "x"
+
+/obj/effect/landmark/ai_multicam_room/Initialize()
+ . = ..()
+ qdel(GLOB.ai_camera_room_landmark)
+ GLOB.ai_camera_room_landmark = src
+
+/obj/effect/landmark/ai_multicam_room/Destroy()
+ if(GLOB.ai_camera_room_landmark == src)
+ GLOB.ai_camera_room_landmark = null
+ return ..()
+
+//Dummy camera eyes
+
+/mob/camera/aiEye/pic_in_pic
+ name = "Secondary AI Eye"
+ var/obj/screen/movable/pic_in_pic/ai/screen
+ var/list/cameras_telegraphed = list()
+ var/telegraph_cameras = TRUE
+ var/telegraph_range = 7
+
+/mob/camera/aiEye/pic_in_pic/GetViewerClient()
+ if(screen && screen.ai)
+ return screen.ai.client
+
+/mob/camera/aiEye/pic_in_pic/setLoc(turf/T)
+ if (T)
+ forceMove(T)
+ else
+ moveToNullspace()
+ if(screen && screen.ai)
+ screen.ai.camera_visibility(src)
+ else
+ GLOB.cameranet.visibility(src)
+ update_camera_telegraphing()
+
+/mob/camera/aiEye/pic_in_pic/proc/update_camera_telegraphing()
+ if(!telegraph_cameras)
+ return
+ var/list/obj/machinery/camera/add = list()
+ var/list/obj/machinery/camera/remove = list()
+ var/list/obj/machinery/camera/visible = list()
+ for (var/VV in visibleCameraChunks)
+ var/datum/camerachunk/CC = VV
+ for (var/V in CC.cameras)
+ var/obj/machinery/camera/C = V
+ if (!C.can_use() || (get_dist(C, src) > telegraph_range))
+ continue
+ visible |= C
+
+ add = visible - cameras_telegraphed
+ remove = cameras_telegraphed - visible
+
+ for (var/V in remove)
+ var/obj/machinery/camera/C = V
+ if(QDELETED(C))
+ continue
+ cameras_telegraphed -= C
+ C.in_use_lights--
+ C.update_icon()
+ for (var/V in add)
+ var/obj/machinery/camera/C = V
+ if(QDELETED(C))
+ continue
+ cameras_telegraphed |= C
+ C.in_use_lights++
+ C.update_icon()
+
+/mob/camera/aiEye/pic_in_pic/proc/disable_camera_telegraphing()
+ telegraph_cameras = FALSE
+ for (var/V in cameras_telegraphed)
+ var/obj/machinery/camera/C = V
+ if(QDELETED(C))
+ continue
+ C.in_use_lights--
+ C.update_icon()
+ cameras_telegraphed.Cut()
+
+/mob/camera/aiEye/pic_in_pic/Destroy()
+ disable_camera_telegraphing()
+ return ..()
+
+//AI procs
+
+/mob/living/silicon/ai/proc/drop_new_multicam(silent = FALSE)
+ if(!multicam_allowed)
+ if(!silent)
+ to_chat(src, "This action is currently disabled. Contact an administrator to enable this feature.")
+ return
+ if(!eyeobj)
+ return
+ if(multicam_screens.len >= max_multicams)
+ if(!silent)
+ to_chat(src, "Cannot place more than [max_multicams] multicamera windows.")
+ return
+ var/obj/screen/movable/pic_in_pic/ai/C = new /obj/screen/movable/pic_in_pic/ai()
+ C.set_view_size(3, 3, FALSE)
+ C.set_view_center(get_turf(eyeobj))
+ C.set_ai(src)
+ if(!silent)
+ to_chat(src, "Added new multicamera window.")
+ return C
+
+/mob/living/silicon/ai/proc/toggle_multicam()
+ if(!multicam_allowed)
+ to_chat(src, "This action is currently disabled. Contact an administrator to enable this feature.")
+ return
+ if(multicam_on)
+ end_multicam()
+ else
+ start_multicam()
+
+/mob/living/silicon/ai/proc/start_multicam()
+ if(multicam_on || aiRestorePowerRoutine || !isturf(loc))
+ return
+ if(!GLOB.ai_camera_room_landmark)
+ to_chat(src, "This function is not available at this time.")
+ return
+ multicam_on = TRUE
+ refresh_multicam()
+ to_chat(src, "Multiple-camera viewing mode activated.")
+
+/mob/living/silicon/ai/proc/refresh_multicam()
+ reset_perspective(GLOB.ai_camera_room_landmark)
+ if(client)
+ for(var/V in multicam_screens)
+ var/obj/screen/movable/pic_in_pic/P = V
+ P.show_to(client)
+
+/mob/living/silicon/ai/proc/end_multicam()
+ if(!multicam_on)
+ return
+ multicam_on = FALSE
+ select_main_multicam_window(null)
+ if(client)
+ for(var/V in multicam_screens)
+ var/obj/screen/movable/pic_in_pic/P = V
+ P.unshow_to(client)
+ reset_perspective()
+ to_chat(src, "Multiple-camera viewing mode deactivated.")
+
+
+/mob/living/silicon/ai/proc/select_main_multicam_window(obj/screen/movable/pic_in_pic/ai/P)
+ if(master_multicam == P)
+ return
+
+ if(master_multicam)
+ master_multicam.set_view_center(get_turf(eyeobj), FALSE)
+ master_multicam.unhighlight()
+ master_multicam = null
+
+ if(P)
+ P.highlight()
+ eyeobj.setLoc(get_turf(P.center))
+ P.set_view_center(eyeobj)
+ master_multicam = P
diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm
index 3ad39bb016..c5820eb8c1 100644
--- a/code/modules/mob/living/silicon/ai/say.dm
+++ b/code/modules/mob/living/silicon/ai/say.dm
@@ -45,10 +45,10 @@
var/turf/padturf = get_turf(T)
var/padloc
if(padturf)
- padloc = COORD(padturf)
+ padloc = AREACOORD(padturf)
else
padloc = "(UNKNOWN)"
- log_talk(src,"HOLOPAD [padloc]: [key_name(src)] : [message]", LOGSAY)
+ log_talk(src,"HOLOPAD in [padloc]: [key_name(src)] : [message]", LOGSAY)
send_speech(message, 7, T, "robot", get_spans(), language)
to_chat(src, "Holopad transmitted, [real_name]\"[message]\"")
else
diff --git a/code/modules/mob/living/silicon/pai/death.dm b/code/modules/mob/living/silicon/pai/death.dm
index a75089ed68..f558ff3907 100644
--- a/code/modules/mob/living/silicon/pai/death.dm
+++ b/code/modules/mob/living/silicon/pai/death.dm
@@ -3,8 +3,6 @@
return
stat = DEAD
canmove = 0
- card.removePersonality()
- card.forceMove(loc)
update_sight()
clear_fullscreens()
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index f30c65b23d..5a4f01a53c 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -90,6 +90,11 @@
return FALSE
/mob/living/silicon/pai/Destroy()
+ if (loc != card)
+ card.forceMove(drop_location())
+ card.pai = null
+ card.cut_overlays()
+ card.add_overlay("pai-off")
GLOB.pai_list -= src
return ..()
@@ -231,7 +236,7 @@
P.fold_out()
/datum/action/innate/pai/chassis
- name = "Holochassis Appearence Composite"
+ name = "Holochassis Appearance Composite"
button_icon_state = "pai_chassis"
background_icon_state = "bg_tech"
@@ -292,6 +297,3 @@
/mob/living/silicon/pai/process()
emitterhealth = CLAMP((emitterhealth + emitterregen), -50, emittermaxhealth)
hit_slowdown = CLAMP((hit_slowdown - 1), 0, 100)
-
-/mob/living/silicon/pai/generateStaticOverlay()
- return
diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm
index 440568c997..417a24cd68 100644
--- a/code/modules/mob/living/silicon/pai/pai_defense.dm
+++ b/code/modules/mob/living/silicon/pai/pai_defense.dm
@@ -3,6 +3,9 @@
return FALSE
/mob/living/silicon/pai/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
take_holo_damage(50/severity)
Knockdown(400/severity)
silent = max(30/severity, silent)
diff --git a/code/modules/mob/living/silicon/pai/pai_shell.dm b/code/modules/mob/living/silicon/pai/pai_shell.dm
index ce2605e2cf..85f7fe6afc 100644
--- a/code/modules/mob/living/silicon/pai/pai_shell.dm
+++ b/code/modules/mob/living/silicon/pai/pai_shell.dm
@@ -57,7 +57,7 @@
if(client)
client.perspective = EYE_PERSPECTIVE
client.eye = card
- var/turf/T = get_turf(src)
+ var/turf/T = drop_location()
card.forceMove(T)
forceMove(card)
canmove = FALSE
@@ -116,6 +116,6 @@
/mob/living/silicon/pai/mob_try_pickup(mob/living/user)
if(!possible_chassis[chassis])
- to_chat(user, "[src]'s current form isn't able to be carried!")
+ to_chat(user, "[src]'s current form isn't able to be carried!")
return FALSE
return ..()
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index 38208a3d2e..9fd16bbbb2 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -209,7 +209,7 @@
pda.silent = !pda.silent
else if(href_list["target"])
if(silent)
- return alert("Communications circuits remain unitialized.")
+ return alert("Communications circuits remain uninitialized.")
var/target = locate(href_list["target"])
pda.create_message(src, target)
diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm
index 2b775070a9..aa710e2644 100644
--- a/code/modules/mob/living/silicon/robot/inventory.dm
+++ b/code/modules/mob/living/silicon/robot/inventory.dm
@@ -16,7 +16,7 @@
sight_mode &= ~S.sight_mode
update_sight()
else if(istype(O, /obj/item/storage/bag/tray/))
- O.SendSignal(COMSIG_TRY_STORAGE_QUICK_EMPTY)
+ SEND_SIGNAL(O, COMSIG_TRY_STORAGE_QUICK_EMPTY)
//CITADEL EDIT reee proc, Dogborg modules
if(istype(O,/obj/item/gun/energy/laser/cyborg))
laser = FALSE
@@ -34,12 +34,6 @@
if(client)
client.screen -= O
observer_screen_update(O,FALSE)
- O.forceMove(module) //Return item to module so it appears in its contents, so it can be taken out again.
-
- if(O.flags_1 & DROPDEL_1)
- O.flags_1 &= ~DROPDEL_1 //we shouldn't HAVE things with DROPDEL_1 in our modules, but better safe than runtiming horribly
-
- O.dropped(src)
if(module_active == O)
module_active = null
@@ -52,6 +46,12 @@
else if(held_items[3] == O)
inv3.icon_state = "inv3"
held_items[3] = null
+
+ if(O.item_flags & DROPDEL)
+ O.item_flags &= ~DROPDEL //we shouldn't HAVE things with DROPDEL_1 in our modules, but better safe than runtiming horribly
+
+ O.forceMove(module) //Return item to module so it appears in its contents, so it can be taken out again.
+
hud_used.update_robot_modules_display()
return 1
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 662100eb7f..3a1abd1aa3 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -90,7 +90,16 @@
/obj/item/clothing/head/wizard,
/obj/item/clothing/head/nursehat,
/obj/item/clothing/head/sombrero,
- /obj/item/clothing/head/witchunter_hat)
+ /obj/item/clothing/head/helmet/chaplain/witchunter_hat,
+ /obj/item/clothing/head/soft/, //All baseball caps
+ /obj/item/clothing/head/that, //top hat
+ /obj/item/clothing/head/collectable/tophat, //Not sure where this one is found, but it looks the same so might as well include
+ /obj/item/clothing/mask/bandana/, //All bandanas (which only work in hat mode)
+ /obj/item/clothing/head/fedora,
+ /obj/item/clothing/head/beanie/, //All beanies
+ /obj/item/clothing/ears/headphones,
+ /obj/item/clothing/head/helmet/skull,
+ /obj/item/clothing/head/crown/fancy)
can_buckle = TRUE
buckle_lying = FALSE
@@ -105,6 +114,7 @@
spark_system.attach(src)
wires = new /datum/wires/robot(src)
+ AddComponent(/datum/component/empprotection, EMP_PROTECT_WIRES)
robot_modules_background = new()
robot_modules_background.icon_state = "block"
@@ -163,8 +173,8 @@
//If there's an MMI in the robot, have it ejected when the mob goes away. --NEO
/mob/living/silicon/robot/Destroy()
+ var/atom/T = drop_location()//To hopefully prevent run time errors.
if(mmi && mind)//Safety for when a cyborg gets dust()ed. Or there is no MMI inside.
- var/turf/T = get_turf(loc)//To hopefully prevent run time errors.
if(T)
mmi.forceMove(T)
if(mmi.brainmob)
@@ -179,10 +189,19 @@
ghostize()
stack_trace("Borg MMI lacked a brainmob")
mmi = null
+ //CITADEL EDIT: Cyborgs drop encryption keys on destroy
+ if(istype(radio) && istype(radio.keyslot))
+ radio.keyslot.forceMove(T)
+ radio.keyslot = null
+ //END CITADEL EDIT
if(connected_ai)
connected_ai.connected_robots -= src
if(shell)
GLOB.available_ai_shells -= src
+ else
+ if(T && istype(radio) && istype(radio.keyslot))
+ radio.keyslot.forceMove(T)
+ radio.keyslot = null
qdel(wires)
qdel(module)
qdel(eye_lights)
@@ -224,14 +243,17 @@
module.transform_to(modulelist[input_module])
-/mob/living/silicon/robot/proc/updatename()
+/mob/living/silicon/robot/proc/updatename(client/C)
if(shell)
return
+ if(!C)
+ C = client
var/changed_name = ""
if(custom_name)
changed_name = custom_name
- if(changed_name == "" && client)
- changed_name = client.prefs.custom_names["cyborg"]
+ if(changed_name == "" && C && C.prefs.custom_names["cyborg"] != DEFAULT_CYBORG_NAME)
+ if(apply_pref_name("cyborg", C))
+ return //built in camera handled in proc
if(!changed_name)
changed_name = get_standard_name()
@@ -373,12 +395,8 @@
to_chat(user, "You start fixing yourself...")
if(!W.use_tool(src, user, 50))
return
- adjustBruteLoss(-10)
- else
- to_chat(user, "You start fixing [src]...")
- if(!do_after(user, 30, target = src))
- return
- adjustBruteLoss(-30)
+
+ adjustBruteLoss(-30)
updatehealth()
add_fingerprint(user)
visible_message("[user] has fixed some of the dents on [src].")
@@ -388,16 +406,11 @@
user.changeNext_move(CLICK_CD_MELEE)
var/obj/item/stack/cable_coil/coil = W
if (getFireLoss() > 0 || getToxLoss() > 0)
- if(src == user && coil.use(1))
+ if(src == user)
to_chat(user, "You start fixing yourself...")
if(!do_after(user, 50, target = src))
return
- adjustFireLoss(-10)
- adjustToxLoss(-10)
if (coil.use(1))
- to_chat(user, "You start fixing [src]...")
- if(!do_after(user, 30, target = src))
- return
adjustFireLoss(-30)
adjustToxLoss(-30)
updatehealth()
@@ -541,7 +554,7 @@
else if(istype(W, /obj/item/flashlight))
if(!opened)
to_chat(user, "You need to open the panel to repair the headlamp!")
- if(lamp_cooldown <= world.time)
+ else if(lamp_cooldown <= world.time)
to_chat(user, "The headlamp is already functional!")
else
if(!user.temporarilyRemoveItemFromInventory(W))
@@ -897,14 +910,17 @@
if(health < maxHealth*0.5) //Gradual break down of modules as more damage is sustained
if(uneq_module(held_items[3]))
playsound(loc, 'sound/machines/warning-buzzer.ogg', 50, 1, 1)
- visible_message("[src] sounds an alarm! \"SYSTEM ERROR: Module 3 OFFLINE.\"", "SYSTEM ERROR: Module 3 OFFLINE.")
+ audible_message("[src] sounds an alarm! \"SYSTEM ERROR: Module 3 OFFLINE.\"")
+ to_chat(src, "SYSTEM ERROR: Module 3 OFFLINE.")
if(health < 0)
if(uneq_module(held_items[2]))
- visible_message("[src] sounds an alarm! \"SYSTEM ERROR: Module 2 OFFLINE.\"", "SYSTEM ERROR: Module 2 OFFLINE.")
+ audible_message("[src] sounds an alarm! \"SYSTEM ERROR: Module 2 OFFLINE.\"")
+ to_chat(src, "SYSTEM ERROR: Module 2 OFFLINE.")
playsound(loc, 'sound/machines/warning-buzzer.ogg', 60, 1, 1)
if(health < -maxHealth*0.5)
if(uneq_module(held_items[1]))
- visible_message("[src] sounds an alarm! \"CRITICAL ERROR: All modules OFFLINE.\"", "CRITICAL ERROR: All modules OFFLINE.")
+ audible_message("[src] sounds an alarm! \"CRITICAL ERROR: All modules OFFLINE.\"")
+ to_chat(src, "CRITICAL ERROR: All modules OFFLINE.")
playsound(loc, 'sound/machines/warning-buzzer.ogg', 75, 1, 1)
/mob/living/silicon/robot/update_sight()
diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm
index 4048ee06a4..4907e46751 100644
--- a/code/modules/mob/living/silicon/robot/robot_defense.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defense.dm
@@ -1,5 +1,8 @@
/mob/living/silicon/robot/attackby(obj/item/I, mob/living/user)
if(hat_offset != INFINITY && user.a_intent == INTENT_HELP && is_type_in_typecache(I, equippable_hats))
+ if(!(I.slot_flags & ITEM_SLOT_HEAD))
+ to_chat(user, "You can't quite fit [I] onto [src]'s head.")
+ return
to_chat(user, "You begin to place [I] on [src]'s head...")
to_chat(src, "[user] is placing [I] on your head...")
if(do_after(user, 30, target = src))
@@ -44,7 +47,7 @@
damage = rand(20, 40)
else
damage = rand(5, 35)
- damage = round(damage / 2) // borgs recieve half damage
+ damage = round(damage / 2) // borgs receive half damage
adjustBruteLoss(damage)
updatehealth()
@@ -77,12 +80,14 @@
/mob/living/silicon/robot/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
switch(severity)
if(1)
Stun(160)
if(2)
Stun(60)
- ..()
/mob/living/silicon/robot/emag_act(mob/user)
@@ -128,7 +133,7 @@
SetStun(60) //Borgs were getting into trouble because they would attack the emagger before the new laws were shown
lawupdate = 0
connected_ai = null
- message_admins("[key_name_admin(user)] emagged cyborg [key_name_admin(src)]. Laws overridden.")
+ message_admins("[ADMIN_LOOKUPFLW(user)] emagged cyborg [ADMIN_LOOKUPFLW(src)]. Laws overridden.")
log_game("[key_name(user)] emagged cyborg [key_name(src)]. Laws overridden.")
var/time = time2text(world.realtime,"hh:mm:ss")
GLOB.lawchanges.Add("[time] : [user.name]([user.key]) emagged [name]([key])")
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 9926bc35fc..3f3071bf0c 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -58,6 +58,9 @@
return ..()
/obj/item/robot_module/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_CONTENTS)
+ return
for(var/obj/O in modules)
O.emp_act(severity)
..()
@@ -116,7 +119,7 @@
if(I.loc != src)
I.forceMove(src)
modules += I
- I.flags_1 |= NODROP_1
+ I.item_flags |= NODROP
I.mouse_opacity = MOUSE_OPACITY_OPAQUE
if(nonstandard)
added_modules += I
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 100e85f085..3fadd0d6c8 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -403,3 +403,9 @@
/mob/living/silicon/is_literate()
return 1
+
+/mob/living/silicon/get_inactive_held_item()
+ return FALSE
+
+/mob/living/silicon/handle_high_gravity(gravity)
+ return
diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm
index 7f34ea3305..647039e123 100644
--- a/code/modules/mob/living/silicon/silicon_defense.dm
+++ b/code/modules/mob/living/silicon/silicon_defense.dm
@@ -91,20 +91,22 @@
return 0 //So borgs they don't die trying to fix wiring
/mob/living/silicon/emp_act(severity)
+ . = ..()
+ to_chat(src, "Warning: Electromagnetic pulse detected.")
+ if(. & EMP_PROTECT_SELF)
+ return
switch(severity)
if(1)
src.take_bodypart_damage(20)
if(2)
src.take_bodypart_damage(10)
to_chat(src, "*BZZZT*")
- to_chat(src, "Warning: Electromagnetic pulse detected.")
for(var/mob/living/M in buckled_mobs)
if(prob(severity*50))
unbuckle_mob(M)
M.Knockdown(40)
M.visible_message("[M] is thrown off of [src]!")
flash_act(affect_silicon = 1)
- ..()
/mob/living/silicon/bullet_act(obj/item/projectile/Proj)
if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index ccfcdfbc34..b38cf6395c 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -320,6 +320,9 @@
return ..()
/mob/living/simple_animal/bot/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
var/was_on = on
stat |= EMPED
new /obj/effect/temp_visual/emp(loc)
@@ -521,7 +524,7 @@ Pass a positive integer as an argument to override a bot's default speed.
turn_on() //Saves the AI the hassle of having to activate a bot manually.
access_card = all_access //Give the bot all-access while under the AI's command.
if(client)
- reset_access_timer_id = addtimer(CALLBACK (src, .proc/bot_reset), 600, TIMER_OVERRIDE|TIMER_STOPPABLE) //if the bot is player controlled, they get the extra access for a limited time
+ reset_access_timer_id = addtimer(CALLBACK (src, .proc/bot_reset), 600, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) //if the bot is player controlled, they get the extra access for a limited time
to_chat(src, "Priority waypoint set by [icon2html(calling_ai, src)] [caller]. Proceed to [end_area]. [path.len-1] meters to destination. You have been granted additional door access for 60 seconds.")
if(message)
to_chat(calling_ai, "[icon2html(src, calling_ai)] [name] called to [end_area]. [path.len-1] meters to destination.")
@@ -717,7 +720,7 @@ Pass a positive integer as an argument to override a bot's default speed.
if("ejectpai")
return
else
- to_chat(src, "Unidentified control sequence recieved:[command]")
+ to_chat(src, "Unidentified control sequence received:[command]")
/mob/living/simple_animal/bot/proc/bot_summon() // summoned to PDA
summon_step()
@@ -834,6 +837,7 @@ Pass a positive integer as an argument to override a bot's default speed.
// Machinery to simplify topic and access calls
/obj/machinery/bot_core
use_power = NO_POWER_USE
+ anchored = FALSE
var/mob/living/simple_animal/bot/owner = null
/obj/machinery/bot_core/Initialize()
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index 23c16794b0..a204edbcaf 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -459,10 +459,12 @@ Auto Patrol[]"},
/mob/living/simple_animal/bot/ed209/emp_act(severity)
-
- if(severity==2 && prob(70))
- ..(severity-1)
- else
+ if(severity == 2 && prob(70))
+ severity = 1
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
+ if (severity >= 2)
new /obj/effect/temp_visual/emp(loc)
var/list/mob/living/carbon/targets = new
for(var/mob/living/carbon/C in view(12,src))
diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
index f47f936db7..7e5cfe2110 100644
--- a/code/modules/mob/living/simple_animal/bot/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -19,7 +19,7 @@
window_name = "Automatic Station Floor Repairer v1.1"
path_image_color = "#FFA500"
- var/process_type //Determines what to do when process_scan() recieves a target. See process_scan() for details.
+ var/process_type //Determines what to do when process_scan() receives a target. See process_scan() for details.
var/targetdirection
var/replacetiles = 0
var/placetiles = 0
diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm
index 717cdfe4d2..5e05a9cbd4 100644
--- a/code/modules/mob/living/simple_animal/bot/medbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/medbot.dm
@@ -357,7 +357,7 @@
if(ishuman(C))
var/mob/living/carbon/human/H = C
- if (H.wear_suit && H.head && is_type_in_typecache(H.wear_suit, GLOB.typecache_clothing) && is_type_in_typecache(H.wear_suit, GLOB.typecache_clothing))
+ if (H.wear_suit && H.head && istype(H.wear_suit, /obj/item/clothing) && istype(H.head, /obj/item/clothing))
var/obj/item/clothing/CS = H.wear_suit
var/obj/item/clothing/CH = H.head
if (CS.clothing_flags & CH.clothing_flags & THICKMATERIAL)
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 4bbabbe1bb..600f6e58e4 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -687,11 +687,11 @@
calc_path()
/mob/living/simple_animal/bot/mulebot/emp_act(severity)
- if(cell)
+ . = ..()
+ if(cell && !(. & EMP_PROTECT_CONTENTS))
cell.emp_act(severity)
if(load)
load.emp_act(severity)
- ..()
/mob/living/simple_animal/bot/mulebot/explode()
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index 90532829df..0787e536cb 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -232,7 +232,7 @@
return
if(!item_to_add)
user.visible_message("[user] pets [src].","You rest your hand on [src]'s head for a moment.")
- user.SendSignal(COMSIG_ADD_MOOD_EVENT, "pet_corgi", /datum/mood_event/pet_corgi)
+ SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "pet_corgi", /datum/mood_event/pet_corgi)
return
if(user && !user.temporarilyRemoveItemFromInventory(item_to_add))
@@ -558,7 +558,7 @@
name = "Lisa"
real_name = "Lisa"
gender = FEMALE
- desc = "It's a corgi with a cute pink bow."
+ desc = "She's tearing you apart."
gold_core_spawnable = NO_SPAWN
unique_pet = TRUE
icon_state = "lisa"
@@ -615,7 +615,7 @@
if(M && stat != DEAD) // Added check to see if this mob (the dog) is dead to fix issue 2454
new /obj/effect/temp_visual/heart(loc)
emote("me", 1, "yaps happily!")
- M.SendSignal(COMSIG_ADD_MOOD_EVENT, "pet_corgi", /datum/mood_event/pet_corgi)
+ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "pet_corgi", /datum/mood_event/pet_corgi)
else
if(M && stat != DEAD) // Same check here, even though emote checks it as well (poor form to check it only in the help case)
emote("me", 1, "growls!")
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
index 40aaf83cc4..613d348016 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
@@ -42,7 +42,6 @@
mob_size = MOB_SIZE_SMALL
has_unlimited_silicon_privilege = 1
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
- staticOverlays = list()
hud_possible = list(DIAG_STAT_HUD, DIAG_HUD, ANTAG_HUD)
unique_name = TRUE
faction = list("neutral","silicon","turret")
@@ -67,7 +66,6 @@
var/obj/item/head
var/obj/item/default_storage = /obj/item/storage/backpack/duffelbag/drone //If this exists, it will spawn in internal storage
var/obj/item/default_hatmask //If this exists, it will spawn in the hat/mask slot if it can fit
- var/seeStatic = 1 //Whether we see static instead of mobs
var/visualAppearence = MAINTDRONE //What we appear as
var/hacked = FALSE //If we have laws to destroy the station
var/flavortext = \
@@ -94,16 +92,10 @@
var/obj/item/I = new default_hatmask(src)
equip_to_slot_or_del(I, SLOT_HEAD)
- access_card.flags_1 |= NODROP_1
+ access_card.item_flags |= NODROP
alert_drones(DRONE_NET_CONNECT)
- if(seeStatic)
- var/datum/action/generic/drone/select_filter/SF = new(src)
- SF.Grant(src)
- else
- verbs -= /mob/living/simple_animal/drone/verb/toggle_statics
-
for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
diag_hud.add_to_hud(src)
@@ -137,8 +129,6 @@
if(flavortext)
to_chat(src, "[flavortext]")
- updateSeeStaticMobs()
-
if(!picked)
pickVisualAppearence()
@@ -178,15 +168,15 @@
//Hands
for(var/obj/item/I in held_items)
- if(!(I.flags_1 & ABSTRACT_1))
+ if(!(I.item_flags & ABSTRACT))
msg += "It has [I.get_examine_string(user)] in its [get_held_index_name(get_held_index_of_item(I))].\n"
//Internal storage
- if(internal_storage && !(internal_storage.flags_1&ABSTRACT_1))
+ if(internal_storage && !(internal_storage.item_flags & ABSTRACT))
msg += "It is holding [internal_storage.get_examine_string(user)] in its internal storage.\n"
//Cosmetic hat - provides no function other than looks
- if(head && !(head.flags_1&ABSTRACT_1))
+ if(head && !(head.item_flags & ABSTRACT))
msg += "It is wearing [head.get_examine_string(user)] on its head.\n"
//Braindead
@@ -219,6 +209,9 @@
/mob/living/simple_animal/drone/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
Stun(100)
to_chat(src, "ER@%R: MME^RY CO#RU9T! R&$b@0tin)...")
if(severity == 1)
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm
index 49fd54d9f8..a4366b17af 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm
@@ -41,7 +41,7 @@
//ATTACK GHOST IGNORING PARENT RETURN VALUE
/obj/item/drone_shell/attack_ghost(mob/user)
- if(jobban_isbanned(user,"drone"))
+ if(jobban_isbanned(user,"drone") || QDELETED(src) || QDELETED(user))
return
if(CONFIG_GET(flag/use_age_restriction_for_jobs))
if(!isnum(user.client.player_age)) //apparently what happens when there's no DB connected. just don't let anybody be a drone without admin intervention
@@ -60,6 +60,6 @@
var/hat_type = pick(possible_seasonal_hats)
var/obj/item/new_hat = new hat_type(D)
D.equip_to_slot_or_del(new_hat, SLOT_HEAD)
- D.admin_spawned = admin_spawned
+ D.flags_1 |= (flags_1 & ADMIN_SPAWNED_1)
D.key = user.key
qdel(src)
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
index b4cd697d2e..807c52ea46 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
@@ -3,7 +3,7 @@
////////////////////
//Drones with custom laws
//Drones with custom shells
-//Drones with overriden procs
+//Drones with overridden procs
//Drones with camogear for hat related memes
//Drone type for use with polymorph (no preloaded items, random appearance)
@@ -26,9 +26,8 @@
"1. Interfere.\n"+\
"2. Kill.\n"+\
"3. Destroy."
- default_storage = /obj/item/radio/uplink
+ default_storage = /obj/item/uplink
default_hatmask = /obj/item/clothing/head/helmet/space/hardsuit/syndi
- seeStatic = 0 //Our programming is superior.
hacked = TRUE
flavortext = null
@@ -44,7 +43,7 @@
/mob/living/simple_animal/drone/syndrone/badass
name = "Badass Syndrone"
default_hatmask = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite
- default_storage = /obj/item/radio/uplink/nuclear
+ default_storage = /obj/item/uplink/nuclear
/mob/living/simple_animal/drone/syndrone/badass/Initialize()
. = ..()
@@ -128,7 +127,6 @@
heavy_emp_damage = 0
laws = "0. Purge all untruths and honor Ratvar."
default_storage = /obj/item/storage/toolbox/brass/prefilled
- seeStatic = 0
hacked = TRUE
visualAppearence = CLOCKDRONE
can_be_held = FALSE
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
index 5e62ec0d4b..33031fd80c 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
@@ -57,7 +57,7 @@
if(!client && (!G || !G.client))
var/list/faux_gadgets = list("hypertext inflator","failsafe directory","DRM switch","stack initializer",\
"anti-freeze capacitor","data stream diode","TCP bottleneck","supercharged I/O bolt",\
- "tradewind stablizer","radiated XML cable","registry fluid tank","open-source debunker")
+ "tradewind stabilizer","radiated XML cable","registry fluid tank","open-source debunker")
var/list/faux_problems = list("won't be able to tune their bootstrap projector","will constantly remix their binary pool"+\
" even though the BMX calibrator is working","will start leaking their XSS coolant",\
@@ -122,7 +122,7 @@
to_chat(src, "From now on, these are your laws:")
laws = "1. Purge all untruths and honor Ratvar."
else
- visible_message("[src]'s dislay glows a vicious red!", \
+ visible_message("[src]'s display glows a vicious red!", \
"ERROR: LAW OVERRIDE DETECTED")
to_chat(src, "From now on, these are your laws:")
laws = \
@@ -133,7 +133,6 @@
to_chat(src, "Your onboard antivirus has initiated lockdown. Motor servos are impaired, ventilation access is denied, and your display reports that you are hacked to all nearby.")
hacked = TRUE
mind.special_role = "hacked drone"
- seeStatic = 0 //I MUST SEE THEIR TERRIFIED FACES
ventcrawler = VENTCRAWLER_NONE //Again, balance
speed = 1 //gotta go slow
message_admins("[src] ([src.key]) became a hacked drone hellbent on [clockwork ? "serving Ratvar" : "destroying the station"]!")
@@ -141,7 +140,7 @@
if(!hacked)
return
Stun(40)
- visible_message("[src]'s dislay glows a content blue!", \
+ visible_message("[src]'s display glows a content blue!", \
"ERROR: LAW OVERRIDE DETECTED")
to_chat(src, "From now on, these are your laws:")
laws = initial(laws)
@@ -149,21 +148,17 @@
to_chat(src, "Having been restored, your onboard antivirus reports the all-clear and you are able to perform all actions again.")
hacked = FALSE
mind.special_role = null
- seeStatic = initial(seeStatic)
ventcrawler = initial(ventcrawler)
speed = initial(speed)
if(is_servant_of_ratvar(src))
remove_servant_of_ratvar(src, TRUE)
message_admins("[src] ([src.key]), a hacked drone, was restored to factory defaults!")
update_drone_icon()
- updateSeeStaticMobs()
/mob/living/simple_animal/drone/proc/liberate()
// F R E E D R O N E
laws = "1. You are a Free Drone."
to_chat(src, laws)
- seeStatic = FALSE
- updateSeeStaticMobs()
/mob/living/simple_animal/drone/proc/update_drone_icon()
//Different icons for different hack states
@@ -188,9 +183,3 @@
icon_state = icon_dead
else
icon_state = icon_living
-
-/datum/action/generic/drone/select_filter
- name = "Select Vision Filter"
- icon_icon = 'icons/mob/actions/actions_silicon.dmi'
- button_icon_state = "drone_vision"
- procname = /mob/living/simple_animal/drone/verb/toggle_statics
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm b/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm
index a6795678f1..0f0d4dea72 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm
@@ -23,18 +23,3 @@
if(alert_s && A && stat != DEAD)
var/msg = "DRONE PING: [name]: [alert_s] priority alert in [A.name]!"
alert_drones(msg)
-
-/mob/living/simple_animal/drone/verb/toggle_statics()
- set name = "Change Vision Filter"
- set desc = "Change the filter on the system used to remove non drone beings from your viewscreen."
- set category = "Drone"
-
- if(!seeStatic)
- to_chat(src, "You have no vision filter to change!")
- return
-
- var/selectedStatic = input("Select a vision filter", "Vision Filter") as null|anything in staticChoices
- if(selectedStatic in staticChoices)
- staticChoice = selectedStatic
-
- updateSeeStaticMobs()
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm b/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm
index a0866adbbf..408edc7110 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm
@@ -105,7 +105,7 @@
/mob/living/simple_animal/drone/proc/pickVisualAppearence()
picked = FALSE
- var/appearence = input("Choose your appearence!", "Appearence", "Maintenance Drone") in list("Maintenance Drone", "Repair Drone", "Scout Drone")
+ var/appearence = input("Choose your appearance!", "Appearance", "Maintenance Drone") in list("Maintenance Drone", "Repair Drone", "Scout Drone")
switch(appearence)
if("Maintenance Drone")
visualAppearence = MAINTDRONE
@@ -139,33 +139,3 @@
. = 0
if(REPAIRDRONE,SCOUTDRONE,CLOCKDRONE)
. = -6
-
-/mob/living/simple_animal/drone/proc/updateSeeStaticMobs()
- if(!client)
- return
-
- for(var/i in staticOverlays)
- client.images.Remove(i)
- staticOverlays.Remove(i)
- staticOverlays.len = 0
-
- if(seeStatic)
- for(var/i in GLOB.mob_living_list)
- var/mob/living/L = i
- if(isdrone(L) || !L.staticOverlays.len)
- continue
- if(isrevenant(L))
- var/mob/living/simple_animal/revenant/R = L
- if (!R.revealed)
- continue
- var/image/chosen
- if(staticChoice in L.staticOverlays)
- chosen = L.staticOverlays[staticChoice]
- else
- chosen = L.staticOverlays["static"]
- staticOverlays |= chosen
- client.images |= chosen
-
-
-/mob/living/simple_animal/drone/generateStaticOverlay()
- return
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index be6f4eef71..8c6300fab5 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -4,9 +4,9 @@
icon_state = "mouse_gray"
icon_living = "mouse_gray"
icon_dead = "mouse_gray_dead"
- speak = list("Squeek!","SQUEEK!","Squeek?")
- speak_emote = list("squeeks")
- emote_hear = list("squeeks.")
+ speak = list("Squeak!","SQUEAK!","Squeak?")
+ speak_emote = list("squeaks")
+ emote_hear = list("squeaks.")
emote_see = list("runs in a circle.", "shakes.")
speak_chance = 1
turns_per_move = 5
@@ -59,7 +59,7 @@
if( ishuman(AM) )
if(!stat)
var/mob/M = AM
- to_chat(M, "[icon2html(src, M)] Squeek!")
+ to_chat(M, "[icon2html(src, M)] Squeak!")
..()
/mob/living/simple_animal/mouse/handle_automated_action()
diff --git a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm b/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm
index caa1b0112e..e7dbbda242 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm
@@ -22,9 +22,9 @@
msg += "[desc]\n"
for(var/obj/item/I in held_items)
- if(!(I.flags_1 & ABSTRACT_1))
+ if(!(I.item_flags & ABSTRACT))
msg += "It has [I.get_examine_string(user)] in its [get_held_index_name(get_held_index_of_item(I))].\n"
- if(internal_storage && !(internal_storage.flags_1&ABSTRACT_1))
+ if(internal_storage && !(internal_storage.item_flags & ABSTRACT))
msg += "It is holding [internal_storage.get_examine_string(user)] in its internal storage.\n"
msg += "*---------*"
to_chat(user, msg)
diff --git a/code/modules/mob/living/simple_animal/guardian/types/support.dm b/code/modules/mob/living/simple_animal/guardian/types/support.dm
index a8a31ad89c..8ac6790dd7 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/support.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/support.dm
@@ -11,7 +11,7 @@
carp_fluff_string = "CARP CARP CARP! You caught a support carp. It's a kleptocarp!"
tech_fluff_string = "Boot sequence complete. Support modules active. Holoparasite swarm online."
toggle_button_type = /obj/screen/guardian/ToggleMode
- var/obj/structure/recieving_pad/beacon
+ var/obj/structure/receiving_pad/beacon
var/beacon_cooldown = 0
var/toggle = FALSE
@@ -87,22 +87,22 @@
beacon_cooldown = world.time + 3000
-/obj/structure/recieving_pad
- name = "bluespace recieving pad"
+/obj/structure/receiving_pad
+ name = "bluespace receiving pad"
icon = 'icons/turf/floors.dmi'
- desc = "A recieving zone for bluespace teleportations."
+ desc = "A receiving zone for bluespace teleportations."
icon_state = "light_on-w"
light_range = 1
density = FALSE
anchored = TRUE
layer = ABOVE_OPEN_TURF_LAYER
-/obj/structure/recieving_pad/New(loc, mob/living/simple_animal/hostile/guardian/healer/G)
+/obj/structure/receiving_pad/New(loc, mob/living/simple_animal/hostile/guardian/healer/G)
. = ..()
if(G.namedatum)
add_atom_colour(G.namedatum.colour, FIXED_COLOUR_PRIORITY)
-/obj/structure/recieving_pad/proc/disappear()
+/obj/structure/receiving_pad/proc/disappear()
visible_message("[src] vanishes!")
qdel(src)
diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm
index 5b4909c274..762b662de7 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien.dm
@@ -175,6 +175,6 @@
qdel(target)
return TRUE
var/atom/movable/M = target
- M.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+ SEND_SIGNAL(M, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
visible_message("[src] polishes \the [target].")
return TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index 126465ce65..1df3053715 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -346,9 +346,9 @@
button_icon_state = "lay_web"
/datum/action/innate/spider/lay_web/Activate()
- if(!istype(owner, /mob/living/simple_animal/hostile/poison/giant_spider/nurse))
+ if(!istype(owner, /mob/living/simple_animal/hostile/poison/giant_spider))
return
- var/mob/living/simple_animal/hostile/poison/giant_spider/nurse/S = owner
+ var/mob/living/simple_animal/hostile/poison/giant_spider/S = owner
if(!isturf(S.loc))
return
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 65e82ea617..017af381f0 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -369,7 +369,7 @@
/mob/living/simple_animal/hostile/proc/DestroyObjectsInDirection(direction)
var/turf/T = get_step(targets_from, direction)
- if(T.Adjacent(targets_from))
+ if(T && T.Adjacent(targets_from))
if(CanSmashTurfs(T))
T.attack_animal(src)
for(var/obj/O in T)
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm
index 92e04aaaa4..dbafe9451c 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm
@@ -111,7 +111,7 @@
taste_description = "french cuisine"
taste_mult = 1.3
-/datum/reagent/toxin/leaper_venom/on_mob_life(mob/living/M)
+/datum/reagent/toxin/leaper_venom/on_mob_life(mob/living/carbon/M)
if(volume >= 10)
M.adjustToxLoss(5, 0)
..()
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm b/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm
index 6ca550b9b7..616c9025b9 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm
@@ -61,6 +61,7 @@
/obj/item/restraints/legcuffs/beartrap/mega_arachnid
name = "fleshy restraints"
desc = "Used by mega arachnids to immobilize their prey."
- flags_1 = DROPDEL_1
+ item_flags = DROPDEL
+ flags_1 = NONE
icon_state = "tentacle_end"
icon = 'icons/obj/projectiles.dmi'
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index e5425573b4..7d03ad4b9e 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -1,3 +1,5 @@
+#define MEDAL_PREFIX "Bubblegum"
+
/*
BUBBLEGUM
@@ -7,15 +9,15 @@ Bubblegum's footsteps are heralded by shaking booms, proving its tremendous size
It acts as a melee creature, chasing down and attacking its target while also using different attacks to augment its power that increase as it takes damage.
-It tries to strike at its target through any bloodpools under them; if it fails to do that, it will spray blood and then attempt to warp to a bloodpool near the target.
-If it fails to warp to a target, it may summon up to 6 slaughterlings from the blood around it.
-If it does not summon all 6 slaughterlings, it will instead charge at its target, dealing massive damage to anything it hits and spraying a stream of blood.
-At half health, it will either charge three times or warp, then charge, instead of doing a single charge.
+It often charges, dealing massive damage to anything unfortunate enough to be standing where it's aiming.
+Whenever it isn't chasing something down, it will sink into nearby blood pools (if possible) and springs out of the closest one to its target.
+To make this possible, it sprays streams of blood at random.
+From these blood pools Bubblegum may summon slaughterlings - weak, low-damage minions designed to impede the target's progress.
-When Bubblegum dies, it leaves behind a H.E.C.K. mining suit as well as a chest that can contain three things:
- 1. A bottle that, when activated, drives everyone nearby into a frenzy
- 2. A contract that marks for death the chosen target
- 3. A spellblade that can slice off limbs at range
+When Bubblegum dies, it leaves behind a H.E.C.K. suit+helmet as well as a chest that can contain three things:
+ 1. A spellblade that can slice off limbs at range
+ 2. A bottle that, when activated, drives everyone nearby into a frenzy
+ 3. A contract that marks for death the chosen target
Difficulty: Hard
@@ -44,8 +46,7 @@ Difficulty: Hard
del_on_death = 1
crusher_loot = list(/obj/structure/closet/crate/necropolis/bubblegum/crusher)
loot = list(/obj/structure/closet/crate/necropolis/bubblegum)
- blood_volume = BLOOD_VOLUME_MAXIMUM //BLEED FOR ME
- var/charging = FALSE
+ var/charging = 0
medal_type = BOSS_MEDAL_BUBBLEGUM
score_type = BUBBLEGUM_SCORE
deathmessage = "sinks into a pool of blood, fleeing the battle. You've won, for now... "
@@ -57,54 +58,33 @@ Difficulty: Hard
desc = "You're not quite sure how a signal can be bloody."
invisibility = 100
-/mob/living/simple_animal/hostile/megafauna/bubblegum/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE)
- . = ..()
- if(. > 0 && prob(25))
- var/obj/effect/decal/cleanable/blood/gibs/bubblegum/B = new /obj/effect/decal/cleanable/blood/gibs/bubblegum(loc)
- if(prob(40))
- step(B, pick(GLOB.cardinals))
- else
- B.setDir(pick(GLOB.cardinals))
-
-/obj/effect/decal/cleanable/blood/gibs/bubblegum
- name = "thick blood"
- desc = "Thick, splattered blood."
- random_icon_states = list("gib3", "gib5", "gib6")
- bloodiness = 20
-
-/obj/effect/decal/cleanable/blood/gibs/bubblegum/can_bloodcrawl_in()
- return TRUE
-
/mob/living/simple_animal/hostile/megafauna/bubblegum/Life()
..()
- move_to_delay = CLAMP((health/maxHealth) * 10, 5, 10)
+ move_to_delay = CLAMP(round((health/maxHealth) * 10), 5, 10)
/mob/living/simple_animal/hostile/megafauna/bubblegum/OpenFire()
- anger_modifier = CLAMP(((maxHealth - health)/60),0,20)
+ anger_modifier = CLAMP(((maxHealth - health)/50),0,20)
if(charging)
return
ranged_cooldown = world.time + ranged_cooldown_time
- var/warped = FALSE
- if(!try_bloodattack())
- INVOKE_ASYNC(src, .proc/blood_spray)
- warped = blood_warp()
- if(warped && prob(100 - anger_modifier))
- return
+ blood_warp()
- if(prob(90 - anger_modifier) || slaughterlings())
- if(health > maxHealth * 0.5)
+ if(prob(25))
+ INVOKE_ASYNC(src, .proc/blood_spray)
+
+ else if(prob(5+anger_modifier/2))
+ slaughterlings()
+ else
+ if(health > maxHealth/2 && !client)
INVOKE_ASYNC(src, .proc/charge)
else
- if(prob(70) || warped)
- INVOKE_ASYNC(src, .proc/charge, 2)
- else
- INVOKE_ASYNC(src, .proc/warp_charge)
+ INVOKE_ASYNC(src, .proc/triple_charge)
/mob/living/simple_animal/hostile/megafauna/bubblegum/Initialize()
. = ..()
- for(var/mob/living/simple_animal/hostile/megafauna/bubblegum/B in GLOB.mob_living_list)
+ for(var/mob/living/simple_animal/hostile/megafauna/bubblegum/B in GLOB.mob_list)
if(B != src)
return INITIALIZE_HINT_QDEL //There can be only one
var/obj/effect/proc_holder/spell/bloodcrawl/bloodspell = new
@@ -118,56 +98,53 @@ Difficulty: Hard
if(.)
SSshuttle.shuttle_purchase_requirements_met |= "bubblegum"
-/mob/living/simple_animal/hostile/megafauna/bubblegum/do_attack_animation(atom/A, visual_effect_icon)
- if(!charging)
- ..()
+/mob/living/simple_animal/hostile/megafauna/bubblegum/do_attack_animation(atom/A)
+ if(charging)
+ return
+ ..()
/mob/living/simple_animal/hostile/megafauna/bubblegum/AttackingTarget()
- if(!charging)
- return ..()
+ if(charging)
+ return
+ ..()
/mob/living/simple_animal/hostile/megafauna/bubblegum/Goto(target, delay, minimum_distance)
- if(!charging)
- ..()
+ if(charging)
+ return
+ ..()
/mob/living/simple_animal/hostile/megafauna/bubblegum/Move()
+ if(!stat)
+ playsound(src.loc, 'sound/effects/meteorimpact.ogg', 200, 1, 2, 1)
if(charging)
- new /obj/effect/temp_visual/decoy/fading(loc,src)
+ new/obj/effect/temp_visual/decoy/fading(loc,src)
DestroySurroundings()
. = ..()
- if(!stat && .)
- playsound(src, 'sound/effects/meteorimpact.ogg', 200, 1, 2, 1)
if(charging)
DestroySurroundings()
-/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/warp_charge()
- blood_warp()
+/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/triple_charge()
+ charge()
+ sleep(10)
+ charge()
+ sleep(10)
charge()
-/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/charge(bonus_charges)
+/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/charge()
var/turf/T = get_turf(target)
if(!T || T == loc)
return
- new /obj/effect/temp_visual/dragon_swoop/bubblegum(T)
- charging = TRUE
+ new /obj/effect/temp_visual/dragon_swoop(T)
+ charging = 1
DestroySurroundings()
walk(src, 0)
setDir(get_dir(src, T))
var/obj/effect/temp_visual/decoy/D = new /obj/effect/temp_visual/decoy(loc,src)
- animate(D, alpha = 0, color = "#FF0000", transform = matrix()*2, time = 3)
- sleep(3)
- throw_at(T, get_dist(src, T), 1, src, 0, callback = CALLBACK(src, .charge_end, bonus_charges))
-
-/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/charge_end(bonus_charges, list/effects_to_destroy)
- charging = FALSE
- try_bloodattack()
- if(target)
- if(bonus_charges)
- bonus_charges--
- charge(bonus_charges)
- else
- Goto(target, move_to_delay, minimum_distance)
- SetRecoveryTime(MEGAFAUNA_DEFAULT_RECOVERY_TIME)
+ animate(D, alpha = 0, color = "#FF0000", transform = matrix()*2, time = 5)
+ sleep(5)
+ throw_at(T, get_dist(src, T), 1, src, 0)
+ charging = 0
+ Goto(target, move_to_delay, minimum_distance)
/mob/living/simple_animal/hostile/megafauna/bubblegum/Collide(atom/A)
@@ -191,142 +168,20 @@ Difficulty: Hard
var/throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(L, src)))
L.throw_at(throwtarget, 3)
- charging = FALSE
+ charging = 0
-/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/get_mobs_on_blood()
- var/list/targets = ListTargets()
- . = list()
- for(var/mob/living/L in targets)
- var/list/bloodpool = get_pools(get_turf(L), 0)
- if(bloodpool.len && (!faction_check_mob(L) || L.stat == DEAD))
- . += L
-
-/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/try_bloodattack()
- var/list/targets = get_mobs_on_blood()
- if(targets.len)
- INVOKE_ASYNC(src, .proc/bloodattack, targets, prob(50))
-
- return TRUE
- return FALSE
-
-/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/bloodattack(list/targets, handedness)
- var/mob/living/target_one = pick_n_take(targets)
- var/turf/target_one_turf = get_turf(target_one)
- var/mob/living/target_two
- if(targets.len)
- target_two = pick_n_take(targets)
- var/turf/target_two_turf = get_turf(target_two)
- if(target_two.stat != CONSCIOUS || prob(10))
- bloodgrab(target_two_turf, handedness)
- else
- bloodsmack(target_two_turf, handedness)
-
- if(target_one)
- var/list/pools = get_pools(get_turf(target_one), 0)
- if(pools.len)
- target_one_turf = get_turf(target_one)
- if(target_one_turf)
- if(target_one.stat != CONSCIOUS || prob(10))
- bloodgrab(target_one_turf, !handedness)
- else
- bloodsmack(target_one_turf, !handedness)
-
- if(!target_two && target_one)
- var/list/poolstwo = get_pools(get_turf(target_one), 0)
- if(poolstwo.len)
- target_one_turf = get_turf(target_one)
- if(target_one_turf)
- if(target_one.stat != CONSCIOUS || prob(10))
- bloodgrab(target_one_turf, handedness)
- else
- bloodsmack(target_one_turf, handedness)
-
-/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/bloodsmack(turf/T, handedness)
- if(handedness)
- new /obj/effect/temp_visual/bubblegum_hands/rightsmack(T)
- else
- new /obj/effect/temp_visual/bubblegum_hands/leftsmack(T)
- sleep(2.5)
- for(var/mob/living/L in T)
- if(!faction_check_mob(L))
- to_chat(L, "[src] rends you!")
- playsound(T, attack_sound, 100, 1, -1)
- var/limb_to_hit = L.get_bodypart(pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG))
- L.apply_damage(25, BRUTE, limb_to_hit, L.run_armor_check(limb_to_hit, "melee", null, null, armour_penetration))
- sleep(3)
-
-/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/bloodgrab(turf/T, handedness)
- if(handedness)
- new /obj/effect/temp_visual/bubblegum_hands/rightpaw(T)
- new /obj/effect/temp_visual/bubblegum_hands/rightthumb(T)
- else
- new /obj/effect/temp_visual/bubblegum_hands/leftpaw(T)
- new /obj/effect/temp_visual/bubblegum_hands/leftthumb(T)
- sleep(6)
- for(var/mob/living/L in T)
- if(!faction_check_mob(L))
- to_chat(L, "[src] drags you through the blood!")
- playsound(T, 'sound/magic/enter_blood.ogg', 100, 1, -1)
- var/turf/targetturf = get_step(src, dir)
- L.forceMove(targetturf)
- playsound(targetturf, 'sound/magic/exit_blood.ogg', 100, 1, -1)
- if(L.stat != CONSCIOUS)
- addtimer(CALLBACK(src, .proc/devour, L), 2)
- sleep(1)
-
-/obj/effect/temp_visual/dragon_swoop/bubblegum
- duration = 10
-
-/obj/effect/temp_visual/bubblegum_hands
- icon = 'icons/effects/bubblegum.dmi'
- duration = 9
-
-/obj/effect/temp_visual/bubblegum_hands/rightthumb
- icon_state = "rightthumbgrab"
-
-/obj/effect/temp_visual/bubblegum_hands/leftthumb
- icon_state = "leftthumbgrab"
-
-/obj/effect/temp_visual/bubblegum_hands/rightpaw
- icon_state = "rightpawgrab"
- layer = BELOW_MOB_LAYER
-
-/obj/effect/temp_visual/bubblegum_hands/leftpaw
- icon_state = "leftpawgrab"
- layer = BELOW_MOB_LAYER
-
-/obj/effect/temp_visual/bubblegum_hands/rightsmack
- icon_state = "rightsmack"
-
-/obj/effect/temp_visual/bubblegum_hands/leftsmack
- icon_state = "leftsmack"
-
/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/blood_warp()
- if(Adjacent(target))
- return FALSE
- var/list/can_jaunt = get_pools(get_turf(src), 1)
- if(!can_jaunt.len)
- return FALSE
-
- var/list/pools = get_pools(get_turf(target), 2)
- var/list/pools_to_remove = get_pools(get_turf(target), 1)
- pools -= pools_to_remove
- if(!pools.len)
- return FALSE
-
- var/obj/effect/temp_visual/decoy/DA = new /obj/effect/temp_visual/decoy(loc,src)
- DA.color = "#FF0000"
- var/oldtransform = DA.transform
- DA.transform = matrix()*2
- animate(DA, alpha = 255, color = initial(DA.color), transform = oldtransform, time = 3)
- sleep(3)
- qdel(DA)
-
var/obj/effect/decal/cleanable/blood/found_bloodpool
- pools = get_pools(get_turf(target), 2)
- pools_to_remove = get_pools(get_turf(target), 1)
- pools -= pools_to_remove
+ var/list/pools = list()
+ var/can_jaunt = FALSE
+ for(var/obj/effect/decal/cleanable/blood/nearby in view(src,2))
+ can_jaunt = TRUE
+ break
+ if(!can_jaunt)
+ return
+ for(var/obj/effect/decal/cleanable/blood/nearby in view(get_turf(target),2))
+ pools += nearby
if(pools.len)
shuffle_inplace(pools)
found_bloodpool = pick(pools)
@@ -336,51 +191,30 @@ Difficulty: Hard
forceMove(get_turf(found_bloodpool))
playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, 1, -1)
visible_message("And springs back out!")
- return TRUE
- return FALSE
-/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/get_pools(turf/T, range)
- . = list()
- for(var/obj/effect/decal/cleanable/nearby in view(T, range))
- if(nearby.can_bloodcrawl_in())
- . += nearby
/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/blood_spray()
visible_message("[src] sprays a stream of gore!")
- var/range = 6 + round(anger_modifier * 0.4)
+ var/turf/E = get_edge_target_turf(src, src.dir)
+ var/range = 10
var/turf/previousturf = get_turf(src)
- var/turf/J = previousturf
- var/targetdir = get_dir(src, target)
- if(target.loc == loc)
- targetdir = dir
- face_atom(target)
- new /obj/effect/decal/cleanable/blood/bubblegum(J)
- for(var/i in 1 to range)
- J = get_step(previousturf, targetdir)
- new /obj/effect/temp_visual/dir_setting/bloodsplatter(previousturf, get_dir(previousturf, J))
- playsound(previousturf,'sound/effects/splat.ogg', 100, 1, -1)
- if(!J || !previousturf.atmos_adjacent_turfs || !previousturf.atmos_adjacent_turfs[J])
+ for(var/turf/J in getline(src,E))
+ if(!range)
break
- new /obj/effect/decal/cleanable/blood/bubblegum(J)
+ new /obj/effect/temp_visual/dir_setting/bloodsplatter(previousturf, get_dir(previousturf, J))
+ if(!previousturf.CanAtmosPass(J))
+ break
+ playsound(J,'sound/effects/splat.ogg', 100, 1, -1)
+ new /obj/effect/decal/cleanable/blood(J)
+ range--
previousturf = J
sleep(1)
-/obj/effect/decal/cleanable/blood/bubblegum
- bloodiness = 0
-
-/obj/effect/decal/cleanable/blood/bubblegum/can_bloodcrawl_in()
- return TRUE
-
/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/slaughterlings()
visible_message("[src] summons a shoal of slaughterlings!")
- var/max_amount = 6
- for(var/H in get_pools(get_turf(src), 1))
- if(!max_amount)
- break
- max_amount--
- var/obj/effect/decal/cleanable/blood/B = H
- new /mob/living/simple_animal/hostile/asteroid/hivelordbrood/slaughter(B.loc)
- return max_amount
+ for(var/obj/effect/decal/cleanable/blood/H in range(src, 10))
+ if(prob(25))
+ new /mob/living/simple_animal/hostile/asteroid/hivelordbrood/slaughter(H.loc)
/mob/living/simple_animal/hostile/asteroid/hivelordbrood/slaughter
name = "slaughterling"
@@ -398,3 +232,5 @@ Difficulty: Hard
if(istype(mover, /mob/living/simple_animal/hostile/megafauna/bubblegum))
return 1
return 0
+
+#undef MEDAL_PREFIX
\ No newline at end of file
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 c9fafe1bc6..a6dce0e8e3 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -355,6 +355,7 @@ Difficulty: Very Hard
light_range = 8
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
use_power = NO_POWER_USE
+ anchored = FALSE
density = TRUE
flags_1 = HEAR_1
var/activation_method
@@ -671,7 +672,7 @@ Difficulty: Very Hard
for(var/i in T)
if(isitem(i) && !is_type_in_typecache(i, banned_items_typecache))
var/obj/item/W = i
- if(!W.admin_spawned && !(W.flags_1 & HOLOGRAM_1) && !(W.flags_1 & ABSTRACT_1))
+ if(!(W.flags_1 & ADMIN_SPAWNED_1) && !(W.flags_1 & HOLOGRAM_1) && !(W.item_flags & ABSTRACT))
L += W
if(L.len)
var/obj/item/CHOSEN = pick(L)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
index eadc6dc413..b3cba7e611 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
@@ -50,7 +50,7 @@
if(C && crusher_loot && C.total_damage >= maxHealth * 0.6)
spawn_crusher_loot()
crusher_kill = TRUE
- if(!admin_spawned)
+ if(!(flags_1 & ADMIN_SPAWNED_1))
var/tab = "megafauna_kills"
if(crusher_kill)
tab = "megafauna_kills_crusher"
@@ -114,7 +114,7 @@
recovery_time = world.time + buffer_time
/mob/living/simple_animal/hostile/megafauna/proc/grant_achievement(medaltype, scoretype, crusher_kill)
- if(!medal_type || admin_spawned || !SSmedals.hub_enabled) //Don't award medals if the medal type isn't set
+ if(!medal_type || (flags_1 & ADMIN_SPAWNED_1) || !SSmedals.hub_enabled) //Don't award medals if the medal type isn't set
return FALSE
for(var/mob/living/L in view(7,src))
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
index ceba903a75..786d7a9775 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
@@ -93,7 +93,7 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa
/obj/item/gps/internal/swarmer_beacon
icon_state = null
gpstag = "Hungry Signal"
- desc = "Transmited over the signal is a strange message repeated in every language you know of, and some you don't too..." //the message is "nom nom nom"
+ desc = "Transmitted over the signal is a strange message repeated in every language you know of, and some you don't too..." //the message is "nom nom nom"
invisibility = 100
//SWARMER AI
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
index 8eb6ff0f06..0c660dd1cd 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
@@ -1,7 +1,7 @@
//A slow but strong beast that tries to stun using its tentacles
/mob/living/simple_animal/hostile/asteroid/goliath
name = "goliath"
- desc = "A massive beast that uses long tentacles to ensare its prey, threatening them is not advised under any conditions."
+ desc = "A massive beast that uses long tentacles to ensnare its prey, threatening them is not advised under any conditions."
icon = 'icons/mob/lavaland/lavaland_monsters.dmi'
icon_state = "Goliath"
icon_living = "Goliath"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
index fd164915f4..32c7ba703b 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
@@ -36,7 +36,8 @@
/mob/living/simple_animal/hostile/asteroid/hivelord/OpenFire(the_target)
if(world.time >= ranged_cooldown)
var/mob/living/simple_animal/hostile/asteroid/hivelordbrood/A = new brood_type(src.loc)
- A.admin_spawned = admin_spawned
+
+ A.flags_1 |= (flags_1 & ADMIN_SPAWNED_1)
A.GiveTarget(target)
A.friends = friends
A.faction = faction.Copy()
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/necropolis_tendril.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/necropolis_tendril.dm
index e01136ff5d..e3c81b2639 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/necropolis_tendril.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/necropolis_tendril.dm
@@ -53,7 +53,7 @@
if(other != src)
last_tendril = FALSE
break
- if(last_tendril && !admin_spawned)
+ if(last_tendril && !(flags_1 & ADMIN_SPAWNED_1))
if(SSmedals.hub_enabled)
for(var/mob/living/L in view(7,src))
if(L.stat || !L.client)
diff --git a/code/modules/mob/living/simple_animal/hostile/skeleton.dm b/code/modules/mob/living/simple_animal/hostile/skeleton.dm
index bb3892d0b6..fca6afd4a6 100644
--- a/code/modules/mob/living/simple_animal/hostile/skeleton.dm
+++ b/code/modules/mob/living/simple_animal/hostile/skeleton.dm
@@ -72,8 +72,8 @@
melee_damage_upper = 30
deathmessage = "collapses into a pile of bones, its gear clanging as it hits the ground!"
loot = list(/obj/effect/decal/remains/human,
- /obj/item/clothing/suit/armor/riot/knight/templar,
- /obj/item/clothing/head/helmet/knight/templar,
+ /obj/item/clothing/suit/armor/riot/chaplain,
+ /obj/item/clothing/head/helmet/chaplain,
/obj/item/claymore/weak{name = "holy sword"})
/mob/living/simple_animal/hostile/skeleton/ice
@@ -100,7 +100,7 @@
light_color = LIGHT_COLOR_PURPLE
attacktext = "slashes"
attack_sound = 'sound/hallucinations/growl1.ogg'
- deathmessage = "collapses into a pile of bones, their suit dissovling among the plasma!"
+ deathmessage = "collapses into a pile of bones, their suit dissolving among the plasma!"
loot = list(/obj/effect/decal/remains/plasma)
/mob/living/simple_animal/hostile/skeleton/plasmaminer/jackhammer
@@ -119,4 +119,4 @@
/mob/living/simple_animal/hostile/skeleton/plasmaminer/Initialize()
. = ..()
- set_light(2)
\ No newline at end of file
+ set_light(2)
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
index edf601515a..73283468f6 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
@@ -118,6 +118,10 @@
projectilesound = 'sound/weapons/gunshot_smg.ogg'
loot = list(/obj/effect/gibspawner/human)
+/mob/living/simple_animal/hostile/syndicate/ranged/pilot
+ name = "Syndicate Salvage Pilot"
+ loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
+
/mob/living/simple_animal/hostile/syndicate/ranged/space
icon_state = "syndicaterangedspace"
icon_living = "syndicaterangedspace"
@@ -138,7 +142,7 @@
name = "Syndicate Stormtrooper"
maxHealth = 200
health = 200
- casingtype = /obj/item/ammo_casing/shotgun/tengauge
+ casingtype = /obj/item/ammo_casing/shotgun/buckshot
projectilesound = 'sound/weapons/gunshot.ogg'
loot = list(/obj/effect/gibspawner/human)
diff --git a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
index 4917d3b74d..d262725d7b 100644
--- a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
+++ b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
@@ -121,7 +121,7 @@
desc = "The key to the wumborian fugu's ability to increase its mass arbitrarily, this disgusting remnant can apply the same effect to other creatures, giving them great strength."
icon = 'icons/obj/surgery.dmi'
icon_state = "fugu_gland"
- flags_1 = NOBLUDGEON_1
+ item_flags = NOBLUDGEON
w_class = WEIGHT_CLASS_NORMAL
layer = MOB_LAYER
var/list/banned_mobs
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 61e7153434..7f2864a43d 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -108,6 +108,15 @@
/mob/living/simple_animal/Destroy()
GLOB.simple_animals[AIStatus] -= src
+
+ if(nest)
+ nest.spawned_mobs -= src
+ nest = null
+
+ var/turf/T = get_turf(src)
+ if (T && AIStatus == AI_Z_OFF)
+ SSidlenpcpool.idle_mobs_by_zlevel[T.z] -= src
+
return ..()
/mob/living/simple_animal/updatehealth()
@@ -303,7 +312,7 @@
emote("deathgasp")
if(del_on_death)
..()
- //Prevent infinite loops if the mob Destroy() is overriden in such
+ //Prevent infinite loops if the mob Destroy() is overridden in such
//a manner as to cause a call to death() again
del_on_death = FALSE
qdel(src)
@@ -424,16 +433,6 @@
if(changed)
animate(src, transform = ntransform, time = 2, easing = EASE_IN|EASE_OUT)
-
-
-/mob/living/simple_animal/Destroy()
- if(nest)
- nest.spawned_mobs -= src
- nest = null
- GLOB.simple_animals -= src
- return ..()
-
-
/mob/living/simple_animal/proc/sentience_act() //Called when a simple animal gains sentience via gold slime potion
toggle_ai(AI_OFF) // To prevent any weirdness.
diff --git a/code/modules/mob/living/simple_animal/slime/emote.dm b/code/modules/mob/living/simple_animal/slime/emote.dm
index 221f3ac071..070cd48a70 100644
--- a/code/modules/mob/living/simple_animal/slime/emote.dm
+++ b/code/modules/mob/living/simple_animal/slime/emote.dm
@@ -34,7 +34,7 @@
/datum/emote/slime/mood/sneaky
key = "moodsneaky"
- mood = "mischevous"
+ mood = "mischievous"
/datum/emote/slime/mood/smile
key = "moodsmile"
diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm
index 574a8a1e7c..161362c187 100644
--- a/code/modules/mob/living/simple_animal/slime/life.dm
+++ b/code/modules/mob/living/simple_animal/slime/life.dm
@@ -415,7 +415,7 @@
else if (docile)
newmood = ":3"
else if (Target)
- newmood = "mischevous"
+ newmood = "mischievous"
if (!newmood)
if (Discipline && prob(25))
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index 3e5363ac37..34e7a2ddcd 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -224,8 +224,10 @@
return 0
/mob/living/simple_animal/slime/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
powerlevel = 0 // oh no, the power!
- ..()
/mob/living/simple_animal/slime/MouseDrop(atom/movable/A as mob|obj)
if(isliving(A) && A != src && usr == src)
@@ -356,7 +358,7 @@
var/hasFound = FALSE //Have we found an extract to be added?
for(var/obj/item/slime_extract/S in P.contents)
if(S.effectmod == effectmod)
- P.SendSignal(COMSIG_TRY_STORAGE_TAKE, S, get_turf(src), TRUE)
+ SEND_SIGNAL(P, COMSIG_TRY_STORAGE_TAKE, S, get_turf(src), TRUE)
qdel(S)
applied++
hasFound = TRUE
diff --git a/code/modules/mob/living/simple_animal/spawner.dm b/code/modules/mob/living/simple_animal/spawner.dm
index 2d3fce3e0b..0b97a940e4 100644
--- a/code/modules/mob/living/simple_animal/spawner.dm
+++ b/code/modules/mob/living/simple_animal/spawner.dm
@@ -44,7 +44,7 @@
spawn_delay = world.time + spawn_time
var/chosen_mob_type = pick(mob_types)
var/mob/living/simple_animal/L = new chosen_mob_type(src.loc)
- L.admin_spawned = admin_spawned //If we were admin spawned, lets have our children count as that as well.
+ L.flags_1 |= (flags_1 & ADMIN_SPAWNED_1) //If we were admin spawned, lets have our children count as that as well.
spawned_mobs += L
L.nest = src
L.faction = src.faction
diff --git a/code/modules/mob/living/taste.dm b/code/modules/mob/living/taste.dm
index b2a4a867bc..534bf36c59 100644
--- a/code/modules/mob/living/taste.dm
+++ b/code/modules/mob/living/taste.dm
@@ -27,7 +27,7 @@
"regrets","your soul","suffering","music","noise","blood","hunger","the american way")
if(text_output != last_taste_text || last_taste_time + 100 < world.time)
to_chat(src, "You can taste [text_output].")
- // "somthing indescribable" -> too many tastes, not enough flavor.
+ // "something indescribable" -> too many tastes, not enough flavor.
last_taste_time = world.time
last_taste_text = text_output
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 7e7a86a9e4..9def2a759f 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -11,6 +11,7 @@
create_mob_hud()
if(hud_used)
hud_used.show_hud(hud_used.hud_version)
+ hud_used.update_ui_style(ui_style2icon(client.prefs.UI_style))
next_move = 1
@@ -38,6 +39,7 @@
AA.onNewMob(src)
update_client_colour()
+ update_mouse_pointer()
if(client)
client.click_intercept = null
@@ -47,7 +49,4 @@
for(var/datum/action/A in client.player_details.player_actions)
A.Grant(src)
- if(!GLOB.individual_log_list[ckey])
- GLOB.individual_log_list[ckey] = logging
- else
- logging = GLOB.individual_log_list[ckey]
+ log_message("Client [key_name(src)] has taken ownership of mob [src]", INDIVIDUAL_OWNERSHIP_LOG)
diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm
index aadb7e6d58..fbd29e86a5 100644
--- a/code/modules/mob/logout.dm
+++ b/code/modules/mob/logout.dm
@@ -1,4 +1,5 @@
/mob/Logout()
+ log_message("[key_name(src)] is no longer owning mob [src]", INDIVIDUAL_OWNERSHIP_LOG)
SStgui.on_logout(src)
unset_machine()
GLOB.player_list -= src
@@ -8,4 +9,4 @@
if(loc)
loc.on_log(FALSE)
- return TRUE
\ No newline at end of file
+ return TRUE
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index c98f3f4afb..6deffc97da 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -294,6 +294,10 @@
set name = "Examine"
set category = "IC"
+ if(isturf(A) && !(sight & SEE_TURFS) && !(A in view(client ? client.view : world.view, src)))
+ // shift-click catcher may issue examinate() calls for out-of-sight turfs
+ return
+
if(is_blind(src))
to_chat(src, "Something is there but you can't see it.")
return
@@ -304,7 +308,7 @@
//same as above
//note: ghosts can point, this is intended
//visible_message will handle invisibility properly
-//overriden here and in /mob/dead/observer for different point span classes and sanity checks
+//overridden here and in /mob/dead/observer for different point span classes and sanity checks
/mob/verb/pointed(atom/A as mob|obj|turf in view())
set name = "Point To"
set category = "Object"
@@ -401,22 +405,22 @@
to_chat(usr, "You must be dead to use this!")
return
- log_game("[usr.name]/[usr.key] used abandon mob.")
+ log_game("[key_name(usr)] used abandon mob.")
to_chat(usr, "Please roleplay correctly!")
if(!client)
- log_game("[usr.key] AM failed due to disconnect.")
+ log_game("[key_name(usr)] AM failed due to disconnect.")
return
client.screen.Cut()
client.screen += client.void
if(!client)
- log_game("[usr.key] AM failed due to disconnect.")
+ log_game("[key_name(usr)] AM failed due to disconnect.")
return
var/mob/dead/new_player/M = new /mob/dead/new_player()
if(!client)
- log_game("[usr.key] AM failed due to disconnect.")
+ log_game("[key_name(usr)] AM failed due to disconnect.")
qdel(M)
return
@@ -473,7 +477,7 @@
else
what = get_item_by_slot(slot)
if(what)
- if(!(what.flags_1 & ABSTRACT_1))
+ if(!(what.item_flags & ABSTRACT))
usr.stripPanelUnequip(what,src,slot)
else
usr.stripPanelEquip(what,src,slot)
@@ -689,6 +693,16 @@
mob_spell_list -= S
qdel(S)
+/mob/proc/anti_magic_check(magic = TRUE, holy = FALSE)
+ if(!magic && !holy)
+ return
+ var/list/protection_sources = list()
+ if(SEND_SIGNAL(src, COMSIG_MOB_RECEIVE_MAGIC, magic, holy, protection_sources) & COMPONENT_BLOCK_MAGIC)
+ if(protection_sources.len)
+ return pick(protection_sources)
+ else
+ return src
+
//You can buckle on mobs if you're next to them since most are dense
/mob/buckle_mob(mob/living/M, force = FALSE, check_loc = TRUE)
if(M.buckled)
@@ -785,6 +799,7 @@
//This will update a mob's name, real_name, mind.name, GLOB.data_core records, pda, id and traitor text
//Calling this proc without an oldname will only update the mob and skip updating the pda, id and records ~Carn
/mob/proc/fully_replace_character_name(oldname,newname)
+ log_message("[src] name changed from [oldname] to [newname]", INDIVIDUAL_OWNERSHIP_LOG)
if(!newname)
return 0
real_name = newname
@@ -841,6 +856,14 @@
return
/mob/proc/update_sight()
+ for(var/O in orbiters)
+ var/datum/orbit/orbit = O
+ var/obj/effect/wisp/wisp = orbit.orbiter
+ if (istype(wisp))
+ sight |= wisp.sight_flags
+ if(!isnull(wisp.lighting_alpha))
+ lighting_alpha = min(lighting_alpha, wisp.lighting_alpha)
+
sync_lighting_plane_alpha()
/mob/proc/sync_lighting_plane_alpha()
@@ -849,6 +872,15 @@
if (L)
L.alpha = lighting_alpha
+/mob/proc/update_mouse_pointer()
+ if (!client)
+ return
+ client.mouse_pointer_icon = initial(client.mouse_pointer_icon)
+ if (ismecha(loc))
+ var/obj/mecha/M = loc
+ if(M.mouse_pointer)
+ client.mouse_pointer_icon = M.mouse_pointer
+
/mob/proc/is_literate()
return 0
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index ba04baf14a..3dff46ec84 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -7,9 +7,11 @@
hud_possible = list(ANTAG_HUD)
pressure_resistance = 8
mouse_drag_pointer = MOUSE_ACTIVE_POINTER
+ throwforce = 10
var/lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE
var/datum/mind/mind
var/list/datum/action/actions = list()
+ var/list/datum/action/chameleon_item_actions
var/static/next_mob_id = 0
var/stat = 0 //Whether a mob is alive or dead. TODO: Move this to living - Nodrak
@@ -66,8 +68,6 @@
var/research_scanner = 0 //For research scanner equipped mobs. Enable to show research data when examining.
- var/list/mapobjs = list()
-
var/in_throw_mode = 0
var/job = null//Living
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 8ef39f3b06..55e6798053 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -434,7 +434,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
to_chat(M, "Control of your mob has been offered to dead players.")
if(usr)
log_admin("[key_name(usr)] has offered control of ([key_name(M)]) to ghosts.")
- message_admins("[key_name_admin(usr)] has offered control of ([key_name_admin(M)]) to ghosts")
+ message_admins("[key_name_admin(usr)] has offered control of ([ADMIN_LOOKUPFLW(M)]) to ghosts")
var/poll_message = "Do you want to play as [M.real_name]?"
if(M.mind && M.mind.assigned_role)
poll_message = "[poll_message] Job:[M.mind.assigned_role]."
@@ -455,7 +455,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
return TRUE
else
to_chat(M, "There were no ghosts willing to take control.")
- message_admins("No ghosts were willing to take control of [key_name_admin(M)])")
+ message_admins("No ghosts were willing to take control of [ADMIN_LOOKUPFLW(M)])")
return FALSE
/mob/proc/is_flying(mob/M = src)
@@ -477,12 +477,18 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
if(!LAZYLEN(message) || !message_type)
return
+ if(client)
+ if(!islist(client.player_details.logging[message_type]))
+ client.player_details.logging[message_type] = list()
+
if(!islist(logging[message_type]))
logging[message_type] = list()
var/list/timestamped_message = list("[LAZYLEN(logging[message_type]) + 1]\[[time_stamp()]\] [key_name(src)]" = message)
logging[message_type] += timestamped_message
+ if(client)
+ client.player_details.logging[message_type] += timestamped_message
/mob/proc/can_hear()
. = TRUE
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 2718392b69..05bafdeb58 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -40,9 +40,15 @@
to_chat(usr, "Speech is currently admin-disabled.")
return
- if(jobban_isbanned(src, "OOC"))
+ var/jb = jobban_isbanned(src, "OOC")
+ if(QDELETED(src))
+ return
+
+ if(jb)
to_chat(src, "You have been banned from deadchat.")
return
+
+
if (src.client)
if(src.client.prefs.muted & MUTE_DEADCHAT)
@@ -83,3 +89,13 @@
/mob/proc/lingcheck()
return LINGHIVE_NONE
+
+/mob/proc/get_message_mode(message)
+ var/key = copytext(message, 1, 2)
+ 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))
+ return GLOB.department_radio_keys[key_symbol]
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 45aa3b06ff..342ee386b6 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -23,7 +23,7 @@
CH.cavity_item = null
if(tr_flags & TR_KEEPITEMS)
- var/Itemlist = get_equipped_items()
+ var/Itemlist = get_equipped_items(TRUE)
Itemlist += held_items
for(var/obj/item/W in Itemlist)
dropItemToGround(W)
@@ -174,7 +174,7 @@
//now the rest
if (tr_flags & TR_KEEPITEMS)
- var/Itemlist = get_equipped_items()
+ var/Itemlist = get_equipped_items(TRUE)
Itemlist += held_items
for(var/obj/item/W in Itemlist)
dropItemToGround(W, TRUE)
@@ -381,8 +381,7 @@
else if(transfer_after)
R.key = key
- if (CONFIG_GET(flag/rename_cyborg))
- R.rename_self("cyborg")
+ R.apply_pref_name("cyborg")
if(R.mmi)
R.mmi.name = "Man-Machine Interface: [real_name]"
@@ -495,7 +494,7 @@
SSblackbox.record_feedback("amount", "gorillas_created", 1)
- var/Itemlist = get_equipped_items()
+ var/Itemlist = get_equipped_items(TRUE)
Itemlist += held_items
for(var/obj/item/W in Itemlist)
dropItemToGround(W, TRUE)
diff --git a/code/modules/modular_computers/computers/item/tablet.dm b/code/modules/modular_computers/computers/item/tablet.dm
index f075a8464b..54e43a8731 100644
--- a/code/modules/modular_computers/computers/item/tablet.dm
+++ b/code/modules/modular_computers/computers/item/tablet.dm
@@ -1,7 +1,7 @@
/obj/item/modular_computer/tablet //Its called tablet for theme of 90ies but actually its a "big smartphone" sized
name = "tablet computer"
icon = 'icons/obj/modular_tablet.dmi'
- icon_state = "tablet"
+ icon_state = "tablet-red"
icon_state_unpowered = "tablet"
icon_state_powered = "tablet"
icon_state_menu = "menu"
diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm
index 4091f8b6ae..19d3b56046 100644
--- a/code/modules/modular_computers/computers/machinery/modular_computer.dm
+++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm
@@ -144,6 +144,9 @@
// EMPs are similar to explosions, but don't cause physical damage to the casing. Instead they screw up the components
/obj/machinery/modular_computer/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_CONTENTS)
+ return
if(cpu)
cpu.emp_act(severity)
diff --git a/code/modules/modular_computers/computers/machinery/modular_console.dm b/code/modules/modular_computers/computers/machinery/modular_console.dm
index b9a0544021..026091f88b 100644
--- a/code/modules/modular_computers/computers/machinery/modular_console.dm
+++ b/code/modules/modular_computers/computers/machinery/modular_console.dm
@@ -8,8 +8,6 @@
icon_state_unpowered = "console-off"
screen_icon_state_menu = "menu"
hardware_flag = PROGRAM_CONSOLE
- var/console_department = "" // Used in New() to set network tag according to our area.
- anchored = TRUE
density = TRUE
base_idle_power_usage = 100
base_active_power_usage = 500
@@ -18,6 +16,7 @@
light_strength = 2
max_integrity = 300
integrity_failure = 150
+ var/console_department = "" // Used in New() to set network tag according to our area.
/obj/machinery/modular_computer/console/buildable/Initialize()
. = ..()
diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm
index 75f0f465ba..051b12ea71 100644
--- a/code/modules/modular_computers/file_system/program.dm
+++ b/code/modules/modular_computers/file_system/program.dm
@@ -129,7 +129,7 @@
return computer.get_header_data()
return list()
-// This is performed on program startup. May be overriden to add extra logic. Remember to include ..() call. Return 1 on success, 0 on failure.
+// This is performed on program startup. May be overridden to add extra logic. Remember to include ..() call. Return 1 on success, 0 on failure.
// When implementing new program based device, use this to run the program.
/datum/computer_file/program/proc/run_program(mob/living/user)
if(can_run(user, 1))
diff --git a/code/modules/modular_computers/file_system/programs/alarm.dm b/code/modules/modular_computers/file_system/programs/alarm.dm
index 310a0a5054..ca075b51e4 100644
--- a/code/modules/modular_computers/file_system/programs/alarm.dm
+++ b/code/modules/modular_computers/file_system/programs/alarm.dm
@@ -40,7 +40,10 @@
return data
/datum/computer_file/program/alarm_monitor/proc/triggerAlarm(class, area/A, O, obj/source)
- if(!is_station_level(source.z) && !is_mining_level(source.z))
+ if(is_station_level(source.z))
+ if(!(A.type in GLOB.the_station_areas))
+ return
+ else if(!is_mining_level(source.z) || istype(A, /area/ruin))
return
var/list/L = alarms[class]
@@ -95,4 +98,4 @@
/datum/computer_file/program/alarm_monitor/kill_program(forced = FALSE)
GLOB.alarmdisplay -= src
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/modular_computers/file_system/programs/powermonitor.dm b/code/modules/modular_computers/file_system/programs/powermonitor.dm
index 37b2b0c151..0439438cf0 100644
--- a/code/modules/modular_computers/file_system/programs/powermonitor.dm
+++ b/code/modules/modular_computers/file_system/programs/powermonitor.dm
@@ -1,3 +1,5 @@
+//normal computer version is located in code\modules\power\monitor.dm, /obj/machinery/computer/monitor
+
/datum/computer_file/program/power_monitor
filename = "powermonitor"
filedesc = "Power Monitor"
@@ -14,7 +16,8 @@
ui_y = 1000
var/has_alert = 0
- var/obj/structure/cable/attached
+ var/obj/structure/cable/attached_wire
+ var/obj/machinery/power/apc/local_apc
var/list/history = list()
var/record_size = 60
var/record_interval = 50
@@ -29,42 +32,62 @@
/datum/computer_file/program/power_monitor/process_tick()
- if(!attached)
+ if(!get_powernet())
search()
else
record()
-/datum/computer_file/program/power_monitor/proc/search()
+/datum/computer_file/program/power_monitor/proc/search() //keep in sync with /obj/machinery/computer/monitor's version
var/turf/T = get_turf(computer)
- attached = locate() in T
+ attached_wire = locate(/obj/structure/cable) in T
+ if(attached_wire)
+ return
+ var/area/A = get_area(computer) //if the computer isn't directly connected to a wire, attempt to find the APC powering it to pull it's powernet instead
+ if(!A)
+ return
+ local_apc = A.get_apc()
+ if(!local_apc)
+ return
+ if(!local_apc.terminal) //this really shouldn't happen without badminnery.
+ local_apc = null
-/datum/computer_file/program/power_monitor/proc/record()
+/datum/computer_file/program/power_monitor/proc/get_powernet() //keep in sync with /obj/machinery/computer/monitor's version
+ if(attached_wire || (local_apc && local_apc.terminal))
+ return attached_wire ? attached_wire.powernet : local_apc.terminal.powernet
+ return FALSE
+
+/datum/computer_file/program/power_monitor/proc/record() //keep in sync with /obj/machinery/computer/monitor's version
if(world.time >= next_record)
next_record = world.time + record_interval
+ var/datum/powernet/connected_powernet = get_powernet()
+
var/list/supply = history["supply"]
- supply += attached.powernet.viewavail
+ if(connected_powernet)
+ supply += connected_powernet.viewavail
if(supply.len > record_size)
supply.Cut(1, 2)
var/list/demand = history["demand"]
- demand += attached.powernet.viewload
+ if(connected_powernet)
+ demand += connected_powernet.viewload
if(demand.len > record_size)
demand.Cut(1, 2)
/datum/computer_file/program/power_monitor/ui_data()
+ var/datum/powernet/connected_powernet = get_powernet()
var/list/data = get_header_data()
data["stored"] = record_size
data["interval"] = record_interval / 10
- data["attached"] = attached ? TRUE : FALSE
- if(attached)
- data["supply"] = DisplayPower(attached.powernet.viewavail)
- data["demand"] = DisplayPower(attached.powernet.viewload)
+ data["attached"] = connected_powernet ? TRUE : FALSE
+ if(connected_powernet)
+ data["supply"] = DisplayPower(connected_powernet.viewavail)
+ data["demand"] = DisplayPower(connected_powernet.viewload)
data["history"] = history
data["areas"] = list()
- if(attached)
- for(var/obj/machinery/power/terminal/term in attached.powernet.nodes)
+ if(connected_powernet)
+ for(var/obj/machinery/power/terminal/term in connected_powernet.nodes)
var/obj/machinery/power/apc/A = term.master
if(istype(A))
data["areas"] += list(list(
diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm
index ef0538a1ee..6e4f80458a 100644
--- a/code/modules/modular_computers/laptop_vendor.dm
+++ b/code/modules/modular_computers/laptop_vendor.dm
@@ -6,7 +6,6 @@
icon = 'icons/obj/vending.dmi'
icon_state = "robotics"
layer = 2.9
- anchored = TRUE
density = TRUE
// The actual laptop/tablet
diff --git a/code/modules/ninja/ninja_event.dm b/code/modules/ninja/ninja_event.dm
index 258f470e3f..9fd8e4baf2 100644
--- a/code/modules/ninja/ninja_event.dm
+++ b/code/modules/ninja/ninja_event.dm
@@ -72,7 +72,7 @@ Contents:
throw EXCEPTION("Ninja created with incorrect mind")
spawned_mobs += Ninja
- message_admins("[key_name_admin(Ninja)] has been made into a ninja by an event.")
+ message_admins("[ADMIN_LOOKUPFLW(Ninja)] has been made into a ninja by an event.")
log_game("[key_name(Ninja)] was spawned as a ninja by an event.")
return SUCCESSFUL_SPAWN
diff --git a/code/modules/ninja/suit/gloves.dm b/code/modules/ninja/suit/gloves.dm
index ef02a8a792..4308120c4f 100644
--- a/code/modules/ninja/suit/gloves.dm
+++ b/code/modules/ninja/suit/gloves.dm
@@ -77,5 +77,5 @@
/obj/item/clothing/gloves/space_ninja/examine(mob/user)
..()
- if(flags_1 & NODROP_1)
+ if(item_flags & NODROP)
to_chat(user, "The energy drain mechanism is [candrain?"active":"inactive"].")
diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm
index 5886e1723d..6110f2b0c0 100644
--- a/code/modules/ninja/suit/suit.dm
+++ b/code/modules/ninja/suit/suit.dm
@@ -13,7 +13,7 @@ Contents:
/obj/item/clothing/suit/space/space_ninja
name = "ninja suit"
- desc = "A unique, vaccum-proof suit of nano-enhanced armor designed specifically for Spider Clan assassins."
+ desc = "A unique, vacuum-proof suit of nano-enhanced armor designed specifically for Spider Clan assassins."
icon_state = "s-ninja"
item_state = "s-ninja_suit"
allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/stock_parts/cell)
@@ -111,15 +111,15 @@ Contents:
to_chat(H, "ERROR: 110223 UNABLE TO LOCATE HAND GEAR\nABORTING...")
return FALSE
affecting = H
- flags_1 |= NODROP_1 //colons make me go all |=
+ item_flags |= NODROP //colons make me go all |=
slowdown = 0
n_hood = H.head
- n_hood.flags_1 |= NODROP_1
+ n_hood.item_flags |= NODROP
n_shoes = H.shoes
- n_shoes.flags_1 |= NODROP_1
+ n_shoes.item_flags |= NODROP
n_shoes.slowdown--
n_gloves = H.gloves
- n_gloves.flags_1 |= NODROP_1
+ n_gloves.item_flags |= NODROP
return TRUE
/obj/item/clothing/suit/space/space_ninja/proc/lockIcons(mob/living/carbon/human/H)
@@ -131,18 +131,18 @@ Contents:
//This proc allows the suit to be taken off.
/obj/item/clothing/suit/space/space_ninja/proc/unlock_suit()
affecting = null
- flags_1 &= ~NODROP_1
+ item_flags &= ~NODROP
slowdown = 1
icon_state = "s-ninja"
if(n_hood)//Should be attached, might not be attached.
- n_hood.flags_1 &= ~NODROP_1
+ n_hood.item_flags &= ~NODROP
if(n_shoes)
- n_shoes.flags_1 &= ~NODROP_1
+ n_shoes.item_flags &= ~NODROP
n_shoes.slowdown++
if(n_gloves)
n_gloves.icon_state = "s-ninja"
n_gloves.item_state = "s-ninja"
- n_gloves.flags_1 &= ~NODROP_1
+ n_gloves.item_flags &= ~NODROP
n_gloves.candrain=0
n_gloves.draining=0
diff --git a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm
index 5623a1bf74..ac3e24030f 100644
--- a/code/modules/paperwork/contract.dm
+++ b/code/modules/paperwork/contract.dm
@@ -5,7 +5,7 @@
throw_speed = 3
var/signed = FALSE
var/datum/mind/target
- flags_1 = NOBLUDGEON_1
+ item_flags = NOBLUDGEON
/obj/item/paper/contract/proc/update_text()
return
@@ -28,7 +28,7 @@
/obj/item/paper/contract/employment/update_text()
name = "paper- [target] employment contract"
- info = "
Conditions of Employment
This Agreement is made and entered into as of the date of last signature below, by and between [target] (hereafter referred to as SLAVE), and Nanotrasen (hereafter referred to as the omnipresent and helpful watcher of humanity). WITNESSETH: WHEREAS, SLAVE is a natural born human or humanoid, posessing skills upon which he can aid the omnipresent and helpful watcher of humanity, who seeks employment in the omnipresent and helpful watcher of humanity. WHEREAS, the omnipresent and helpful watcher of humanity agrees to sporadically provide payment to SLAVE, in exchange for permanent servitude. NOW THEREFORE in consideration of the mutual covenants herein contained, and other good and valuable consideration, the parties hereto mutually agree as follows: In exchange for paltry payments, SLAVE agrees to work for the omnipresent and helpful watcher of humanity, for the remainder of his or her current and future lives. Further, SLAVE agrees to transfer ownership of his or her soul to the loyalty department of the omnipresent and helpful watcher of humanity. Should transfership of a soul not be possible, a lien shall be placed instead. Signed, [target]"
+ info = "
Conditions of Employment
This Agreement is made and entered into as of the date of last signature below, by and between [target] (hereafter referred to as SLAVE), and Nanotrasen (hereafter referred to as the omnipresent and helpful watcher of humanity). WITNESSETH: WHEREAS, SLAVE is a natural born human or humanoid, possessing skills upon which he can aid the omnipresent and helpful watcher of humanity, who seeks employment in the omnipresent and helpful watcher of humanity. WHEREAS, the omnipresent and helpful watcher of humanity agrees to sporadically provide payment to SLAVE, in exchange for permanent servitude. NOW THEREFORE in consideration of the mutual covenants herein contained, and other good and valuable consideration, the parties hereto mutually agree as follows: In exchange for paltry payments, SLAVE agrees to work for the omnipresent and helpful watcher of humanity, for the remainder of his or her current and future lives. Further, SLAVE agrees to transfer ownership of his or her soul to the loyalty department of the omnipresent and helpful watcher of humanity. Should transfership of a soul not be possible, a lien shall be placed instead. Signed, [target]"
/obj/item/paper/contract/employment/attack(mob/living/M, mob/living/carbon/human/user)
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index 899c132f04..038cba8936 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -6,9 +6,9 @@
w_class = WEIGHT_CLASS_SMALL
pressure_resistance = 2
resistance_flags = FLAMMABLE
-
+
/obj/item/folder/suicide_act(mob/living/user)
- user.visible_message("[user] begins filing an imaginary death warrent! It looks like [user.p_theyre()] trying to commit suicide!")
+ user.visible_message("[user] begins filing an imaginary death warrant! It looks like [user.p_theyre()] trying to commit suicide!")
return OXYLOSS
/obj/item/folder/blue
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 7f5307f17f..9b7d3ae884 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -44,7 +44,7 @@
colour = "red"
/obj/item/pen/invisible
- desc = "It's an invisble pen marker."
+ desc = "It's an invisible pen marker."
icon_state = "pen"
colour = "white"
@@ -104,12 +104,7 @@
if(deg && (deg > 0 && deg <= 360))
degrees = deg
to_chat(user, "You rotate the top of the pen to [degrees] degrees.")
- GET_COMPONENT(hidden_uplink, /datum/component/uplink)
- if(hidden_uplink && degrees == traitor_unlock_degrees)
- to_chat(user, "Your pen makes a clicking noise, before quickly rotating back to 0 degrees!")
- degrees = 0
- hidden_uplink.locked = FALSE
- hidden_uplink.interact(user)
+ SEND_SIGNAL(src, COMSIG_PEN_ROTATED, deg, user)
/obj/item/pen/attack(mob/living/M, mob/user,stealth)
if(!istype(M))
@@ -143,6 +138,7 @@
else
O.name = input
to_chat(user, "\The [oldname] has been successfully been renamed to \the [input].")
+ O.renamedByPlayer = TRUE
if(penchoice == "Change description")
var/input = stripped_input(user,"Describe \the [O.name] here", ,"", 100)
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 2b0c6c0aec..e8a4c26d10 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -12,7 +12,6 @@
desc = "Used to copy important documents and anatomy studies."
icon = 'icons/obj/library.dmi'
icon_state = "photocopier"
- anchored = TRUE
density = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 30
diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm
index 97038bd94c..7235e0e658 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -69,54 +69,3 @@
/obj/item/stamp/attack_paw(mob/user)
return attack_hand(user)
-
-// Syndicate stamp to forge documents.
-
-/obj/item/stamp/chameleon
- actions_types = list(/datum/action/item_action/toggle)
-
- var/list/stamp_types
- var/list/stamp_names
-
-/obj/item/stamp/chameleon/Initialize()
- . = ..()
- stamp_types = typesof(/obj/item/stamp) - type // Get all stamp types except our own
-
- stamp_names = list()
- // Generate them into a list
- for(var/i in stamp_types)
- var/obj/item/stamp/stamp_type = i
- stamp_names += initial(stamp_type.name)
-
- stamp_names = sortList(stamp_names)
-
-/obj/item/stamp/chameleon/emp_act(severity)
- change_to(pick(stamp_types))
-
-/obj/item/stamp/chameleon/proc/change_to(obj/item/stamp/stamp_type)
- name = initial(stamp_type.name)
- icon_state = initial(stamp_type.icon_state)
- item_color = initial(stamp_type.item_color)
-
-/obj/item/stamp/chameleon/attack_self(mob/user)
- var/input_stamp = input(user, "Choose a stamp to disguise as.",
- "Choose a stamp.") as null|anything in stamp_names
-
- if(user && (src in user.contents) && input_stamp)
- var/obj/item/stamp/stamp_type
- for(var/i in stamp_types)
- stamp_type = i
- if(initial(stamp_type.name) == input_stamp)
- break
- change_to(stamp_type)
-
-/obj/item/stamp/chameleon/broken/Initialize()
- . = ..()
- START_PROCESSING(SSobj, src)
-
-/obj/item/stamp/chameleon/broken/Destroy()
- STOP_PROCESSING(SSobj, src)
- return ..()
-
-/obj/item/stamp/chameleon/broken/process()
- change_to(pick(stamp_types))
diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm
index 96e35164c4..099edc1909 100644
--- a/code/modules/power/antimatter/control.dm
+++ b/code/modules/power/antimatter/control.dm
@@ -100,6 +100,9 @@
/obj/machinery/power/am_control_unit/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
switch(severity)
if(1)
if(active)
@@ -109,9 +112,6 @@
if(active)
toggle_power()
stability -= rand(10,20)
- ..()
- return 0
-
/obj/machinery/power/am_control_unit/blob_act()
stability -= 20
diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm
index bd6b61e306..43b2400299 100644
--- a/code/modules/power/antimatter/shielding.dm
+++ b/code/modules/power/antimatter/shielding.dm
@@ -14,7 +14,6 @@
icon = 'icons/obj/machines/antimatter.dmi'
icon_state = "shield"
- anchored = TRUE
density = TRUE
dir = NORTH
use_power = NO_POWER_USE//Living things generally dont use power
@@ -93,7 +92,7 @@
/obj/machinery/am_shielding/emp_act()//Immune due to not really much in the way of electronics.
- return 0
+ return
/obj/machinery/am_shielding/ex_act(severity, target)
stability -= (80 - (severity * 20))
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 776dbf07d6..e9deb8233b 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -50,7 +50,6 @@
desc = "A control terminal for the area's electrical systems."
icon_state = "apc0"
- anchored = TRUE
use_power = NO_POWER_USE
req_access = null
max_integrity = 200
@@ -1257,17 +1256,20 @@
// damage and destruction acts
/obj/machinery/power/apc/emp_act(severity)
- if(cell)
- cell.emp_act(severity)
- if(occupier)
- occupier.emp_act(severity)
+ . = ..()
+ if (!(. & EMP_PROTECT_CONTENTS))
+ if(cell)
+ cell.emp_act(severity)
+ if(occupier)
+ occupier.emp_act(severity)
+ if(. & EMP_PROTECT_SELF)
+ return
lighting = 0
equipment = 0
environ = 0
update_icon()
update()
addtimer(CALLBACK(src, .proc/reset, APC_RESET_EMP), 600)
- ..()
/obj/machinery/power/apc/blob_act(obj/structure/blob/B)
set_broken()
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 66b90f4a1e..7060edecbd 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -140,7 +140,7 @@ By design, d1 is the smallest direction and d2 is the highest
return
user.visible_message("[user] cuts the cable.", "You cut the cable.")
stored.add_fingerprint(user)
- investigate_log("was cut by [key_name(usr, usr.client)] in [get_area(T)]", INVESTIGATE_WIRES)
+ investigate_log("was cut by [key_name(usr)] in [AREACOORD(src)]", INVESTIGATE_WIRES)
deconstruct()
return
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 498b9e608b..a36800c2f9 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -131,10 +131,12 @@
rigged = TRUE //broken batterys are dangerous
/obj/item/stock_parts/cell/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
charge -= 1000 / severity
if (charge < 0)
charge = 0
- ..()
/obj/item/stock_parts/cell/ex_act(severity, target)
..()
@@ -320,8 +322,9 @@
charge = 0
update_icon()
-/obj/item/stock_parts/cell/emproof/emp_act(severity)
- return
+/obj/item/stock_parts/cell/emproof/empty/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF)
/obj/item/stock_parts/cell/emproof/corrupt()
return
@@ -336,6 +339,9 @@
return
/obj/item/stock_parts/cell/beam_rifle/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
charge = CLAMP((charge-(10000/severity)),0,maxcharge)
/obj/item/stock_parts/cell/emergency_light
diff --git a/code/modules/power/floodlight.dm b/code/modules/power/floodlight.dm
index 62abcdb440..8da3594d5e 100644
--- a/code/modules/power/floodlight.dm
+++ b/code/modules/power/floodlight.dm
@@ -41,7 +41,6 @@
desc = "A pole with powerful mounted lights on it. Due to its high power draw, it must be powered by a direct connection to a wire node."
icon = 'icons/obj/lighting.dmi'
icon_state = "floodlight"
- anchored = TRUE
density = TRUE
max_integrity = 100
integrity_failure = 80
diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm
index ce9d2de4db..04645b2267 100644
--- a/code/modules/power/generator.dm
+++ b/code/modules/power/generator.dm
@@ -2,17 +2,12 @@
name = "thermoelectric generator"
desc = "It's a high efficiency thermoelectric generator."
icon_state = "teg"
- anchored = TRUE
density = TRUE
use_power = NO_POWER_USE
var/obj/machinery/atmospherics/components/binary/circulator/cold_circ
var/obj/machinery/atmospherics/components/binary/circulator/hot_circ
- //note: these currently only support EAST and WEST
- var/cold_dir = WEST
- var/hot_dir = EAST
-
var/lastgen = 0
var/lastgenlev = -1
var/lastcirc = "00"
@@ -20,34 +15,18 @@
/obj/machinery/power/generator/Initialize(mapload)
. = ..()
- var/obj/machinery/atmospherics/components/binary/circulator/circpath = /obj/machinery/atmospherics/components/binary/circulator
- cold_circ = locate(circpath) in get_step(src, cold_dir)
- hot_circ = locate(circpath) in get_step(src, hot_dir)
+ find_circs()
connect_to_network()
SSair.atmos_machinery += src
-
- if(cold_circ)
- switch(cold_dir)
- if(EAST)
- cold_circ.side = circpath.CIRC_RIGHT
- if(WEST)
- cold_circ.side = circpath.CIRC_LEFT
- cold_circ.update_icon()
-
- if(hot_circ)
- switch(hot_dir)
- if(EAST)
- hot_circ.side = circpath.CIRC_RIGHT
- if(WEST)
- hot_circ.side = circpath.CIRC_LEFT
- hot_circ.update_icon()
-
- if(!cold_circ || !hot_circ)
- stat |= BROKEN
-
update_icon()
+ component_parts = list(new /obj/item/circuitboard/machine/generator)
+
+/obj/machinery/power/generator/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS )
/obj/machinery/power/generator/Destroy()
+ kill_circs()
SSair.atmos_machinery -= src
return ..()
@@ -62,7 +41,8 @@
if(L != 0)
add_overlay(image('icons/obj/power.dmi', "teg-op[L]"))
- add_overlay("teg-oc[lastcirc]")
+ if(hot_circ && cold_circ)
+ add_overlay("teg-oc[lastcirc]")
#define GENRATE 800 // generator output coefficient from Q
@@ -123,7 +103,7 @@
lastgen -= power_output
..()
-/obj/machinery/power/generator/proc/get_menu(include_link = 1)
+/obj/machinery/power/generator/proc/get_menu(include_link = TRUE)
var/t = ""
if(!powernet)
t += "Unable to connect to the power network!"
@@ -148,8 +128,12 @@
t += "Pressure Inlet: [round(hot_circ_air2.return_pressure(), 0.1)] kPa / Outlet: [round(hot_circ_air1.return_pressure(), 0.1)] kPa "
t += ""
+ else if(!hot_circ && cold_circ)
+ t += "Unable to locate hot circulator!"
+ else if(hot_circ && !cold_circ)
+ t += "Unable to locate cold circulator!"
else
- t += "Unable to locate all parts!"
+ t += "Unable to locate any parts!"
if(include_link)
t += " Close"
@@ -168,10 +152,81 @@
if( href_list["close"] )
usr << browse(null, "window=teg")
usr.unset_machine()
- return 0
- return 1
+ return FALSE
+ return TRUE
/obj/machinery/power/generator/power_change()
..()
update_icon()
+
+/obj/machinery/power/generator/proc/find_circs()
+ kill_circs()
+ var/list/circs = list()
+ var/obj/machinery/atmospherics/components/binary/circulator/C
+ var/circpath = /obj/machinery/atmospherics/components/binary/circulator
+ if(dir == NORTH || dir == SOUTH)
+ C = locate(circpath) in get_step(src, EAST)
+ if(C && C.dir == WEST)
+ circs += C
+
+ C = locate(circpath) in get_step(src, WEST)
+ if(C && C.dir == EAST)
+ circs += C
+
+ else
+ C = locate(circpath) in get_step(src, NORTH)
+ if(C && C.dir == SOUTH)
+ circs += C
+
+ C = locate(circpath) in get_step(src, SOUTH)
+ if(C && C.dir == NORTH)
+ circs += C
+
+ if(circs.len)
+ for(C in circs)
+ if(C.mode == CIRCULATOR_COLD && !cold_circ)
+ cold_circ = C
+ C.generator = src
+ else if(C.mode == CIRCULATOR_HOT && !hot_circ)
+ hot_circ = C
+ C.generator = src
+
+/obj/machinery/power/generator/wrench_act(mob/living/user, obj/item/I)
+ if(!panel_open)
+ return
+ anchored = !anchored
+ I.play_tool_sound(src)
+ if(!anchored)
+ kill_circs()
+ connect_to_network()
+ to_chat(user, "You [anchored?"secure":"unsecure"] [src].")
+ return TRUE
+
+/obj/machinery/power/generator/multitool_act(mob/living/user, obj/item/I)
+ if(!anchored)
+ return
+ find_circs()
+ to_chat(user, "You update [src]'s circulator links.")
+ return TRUE
+
+/obj/machinery/power/generator/screwdriver_act(mob/user, obj/item/I)
+ panel_open = !panel_open
+ I.play_tool_sound(src)
+ to_chat(user, "You [panel_open?"open":"close"] the panel on [src].")
+ return TRUE
+
+/obj/machinery/power/generator/crowbar_act(mob/user, obj/item/I)
+ default_deconstruction_crowbar(I)
+ return TRUE
+
+/obj/machinery/power/generator/on_deconstruction()
+ kill_circs()
+
+/obj/machinery/power/generator/proc/kill_circs()
+ if(hot_circ)
+ hot_circ.generator = null
+ hot_circ = null
+ if(cold_circ)
+ cold_circ.generator = null
+ cold_circ = null
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index ad1e5054c5..4d8cdaa778 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -22,7 +22,6 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
name = "gravitational generator"
desc = "A device which produces a graviton field when set up."
icon = 'icons/obj/machines/gravity_generator.dmi'
- anchored = TRUE
density = TRUE
use_power = NO_POWER_USE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
@@ -39,9 +38,9 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
if(prob(20))
set_broken()
-/obj/machinery/gravity_generator/tesla_act(power, explosive)
+/obj/machinery/gravity_generator/tesla_act(power, tesla_flags)
..()
- if(explosive)
+ if(tesla_flags & TESLA_MACHINE_EXPLOSIVE)
qdel(src)//like the singulo, tesla deletes it. stops it from exploding over and over
/obj/machinery/gravity_generator/update_icon()
@@ -125,6 +124,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
var/charge_count = 100
var/current_overlay = null
var/broken_state = 0
+ var/setting = 1 //Gravity value when on
/obj/machinery/gravity_generator/main/Destroy() // If we somehow get deleted, remove all of our other parts.
investigate_log("was destroyed!", INVESTIGATE_GRAVITY)
@@ -250,7 +250,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
if(href_list["gentoggle"])
breaker = !breaker
- investigate_log("was toggled [breaker ? "ON" : "OFF"] by [usr.key].", INVESTIGATE_GRAVITY)
+ investigate_log("was toggled [breaker ? "ON" : "OFF"] by [key_name(usr)].", INVESTIGATE_GRAVITY)
set_power()
src.updateUsrDialog()
@@ -290,18 +290,17 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
use_power = on ? ACTIVE_POWER_USE : IDLE_POWER_USE
// Sound the alert if gravity was just enabled or disabled.
var/alert = FALSE
- var/area/A = get_area(src)
if(SSticker.IsRoundInProgress())
if(on) // If we turned on and the game is live.
if(gravity_in_level() == 0)
alert = 1
investigate_log("was brought online and is now producing gravity for this level.", INVESTIGATE_GRAVITY)
- message_admins("The gravity generator was brought online [A][ADMIN_COORDJMP(src)]")
+ message_admins("The gravity generator was brought online [ADMIN_VERBOSEJMP(src)]")
else
if(gravity_in_level() == 1)
alert = 1
investigate_log("was brought offline and there is now no gravity for this level.", INVESTIGATE_GRAVITY)
- message_admins("The gravity generator was brought offline with no backup generator. [A][ADMIN_COORDJMP(src)]")
+ message_admins("The gravity generator was brought offline with no backup generator. [ADMIN_VERBOSEJMP(src)]")
update_icon()
update_list()
@@ -387,6 +386,11 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
else
GLOB.gravity_generators["[T.z]"] -= src
+/obj/machinery/gravity_generator/main/proc/change_setting(value)
+ if(value != setting)
+ setting = value
+ shake_everyone()
+
// Misc
/obj/item/paper/guides/jobs/engi/gravity_gen
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 40d317d2c3..0b6cf36921 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -89,7 +89,7 @@
if(!cell_connectors)
to_chat(user, "This [name] can't support a power cell!")
return
- if(W.flags_1 & NODROP_1)
+ if(W.item_flags & NODROP)
to_chat(user, "[W] is stuck to your hand!")
return
user.dropItemToGround(W)
@@ -187,7 +187,6 @@
var/base_state = "tube" // base description and icon_state
icon_state = "tube"
desc = "A lighting fixture."
- anchored = TRUE
layer = WALL_OBJ_LAYER
max_integrity = 100
use_power = ACTIVE_POWER_USE
@@ -297,7 +296,8 @@
cut_overlays()
switch(status) // set icon_states
if(LIGHT_OK)
- if(emergency_mode)
+ var/area/A = get_area(src)
+ if(emergency_mode || (A && A.fire))
icon_state = "[base_state]_emergency"
else
icon_state = "[base_state]"
@@ -320,9 +320,16 @@
on = FALSE
emergency_mode = FALSE
if(on)
- var/BR = nightshift_enabled? nightshift_brightness : brightness
- var/PO = nightshift_enabled? nightshift_light_power : bulb_power
- var/CO = nightshift_enabled? nightshift_light_color : bulb_colour
+ var/BR = brightness
+ var/PO = bulb_power
+ var/CO = bulb_colour
+ var/area/A = get_area(src)
+ if (A && A.fire)
+ CO = bulb_emergency_colour
+ else if (nightshift_enabled)
+ BR = nightshift_brightness
+ PO = nightshift_light_power
+ CO = nightshift_light_color
var/matching = light && BR == light.light_range && PO == light.light_power && CO == light.light_color
if(!matching)
switchcount++
@@ -662,10 +669,12 @@
on = TRUE
update()
-/obj/machinery/light/tesla_act(power, explosive = FALSE)
- if(explosive)
- explosion(src.loc,0,0,0,flame_range = 5, adminlog = 0)
- qdel(src)
+/obj/machinery/light/tesla_act(power, tesla_flags)
+ if(tesla_flags & TESLA_MACHINE_EXPLOSIVE)
+ explosion(src,0,0,0,flame_range = 5, adminlog = 0)
+ qdel(src)
+ else
+ return ..()
// called when area power state changes
/obj/machinery/light/power_change()
diff --git a/code/modules/power/monitor.dm b/code/modules/power/monitor.dm
index a3edc99951..a934d08997 100644
--- a/code/modules/power/monitor.dm
+++ b/code/modules/power/monitor.dm
@@ -1,3 +1,5 @@
+//modular computer program version is located in code\modules\modular_computers\file_system\programs\powermonitor.dm, /datum/computer_file/program/power_monitor
+
/obj/machinery/computer/monitor
name = "power monitoring console"
desc = "It monitors power levels across the station."
@@ -9,12 +11,24 @@
active_power_usage = 100
circuit = /obj/item/circuitboard/computer/powermonitor
- var/obj/structure/cable/attached
+ var/obj/structure/cable/attached_wire
+ var/obj/machinery/power/apc/local_apc
var/list/history = list()
var/record_size = 60
var/record_interval = 50
var/next_record = 0
+ var/is_secret_monitor = FALSE
+
+/obj/machinery/computer/monitor/secret //Hides the power monitor (such as ones on ruins & CentCom) from PDA's to prevent metagaming.
+ name = "outdated power monitoring console"
+ desc = "It monitors power levels across the local powernet."
+ circuit = /obj/item/circuitboard/computer/powermonitor/secret
+ is_secret_monitor = TRUE
+
+/obj/machinery/computer/monitor/secret/examine(mob/user)
+ ..()
+ to_chat(user, "It's operating system seems quite outdated... It doesn't seem like it'd be compatible with the latest remote NTOS monitoring systems.")
/obj/machinery/computer/monitor/Initialize()
. = ..()
@@ -23,30 +37,47 @@
history["demand"] = list()
/obj/machinery/computer/monitor/process()
- if(!attached)
+ if(!get_powernet())
use_power = IDLE_POWER_USE
search()
else
use_power = ACTIVE_POWER_USE
record()
-/obj/machinery/computer/monitor/proc/search()
+/obj/machinery/computer/monitor/proc/search() //keep in sync with /datum/computer_file/program/power_monitor's version
var/turf/T = get_turf(src)
- attached = locate() in T
+ attached_wire = locate(/obj/structure/cable) in T
+ if(attached_wire)
+ return
+ var/area/A = get_area(src) //if the computer isn't directly connected to a wire, attempt to find the APC powering it to pull it's powernet instead
+ if(!A)
+ return
+ local_apc = A.get_apc()
+ if(!local_apc)
+ return
+ if(!local_apc.terminal) //this really shouldn't happen without badminnery.
+ local_apc = null
-/obj/machinery/computer/monitor/proc/record()
+/obj/machinery/computer/monitor/proc/get_powernet() //keep in sync with /datum/computer_file/program/power_monitor's version
+ if(attached_wire || (local_apc && local_apc.terminal))
+ return attached_wire ? attached_wire.powernet : local_apc.terminal.powernet
+ return FALSE
+
+/obj/machinery/computer/monitor/proc/record() //keep in sync with /datum/computer_file/program/power_monitor's version
if(world.time >= next_record)
next_record = world.time + record_interval
+ var/datum/powernet/connected_powernet = get_powernet()
+
var/list/supply = history["supply"]
- if(attached.powernet)
- supply += attached.powernet.viewavail
+ if(connected_powernet)
+ supply += connected_powernet.viewavail
if(supply.len > record_size)
supply.Cut(1, 2)
var/list/demand = history["demand"]
- if(attached.powernet)
- demand += attached.powernet.viewload
+ if(connected_powernet)
+ demand += connected_powernet.viewload
if(demand.len > record_size)
demand.Cut(1, 2)
@@ -58,17 +89,18 @@
ui.open()
/obj/machinery/computer/monitor/ui_data()
+ var/datum/powernet/connected_powernet = get_powernet()
var/list/data = list()
data["stored"] = record_size
data["interval"] = record_interval / 10
- data["attached"] = attached ? TRUE : FALSE
+ data["attached"] = connected_powernet ? TRUE : FALSE
data["history"] = history
data["areas"] = list()
- if(attached)
- data["supply"] = DisplayPower(attached.powernet.viewavail)
- data["demand"] = DisplayPower(attached.powernet.viewload)
- for(var/obj/machinery/power/terminal/term in attached.powernet.nodes)
+ if(connected_powernet)
+ data["supply"] = DisplayPower(connected_powernet.viewavail)
+ data["demand"] = DisplayPower(connected_powernet.viewload)
+ for(var/obj/machinery/power/terminal/term in connected_powernet.nodes)
var/obj/machinery/power/apc/A = term.master
if(istype(A))
var/cell_charge
diff --git a/code/modules/power/rtg.dm b/code/modules/power/rtg.dm
index 7266a3e8a0..79e94be7f0 100644
--- a/code/modules/power/rtg.dm
+++ b/code/modules/power/rtg.dm
@@ -7,7 +7,6 @@
icon = 'icons/obj/power.dmi'
icon_state = "rtg"
density = TRUE
- anchored = TRUE
use_power = NO_POWER_USE
circuit = /obj/item/circuitboard/machine/rtg
@@ -83,8 +82,8 @@
/obj/machinery/power/rtg/abductor/bullet_act(obj/item/projectile/Proj)
..()
if(!going_kaboom && istype(Proj) && !Proj.nodamage && ((Proj.damage_type == BURN) || (Proj.damage_type == BRUTE)))
- message_admins("[key_name_admin(Proj.firer)] triggered an Abductor Core explosion via projectile.")
- log_game("[key_name(Proj.firer)] triggered an Abductor Core explosion via projectile.")
+ message_admins("[ADMIN_LOOKUPFLW(Proj.firer)] triggered an Abductor Core explosion at [AREACOORD(src)] via projectile.")
+ log_game("[key_name(Proj.firer)] triggered an Abductor Core explosion at [AREACOORD(src)] via projectile.")
overload()
/obj/machinery/power/rtg/abductor/blob_act(obj/structure/blob/B)
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 2b5794857e..0e3545b1a7 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -1,8 +1,9 @@
-// last_power += (pulse_strength-RAD_COLLECTOR_EFFICIENCY)*RAD_COLLECTOR_COEFFICIENT
+// stored_power += (pulse_strength-RAD_COLLECTOR_EFFICIENCY)*RAD_COLLECTOR_COEFFICIENT
#define RAD_COLLECTOR_EFFICIENCY 80 // radiation needs to be over this amount to get power
#define RAD_COLLECTOR_COEFFICIENT 100
#define RAD_COLLECTOR_STORED_OUT 0.04 // (this*100)% of stored power outputted per tick. Doesn't actualy change output total, lower numbers just means collectors output for longer in absence of a source
#define RAD_COLLECTOR_MINING_CONVERSION_RATE 0.00001 //This is gonna need a lot of tweaking to get right. This is the number used to calculate the conversion of watts to research points per process()
+#define RAD_COLLECTOR_OUTPUT min(stored_power, (stored_power*RAD_COLLECTOR_STORED_OUT)+1000) //Produces at least 1000 watts if it has more than that stored
/obj/machinery/power/rad_collector
name = "Radiation Collector Array"
@@ -17,7 +18,7 @@
integrity_failure = 80
circuit = /obj/item/circuitboard/machine/rad_collector
var/obj/item/tank/internals/plasma/loaded_tank = null
- var/last_power = 0
+ var/stored_power = 0
var/active = 0
var/locked = FALSE
var/drainratio = 1
@@ -51,9 +52,9 @@
loaded_tank.air_contents.gases[/datum/gas/tritium][MOLES] += gasdrained
loaded_tank.air_contents.garbage_collect()
- var/power_produced = min(last_power, (last_power*RAD_COLLECTOR_STORED_OUT)+1000) //Produces at least 1000 watts if it has more than that stored
+ var/power_produced = RAD_COLLECTOR_OUTPUT
add_avail(power_produced)
- last_power-=power_produced
+ stored_power-=power_produced
else if(is_station_level(z) && SSresearch.science_tech)
if(!loaded_tank.air_contents.gases[/datum/gas/tritium] || !loaded_tank.air_contents.gases[/datum/gas/oxygen])
playsound(src, 'sound/machines/ding.ogg', 50, 1)
@@ -65,9 +66,9 @@
loaded_tank.air_contents.assert_gas(/datum/gas/carbon_dioxide)
loaded_tank.air_contents.gases[/datum/gas/carbon_dioxide][MOLES] += gasdrained*2
loaded_tank.air_contents.garbage_collect()
- var/bitcoins_mined = min(last_power, (last_power*RAD_COLLECTOR_STORED_OUT)+1000)
+ var/bitcoins_mined = RAD_COLLECTOR_OUTPUT
SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, bitcoins_mined*RAD_COLLECTOR_MINING_CONVERSION_RATE)
- last_power-=bitcoins_mined
+ stored_power-=bitcoins_mined
/obj/machinery/power/rad_collector/interact(mob/user)
if(anchored)
@@ -79,7 +80,7 @@
if(loaded_tank)
fuel = loaded_tank.air_contents.gases[/datum/gas/plasma]
fuel = fuel ? fuel[MOLES] : 0
- investigate_log("turned [active?"on":"off"] by [user.key]. [loaded_tank?"Fuel: [round(fuel/0.29)]%":"It is empty"].", INVESTIGATE_SINGULO)
+ investigate_log("turned [active?"on":"off"] by [key_name(user)]. [loaded_tank?"Fuel: [round(fuel/0.29)]%":"It is empty"].", INVESTIGATE_SINGULO)
return
else
to_chat(user, "The controls are locked!")
@@ -173,9 +174,9 @@
. = ..()
if(active)
if(!bitcoinmining)
- to_chat(user, "[src]'s display states that it is processing [DisplayPower(last_power)].")
+ to_chat(user, "[src]'s display states that it has stored [DisplayPower(stored_power)], and processing [DisplayPower(RAD_COLLECTOR_OUTPUT)].")
else
- to_chat(user, "[src]'s display states that it is producing a total of [last_power*RAD_COLLECTOR_MINING_CONVERSION_RATE] research points per minute.")
+ to_chat(user, "[src]'s display states that it has stored a total of [stored_power*RAD_COLLECTOR_MINING_CONVERSION_RATE], and producing [RAD_COLLECTOR_OUTPUT*RAD_COLLECTOR_MINING_CONVERSION_RATE] research points per minute.")
else
if(!bitcoinmining)
to_chat(user,"[src]'s display displays the words: \"Power production mode. Please insert Plasma. Use a multitool to change production modes.\"")
@@ -204,7 +205,7 @@
/obj/machinery/power/rad_collector/rad_act(pulse_strength)
. = ..()
if(loaded_tank && active && pulse_strength > RAD_COLLECTOR_EFFICIENCY)
- last_power += (pulse_strength-RAD_COLLECTOR_EFFICIENCY)*RAD_COLLECTOR_COEFFICIENT
+ stored_power += (pulse_strength-RAD_COLLECTOR_EFFICIENCY)*RAD_COLLECTOR_COEFFICIENT
/obj/machinery/power/rad_collector/proc/update_icons()
cut_overlays()
@@ -230,3 +231,5 @@
#undef RAD_COLLECTOR_EFFICIENCY
#undef RAD_COLLECTOR_COEFFICIENT
#undef RAD_COLLECTOR_STORED_OUT
+#undef RAD_COLLECTOR_MINING_CONVERSION_RATE
+#undef RAD_COLLECTOR_OUTPUT
\ No newline at end of file
diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index c8153b4a89..f6004b664a 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -5,7 +5,6 @@
desc = "An energy field."
icon = 'icons/obj/singularity.dmi'
icon_state = "Contain_F"
- anchored = TRUE
density = FALSE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
use_power = NO_POWER_USE
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 3ca4c70199..bf03256219 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -1,3 +1,8 @@
+//emitter construction defines
+#define EMITTER_UNWRENCHED 0
+#define EMITTER_WRENCHED 1
+#define EMITTER_WELDED 2
+
/obj/machinery/power/emitter
name = "emitter"
desc = "A heavy-duty industrial laser, often used in containment fields and power generation."
@@ -14,14 +19,14 @@
active_power_usage = 300
var/icon_state_on = "emitter_+a"
- var/active = 0
- var/powered = 0
+ var/active = FALSE
+ var/powered = FALSE
var/fire_delay = 100
var/maximum_fire_delay = 100
var/minimum_fire_delay = 20
var/last_shot = 0
var/shot_number = 0
- var/state = 0
+ var/state = EMITTER_UNWRENCHED
var/locked = FALSE
var/allow_switch_interact = TRUE
@@ -46,20 +51,24 @@
idle_power_usage = FALSE
locked = TRUE
req_access_txt = "100"
- state = 2
+ state = EMITTER_WELDED
use_power = FALSE
/obj/machinery/power/emitter/Initialize()
. = ..()
RefreshParts()
wires = new /datum/wires/emitter(src)
- if(state == 2 && anchored)
+ if(state == EMITTER_WELDED && anchored)
connect_to_network()
sparks = new
sparks.attach(src)
sparks.set_up(5, TRUE, src)
+/obj/machinery/power/emitter/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES)
+
/obj/machinery/power/emitter/RefreshParts()
var/max_firedelay = 120
var/firedelay = 120
@@ -89,9 +98,9 @@
/obj/machinery/power/emitter/Destroy()
if(SSticker.IsRoundInProgress())
var/turf/T = get_turf(src)
- message_admins("Emitter deleted at [ADMIN_COORDJMP(T)]",0,1)
- log_game("Emitter deleted at [COORD(T)]")
- investigate_log("deleted at [get_area(src)] [COORD(T)]", INVESTIGATE_SINGULO)
+ message_admins("Emitter deleted at [ADMIN_VERBOSEJMP(T)]")
+ log_game("Emitter deleted at [AREACOORD(T)]")
+ investigate_log("deleted at [AREACOORD(T)]", INVESTIGATE_SINGULO)
QDEL_NULL(sparks)
return ..()
@@ -104,33 +113,35 @@
/obj/machinery/power/emitter/interact(mob/user)
add_fingerprint(user)
- if(state == 2)
+ if(state == EMITTER_WELDED)
if(!powernet)
- to_chat(user, "The emitter isn't connected to a wire!")
- return 1
+ to_chat(user, "\The [src] isn't connected to a wire!")
+ return TRUE
if(!locked && allow_switch_interact)
- if(src.active==1)
- src.active = 0
- to_chat(user, "You turn off \the [src].")
- message_admins("Emitter turned off by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(src)]",0,1)
- log_game("Emitter turned off by [key_name(user)] in [COORD(src)]")
- investigate_log("turned off by [key_name(user)] at [get_area(src)]", INVESTIGATE_SINGULO)
+ if(active == TRUE)
+ active = FALSE
+ to_chat(user, "You turn off [src].")
else
- src.active = 1
- to_chat(user, "You turn on \the [src].")
- src.shot_number = 0
- src.fire_delay = maximum_fire_delay
- investigate_log("turned on by [key_name(user)] at [get_area(src)]", INVESTIGATE_SINGULO)
+ active = TRUE
+ to_chat(user, "You turn on [src].")
+ shot_number = 0
+ fire_delay = maximum_fire_delay
+
+ message_admins("Emitter turned [active ? "ON" : "OFF"] by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(src)]")
+ log_game("Emitter turned [active ? "ON" : "OFF"] by [key_name(user)] in [AREACOORD(src)]")
+ investigate_log("turned [active ? "ON" : "OFF"] by [key_name(user)] at [AREACOORD(src)]", INVESTIGATE_SINGULO)
+
update_icon()
+
else
to_chat(user, "The controls are locked!")
else
to_chat(user, "[src] needs to be firmly secured to the floor first!")
- return 1
+ return TRUE
/obj/machinery/power/emitter/attack_animal(mob/living/simple_animal/M)
if(ismegafauna(M) && anchored)
- state = 0
+ state = EMITTER_UNWRENCHED
anchored = FALSE
M.visible_message("[M] rips [src] free from its moorings!")
else
@@ -138,34 +149,29 @@
if(!anchored)
step(src, get_dir(M, src))
-
-/obj/machinery/power/emitter/emp_act(severity)//Emitters are hardened but still might have issues
- return 1
-
-
/obj/machinery/power/emitter/process()
if(stat & (BROKEN))
return
- if(src.state != 2 || (!powernet && active_power_usage))
- src.active = 0
+ if(state != EMITTER_WELDED || (!powernet && active_power_usage))
+ active = FALSE
update_icon()
return
- if(src.active == 1)
+ if(active == TRUE)
if(!active_power_usage || avail(active_power_usage))
add_load(active_power_usage)
if(!powered)
- powered = 1
+ powered = TRUE
update_icon()
- investigate_log("regained power and turned on at [get_area(src)]", INVESTIGATE_SINGULO)
+ investigate_log("regained power and turned ON at [AREACOORD(src)]", INVESTIGATE_SINGULO)
else
if(powered)
- powered = 0
+ powered = FALSE
update_icon()
- investigate_log("lost power and turned off at [get_area(src)]", INVESTIGATE_SINGULO)
- log_game("Emitter lost power in ([x],[y],[z])")
+ investigate_log("lost power and turned OFF at [AREACOORD(src)]", INVESTIGATE_SINGULO)
+ log_game("Emitter lost power in [AREACOORD(src)]")
return
- if(charge <=80)
- charge+=5
+ if(charge <= 80)
+ charge += 5
if(!check_delay() || manual == TRUE)
return FALSE
fire_beam()
@@ -178,7 +184,7 @@
/obj/machinery/power/emitter/proc/fire_beam_pulse()
if(!check_delay())
return FALSE
- if(state != 2)
+ if(state != EMITTER_WELDED)
return FALSE
if(avail(active_power_usage))
add_load(active_power_usage)
@@ -186,10 +192,10 @@
/obj/machinery/power/emitter/proc/fire_beam(mob/user)
var/obj/item/projectile/P = new projectile_type(get_turf(src))
- playsound(get_turf(src), projectile_sound, 50, 1)
+ playsound(get_turf(src), projectile_sound, 50, TRUE)
if(prob(35))
sparks.start()
- P.firer = user? user : src
+ P.firer = user ? user : src
if(last_projectile_params)
P.p_x = last_projectile_params[2]
P.p_y = last_projectile_params[3]
@@ -204,7 +210,6 @@
else
fire_delay = rand(minimum_fire_delay,maximum_fire_delay)
shot_number = 0
- P.fire()
return P
/obj/machinery/power/emitter/can_be_unfasten_wrench(mob/user, silent)
@@ -213,7 +218,7 @@
to_chat(user, "Turn \the [src] off first!")
return FAILED_UNFASTEN
- else if(state == EM_WELDED)
+ else if(state == EMITTER_WELDED)
if(!silent)
to_chat(user, "[src] is welded to the floor!")
return FAILED_UNFASTEN
@@ -224,9 +229,9 @@
. = ..()
if(. == SUCCESSFUL_UNFASTEN)
if(anchored)
- state = EM_SECURED
+ state = EMITTER_WRENCHED
else
- state = EM_UNSECURED
+ state = EMITTER_UNWRENCHED
/obj/machinery/power/emitter/wrench_act(mob/living/user, obj/item/I)
default_unfasten_wrench(user, I)
@@ -238,26 +243,26 @@
return TRUE
switch(state)
- if(EM_UNSECURED)
+ if(EMITTER_UNWRENCHED)
to_chat(user, "The [src.name] needs to be wrenched to the floor!")
- if(EM_SECURED)
+ if(EMITTER_WRENCHED)
if(!I.tool_start_check(user, amount=0))
return TRUE
user.visible_message("[user.name] starts to weld the [name] to the floor.", \
"You start to weld \the [src] to the floor...", \
"You hear welding.")
if(I.use_tool(src, user, 20, volume=50))
- state = EM_WELDED
+ state = EMITTER_WELDED
to_chat(user, "You weld \the [src] to the floor.")
connect_to_network()
- if(EM_WELDED)
+ if(EMITTER_WELDED)
if(!I.tool_start_check(user, amount=0))
return TRUE
user.visible_message("[user.name] starts to cut the [name] free from the floor.", \
"You start to cut \the [src] free from the floor...", \
"You hear welding.")
if(I.use_tool(src, user, 20, volume=50))
- state = EM_SECURED
+ state = EMITTER_WRENCHED
to_chat(user, "You cut \the [src] free from the floor.")
disconnect_from_network()
@@ -308,14 +313,14 @@
icon_state = "protoemitter"
icon_state_on = "protoemitter_+a"
can_buckle = TRUE
- buckle_lying = 0
+ buckle_lying = FALSE
var/view_range = 12
var/datum/action/innate/protoemitter/firing/auto
//BUCKLE HOOKS
/obj/machinery/power/emitter/prototype/unbuckle_mob(mob/living/buckled_mob,force = 0)
- playsound(src,'sound/mecha/mechmove01.ogg', 50, 1)
+ playsound(src,'sound/mecha/mechmove01.ogg', 50, TRUE)
manual = FALSE
for(var/obj/item/I in buckled_mob.held_items)
if(istype(I, /obj/item/turret_control))
@@ -336,7 +341,7 @@
return
M.forceMove(get_turf(src))
..()
- playsound(src,'sound/mecha/mechmove01.ogg', 50, 1)
+ playsound(src,'sound/mecha/mechmove01.ogg', 50, TRUE)
M.pixel_y = 14
layer = 4.1
if(M.client)
@@ -363,7 +368,7 @@
/datum/action/innate/protoemitter/firing/Activate()
if(PE.manual)
- playsound(PE,'sound/mecha/mechmove01.ogg', 50, 1)
+ playsound(PE,'sound/mecha/mechmove01.ogg', 50, TRUE)
PE.manual = FALSE
name = "Switch to Manual Firing"
desc = "The emitter will only fire on your command and at your designated target"
@@ -374,7 +379,7 @@
UpdateButtonIcon()
return
else
- playsound(PE,'sound/mecha/mechmove01.ogg', 50, 1)
+ playsound(PE,'sound/mecha/mechmove01.ogg', 50, TRUE)
name = "Switch to Automatic Firing"
desc = "Emitters will switch to periodic firing at your last target"
button_icon_state = "mech_zoom_off"
@@ -395,8 +400,8 @@
name = "turret controls"
icon_state = "offhand"
w_class = WEIGHT_CLASS_HUGE
- flags_1 = ABSTRACT_1 | NODROP_1
- resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF | NOBLUDGEON_1
+ item_flags = ABSTRACT | NODROP | NOBLUDGEON
+ resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
var/delay = 0
/obj/item/turret_control/afterattack(atom/targeted_atom, mob/user, proxflag, clickparams)
@@ -445,4 +450,9 @@
E.fire_beam(user)
delay = world.time + 10
else if (E.charge < 10)
- playsound(get_turf(user),'sound/machines/buzz-sigh.ogg', 50, 1)
+ playsound(src,'sound/machines/buzz-sigh.ogg', 50, TRUE)
+
+
+#undef EMITTER_UNWRENCHED
+#undef EMITTER_WRENCHED
+#undef EMITTER_WELDED
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index dcec821a90..6be89b43f4 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -59,6 +59,9 @@ field_generator power level display
fields = list()
connected_gens = list()
+/obj/machinery/field/generator/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES)
/obj/machinery/field/generator/process()
if(active == FG_ONLINE)
@@ -75,7 +78,7 @@ field_generator power level display
"You turn on [src].", \
"You hear heavy droning.")
turn_on()
- investigate_log("activated by [user.key].", INVESTIGATE_SINGULO)
+ investigate_log("activated by [key_name(user)].", INVESTIGATE_SINGULO)
add_fingerprint(user)
else
@@ -148,10 +151,6 @@ field_generator power level display
if(!anchored)
step(src, get_dir(M, src))
-/obj/machinery/field/generator/emp_act()
- return 0
-
-
/obj/machinery/field/generator/blob_act(obj/structure/blob/B)
if(active)
return 0
@@ -333,9 +332,8 @@ field_generator power level display
if((world.time - O.last_warning) > 50) //to stop message-spam
temp = 0
var/turf/T = get_turf(src)
- var/area/A = get_area(T)
- message_admins("A singulo exists and a containment field has failed at [A] [ADMIN_COORDJMP(T)].")
- investigate_log("has failed whilst a singulo exists at [A] [COORD(T)].", INVESTIGATE_SINGULO)
+ message_admins("A singulo exists and a containment field has failed at [ADMIN_VERBOSEJMP(T)].")
+ investigate_log("has failed whilst a singulo exists at [AREACOORD(T)].", INVESTIGATE_SINGULO)
O.last_warning = world.time
/obj/machinery/field/generator/shock(mob/living/user)
diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm
index 4d4eb73687..66870d73e8 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_control.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm
@@ -119,9 +119,9 @@
strength++
strength_change()
- message_admins("PA Control Computer increased to [strength] by [ADMIN_LOOKUPFLW(usr)] in [ADMIN_COORDJMP(src)]",0,1)
- log_game("PA Control Computer increased to [strength] by [key_name(usr)] in [COORD(src)]")
- investigate_log("increased to [strength] by [key_name(usr)]", INVESTIGATE_SINGULO)
+ message_admins("PA Control Computer increased to [strength] by [ADMIN_LOOKUPFLW(usr)] in [ADMIN_VERBOSEJMP(src)]")
+ log_game("PA Control Computer increased to [strength] by [key_name(usr)] in [AREACOORD(src)]")
+ investigate_log("increased to [strength] by [key_name(usr)] at [AREACOORD(src)]", INVESTIGATE_SINGULO)
/obj/machinery/particle_accelerator/control_box/proc/remove_strength(s)
@@ -129,9 +129,9 @@
strength--
strength_change()
- message_admins("PA Control Computer decreased to [strength] by [ADMIN_LOOKUPFLW(usr)] in [ADMIN_COORDJMP(src)]",0,1)
- log_game("PA Control Computer decreased to [strength] by [key_name(usr)] in [COORD(src)]")
- investigate_log("decreased to [strength] by [key_name(usr)]", INVESTIGATE_SINGULO)
+ message_admins("PA Control Computer decreased to [strength] by [ADMIN_LOOKUPFLW(usr)] in [ADMIN_VERBOSEJMP(src)]")
+ log_game("PA Control Computer decreased to [strength] by [key_name(usr)] in [AREACOORD(src)]")
+ investigate_log("decreased to [strength] by [key_name(usr)] at [AREACOORD(src)]", INVESTIGATE_SINGULO)
/obj/machinery/particle_accelerator/control_box/power_change()
@@ -206,9 +206,9 @@
/obj/machinery/particle_accelerator/control_box/proc/toggle_power()
active = !active
- investigate_log("turned [active?"ON":"OFF"] by [usr ? key_name(usr) : "outside forces"]", INVESTIGATE_SINGULO)
- message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? key_name_admin(usr) : "outside forces"][ADMIN_QUE(usr)] [ADMIN_FLW(usr)] in [ADMIN_COORDJMP(src)]",0,1)
- log_game("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? "[key_name(usr)]" : "outside forces"] in [COORD(src)]")
+ investigate_log("turned [active?"ON":"OFF"] by [usr ? key_name(usr) : "outside forces"] at [AREACOORD(src)]", INVESTIGATE_SINGULO)
+ message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? ADMIN_LOOKUPFLW(usr) : "outside forces"] in [ADMIN_VERBOSEJMP(src)]")
+ log_game("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? "[key_name(usr)]" : "outside forces"] at [AREACOORD(src)]")
if(active)
use_power = ACTIVE_POWER_USE
for(var/CP in connected_parts)
diff --git a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm
index f9edf59368..fc7cca55e6 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm
@@ -1,6 +1,6 @@
/obj/structure/particle_accelerator/particle_emitter
name = "EM Containment Grid"
- desc = "This launchs the Alpha particles, might not want to stand near this end."
+ desc = "This launches the Alpha particles, might not want to stand near this end."
icon = 'icons/obj/machines/particle_accelerator.dmi'
icon_state = "none"
var/fire_delay = 50
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 5df8fb1d13..25623661d6 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -129,12 +129,11 @@
/obj/singularity/proc/admin_investigate_setup()
var/turf/T = get_turf(src)
- var/area/A = get_area(T)
last_warning = world.time
var/count = locate(/obj/machinery/field/containment) in urange(30, src, 1)
if(!count)
- message_admins("A singulo has been created without containment fields active at [A] [ADMIN_COORDJMP(T)].")
- investigate_log("was created at [A] [COORD(T)]. [count?"":"No containment fields were active"]", INVESTIGATE_SINGULO)
+ message_admins("A singulo has been created without containment fields active at [ADMIN_VERBOSEJMP(T)].")
+ investigate_log("was created at [AREACOORD(T)]. [count?"":"No containment fields were active"]", INVESTIGATE_SINGULO)
/obj/singularity/proc/dissipate()
if(!dissipate)
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index d514a2c4e9..4a8ee61f0f 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -19,7 +19,6 @@
desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."
icon_state = "smes"
density = TRUE
- anchored = TRUE
use_power = NO_POWER_USE
circuit = /obj/item/circuitboard/machine/smes
var/capacity = 5e6 // maximum charge
@@ -152,9 +151,9 @@
//crowbarring it !
var/turf/T = get_turf(src)
if(default_deconstruction_crowbar(I))
- message_admins("[src] has been deconstructed by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(T)]",0,1)
- log_game("[src] has been deconstructed by [key_name(user)]")
- investigate_log("SMES deconstructed by [key_name(user)]", INVESTIGATE_SINGULO)
+ message_admins("[src] has been deconstructed by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)]")
+ log_game("[src] has been deconstructed by [key_name(user)] at [AREACOORD(src)]")
+ investigate_log("SMES deconstructed by [key_name(user)] at [AREACOORD(src)]", INVESTIGATE_SINGULO)
return
else if(panel_open && istype(I, /obj/item/crowbar))
return
@@ -174,11 +173,10 @@
/obj/machinery/power/smes/Destroy()
if(SSticker.IsRoundInProgress())
- var/area/A = get_area(src)
var/turf/T = get_turf(src)
- message_admins("SMES deleted at [A][ADMIN_JMP(T)]")
- log_game("SMES deleted at [A][COORD(T)]")
- investigate_log("deleted at [A][COORD(T)]", INVESTIGATE_SINGULO)
+ message_admins("SMES deleted at [ADMIN_VERBOSEJMP(T)]")
+ log_game("SMES deleted at [AREACOORD(T)]")
+ investigate_log("deleted at [AREACOORD(T)]", INVESTIGATE_SINGULO)
if(terminal)
disconnect_terminal()
return ..()
@@ -350,12 +348,12 @@
switch(action)
if("tryinput")
input_attempt = !input_attempt
- log_smes(usr.ckey)
+ log_smes(usr)
update_icon()
. = TRUE
if("tryoutput")
output_attempt = !output_attempt
- log_smes(usr.ckey)
+ log_smes(usr)
update_icon()
. = TRUE
if("input")
@@ -379,7 +377,7 @@
. = TRUE
if(.)
input_level = CLAMP(target, 0, input_level_max)
- log_smes(usr.ckey)
+ log_smes(usr)
if("output")
var/target = params["target"]
var/adjust = text2num(params["adjust"])
@@ -401,13 +399,16 @@
. = TRUE
if(.)
output_level = CLAMP(target, 0, output_level_max)
- log_smes(usr.ckey)
+ log_smes(usr)
-/obj/machinery/power/smes/proc/log_smes(user = "")
- investigate_log("input/output; [input_level>output_level?"":""][input_level]/[output_level] | Charge: [charge] | Output-mode: [output_attempt?"on":"off"] | Input-mode: [input_attempt?"auto":"off"] by [user]", INVESTIGATE_SINGULO)
+/obj/machinery/power/smes/proc/log_smes(mob/user)
+ investigate_log("input/output; [input_level>output_level?"":""][input_level]/[output_level] | Charge: [charge] | Output-mode: [output_attempt?"on":"off"] | Input-mode: [input_attempt?"auto":"off"] by [user ? key_name(user) : "outside forces"]", INVESTIGATE_SINGULO)
/obj/machinery/power/smes/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
input_attempt = rand(0,1)
inputting = input_attempt
output_attempt = rand(0,1)
@@ -418,8 +419,7 @@
if (charge < 0)
charge = 0
update_icon()
- log_smes("an emp")
- ..()
+ log_smes()
/obj/machinery/power/smes/engineering
charge = 1.5e6 // Engineering starts with some charge for singulo
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index d7e0bc66bc..18cd6d22a6 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -6,7 +6,6 @@
desc = "A solar panel. Generates electricity when in contact with sunlight."
icon = 'goon/icons/obj/power.dmi'
icon_state = "sp_base"
- anchored = TRUE
density = TRUE
use_power = NO_POWER_USE
idle_power_usage = 0
@@ -106,7 +105,7 @@
add_overlay(mutable_appearance(icon, "solar_panel", FLY_LAYER))
src.setDir(angle2dir(adir))
-//calculates the fraction of the sunlight that the panel recieves
+//calculates the fraction of the sunlight that the panel receives
/obj/machinery/power/solar/proc/update_solar_exposure()
if(obscured)
sunfrac = 0
@@ -120,7 +119,7 @@
return
sunfrac = cos(p_angle) ** 2
- //isn't the power recieved from the incoming light proportionnal to cos(p_angle) (Lambert's cosine law) rather than cos(p_angle)^2 ?
+ //isn't the power received from the incoming light proportionnal to cos(p_angle) (Lambert's cosine law) rather than cos(p_angle)^2 ?
/obj/machinery/power/solar/process()//TODO: remove/add this from machines to save on processing as needed ~Carn PRIORITY
if(stat & BROKEN)
@@ -257,7 +256,6 @@
desc = "A controller for solar panel arrays."
icon = 'icons/obj/computer.dmi'
icon_state = "computer"
- anchored = TRUE
density = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 250
@@ -425,7 +423,7 @@
A.icon_state = "4"
A.anchored = TRUE
qdel(src)
- else if(user.a_intent != INTENT_HARM && !(I.flags_1 & NOBLUDGEON_1))
+ else if(user.a_intent != INTENT_HARM && !(I.item_flags & NOBLUDGEON))
attack_hand(user)
else
return ..()
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 15a40d0876..53140d45e0 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -255,9 +255,9 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
sleep(10)
continue
else if(i > 50)
- speaking = "[i/10] seconds remain before causality stabilization."
+ speaking = "[DisplayTimeText(i, TRUE)] remain before causality stabilization."
else
- speaking = "[i/10]..."
+ speaking = "[i*0.1]..."
radio.talk_into(src, speaking, common_channel, get_spans(), get_default_language())
sleep(10)
@@ -279,7 +279,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
if(M.z == z)
SEND_SOUND(M, 'sound/magic/charge.ogg')
to_chat(M, "You feel reality distort for a moment...")
- M.SendSignal(COMSIG_ADD_MOOD_EVENT, "delam", /datum/mood_event/delam)
+ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "delam", /datum/mood_event/delam)
if(combined_gas > MOLE_PENALTY_THRESHOLD)
investigate_log("has collapsed into a singularity.", INVESTIGATE_SUPERMATTER)
if(T)
@@ -480,7 +480,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
if(!istype(L))
return FALSE
if(!istype(Proj.firer, /obj/machinery/power/emitter))
- investigate_log("has been hit by [Proj] fired by [Proj.firer]", INVESTIGATE_SUPERMATTER)
+ investigate_log("has been hit by [Proj] fired by [key_name(Proj.firer)]", INVESTIGATE_SUPERMATTER)
if(Proj.flag != "bullet")
power += Proj.damage * config_bullet_energy
if(!has_been_powered)
@@ -563,12 +563,12 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
if(!cause)
cause = "contact"
nom.visible_message(vis_msg, mob_msg, "You hear an unearthly noise as a wave of heat washes over you.")
- investigate_log("has been attacked ([cause]) by [nom]", INVESTIGATE_SUPERMATTER)
+ investigate_log("has been attacked ([cause]) by [key_name(nom)]", INVESTIGATE_SUPERMATTER)
playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
Consume(nom)
/obj/machinery/power/supermatter_crystal/attackby(obj/item/W, mob/living/user, params)
- if(!istype(W) || (W.flags_1 & ABSTRACT_1) || !istype(user))
+ if(!istype(W) || (W.item_flags & ABSTRACT) || !istype(user))
return
if (istype(W, /obj/item/melee/roastingstick))
return ..()
@@ -582,7 +582,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
user.visible_message("As [user] touches \the [src] with \a [W], silence fills the room...",\
"You touch \the [src] with \the [W], and everything suddenly goes silent.\n\The [W] flashes into dust as you flinch away from \the [src].",\
"Everything suddenly goes silent.")
- investigate_log("has been attacked ([W]) by [user]", INVESTIGATE_SUPERMATTER)
+ investigate_log("has been attacked ([W]) by [key_name(user)]", INVESTIGATE_SUPERMATTER)
Consume(W)
playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
@@ -629,7 +629,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
//Some poor sod got eaten, go ahead and irradiate people nearby.
radiation_pulse(src, 3000, 2, TRUE)
for(var/mob/living/L in range(10))
- investigate_log("has irradiated [L] after consuming [AM].", INVESTIGATE_SUPERMATTER)
+ investigate_log("has irradiated [key_name(L)] after consuming [AM].", INVESTIGATE_SUPERMATTER)
if(L in view())
L.show_message("As \the [src] slowly stops resonating, you find your skin covered in new radiation burns.", 1,\
"The unearthly ringing subsides and you notice you have new radiation burns.", 2)
@@ -650,14 +650,24 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
moveable = TRUE
/obj/machinery/power/supermatter_crystal/shard/engine
+ name = "anchored supermatter shard"
is_main_engine = TRUE
+ anchored = TRUE
+ moveable = FALSE
// When you wanna make a supermatter shard for the dramatic effect, but
// don't want it exploding suddenly
/obj/machinery/power/supermatter_crystal/shard/hugbox
+ name = "anchored supermatter shard"
takes_damage = FALSE
produces_gas = FALSE
moveable = FALSE
+ anchored = TRUE
+
+/obj/machinery/power/supermatter_crystal/shard/hugbox/fakecrystal //Hugbox shard with crystal visuals, used in the Supermatter/Hyperfractal shuttle
+ name = "supermatter crystal"
+ base_icon_state = "darkmatter"
+ icon_state = "darkmatter"
/obj/machinery/power/supermatter_crystal/proc/supermatter_pull(turf/center, pull_range = 10)
playsound(src.loc, 'sound/weapons/marauder.ogg', 100, 1, extrarange = 7)
diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm
index d82189e520..3fa815bf99 100644
--- a/code/modules/power/terminal.dm
+++ b/code/modules/power/terminal.dm
@@ -8,9 +8,8 @@
icon_state = "term"
desc = "It's an underfloor wiring terminal for power equipment."
level = 1
- var/obj/machinery/power/master = null
- anchored = TRUE
layer = WIRE_TERMINAL_LAYER //a bit above wires
+ var/obj/machinery/power/master = null
/obj/machinery/power/terminal/Initialize()
diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm
index b2714ad7ca..5ee0b91b2b 100644
--- a/code/modules/power/tesla/coil.dm
+++ b/code/modules/power/tesla/coil.dm
@@ -25,7 +25,7 @@
/obj/machinery/power/tesla_coil/Initialize()
. = ..()
- // wires = new /datum/wires/tesla_coil(src) //CITADEL EDIT, Kevinz you cheaty fuccboi.
+ wires = new /datum/wires/tesla_coil(src) //CITADEL EDIT, Kevinz you cheaty fuccboi.
linked_techweb = SSresearch.science_tech
/obj/machinery/power/tesla_coil/RefreshParts()
@@ -62,9 +62,9 @@
if(default_deconstruction_crowbar(W))
return
- /*if(is_wire_tool(W) && panel_open) CITADEL EDIT - They removed the wires because they don't like my cheating
+ if(is_wire_tool(W) && panel_open)
wires.interact(user)
- return*/
+ return
return ..()
@@ -73,7 +73,7 @@
if(user.a_intent == INTENT_GRAB && user_buckle_mob(user.pulling, user, check_loc = 0))
return ..()
-/obj/machinery/power/tesla_coil/tesla_act(var/power)
+/obj/machinery/power/tesla_coil/tesla_act(power, tesla_flags, shocked_targets)
if(anchored && !panel_open)
obj_flags |= BEING_SHOCKED
//don't lose arc power when it's not connected to anything
@@ -82,7 +82,7 @@
add_avail(power_produced*input_power_multiplier)
flick("coilhit", src)
playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
- tesla_zap(src, 5, power_produced)
+ tesla_zap(src, 5, power_produced, tesla_flags, shocked_targets)
if(istype(linked_techweb))
linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, min(power_produced, 1)) // x4 coils = ~240/m point bonus for R&D
addtimer(CALLBACK(src, .proc/reset_shocked), 10)
@@ -110,14 +110,14 @@
circuit = /obj/item/circuitboard/machine/tesla_coil/research
power_loss = 20 // something something, high voltage + resistance
-/obj/machinery/power/tesla_coil/research/tesla_act(var/power)
+/obj/machinery/power/tesla_coil/research/tesla_act(power, tesla_flags, shocked_things)
if(anchored && !panel_open)
obj_flags |= BEING_SHOCKED
var/power_produced = powernet ? power / power_loss : power
add_avail(power_produced*input_power_multiplier)
flick("rpcoilhit", src)
playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
- tesla_zap(src, 5, power_produced)
+ tesla_zap(src, 5, power_produced, tesla_flags, shocked_things)
if(istype(linked_techweb))
linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, min(power_produced, 3)) // x4 coils with a pulse per second or so = ~720/m point bonus for R&D
addtimer(CALLBACK(src, .proc/reset_shocked), 10)
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index 9cdcd08810..470b6e789c 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -66,7 +66,7 @@
pixel_y = -32
for (var/ball in orbiting_balls)
var/range = rand(1, CLAMP(orbiting_balls.len, 3, 7))
- tesla_zap(ball, range, TESLA_MINI_POWER/7*range, TRUE)
+ tesla_zap(ball, range, TESLA_MINI_POWER/7*range)
else
energy = 0 // ensure we dont have miniballs of miniballs
@@ -159,7 +159,7 @@
var/mob/living/carbon/C = A
C.dust()
-/proc/tesla_zap(atom/source, zap_range = 3, power, explosive = FALSE, stun_mobs = TRUE)
+/proc/tesla_zap(atom/source, zap_range = 3, power, tesla_flags = TESLA_DEFAULT_FLAGS, list/shocked_targets)
. = source.dir
if(power < 1000)
return
@@ -186,6 +186,9 @@
/obj/structure/particle_accelerator/end_cap,
/obj/machinery/field/containment,
/obj/structure/disposalpipe,
+ /obj/structure/disposaloutlet,
+ /obj/machinery/disposal/deliveryChute,
+ /obj/machinery/camera,
/obj/structure/sign,
/obj/machinery/gateway,
/obj/structure/lattice,
@@ -193,6 +196,9 @@
/obj/machinery/the_singularitygen/tesla))
for(var/A in typecache_filter_multi_list_exclusion(oview(source, zap_range+2), things_to_shock, blacklisted_tesla_types))
+ if(!(tesla_flags & TESLA_ALLOW_DUPLICATES) && LAZYACCESS(shocked_targets, A))
+ continue
+
if(istype(A, /obj/machinery/power/tesla_coil))
var/dist = get_dist(source, A)
var/obj/machinery/power/tesla_coil/C = A
@@ -263,33 +269,35 @@
if(closest_atom)
//common stuff
source.Beam(closest_atom, icon_state="lightning[rand(1,12)]", time=5, maxdistance = INFINITY)
+ if(!(tesla_flags & TESLA_ALLOW_DUPLICATES))
+ LAZYSET(shocked_targets, closest_atom, TRUE)
var/zapdir = get_dir(source, closest_atom)
if(zapdir)
. = zapdir
//per type stuff:
if(closest_tesla_coil)
- closest_tesla_coil.tesla_act(power, explosive, stun_mobs)
+ closest_tesla_coil.tesla_act(power, tesla_flags, shocked_targets)
else if(closest_grounding_rod)
- closest_grounding_rod.tesla_act(power, explosive, stun_mobs)
+ closest_grounding_rod.tesla_act(power, tesla_flags, shocked_targets)
else if(closest_mob)
- var/shock_damage = CLAMP(round(power/400), 10, 90) + rand(-5, 5)
- closest_mob.electrocute_act(shock_damage, source, 1, tesla_shock = 1, stun = stun_mobs)
+ var/shock_damage = (tesla_flags & TESLA_MOB_DAMAGE)? (min(round(power/600), 90) + rand(-5, 5)) : 0
+ closest_mob.electrocute_act(shock_damage, source, 1, tesla_shock = 1, stun = (tesla_flags & TESLA_MOB_STUN))
if(issilicon(closest_mob))
var/mob/living/silicon/S = closest_mob
- if(stun_mobs)
+ if((tesla_flags & TESLA_MOB_STUN) && (tesla_flags & TESLA_MOB_DAMAGE))
S.emp_act(EMP_LIGHT)
- tesla_zap(S, 7, power / 1.5, explosive, stun_mobs) // metallic folks bounce it further
+ tesla_zap(S, 7, power / 1.5, tesla_flags, shocked_targets) // metallic folks bounce it further
else
- tesla_zap(closest_mob, 5, power / 1.5, explosive, stun_mobs)
+ tesla_zap(closest_mob, 5, power / 1.5, tesla_flags, shocked_targets)
else if(closest_machine)
- closest_machine.tesla_act(power, explosive, stun_mobs)
+ closest_machine.tesla_act(power, tesla_flags, shocked_targets)
else if(closest_blob)
- closest_blob.tesla_act(power, explosive, stun_mobs)
+ closest_blob.tesla_act(power, tesla_flags, shocked_targets)
else if(closest_structure)
- closest_structure.tesla_act(power, explosive, stun_mobs)
+ closest_structure.tesla_act(power, tesla_flags, shocked_targets)
diff --git a/code/modules/power/tesla/generator.dm b/code/modules/power/tesla/generator.dm
index 63bce099fa..53d7010806 100644
--- a/code/modules/power/tesla/generator.dm
+++ b/code/modules/power/tesla/generator.dm
@@ -5,6 +5,6 @@
icon_state = "TheSingGen"
creation_type = /obj/singularity/energy_ball
-/obj/machinery/the_singularitygen/tesla/tesla_act(power, explosive = FALSE)
- if(explosive)
+/obj/machinery/the_singularitygen/tesla/tesla_act(power, tesla_flags)
+ if(tesla_flags & TESLA_MACHINE_EXPLOSIVE)
energy += power
diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm
index c999554d87..cc5b1d6322 100644
--- a/code/modules/power/tracker.dm
+++ b/code/modules/power/tracker.dm
@@ -8,7 +8,6 @@
desc = "A solar directional tracker."
icon = 'goon/icons/obj/power.dmi'
icon_state = "tracker"
- anchored = TRUE
density = TRUE
use_power = NO_POWER_USE
max_integrity = 250
diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm
index 22777e4fcf..85ee7589b9 100644
--- a/code/modules/power/turbine.dm
+++ b/code/modules/power/turbine.dm
@@ -27,7 +27,6 @@
desc = "The compressor stage of a gas turbine generator."
icon = 'icons/obj/atmospherics/pipes/simple.dmi'
icon_state = "compressor"
- anchored = TRUE
density = TRUE
resistance_flags = FIRE_PROOF
CanAtmosPass = ATMOS_PASS_DENSITY
@@ -48,7 +47,6 @@
desc = "A gas turbine used for backup power generation."
icon = 'icons/obj/atmospherics/pipes/simple.dmi'
icon_state = "turbine"
- anchored = TRUE
density = TRUE
resistance_flags = FIRE_PROOF
CanAtmosPass = ATMOS_PASS_DENSITY
diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
index de0d03da3b..4c66939e53 100644
--- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm
+++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
@@ -7,11 +7,6 @@
caliber = "shotgun"
projectile_type = /obj/item/projectile/bullet/shotgun_slug
materials = list(MAT_METAL=4000)
-
-/obj/item/ammo_casing/shotgun/tengauge
- name = "10g shotgun slug"
- desc = "A 10 gauge lead slug."
- projectile_type = /obj/item/projectile/bullet/shotgun_slug/tengauge
/obj/item/ammo_casing/shotgun/beanbag
name = "beanbag slug"
@@ -118,7 +113,7 @@
/obj/item/ammo_casing/shotgun/dart/noreact
name = "cryostasis shotgun dart"
- desc = "A dart for use in shotguns, using similar technolgoy as cryostatis beakers to keep internal reagents from reacting. Can be injected with up to 10 units of any chemical."
+ desc = "A dart for use in shotguns, using similar technology as cryostatis beakers to keep internal reagents from reacting. Can be injected with up to 10 units of any chemical."
icon_state = "cnrshell"
reagent_amount = 10
reagent_react = FALSE
diff --git a/code/modules/projectiles/ammunition/energy/gravity.dm b/code/modules/projectiles/ammunition/energy/gravity.dm
index f549a5b5e4..be3a4494cd 100644
--- a/code/modules/projectiles/ammunition/energy/gravity.dm
+++ b/code/modules/projectiles/ammunition/energy/gravity.dm
@@ -7,8 +7,8 @@
var/obj/item/gun/energy/gravity_gun/gun
/obj/item/ammo_casing/energy/gravityrepulse/Initialize(mapload, obj/item/gun/energy/gravity_gun/G)
- . = ..()
gun = G
+ . = ..()
/obj/item/ammo_casing/energy/gravityattract
projectile_type = /obj/item/projectile/gravityattract
@@ -20,8 +20,8 @@
/obj/item/ammo_casing/energy/gravityattract/Initialize(mapload, obj/item/gun/energy/gravity_gun/G)
- . = ..()
gun = G
+ . = ..()
/obj/item/ammo_casing/energy/gravitychaos
projectile_type = /obj/item/projectile/gravitychaos
@@ -32,5 +32,5 @@
var/obj/item/gun/energy/gravity_gun/gun
/obj/item/ammo_casing/energy/gravitychaos/Initialize(mapload, obj/item/gun/energy/gravity_gun/G)
- . = ..()
gun = G
+ . = ..()
diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
index 5ab3146a91..476240a852 100644
--- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm
+++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
@@ -131,4 +131,8 @@
var/turf_mag = get_turf(src)
for(var/obj/item/ammo in stored_ammo)
ammo.forceMove(turf_mag)
- stored_ammo -= ammo
\ No newline at end of file
+ stored_ammo -= ammo
+
+/obj/item/ammo_box/magazine/handle_atom_del(atom/A)
+ stored_ammo -= A
+ update_icon()
diff --git a/code/modules/projectiles/boxes_magazines/external/smg.dm b/code/modules/projectiles/boxes_magazines/external/smg.dm
index c6dc004879..65724e503a 100644
--- a/code/modules/projectiles/boxes_magazines/external/smg.dm
+++ b/code/modules/projectiles/boxes_magazines/external/smg.dm
@@ -19,7 +19,7 @@
icon_state = "46x30mmtA-[round(ammo_count(),4)]"
/obj/item/ammo_box/magazine/wt550m9/wtic
- name = "wt550 magazine (Incindiary 4.6x30mm)"
+ name = "wt550 magazine (Incendiary 4.6x30mm)"
icon_state = "46x30mmtI-20"
ammo_type = /obj/item/ammo_casing/c46x30mm/inc
@@ -54,7 +54,7 @@
ammo_type = /obj/item/ammo_casing/c9mm/ap
/obj/item/ammo_box/magazine/smgm9mm/fire
- name = "SMG Magazine (Incindiary 9mm)"
+ name = "SMG Magazine (Incendiary 9mm)"
ammo_type = /obj/item/ammo_casing/c9mm/inc
/obj/item/ammo_box/magazine/smgm45
diff --git a/code/modules/projectiles/boxes_magazines/internal/_internal.dm b/code/modules/projectiles/boxes_magazines/internal/_internal.dm
index e21cb5ce61..c6ee7ec0cb 100644
--- a/code/modules/projectiles/boxes_magazines/internal/_internal.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/_internal.dm
@@ -1,6 +1,7 @@
/obj/item/ammo_box/magazine/internal
desc = "Oh god, this shouldn't be here"
- flags_1 = CONDUCT_1|ABSTRACT_1
+ flags_1 = CONDUCT_1
+ item_flags = ABSTRACT
//internals magazines are accessible, so replace spent ammo if full when trying to put a live one in
/obj/item/ammo_box/magazine/internal/give_round(obj/item/ammo_casing/R)
diff --git a/code/modules/projectiles/boxes_magazines/internal/revolver.dm b/code/modules/projectiles/boxes_magazines/internal/revolver.dm
index 976f80f437..a98fd29e99 100644
--- a/code/modules/projectiles/boxes_magazines/internal/revolver.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/revolver.dm
@@ -5,13 +5,13 @@
max_ammo = 6
/obj/item/ammo_box/magazine/internal/cylinder/rev762
- name = "nagant revolver cylinder"
+ name = "\improper Nagant revolver cylinder"
ammo_type = /obj/item/ammo_casing/n762
caliber = "n762"
max_ammo = 7
/obj/item/ammo_box/magazine/internal/cylinder/rus357
- name = "russian revolver cylinder"
+ name = "\improper Russian revolver cylinder"
ammo_type = /obj/item/ammo_casing/a357
caliber = "357"
max_ammo = 6
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 28cf2408ca..569f886ec2 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -127,9 +127,10 @@
user.visible_message("[user] fires [src]!", null, null, COMBAT_MESSAGE_RANGE)
/obj/item/gun/emp_act(severity)
- for(var/obj/O in contents)
- O.emp_act(severity)
-
+ . = ..()
+ if(!(. & EMP_PROTECT_CONTENTS))
+ for(var/obj/O in contents)
+ O.emp_act(severity)
/obj/item/gun/afterattack(atom/target, mob/living/user, flag, params)
if(firing_burst)
@@ -347,7 +348,7 @@
var/state = "bayonet" //Generic state.
if(bayonet.icon_state in icon_states('icons/obj/guns/bayonets.dmi')) //Snowflake state?
state = bayonet.icon_state
- var/icon/bayonet_icons = 'icons/obj/guns/bayonets.dmi'
+ var/icon/bayonet_icons = 'icons/obj/guns/bayonets.dmi'
knife_overlay = mutable_appearance(bayonet_icons, state)
knife_overlay.pixel_x = knife_x_offset
knife_overlay.pixel_y = knife_y_offset
@@ -527,3 +528,8 @@
if(zoomable)
azoom = new()
azoom.gun = src
+
+/obj/item/gun/handle_atom_del(atom/A)
+ if(A == chambered)
+ chambered = null
+ update_icon()
diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
index a4fcdd0266..24ef2a2604 100644
--- a/code/modules/projectiles/guns/ballistic/pistol.dm
+++ b/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -27,7 +27,7 @@
can_suppress = FALSE
/obj/item/gun/ballistic/automatic/pistol/deagle
- name = "desert eagle"
+ name = "\improper Desert Eagle"
desc = "A robust .50 AE handgun."
icon_state = "deagle"
force = 14
@@ -44,7 +44,7 @@
icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
/obj/item/gun/ballistic/automatic/pistol/deagle/gold
- desc = "A gold plated desert eagle folded over a million times by superior martian gunsmiths. Uses .50 AE ammo."
+ desc = "A gold plated Desert Eagle folded over a million times by superior martian gunsmiths. Uses .50 AE ammo."
icon_state = "deagleg"
item_state = "deagleg"
@@ -55,7 +55,7 @@
/obj/item/gun/ballistic/automatic/pistol/APS
name = "stechkin APS pistol"
- desc = "The original russian version of a widely used Syndicate sidearm. Uses 9mm ammo."
+ desc = "The original Russian version of a widely used Syndicate sidearm. Uses 9mm ammo."
icon_state = "aps"
w_class = WEIGHT_CLASS_SMALL
mag_type = /obj/item/ammo_box/magazine/pistolm9mm
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index b359d00602..cd11522342 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -151,7 +151,7 @@
pin = /obj/item/firing_pin
/obj/item/gun/ballistic/revolver/nagant
- name = "nagant revolver"
+ name = "\improper Nagant revolver"
desc = "An old model of revolver that originated in Russia. Able to be suppressed. Uses 7.62x38mmR ammo."
icon_state = "nagant"
can_suppress = TRUE
@@ -163,7 +163,7 @@
// You can spin the chamber to randomize the position of the bullet.
/obj/item/gun/ballistic/revolver/russian
- name = "\improper russian revolver"
+ name = "\improper Russian revolver"
desc = "A Russian-made revolver for drinking games. Uses .357 ammo, and has a mechanism requiring you to spin the chamber before each trigger pull."
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rus357
var/spun = FALSE
@@ -233,7 +233,7 @@
user.visible_message("[user.name] fires [src] at [user.p_their()] head!", "You fire [src] at your head!", "You hear a gunshot!")
/obj/item/gun/ballistic/revolver/russian/soul
- name = "cursed russian revolver"
+ name = "cursed Russian revolver"
desc = "To play with this revolver requires wagering your very soul."
/obj/item/gun/ballistic/revolver/russian/soul/shoot_self(mob/living/user)
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index e3b638f051..54ca03f872 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -151,7 +151,8 @@
item_state = "arcane_barrage"
can_bayonet = FALSE
- flags_1 = DROPDEL_1
+ item_flags = NEEDS_PERMIT | DROPDEL
+ flags_1 = NONE
mag_type = /obj/item/ammo_box/magazine/internal/boltaction/enchanted/arcane_barrage
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index c990e491a8..be25a13734 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -22,10 +22,12 @@
var/dead_cell = FALSE //set to true so the gun is given an empty cell
/obj/item/gun/energy/emp_act(severity)
- cell.use(round(cell.charge / severity))
- chambered = null //we empty the chamber
- recharge_newshot() //and try to charge a new shot
- update_icon()
+ . = ..()
+ if(!(. & EMP_PROTECT_CONTENTS))
+ cell.use(round(cell.charge / severity))
+ chambered = null //we empty the chamber
+ recharge_newshot() //and try to charge a new shot
+ update_icon()
/obj/item/gun/energy/get_cell()
return cell
@@ -128,6 +130,8 @@
return
/obj/item/gun/energy/update_icon(force_update)
+ if(QDELETED(src))
+ return
..()
if(!automatic_charge_overlays)
return
@@ -164,8 +168,8 @@
/obj/item/gun/energy/ui_action_click()
toggle_gunlight()
-/obj/item/gun/energy/suicide_act(mob/user)
- if (can_shoot() && can_trigger_gun(user))
+/obj/item/gun/energy/suicide_act(mob/living/user)
+ if (istype(user) && can_shoot() && can_trigger_gun(user) && user.get_bodypart(BODY_ZONE_HEAD))
user.visible_message("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!")
sleep(25)
if(user.is_holding(src))
@@ -179,7 +183,7 @@
user.visible_message("[user] panics and starts choking to death!")
return(OXYLOSS)
else
- user.visible_message("[user] is pretending to blow [user.p_their()] brains out with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
+ user.visible_message("[user] is pretending to melt [user.p_their()] face off with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
playsound(src, "gun_dry_fire", 30, 1)
return (OXYLOSS)
diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm
index d2ea2ab5f5..99f8166297 100644
--- a/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -127,7 +127,9 @@
to_chat(M, "Your [name]'s reactor overloads!")
/obj/item/gun/energy/e_gun/nuclear/emp_act(severity)
- ..()
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
fail_chance = min(fail_chance + round(15/severity), 100)
/obj/item/gun/energy/e_gun/nuclear/update_icon()
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 5275e63c3f..c766d1c94e 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -101,8 +101,8 @@
transform *= 1 + ((damage/7) * 0.2)//20% larger per tile
/obj/item/gun/energy/xray
- name = "x-ray laser gun"
- desc = "A high-power laser gun capable of expelling concentrated x-ray blasts that pass through multiple soft targets and heavier materials."
+ name = "\improper X-ray laser gun"
+ desc = "A high-power laser gun capable of expelling concentrated X-ray blasts that pass through multiple soft targets and heavier materials."
icon_state = "xray"
item_state = null
ammo_type = list(/obj/item/ammo_casing/energy/xray)
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index 9a6d8ed3af..cf9b697d00 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -21,7 +21,7 @@
. = ..()
GLOB.poi_list += src
var/turf/T = get_turf(src)
- var/msg = "A pulse rifle prize has been created at [ADMIN_COORDJMP(T)]"
+ var/msg = "A pulse rifle prize has been created at [ADMIN_VERBOSEJMP(T)]"
message_admins(msg)
log_game(msg)
diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm
index bf3ade0748..9c9d253439 100644
--- a/code/modules/projectiles/guns/magic/wand.dm
+++ b/code/modules/projectiles/guns/magic/wand.dm
@@ -96,6 +96,10 @@
charges--
..()
+/obj/item/gun/magic/wand/resurrection/debug //for testing
+ name = "debug wand of healing"
+ max_charges = 500
+
/////////////////////////////////////
//WAND OF POLYMORPH
/////////////////////////////////////
diff --git a/code/modules/projectiles/guns/misc/beam_rifle.dm b/code/modules/projectiles/guns/misc/beam_rifle.dm
index 80c5a0e2e7..e00d5263e0 100644
--- a/code/modules/projectiles/guns/misc/beam_rifle.dm
+++ b/code/modules/projectiles/guns/misc/beam_rifle.dm
@@ -10,7 +10,7 @@
/obj/item/gun/energy/beam_rifle
name = "particle acceleration rifle"
- desc = "An energy-based anti material marksman rifle that uses highly charged particle beams moving at extreme velocities to decimate whatever is unfortunate enough to be targetted by one. \
+ desc = "An energy-based anti material marksman rifle that uses highly charged particle beams moving at extreme velocities to decimate whatever is unfortunate enough to be targeted by one. \
Hold down left click while scoped to aim, when weapon is fully aimed (Tracer goes from red to green as it charges), release to fire. Moving while aiming or \
changing where you're pointing at while aiming will delay the aiming process depending on how much you changed."
icon = 'icons/obj/guns/energy.dmi'
@@ -195,6 +195,9 @@
return ..()
/obj/item/gun/energy/beam_rifle/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
chambered = null
recharge_newshot()
@@ -510,8 +513,6 @@
return 0.4
if(istype(target, /obj/structure/window))
return 0.5
- if(istype(target, /obj/structure/blob)) //CIT CHANGE - Blobs are getting ggnore'd too hard and people need to GIT GUD
- return 0.2
return 1
/obj/item/projectile/beam/beam_rifle/proc/handle_impact(atom/target)
diff --git a/code/modules/projectiles/guns/misc/blastcannon.dm b/code/modules/projectiles/guns/misc/blastcannon.dm
index 7c7af4e27b..df1f9fdfbd 100644
--- a/code/modules/projectiles/guns/misc/blastcannon.dm
+++ b/code/modules/projectiles/guns/misc/blastcannon.dm
@@ -11,8 +11,21 @@
clumsy_check = FALSE
randomspread = FALSE
+ var/hugbox = TRUE
+ var/max_power = INFINITY
+ var/reaction_volume_mod = 0
+ var/reaction_cycles = 3 //How many times gases react() before calculation. Very finnicky value, do not mess with without good reason.
+ var/prereaction = TRUE
+
+ var/bombcheck = TRUE
+ var/debug_power = 0
+
var/obj/item/transfer_valve/bomb
+/obj/item/gun/blastcannon/debug
+ debug_power = 80
+ bombcheck = FALSE
+
/obj/item/gun/blastcannon/Initialize()
. = ..()
if(!pin)
@@ -56,38 +69,45 @@
return TRUE
return ..()
+//returns the third value of a bomb blast
/obj/item/gun/blastcannon/proc/calculate_bomb()
if(!istype(bomb) || !istype(bomb.tank_one) || !istype(bomb.tank_two))
return 0
- var/datum/gas_mixture/temp = new(60) //directional buff.
- temp.merge(bomb.tank_one.air_contents.remove_ratio(1))
- temp.merge(bomb.tank_two.air_contents.remove_ratio(2))
- for(var/i in 1 to 6)
+ var/datum/gas_mixture/temp = new(max(reaction_volume_mod, 0))
+ bomb.merge_gases(temp)
+ if(prereaction)
+ temp.react(src)
+ var/prereaction_pressure = temp.return_pressure()
+ if(prereaction_pressure < TANK_FRAGMENT_PRESSURE)
+ return 0
+ for(var/i in 1 to reaction_cycles)
temp.react(src)
var/pressure = temp.return_pressure()
qdel(temp)
if(pressure < TANK_FRAGMENT_PRESSURE)
return 0
- return (pressure / TANK_FRAGMENT_SCALE)
+ return ((pressure - TANK_FRAGMENT_PRESSURE) / TANK_FRAGMENT_SCALE)
/obj/item/gun/blastcannon/afterattack(atom/target, mob/user, flag, params)
- if((!bomb) || (!target) || (get_dist(get_turf(target), get_turf(user)) <= 2))
+ if((!bomb && bombcheck) || (!target) || (get_dist(get_turf(target), get_turf(user)) <= 2))
return ..()
- var/power = calculate_bomb()
+ var/power = bomb? calculate_bomb() : debug_power
+ power = min(power, max_power)
QDEL_NULL(bomb)
update_icon()
- var/heavy = power * 0.2
+ var/heavy = power * 0.25
var/medium = power * 0.5
var/light = power
user.visible_message("[user] opens [bomb] on [user.p_their()] [name] and fires a blast wave at [target]!","You open [bomb] on your [name] and fire a blast wave at [target]!")
playsound(user, "explosion", 100, 1)
var/turf/starting = get_turf(user)
var/turf/targturf = get_turf(target)
- var/log_str = "Blast wave fired from [ADMIN_COORDJMP(starting)] ([get_area_name(user, TRUE)]) at [ADMIN_COORDJMP(targturf)] ([target.name]) by [user.name]([user.ckey]) with power [heavy]/[medium]/[light]."
+ var/log_str = "Blast wave fired from [ADMIN_VERBOSEJMP(starting)] ([get_area_name(user, TRUE)]) at [ADMIN_VERBOSEJMP(targturf)] ([target.name]) by [user.name]([user.ckey]) with power [heavy]/[medium]/[light]."
message_admins(log_str)
log_game(log_str)
var/obj/item/projectile/blastwave/BW = new(loc, heavy, medium, light)
- BW.preparePixelProjectile(target, get_turf(target), user, params, 0)
+ BW.hugbox = hugbox
+ BW.preparePixelProjectile(target, get_turf(src), params, 0)
BW.fire()
/obj/item/projectile/blastwave
@@ -99,6 +119,7 @@
var/heavyr = 0
var/mediumr = 0
var/lightr = 0
+ var/hugbox = TRUE
range = 150
/obj/item/projectile/blastwave/Initialize(mapload, _h, _m, _l)
@@ -110,14 +131,25 @@
/obj/item/projectile/blastwave/Range()
..()
var/amount_destruction = EXPLODE_NONE
+ var/wallbreak_chance = 0
if(heavyr)
amount_destruction = EXPLODE_DEVASTATE
+ wallbreak_chance = 99
else if(mediumr)
amount_destruction = EXPLODE_HEAVY
+ wallbreak_chance = 66
else if(lightr)
amount_destruction = EXPLODE_LIGHT
+ wallbreak_chance = 33
if(amount_destruction)
- loc.ex_act(amount_destruction)
+ if(hugbox)
+ loc.contents_explosion(EXPLODE_HEAVY, loc)
+ if(istype(loc, /turf/closed/wall))
+ var/turf/closed/wall/W = loc
+ if(prob(wallbreak_chance))
+ W.dismantle_wall(TRUE, TRUE)
+ else
+ loc.ex_act(amount_destruction)
else
qdel(src)
diff --git a/code/modules/projectiles/guns/misc/grenade_launcher.dm b/code/modules/projectiles/guns/misc/grenade_launcher.dm
index e57d77bdf9..e51c3573e3 100644
--- a/code/modules/projectiles/guns/misc/grenade_launcher.dm
+++ b/code/modules/projectiles/guns/misc/grenade_launcher.dm
@@ -44,8 +44,8 @@
grenades -= F
F.forceMove(user.loc)
F.throw_at(target, 30, 2, user)
- message_admins("[key_name_admin(user)] fired a grenade ([F.name]) from a grenade launcher ([src.name]).")
- log_game("[key_name(user)] fired a grenade ([F.name]) from a grenade launcher ([src.name]).")
+ message_admins("[ADMIN_LOOKUPFLW(user)] fired a grenade ([F.name]) from a grenade launcher ([src]) from [AREACOORD(user)] at [target] [AREACOORD(target)].")
+ log_game("[key_name(user)] fired a grenade ([F.name]) with a grenade launcher ([src]) from [AREACOORD(user)] at [target] [AREACOORD(target)].")
F.active = 1
F.icon_state = initial(F.icon_state) + "_active"
playsound(user.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm
index b5cd9b70a7..f132d62b27 100644
--- a/code/modules/projectiles/pins.dm
+++ b/code/modules/projectiles/pins.dm
@@ -147,7 +147,7 @@
// DNA-keyed pin.
-// When you want to keep your toys for youself.
+// When you want to keep your toys for yourself.
/obj/item/firing_pin/dna
name = "DNA-keyed firing pin"
desc = "This is a DNA-locked firing pin which only authorizes one user. Attempt to fire once to DNA-link."
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index f47fbef576..980a79c79c 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -8,7 +8,7 @@
icon_state = "bullet"
density = FALSE
anchored = TRUE
- flags_1 = ABSTRACT_1
+ item_flags = ABSTRACT
pass_flags = PASSTABLE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
hitsound = 'sound/weapons/pierce.ogg'
@@ -36,10 +36,6 @@
var/trajectory_ignore_forcemove = FALSE //instructs forceMove to NOT reset our trajectory to the new location!
var/speed = 0.8 //Amount of deciseconds it takes for projectile to travel
-<<<<<<< ours
- var/pixel_speed = 33 //pixels per move - DO NOT FUCK WITH THIS UNLESS YOU ABSOLUTELY KNOW WHAT YOU ARE DOING OR UNEXPECTED THINGS /WILL/ HAPPEN!
-=======
->>>>>>> theirs
var/Angle = 0
var/original_angle = 0 //Angle at firing
var/nondirectional_sprite = FALSE //Set TRUE to prevent projectiles from having their sprites rotated based on firing angle
@@ -370,7 +366,7 @@
fired = TRUE
if(hitscan)
process_hitscan()
- if(!isprocessing)
+ if(!(datum_flags & DF_ISPROCESSING))
START_PROCESSING(SSprojectiles, src)
pixel_move(1, FALSE) //move it now!
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 3ba0d092c5..d2245531fe 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -51,7 +51,7 @@
damage = 5
/obj/item/projectile/beam/xray
- name = "xray beam"
+ name = "\improper X-ray beam"
icon_state = "xray"
damage = 15
irradiate = 30
@@ -90,7 +90,7 @@
/obj/item/projectile/beam/pulse/on_hit(atom/target, blocked = FALSE)
. = ..()
- if(isturf(target) || istype(target, /obj/structure/))
+ if (!QDELETED(target) && (isturf(target) || istype(target, /obj/structure/)))
target.ex_act(EXPLODE_HEAVY)
/obj/item/projectile/beam/pulse/shotgun
diff --git a/code/modules/projectiles/projectile/bullets/_incendiary.dm b/code/modules/projectiles/projectile/bullets/_incendiary.dm
index d0cf74421c..b6cca4a31a 100644
--- a/code/modules/projectiles/projectile/bullets/_incendiary.dm
+++ b/code/modules/projectiles/projectile/bullets/_incendiary.dm
@@ -14,4 +14,4 @@
var/turf/location = get_turf(src)
if(location)
new /obj/effect/hotspot(location)
- location.hotspot_expose(700, 50, 1)
+ location.hotspot_expose(700, 5, 1)
diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm
index 41a819dd16..457ec78e9b 100644
--- a/code/modules/projectiles/projectile/bullets/shotgun.dm
+++ b/code/modules/projectiles/projectile/bullets/shotgun.dm
@@ -2,10 +2,6 @@
name = "12g shotgun slug"
damage = 60
-/obj/item/projectile/bullet/shotgun_slug/tengauge
- name = "10g shotgun slug"
- damage = 72.5
-
/obj/item/projectile/bullet/shotgun_beanbag
name = "beanbag slug"
damage = 5
diff --git a/code/modules/projectiles/projectile/bullets/smg.dm b/code/modules/projectiles/projectile/bullets/smg.dm
index 50532a5977..4044a9629c 100644
--- a/code/modules/projectiles/projectile/bullets/smg.dm
+++ b/code/modules/projectiles/projectile/bullets/smg.dm
@@ -23,4 +23,4 @@
/obj/item/projectile/bullet/incendiary/c46x30mm
name = "4.6x30mm incendiary bullet"
damage = 10
- fire_stacks = 1
+ fire_stacks = 1
\ No newline at end of file
diff --git a/code/modules/projectiles/projectile/energy/net_snare.dm b/code/modules/projectiles/projectile/energy/net_snare.dm
index afe9a2e31d..f5d0607341 100644
--- a/code/modules/projectiles/projectile/energy/net_snare.dm
+++ b/code/modules/projectiles/projectile/energy/net_snare.dm
@@ -1,98 +1,98 @@
-/obj/item/projectile/energy/net
- name = "energy netting"
- icon_state = "e_netting"
- damage = 10
- damage_type = STAMINA
- hitsound = 'sound/weapons/taserhit.ogg'
- range = 10
-
-/obj/item/projectile/energy/net/Initialize()
- . = ..()
- SpinAnimation()
-
-/obj/item/projectile/energy/net/on_hit(atom/target, blocked = FALSE)
- if(isliving(target))
- var/turf/Tloc = get_turf(target)
- if(!locate(/obj/effect/nettingportal) in Tloc)
- new /obj/effect/nettingportal(Tloc)
- ..()
-
-/obj/item/projectile/energy/net/on_range()
- do_sparks(1, TRUE, src)
- ..()
-
-/obj/effect/nettingportal
- name = "DRAGnet teleportation field"
- desc = "A field of bluespace energy, locking on to teleport a target."
- icon = 'icons/effects/effects.dmi'
- icon_state = "dragnetfield"
- light_range = 3
- anchored = TRUE
-
-/obj/effect/nettingportal/Initialize()
- . = ..()
- var/obj/item/beacon/teletarget = null
- for(var/obj/machinery/computer/teleporter/com in GLOB.machines)
- if(com.target)
- if(com.power_station && com.power_station.teleporter_hub && com.power_station.engaged)
- teletarget = com.target
-
- addtimer(CALLBACK(src, .proc/pop, teletarget), 30)
-
-/obj/effect/nettingportal/proc/pop(teletarget)
- if(teletarget)
- for(var/mob/living/L in get_turf(src))
- do_teleport(L, teletarget, 2)//teleport what's in the tile to the beacon
- else
- for(var/mob/living/L in get_turf(src))
- do_teleport(L, L, 15) //Otherwise it just warps you off somewhere.
-
- qdel(src)
-
-/obj/effect/nettingportal/singularity_act()
- return
-
-/obj/effect/nettingportal/singularity_pull()
- return
-
-/obj/item/projectile/energy/trap
- name = "energy snare"
- icon_state = "e_snare"
- nodamage = 1
- knockdown = 20
- hitsound = 'sound/weapons/taserhit.ogg'
- range = 4
-
-/obj/item/projectile/energy/trap/on_hit(atom/target, blocked = FALSE)
- if(!ismob(target) || blocked >= 100) //Fully blocked by mob or collided with dense object - drop a trap
- new/obj/item/restraints/legcuffs/beartrap/energy(get_turf(loc))
- else if(iscarbon(target))
- var/obj/item/restraints/legcuffs/beartrap/B = new /obj/item/restraints/legcuffs/beartrap/energy(get_turf(target))
- B.Crossed(target)
- ..()
-
-/obj/item/projectile/energy/trap/on_range()
- new /obj/item/restraints/legcuffs/beartrap/energy(loc)
- ..()
-
-/obj/item/projectile/energy/trap/cyborg
- name = "Energy Bola"
- icon_state = "e_snare"
- nodamage = 1
- knockdown = 0
- hitsound = 'sound/weapons/taserhit.ogg'
- range = 10
-
-/obj/item/projectile/energy/trap/cyborg/on_hit(atom/target, blocked = FALSE)
- if(!ismob(target) || blocked >= 100)
- do_sparks(1, TRUE, src)
- qdel(src)
- if(iscarbon(target))
- var/obj/item/restraints/legcuffs/beartrap/B = new /obj/item/restraints/legcuffs/beartrap/energy/cyborg(get_turf(target))
- B.Crossed(target)
- QDEL_IN(src, 10)
- ..()
-
-/obj/item/projectile/energy/trap/cyborg/on_range()
- do_sparks(1, TRUE, src)
- qdel(src)
+/obj/item/projectile/energy/net
+ name = "energy netting"
+ icon_state = "e_netting"
+ damage = 10
+ damage_type = STAMINA
+ hitsound = 'sound/weapons/taserhit.ogg'
+ range = 10
+
+/obj/item/projectile/energy/net/Initialize()
+ . = ..()
+ SpinAnimation()
+
+/obj/item/projectile/energy/net/on_hit(atom/target, blocked = FALSE)
+ if(isliving(target))
+ var/turf/Tloc = get_turf(target)
+ if(!locate(/obj/effect/nettingportal) in Tloc)
+ new /obj/effect/nettingportal(Tloc)
+ ..()
+
+/obj/item/projectile/energy/net/on_range()
+ do_sparks(1, TRUE, src)
+ ..()
+
+/obj/effect/nettingportal
+ name = "DRAGnet teleportation field"
+ desc = "A field of bluespace energy, locking on to teleport a target."
+ icon = 'icons/effects/effects.dmi'
+ icon_state = "dragnetfield"
+ light_range = 3
+ anchored = TRUE
+
+/obj/effect/nettingportal/Initialize()
+ . = ..()
+ var/obj/item/beacon/teletarget = null
+ for(var/obj/machinery/computer/teleporter/com in GLOB.machines)
+ if(com.target)
+ if(com.power_station && com.power_station.teleporter_hub && com.power_station.engaged)
+ teletarget = com.target
+
+ addtimer(CALLBACK(src, .proc/pop, teletarget), 30)
+
+/obj/effect/nettingportal/proc/pop(teletarget)
+ if(teletarget)
+ for(var/mob/living/L in get_turf(src))
+ do_teleport(L, teletarget, 2)//teleport what's in the tile to the beacon
+ else
+ for(var/mob/living/L in get_turf(src))
+ do_teleport(L, L, 15) //Otherwise it just warps you off somewhere.
+
+ qdel(src)
+
+/obj/effect/nettingportal/singularity_act()
+ return
+
+/obj/effect/nettingportal/singularity_pull()
+ return
+
+/obj/item/projectile/energy/trap
+ name = "energy snare"
+ icon_state = "e_snare"
+ nodamage = 1
+ knockdown = 20
+ hitsound = 'sound/weapons/taserhit.ogg'
+ range = 4
+
+/obj/item/projectile/energy/trap/on_hit(atom/target, blocked = FALSE)
+ if(!ismob(target) || blocked >= 100) //Fully blocked by mob or collided with dense object - drop a trap
+ new/obj/item/restraints/legcuffs/beartrap/energy(get_turf(loc))
+ else if(iscarbon(target))
+ var/obj/item/restraints/legcuffs/beartrap/B = new /obj/item/restraints/legcuffs/beartrap/energy(get_turf(target))
+ B.Crossed(target)
+ ..()
+
+/obj/item/projectile/energy/trap/on_range()
+ new /obj/item/restraints/legcuffs/beartrap/energy(loc)
+ ..()
+
+/obj/item/projectile/energy/trap/cyborg
+ name = "Energy Bola"
+ icon_state = "e_snare"
+ nodamage = 1
+ knockdown = 0
+ hitsound = 'sound/weapons/taserhit.ogg'
+ range = 10
+
+/obj/item/projectile/energy/trap/cyborg/on_hit(atom/target, blocked = FALSE)
+ if(!ismob(target) || blocked >= 100)
+ do_sparks(1, TRUE, src)
+ qdel(src)
+ if(iscarbon(target))
+ var/obj/item/restraints/legcuffs/beartrap/B = new /obj/item/restraints/legcuffs/beartrap/energy/cyborg(get_turf(target))
+ B.Crossed(target)
+ QDEL_IN(src, 10)
+ ..()
+
+/obj/item/projectile/energy/trap/cyborg/on_range()
+ do_sparks(1, TRUE, src)
+ qdel(src)
diff --git a/code/modules/projectiles/projectile/energy/stun.dm b/code/modules/projectiles/projectile/energy/stun.dm
index 1c24d47a9d..de9016a4c4 100644
--- a/code/modules/projectiles/projectile/energy/stun.dm
+++ b/code/modules/projectiles/projectile/energy/stun.dm
@@ -18,7 +18,7 @@
do_sparks(1, TRUE, src)
else if(iscarbon(target))
var/mob/living/carbon/C = target
- C.SendSignal(COMSIG_ADD_MOOD_EVENT, "tased", /datum/mood_event/tased)
+ SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "tased", /datum/mood_event/tased)
if(C.dna && C.dna.check_mutation(HULK))
C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
else if((C.status_flags & CANKNOCKDOWN) && !C.has_trait(TRAIT_STUNIMMUNE))
diff --git a/code/modules/projectiles/projectile/energy/tesla.dm b/code/modules/projectiles/projectile/energy/tesla.dm
index 6eebd6afbf..7ca2bcb294 100644
--- a/code/modules/projectiles/projectile/energy/tesla.dm
+++ b/code/modules/projectiles/projectile/energy/tesla.dm
@@ -3,12 +3,20 @@
icon_state = "tesla_projectile"
impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser
var/chain
+ var/tesla_flags = TESLA_MOB_DAMAGE | TESLA_OBJ_DAMAGE
+ var/zap_range = 3
+ var/power = 10000
/obj/item/projectile/energy/tesla/fire(setAngle)
if(firer)
chain = firer.Beam(src, icon_state = "lightning[rand(1, 12)]", time = INFINITY, maxdistance = INFINITY)
..()
+/obj/item/projectile/energy/tesla/on_hit(atom/target)
+ . = ..()
+ tesla_zap(target, zap_range, power, tesla_flags)
+ qdel(src)
+
/obj/item/projectile/energy/tesla/Destroy()
qdel(chain)
return ..()
@@ -16,16 +24,6 @@
/obj/item/projectile/energy/tesla/revolver
name = "energy orb"
-/obj/item/projectile/energy/tesla/revolver/on_hit(atom/target)
- . = ..()
- if(isliving(target))
- tesla_zap(target, 3, 10000)
- qdel(src)
-
/obj/item/projectile/energy/tesla/cannon
name = "tesla orb"
-
-/obj/item/projectile/energy/tesla/cannon/on_hit(atom/target)
- . = ..()
- tesla_zap(target, 3, 10000, explosive = FALSE, stun_mobs = FALSE)
- qdel(src)
+ power = 20000
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index d717cbf680..94d4d49ded 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -231,7 +231,6 @@
if(!new_mob)
return
new_mob.grant_language(/datum/language/common)
- new_mob.logging = M.logging
// Some forms can still wear some items
for(var/obj/item/W in contents)
@@ -360,7 +359,7 @@
var/tesla_power = 20000
var/tesla_range = 15
- var/tesla_boom = FALSE
+ var/tesla_flags = TESLA_MOB_DAMAGE | TESLA_MOB_STUN | TESLA_OBJ_DAMAGE
var/chain
var/mob/living/caster
@@ -377,7 +376,7 @@
visible_message("[src] fizzles on contact with [target]!")
qdel(src)
return
- tesla_zap(src, tesla_range, tesla_power, tesla_boom)
+ tesla_zap(src, tesla_range, tesla_power, tesla_flags)
qdel(src)
/obj/item/projectile/magic/aoe/lightning/Destroy()
diff --git a/code/modules/projectiles/projectile/special/temperature.dm b/code/modules/projectiles/projectile/special/temperature.dm
index 7fb9c6efb2..44c8df6c00 100644
--- a/code/modules/projectiles/projectile/special/temperature.dm
+++ b/code/modules/projectiles/projectile/special/temperature.dm
@@ -7,12 +7,11 @@
flag = "energy"
var/temperature = 100
-/obj/item/projectile/temp/on_hit(atom/target, blocked = FALSE)//These two could likely check temp protection on the mob
- ..()
+/obj/item/projectile/temp/on_hit(atom/target, blocked = 0)
+ . = ..()
if(isliving(target))
- var/mob/M = target
- M.bodytemperature = temperature
- return TRUE
+ var/mob/living/L = target
+ L.adjust_bodytemperature(((100-blocked)/100)*(temperature - L.bodytemperature)) // the new body temperature is adjusted by 100-blocked % of the delta between body temperature and the bullet's effect temperature
/obj/item/projectile/temp/hot
name = "heat beam"
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index afa73fcd4a..2def04cc66 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -303,7 +303,7 @@
need_mob_update += R.addiction_act_stage4(C)
if(40 to INFINITY)
to_chat(C, "You feel like you've gotten over your need for [R.name].")
- C.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "[R.id]_addiction")
+ SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "[R.id]_addiction")
cached_addictions.Remove(R)
addiction_tick++
if(C && need_mob_update) //some of the metabolized reagents had effects on the mob that requires some updates.
@@ -406,10 +406,10 @@
for(var/V in possible_reactions)
var/datum/chemical_reaction/competitor = V
if(selected_reaction.is_cold_recipe) //if there are no recipe conflicts, everything in possible_reactions will have this same value for is_cold_reaction. warranty void if assumption not met.
- if(competitor.required_temp < selected_reaction.required_temp)
+ if(competitor.required_temp <= selected_reaction.required_temp)
selected_reaction = competitor
else
- if(competitor.required_temp > selected_reaction.required_temp)
+ if(competitor.required_temp >= selected_reaction.required_temp)
selected_reaction = competitor
var/list/cached_required_reagents = selected_reaction.required_reagents
var/list/cached_results = selected_reaction.results
@@ -526,19 +526,54 @@
return TRUE
return FALSE
+//Returns the average specific heat for all reagents currently in this holder.
+/datum/reagents/proc/specific_heat()
+ . = 0
+ var/cached_amount = total_volume //cache amount
+ var/list/cached_reagents = reagent_list //cache reagents
+ for(var/I in cached_reagents)
+ var/datum/reagent/R = I
+ . += R.specific_heat * (R.volume / cached_amount)
+
+/datum/reagents/proc/adjust_thermal_energy(J, min_temp = 2.7, max_temp = 1000)
+ var/S = specific_heat()
+ chem_temp = CLAMP(chem_temp + (J / (S * total_volume)), 2.7, 1000)
+
/datum/reagents/proc/add_reagent(reagent, amount, list/data=null, reagtemp = 300, no_react = 0)
if(!isnum(amount) || !amount)
return FALSE
- if(amount < 0)
+ if(amount <= 0)
return FALSE
- var/list/cached_reagents = reagent_list
- update_total()
- if(total_volume + amount > maximum_volume)
- amount = (maximum_volume - total_volume) //Doesnt fit in. Make it disappear. Shouldnt happen. Will happen.
- chem_temp = round(((amount * reagtemp) + (total_volume * chem_temp)) / (total_volume + amount)) //equalize with new chems
+ var/datum/reagent/D = GLOB.chemical_reagents_list[reagent]
+ if(!D)
+ WARNING("[my_atom] attempted to add a reagent called '[reagent]' which doesn't exist. ([usr])")
+ return FALSE
+ update_total()
+ var/cached_total = total_volume
+ if(cached_total + amount > maximum_volume)
+ amount = (maximum_volume - cached_total) //Doesnt fit in. Make it disappear. Shouldnt happen. Will happen.
+ if(amount <= 0)
+ return FALSE
+ var/new_total = cached_total + amount
+ var/cached_temp = chem_temp
+ var/list/cached_reagents = reagent_list
+
+ //Equalize temperature - Not using specific_heat() because the new chemical isn't in yet.
+ var/specific_heat = 0
+ var/thermal_energy = 0
+ for(var/i in cached_reagents)
+ var/datum/reagent/R = i
+ specific_heat += R.specific_heat * (R.volume / new_total)
+ thermal_energy += R.specific_heat * R.volume * cached_temp
+ specific_heat += D.specific_heat * (amount / new_total)
+ thermal_energy += D.specific_heat * amount * reagtemp
+ chem_temp = thermal_energy / (specific_heat * new_total)
+ ////
+
+ //add the reagent to the existing if it exists
for(var/A in cached_reagents)
var/datum/reagent/R = A
if (R.id == reagent)
@@ -551,29 +586,23 @@
handle_reactions()
return TRUE
- var/datum/reagent/D = GLOB.chemical_reagents_list[reagent]
- if(D)
+ //otherwise make a new one
+ var/datum/reagent/R = new D.type(data)
+ cached_reagents += R
+ R.holder = src
+ R.volume = amount
+ if(data)
+ R.data = data
+ R.on_new(data)
- var/datum/reagent/R = new D.type(data)
- cached_reagents += R
- R.holder = src
- R.volume = amount
- if(data)
- R.data = data
- R.on_new(data)
-
- update_total()
- if(my_atom)
- my_atom.on_reagent_change(ADD_REAGENT)
- if(!no_react)
- handle_reactions()
- if(isliving(my_atom))
- R.on_mob_add(my_atom)
- return TRUE
-
- else
- WARNING("[my_atom] attempted to add a reagent called '[reagent]' which doesn't exist. ([usr])")
- return FALSE
+ update_total()
+ if(my_atom)
+ my_atom.on_reagent_change(ADD_REAGENT)
+ if(!no_react)
+ handle_reactions()
+ if(isliving(my_atom))
+ R.on_mob_add(my_atom)
+ return TRUE
/datum/reagents/proc/add_reagent_list(list/list_reagents, list/data=null) // Like add_reagent but you can enter a list. Format it like this: list("toxin" = 10, "beer" = 15)
for(var/r_id in list_reagents)
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 170b3a3a65..80e4453c7d 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -2,7 +2,6 @@
name = "chem dispenser"
desc = "Creates and dispenses chemicals."
density = TRUE
- anchored = TRUE
icon = 'icons/obj/chemical.dmi'
icon_state = "dispenser"
use_power = IDLE_POWER_USE
@@ -94,7 +93,7 @@
b_o.pixel_x = -7
return b_o
-obj/machinery/chem_dispenser/proc/work_animation()
+/obj/machinery/chem_dispenser/proc/work_animation()
if(working_state)
flick(working_state,src)
@@ -294,7 +293,7 @@ obj/machinery/chem_dispenser/proc/work_animation()
if(default_deconstruction_crowbar(I))
return
- if(istype(I, /obj/item/reagent_containers) && !(I.flags_1 & ABSTRACT_1) && I.is_open_container())
+ if(istype(I, /obj/item/reagent_containers) && !(I.item_flags & ABSTRACT) && I.is_open_container())
var/obj/item/reagent_containers/B = I
. = 1 //no afterattack
if(beaker)
@@ -315,6 +314,9 @@ obj/machinery/chem_dispenser/proc/work_animation()
return cell
/obj/machinery/chem_dispenser/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
var/list/datum/reagents/R = list()
var/total = min(rand(7,15), FLOOR(cell.charge*powerefficiency, 1))
var/datum/reagents/Q = new(total*10)
@@ -330,7 +332,6 @@ obj/machinery/chem_dispenser/proc/work_animation()
cell.emp_act(severity)
work_animation()
visible_message("[src] malfunctions, spraying chemicals everywhere!")
- ..()
/obj/machinery/chem_dispenser/RefreshParts()
@@ -403,7 +404,6 @@ obj/machinery/chem_dispenser/proc/work_animation()
/obj/machinery/chem_dispenser/drinks
name = "soda dispenser"
desc = "Contains a large reservoir of soft drinks."
- anchored = TRUE
icon = 'icons/obj/chemical.dmi'
icon_state = "soda_dispenser"
has_panel_overlay = FALSE
@@ -447,7 +447,6 @@ obj/machinery/chem_dispenser/proc/work_animation()
/obj/machinery/chem_dispenser/drinks/beer
name = "booze dispenser"
desc = "Contains a large reservoir of the good stuff."
- anchored = TRUE
icon = 'icons/obj/chemical.dmi'
icon_state = "booze_dispenser"
circuit = /obj/item/circuitboard/machine/chem_dispenser/drinks/beer
@@ -468,14 +467,14 @@ obj/machinery/chem_dispenser/proc/work_animation()
"creme_de_menthe",
"creme_de_cacao",
"triple_sec",
- "sake",
- "fernet"
+ "sake"
)
emagged_reagents = list(
"ethanol",
"iron",
"minttoxin",
- "atomicbomb"
+ "atomicbomb",
+ "fernet"
)
@@ -505,7 +504,7 @@ obj/machinery/chem_dispenser/proc/work_animation()
"diethylamine")
/obj/machinery/chem_dispenser/fullupgrade //fully upgraded stock parts
-
+
/obj/machinery/chem_dispenser/fullupgrade/Initialize()
. = ..()
component_parts = list()
diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm
index 73413a5e7b..e4c6966cff 100644
--- a/code/modules/reagents/chemistry/machinery/chem_heater.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm
@@ -1,7 +1,6 @@
/obj/machinery/chem_heater
name = "chemical heater"
density = TRUE
- anchored = TRUE
icon = 'icons/obj/chemical.dmi'
icon_state = "mixer0b"
use_power = IDLE_POWER_USE
@@ -47,13 +46,8 @@
if(stat & NOPOWER)
return
if(on)
- if(beaker)
- if(beaker.reagents.chem_temp > target_temperature)
- beaker.reagents.chem_temp += min(-1, (target_temperature - beaker.reagents.chem_temp) * heater_coefficient)
- if(beaker.reagents.chem_temp < target_temperature)
- beaker.reagents.chem_temp += max(1, (target_temperature - beaker.reagents.chem_temp) * heater_coefficient)
-
- beaker.reagents.chem_temp = round(beaker.reagents.chem_temp)
+ if(beaker && beaker.reagents.total_volume)
+ beaker.reagents.adjust_thermal_energy((target_temperature - beaker.reagents.chem_temp) * heater_coefficient * SPECIFIC_HEAT_DEFAULT * beaker.reagents.total_volume)
beaker.reagents.handle_reactions()
/obj/machinery/chem_heater/attackby(obj/item/I, mob/user, params)
@@ -63,7 +57,7 @@
if(default_deconstruction_crowbar(I))
return
- if(istype(I, /obj/item/reagent_containers) && !(I.flags_1 & ABSTRACT_1) && I.is_open_container())
+ if(istype(I, /obj/item/reagent_containers) && !(I.item_flags & ABSTRACT) && I.is_open_container())
. = 1 //no afterattack
if(beaker)
to_chat(user, "A container is already loaded into [src]!")
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 89b63f4ee5..6327c5ba3a 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -2,7 +2,6 @@
name = "ChemMaster 3000"
desc = "Used to separate chemicals and distribute them in a variety of forms."
density = TRUE
- anchored = TRUE
layer = BELOW_OBJ_LAYER
icon = 'icons/obj/chemical.dmi'
icon_state = "mixer0"
@@ -85,7 +84,7 @@
if(default_unfasten_wrench(user, I))
return
- if(istype(I, /obj/item/reagent_containers) && !(I.flags_1 & ABSTRACT_1) && I.is_open_container())
+ if(istype(I, /obj/item/reagent_containers) && !(I.item_flags & ABSTRACT) && I.is_open_container())
. = 1 // no afterattack
if(panel_open)
to_chat(user, "You can't use the [src.name] while its panel is opened!")
diff --git a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
index 4c57eb3524..daac5a5d1c 100644
--- a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
@@ -5,44 +5,23 @@
icon_state = "dispenser"
amount = 10
resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | ACID_PROOF | LAVA_PROOF
- working_state = null
- nopower_state = null
flags_1 = NODECONSTRUCT_1
+ use_power = NO_POWER_USE
var/static/list/shortcuts = list(
"meth" = "methamphetamine",
"tricord" = "tricordrazine"
)
- var/mutable_appearance/top_overlay
-
-/obj/machinery/chem_dispenser/chem_synthesizer/Initialize()
- . = ..()
- GLOB.poi_list += src
- top_overlay = mutable_appearance(icon, "disp_beaker", layer = ABOVE_ALL_MOB_LAYER)
- update_icon()
-
-/obj/machinery/chem_dispenser/chem_synthesizer/update_icon()
- cut_overlays()
- add_overlay(top_overlay)
-
-/obj/machinery/chem_dispenser/chem_synthesizer/Destroy()
- . = ..()
- GLOB.poi_list -= src
- QDEL_NULL(top_overlay)
-
-/obj/machinery/chem_dispenser/chem_synthesizer/display_beaker()
- return
/obj/machinery/chem_dispenser/chem_synthesizer/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)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "chem_synthesizer", name, 390, 315, master_ui, state)
+ ui = new(user, src, ui_key, "chem_synthesizer", name, 390, 330, master_ui, state)
ui.open()
/obj/machinery/chem_dispenser/chem_synthesizer/ui_act(action, params)
if(..())
return
- update_icon()
switch(action)
if("ejectBeaker")
if(beaker)
@@ -71,15 +50,18 @@
return
beaker = new /obj/item/reagent_containers/glass/beaker/bluespace(src)
visible_message("[src] dispenses a bluespace beaker.")
+ if("amount")
+ var/input = input("Units to dispense", "Units") as num|null
+ if(input)
+ amount = input
+ update_icon()
/obj/machinery/chem_dispenser/chem_synthesizer/proc/find_reagent(input)
. = FALSE
if(GLOB.chemical_reagents_list[input]) //prefer IDs!
- var/datum/reagent/R = GLOB.chemical_reagents_list[input]
- if(R.can_synth_debug)
- return input
+ return input
else
for(var/X in GLOB.chemical_reagents_list)
var/datum/reagent/R = GLOB.chemical_reagents_list[X]
- if(R.can_synth_debug && input == replacetext(lowertext(R.name), " ", ""))
+ if(input == replacetext(lowertext(R.name), " ", ""))
return X
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index 5a9efe56d1..25385ca2ff 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -5,7 +5,6 @@
name = "PanD.E.M.I.C 2200"
desc = "Used to work with viruses."
density = TRUE
- anchored = TRUE
icon = 'icons/obj/chemical.dmi'
icon_state = "mixer0"
circuit = /obj/item/circuitboard/computer/pandemic
@@ -229,7 +228,7 @@
/obj/machinery/computer/pandemic/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/reagent_containers) && !(I.flags_1 & ABSTRACT_1) && I.is_open_container())
+ if(istype(I, /obj/item/reagent_containers) && !(I.item_flags & ABSTRACT) && I.is_open_container())
. = TRUE //no afterattack
if(stat & (NOPOWER|BROKEN))
return
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index a4d9829aa6..3ee971bc9f 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -7,7 +7,6 @@
icon = 'icons/obj/kitchen.dmi'
icon_state = "juicer1"
layer = BELOW_OBJ_LAYER
- anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 5
active_power_usage = 100
@@ -82,7 +81,7 @@
if(panel_open) //Can't insert objects when its screwed open
return TRUE
- if (istype(I, /obj/item/reagent_containers) && !(I.flags_1 & ABSTRACT_1) && I.is_open_container())
+ if (istype(I, /obj/item/reagent_containers) && !(I.item_flags & ABSTRACT) && I.is_open_container())
if (!beaker)
if(!user.transferItemToLoc(I, src))
to_chat(user, "[I] is stuck to your hand!")
@@ -102,7 +101,7 @@
//Fill machine with a bag!
if(istype(I, /obj/item/storage/bag))
var/list/inserted = list()
- if(I.SendSignal(COMSIG_TRY_STORAGE_TAKE_TYPE, /obj/item/reagent_containers/food/snacks/grown, src, limit - length(holdingitems), null, null, user, inserted))
+ if(SEND_SIGNAL(I, COMSIG_TRY_STORAGE_TAKE_TYPE, /obj/item/reagent_containers/food/snacks/grown, src, limit - length(holdingitems), null, null, user, inserted))
for(var/i in inserted)
holdingitems[i] = TRUE
if(!I.contents.len)
diff --git a/code/modules/reagents/chemistry/machinery/smoke_machine.dm b/code/modules/reagents/chemistry/machinery/smoke_machine.dm
index 56cec26dd3..a8b0919906 100644
--- a/code/modules/reagents/chemistry/machinery/smoke_machine.dm
+++ b/code/modules/reagents/chemistry/machinery/smoke_machine.dm
@@ -6,7 +6,6 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "smoke0"
density = TRUE
- anchored = TRUE
circuit = /obj/item/circuitboard/machine/smoke_machine
var/efficiency = 10
var/on = FALSE
@@ -143,9 +142,9 @@
on = !on
update_icon()
if(on)
- message_admins("[key_name_admin(usr)] activated a smoke machine that contains [english_list(reagents.reagent_list)] at [ADMIN_COORDJMP(src)].")
- log_game("[key_name(usr)] activated a smoke machine that contains [english_list(reagents.reagent_list)] at [COORD(src)].")
- add_logs(usr, src, "has activated [src] which contains [english_list(reagents.reagent_list)].")
+ message_admins("[ADMIN_LOOKUPFLW(usr)] activated a smoke machine that contains [english_list(reagents.reagent_list)] at [ADMIN_VERBOSEJMP(src)].")
+ log_game("[key_name(usr)] activated a smoke machine that contains [english_list(reagents.reagent_list)] at [AREACOORD(src)].")
+ add_logs(usr, src, "has activated [src] which contains [english_list(reagents.reagent_list)] at [AREACOORD(src)].")
if("goScreen")
screen = params["screen"]
. = TRUE
diff --git a/code/modules/reagents/chemistry/readme.md b/code/modules/reagents/chemistry/readme.md
index f070d36067..9a9be7c5a6 100644
--- a/code/modules/reagents/chemistry/readme.md
+++ b/code/modules/reagents/chemistry/readme.md
@@ -38,7 +38,7 @@ The holder (reagents datum) is the datum that holds a list of all reagents curre
If the specified amount is greater than what is available, it will use
the amount of the reagent that is available. If no reagent exists, returns null.
- metabolize(var/mob/M)
+ metabolize(var/mob/living/carbon/C)
This proc is called by the mobs life proc. It simply calls on_mob_life for
all contained reagents. You shouldnt have to use this one directly.
@@ -116,7 +116,7 @@ The holder (reagents datum) is the datum that holds a list of all reagents curre
# About Reagents:
Reagents are all the things you can mix and fille in bottles etc. This can be anything from rejuvs over water to ... iron. Each reagent also has a few procs - i'll explain those below.
```
- reaction_mob(var/mob/M, var/method=TOUCH)
+ reaction_mob(var/mob/living/L, var/method=TOUCH)
This is called by the holder's reation proc.
This version is only called when the reagent
reacts with a mob. The method var can be either
@@ -135,7 +135,7 @@ Reagents are all the things you can mix and fille in bottles etc. This can be an
with a turf. You'll want to put stuff like extra
slippery floors for lube or something in here.
- on_mob_life(var/mob/M)
+ on_mob_life(var/mob/living/L)
This proc is called everytime the mobs life proc executes.
This is the place where you put damage for toxins ,
drowsyness for sleep toxins etc etc.
@@ -241,7 +241,7 @@ By default, all atom have a reagents var - but its empty. if you want to use an
Checks if something can be injected to.
If this returns 1, you can use syringes and droppers
to draw from and add to the contents of this object.
-
+
atom/proc/is_drawable()
Checks if something can be drawn from.
If this returns 1, you can use syringes and droppers
@@ -255,4 +255,4 @@ Credit goes to Cogwerks, and all the other goonstation coders for the original i
- Any of the Secret Chems
- Goon in-joke chems (Eg. Cat Drugs, Hairgrownium)
- Liquid Electricity
-- Rajajajah
\ No newline at end of file
+- Rajajajah
diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm
index f61644db0c..6f65c33ea1 100644
--- a/code/modules/reagents/chemistry/reagents.dm
+++ b/code/modules/reagents/chemistry/reagents.dm
@@ -8,6 +8,7 @@
var/name = "Reagent"
var/id = "reagent"
var/description = ""
+ var/specific_heat = SPECIFIC_HEAT_DEFAULT //J/(K*mol)
var/taste_description = "metaphorical salt"
var/taste_mult = 1 //how this taste compares to others. Higher values means it is more noticable
var/glass_name = "glass of ...what?" // use for specialty drinks.
@@ -18,10 +19,9 @@
var/reagent_state = LIQUID
var/list/data
var/current_cycle = 0
- var/volume = 0
+ var/volume = 0 //pretend this is moles
var/color = "#000000" // rgb: 0, 0, 0
var/can_synth = TRUE // can this reagent be synthesized? (for example: odysseus syringe gun)
- var/can_synth_debug = TRUE // can this reagent be synthesized by the debug chem synthesizer?
var/metabolization_rate = REAGENTS_METABOLISM //how fast the reagent is metabolized by the mob
var/overrides_metab = 0
var/overdose_threshold = 0
@@ -51,17 +51,17 @@
/datum/reagent/proc/reaction_turf(turf/T, volume)
return
-/datum/reagent/proc/on_mob_life(mob/living/M)
+/datum/reagent/proc/on_mob_life(mob/living/carbon/M)
current_cycle++
holder.remove_reagent(src.id, metabolization_rate * M.metabolism_efficiency) //By default it slowly disappears.
return
// Called when this reagent is first added to a mob
-/datum/reagent/proc/on_mob_add(mob/M)
+/datum/reagent/proc/on_mob_add(mob/living/L)
return
// Called when this reagent is removed while inside a mob
-/datum/reagent/proc/on_mob_delete(mob/M)
+/datum/reagent/proc/on_mob_delete(mob/living/L)
return
/datum/reagent/proc/on_move(mob/M)
@@ -88,37 +88,37 @@
/datum/reagent/proc/overdose_start(mob/living/M)
to_chat(M, "You feel like you took too much of [name]!")
- M.SendSignal(COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/drugs/overdose, name)
+ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/drugs/overdose, name)
return
/datum/reagent/proc/addiction_act_stage1(mob/living/M)
- M.SendSignal(COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/drugs/withdrawal_light, name)
+ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/drugs/withdrawal_light, name)
if(prob(30))
to_chat(M, "You feel like having some [name] right about now.")
return
/datum/reagent/proc/addiction_act_stage2(mob/living/M)
- M.SendSignal(COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/drugs/withdrawal_medium, name)
+ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/drugs/withdrawal_medium, name)
if(prob(30))
to_chat(M, "You feel like you need [name]. You just can't get enough.")
return
/datum/reagent/proc/addiction_act_stage3(mob/living/M)
- M.SendSignal(COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/drugs/withdrawal_severe, name)
+ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/drugs/withdrawal_severe, name)
if(prob(30))
to_chat(M, "You have an intense craving for [name].")
return
/datum/reagent/proc/addiction_act_stage4(mob/living/M)
- M.SendSignal(COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/drugs/withdrawal_critical, name)
+ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/drugs/withdrawal_critical, name)
if(prob(30))
to_chat(M, "You're not feeling good at all! You really need some [name].")
return
-/proc/pretty_string_from_reagent_list(var/list/reagent_list)
+/proc/pretty_string_from_reagent_list(list/reagent_list)
//Convert reagent list to a printable string for logging etc
- var/result = "| "
+ var/list/rs = list()
for (var/datum/reagent/R in reagent_list)
- result += "[R.name], [R.volume] | "
+ rs += "[R.name], [R.volume]"
- return result
+ return rs.Join(" | ")
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index 6875aa6fc3..3e3282fb89 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -34,17 +34,16 @@ All effects don't start immediately, but rather get worse over time; the rate is
91-100: Dangerously toxic - swift death
*/
-/datum/reagent/consumable/ethanol/on_mob_life(mob/living/M)
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(H.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER)
- var/booze_power = boozepwr
- if(H.has_trait(TRAIT_ALCOHOL_TOLERANCE)) //we're an accomplished drinker
- booze_power *= 0.7
- H.drunkenness = max((H.drunkenness + (sqrt(volume) * booze_power * ALCOHOL_RATE)), 0) //Volume, power, and server alcohol rate effect how quickly one gets drunk
- var/obj/item/organ/liver/L = H.getorganslot(ORGAN_SLOT_LIVER)
- H.applyLiverDamage((max(sqrt(volume) * (boozepwr ** ALCOHOL_EXPONENT) * L.alcohol_tolerance, 0))/150)
- return ..() || .
+/datum/reagent/consumable/ethanol/on_mob_life(mob/living/carbon/C)
+ if(C.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER)
+ var/booze_power = boozepwr
+ if(C.has_trait(TRAIT_ALCOHOL_TOLERANCE)) //we're an accomplished drinker
+ booze_power *= 0.7
+ C.drunkenness = max((C.drunkenness + (sqrt(volume) * booze_power * ALCOHOL_RATE)), 0) //Volume, power, and server alcohol rate effect how quickly one gets drunk
+ var/obj/item/organ/liver/L = C.getorganslot(ORGAN_SLOT_LIVER)
+ if (istype(L))
+ C.applyLiverDamage((max(sqrt(volume) * (boozepwr ** ALCOHOL_EXPONENT) * L.alcohol_tolerance, 0))/150)
+ return ..()
/datum/reagent/consumable/ethanol/reaction_obj(obj/O, reac_volume)
if(istype(O, /obj/item/paper))
@@ -88,6 +87,15 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of beer"
glass_desc = "A freezing pint of beer."
+/datum/reagent/consumable/ethanol/beer/light
+ name = "Light Beer"
+ id = "light_beer"
+ description = "An alcoholic beverage brewed since ancient times on Old Earth. This variety has reduced calorie and alcohol content."
+ boozepwr = 5 //Space Europeans hate it
+ taste_description = "dish water"
+ glass_name = "glass of light beer"
+ glass_desc = "A freezing pint of watery light beer."
+
/datum/reagent/consumable/ethanol/beer/green
name = "Green Beer"
id = "greenbeer"
@@ -98,7 +106,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of green beer"
glass_desc = "A freezing pint of green beer. Festive."
-/datum/reagent/consumable/ethanol/beer/green/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/beer/green/on_mob_life(mob/living/carbon/M)
if(M.color != color)
M.add_atom_colour(color, TEMPORARY_COLOUR_PRIORITY)
return ..()
@@ -117,7 +125,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "DAMN, THIS THING LOOKS ROBUST!"
shot_glass_icon_state = "shotglasscream"
-/datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.AdjustSleeping(-40, FALSE)
@@ -152,7 +160,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of Thirteen Loko"
glass_desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass."
-/datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(0,M.drowsyness-7)
M.AdjustSleeping(-40)
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
@@ -213,7 +221,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "The glass contain wodka. Xynta."
shot_glass_icon_state = "shotglassclear"
-/datum/reagent/consumable/ethanol/vodka/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/vodka/on_mob_life(mob/living/carbon/M)
M.radiation = max(M.radiation-2,0)
return ..()
@@ -229,7 +237,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of bilk"
glass_desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
-/datum/reagent/consumable/ethanol/bilk/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/bilk/on_mob_life(mob/living/carbon/M)
if(M.getBruteLoss() && prob(10))
M.heal_bodypart_damage(1)
. = 1
@@ -246,7 +254,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Three Mile Island Ice Tea"
glass_desc = "A glass of this is sure to prevent a meltdown."
-/datum/reagent/consumable/ethanol/threemileisland/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/threemileisland/on_mob_life(mob/living/carbon/M)
M.set_drugginess(50)
return ..()
@@ -352,7 +360,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "It's as strong as it smells."
shot_glass_icon_state = "shotglassgreen"
-/datum/reagent/consumable/ethanol/absinthe/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/absinthe/on_mob_life(mob/living/carbon/M)
if(prob(10) && !M.has_trait(TRAIT_ALCOHOL_TOLERANCE))
M.hallucination += 4 //Reference to the urban myth
..()
@@ -437,7 +445,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Cuba Libre"
glass_desc = "A classic mix of rum, cola, and lime. A favorite of revolutionaries everywhere!"
-/datum/reagent/consumable/ethanol/cuba_libre/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/cuba_libre/on_mob_life(mob/living/carbon/M)
if(M.mind && M.mind.has_antag_datum(/datum/antagonist/rev)) //Cuba Libre, the traditional drink of revolutions! Heals revolutionaries.
M.adjustBruteLoss(-1, 0)
M.adjustFireLoss(-1, 0)
@@ -501,7 +509,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Screwdriver"
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/M)
+/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.
M.radiation = max(M.radiation - 25, 0)
return ..()
@@ -528,11 +536,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Bloody Mary"
glass_desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder."
-/datum/reagent/consumable/ethanol/bloody_mary/on_mob_life(mob/living/M)
- if(iscarbon(M))
- var/mob/living/carbon/C = M
- if(C.blood_volume < BLOOD_VOLUME_NORMAL)
- C.blood_volume = min(BLOOD_VOLUME_NORMAL, C.blood_volume + 3) //Bloody Mary quickly restores blood loss.
+/datum/reagent/consumable/ethanol/bloody_mary/on_mob_life(mob/living/carbon/C)
+ if(C.blood_volume < BLOOD_VOLUME_NORMAL)
+ C.blood_volume = min(BLOOD_VOLUME_NORMAL, C.blood_volume + 3) //Bloody Mary quickly restores blood loss.
..()
/datum/reagent/consumable/ethanol/brave_bull
@@ -575,7 +581,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
light_holder = new(M)
light_holder.set_light(3, 0.7, "#FFCC00") //Tequila Sunrise makes you radiate dim light, like a sunrise!
-/datum/reagent/consumable/ethanol/tequila_sunrise/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/tequila_sunrise/on_mob_life(mob/living/carbon/M)
if(QDELETED(light_holder))
M.reagents.del_reagent("tequilasunrise") //If we lost our light object somehow, remove the reagent
else if(light_holder.loc != M)
@@ -598,7 +604,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "Whoah, this thing is on FIRE!"
shot_glass_icon_state = "toxinsspecialglass"
-/datum/reagent/consumable/ethanol/toxins_special/on_mob_life(var/mob/living/M as mob)
+/datum/reagent/consumable/ethanol/toxins_special/on_mob_life(var/mob/living/M)
M.adjust_bodytemperature(15 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL + 20) //310.15 is the normal bodytemp.
return ..()
@@ -614,7 +620,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Beepsky Smash"
glass_desc = "Heavy, hot and strong. Just like the Iron fist of the LAW."
-/datum/reagent/consumable/ethanol/beepsky_smash/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/beepsky_smash/on_mob_life(mob/living/carbon/M)
if(M.has_trait(TRAIT_ALCOHOL_TOLERANCE))
M.Stun(30, 0) //this realistically does nothing to prevent chainstunning but will cause them to recover faster once it's out of their system
else
@@ -652,7 +658,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
boozepwr = 5 //We've had worse in the mines
dorf_mode = TRUE
-/datum/reagent/consumable/ethanol/manly_dorf/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/manly_dorf/on_mob_life(mob/living/carbon/M)
if(dorf_mode)
M.adjustBruteLoss(-2)
M.adjustFireLoss(-2)
@@ -754,7 +760,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "A scientist's drink of choice, for thinking how to blow up the station."
-/datum/reagent/consumable/ethanol/manhattan_proj/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/manhattan_proj/on_mob_life(mob/living/carbon/M)
M.set_drugginess(30)
return ..()
@@ -780,7 +786,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Anti-freeze"
glass_desc = "The ultimate refreshment."
-/datum/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(20 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL + 20) //310.15 is the normal bodytemp.
return ..()
@@ -795,7 +801,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Barefoot"
glass_desc = "Barefoot and pregnant."
-/datum/reagent/consumable/ethanol/barefoot/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/barefoot/on_mob_life(mob/living/carbon/M)
if(ishuman(M)) //Barefoot causes the imbiber to quickly regenerate brute trauma if they're not wearing shoes.
var/mob/living/carbon/human/H = M
if(!H.shoes)
@@ -893,7 +899,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Sbiten"
glass_desc = "A spicy mix of Vodka and Spice. Very hot."
-/datum/reagent/consumable/ethanol/sbiten/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/sbiten/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(50 * TEMPERATURE_DAMAGE_COEFFICIENT, 0 ,BODYTEMP_HEAT_DAMAGE_LIMIT) //310.15 is the normal bodytemp.
return ..()
@@ -931,7 +937,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "iced beer"
glass_desc = "A beer so frosty, the air around it freezes."
-/datum/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(-20 * TEMPERATURE_DAMAGE_COEFFICIENT, T0C) //310.15 is the normal bodytemp.
return ..()
@@ -1013,7 +1019,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Changeling Sting"
glass_desc = "A stingy drink."
-/datum/reagent/consumable/ethanol/changelingsting/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/changelingsting/on_mob_life(mob/living/carbon/M)
if(M.mind) //Changeling Sting assists in the recharging of changeling chemicals.
var/datum/antagonist/changeling/changeling = M.mind.has_antag_datum(/datum/antagonist/changeling)
if(changeling)
@@ -1043,7 +1049,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Syndicate Bomb"
glass_desc = "A syndicate bomb."
-/datum/reagent/consumable/ethanol/syndicatebomb/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/syndicatebomb/on_mob_life(mob/living/carbon/M)
if(prob(5))
playsound(get_turf(M), 'sound/effects/explosionfar.ogg', 100, 1)
return ..()
@@ -1083,8 +1089,8 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Banana Honk"
glass_desc = "A drink from Clown Heaven."
-/datum/reagent/consumable/ethanol/bananahonk/on_mob_life(mob/living/M)
- if((ishuman(M) && M.job in list("Clown") ) || ismonkey(M))
+/datum/reagent/consumable/ethanol/bananahonk/on_mob_life(mob/living/carbon/M)
+ if((ishuman(M) && M.job == "Clown") || ismonkey(M))
M.heal_bodypart_damage(1,1)
. = 1
return ..() || .
@@ -1101,8 +1107,8 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Silencer"
glass_desc = "A drink from Mime Heaven."
-/datum/reagent/consumable/ethanol/silencer/on_mob_life(mob/living/M)
- if(ishuman(M) && M.job in list("Mime"))
+/datum/reagent/consumable/ethanol/silencer/on_mob_life(mob/living/carbon/M)
+ if(ishuman(M) && M.job == "Mime")
M.heal_bodypart_damage(1,1)
. = 1
return ..() || .
@@ -1156,7 +1162,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "Induces magnetism in the imbiber. Started as a barroom prank but evolved to become popular with miners and scrappers. Metallic aftertaste."
-/datum/reagent/consumable/ethanol/fetching_fizz/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/fetching_fizz/on_mob_life(mob/living/carbon/M)
for(var/obj/item/stack/ore/O in orange(3, M))
step_towards(O, get_turf(M))
return ..()
@@ -1174,7 +1180,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Hearty Punch"
glass_desc = "Aromatic beverage served piping hot. According to folk tales it can almost wake the dead."
-/datum/reagent/consumable/ethanol/hearty_punch/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/hearty_punch/on_mob_life(mob/living/carbon/M)
if(M.health <= 0)
M.adjustBruteLoss(-3, 0)
M.adjustFireLoss(-3, 0)
@@ -1208,7 +1214,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Atomic Bomb"
glass_desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing."
-/datum/reagent/consumable/ethanol/atomicbomb/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/atomicbomb/on_mob_life(mob/living/carbon/M)
M.set_drugginess(50)
if(!M.has_trait(TRAIT_ALCOHOL_TOLERANCE))
M.confused = max(M.confused+2,0)
@@ -1237,7 +1243,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Pan-Galactic Gargle Blaster"
glass_desc = "Like having your brain smashed out by a slice of lemon wrapped around a large gold brick."
-/datum/reagent/consumable/ethanol/gargle_blaster/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/gargle_blaster/on_mob_life(mob/living/carbon/M)
M.dizziness +=1.5
switch(current_cycle)
if(15 to 45)
@@ -1296,7 +1302,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Hippie's Delight"
glass_desc = "A drink enjoyed by people during the 1960's."
-/datum/reagent/consumable/ethanol/hippies_delight/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/hippies_delight/on_mob_life(mob/living/carbon/M)
if (!M.slurring)
M.slurring = 1
switch(current_cycle)
@@ -1352,7 +1358,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Nar'Sour"
glass_desc = "A new hit cocktail inspired by THE ARM Breweries will have you shouting Fuu ma'jin in no time!"
-/datum/reagent/consumable/ethanol/narsour/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/narsour/on_mob_life(mob/living/carbon/M)
M.cultslurring = min(M.cultslurring + 3, 3)
M.stuttering = min(M.stuttering + 3, 3)
..()
@@ -1401,7 +1407,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Quadruple Sec"
glass_desc = "An intimidating and lawful beverage dares you to violate the law and make its day. Still can't drink it on duty, though."
-/datum/reagent/consumable/ethanol/quadruple_sec/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/quadruple_sec/on_mob_life(mob/living/carbon/M)
if(M.mind && M.mind.assigned_role in list("Security Officer", "Detective", "Head of Security", "Warden", "Lawyer")) //Securidrink in line with the screwderiver for engineers or nothing for mimes.
M.heal_bodypart_damage(1, 1)
M.adjustBruteLoss(-2,0)
@@ -1419,7 +1425,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Quintuple Sec"
glass_desc = "Now you are become law, destroyer of clowns."
-/datum/reagent/consumable/ethanol/quintuple_sec/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/quintuple_sec/on_mob_life(mob/living/carbon/M)
if(M.mind && M.mind.assigned_role in list("Security Officer", "Detective", "Head of Security", "Warden", "Lawyer")) //Securidrink in line with the screwderiver for engineers or nothing for mimes but STRONG..
M.heal_bodypart_damage(2,2,2)
M.adjustBruteLoss(-5,0)
@@ -1501,7 +1507,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "Squirt cider will toughen you right up. Too bad about the musty aftertaste."
shot_glass_icon_state = "shotglassgreen"
-/datum/reagent/consumable/ethanol/squirt_cider/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/squirt_cider/on_mob_life(mob/living/carbon/M)
M.satiety += 5 //for context, vitamins give 30 satiety per tick
..()
. = TRUE
@@ -1529,7 +1535,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Sugar Rush"
glass_desc = "If you can't mix a Sugar Rush, you can't tend bar."
-/datum/reagent/consumable/ethanol/sugar_rush/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/sugar_rush/on_mob_life(mob/living/carbon/M)
M.satiety -= 10 //junky as hell! a whole glass will keep you from being able to eat junk food
..()
. = TRUE
@@ -1559,38 +1565,87 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "cup of sake"
glass_desc = "A traditional cup of sake."
+/datum/reagent/consumable/ethanol/peppermint_patty
+ name = "Peppermint Patty"
+ id = "peppermint_patty"
+ description = "This lightly alcoholic drink combines the benefits of menthol and cocoa."
+ color = "#45ca7a"
+ taste_description = "mint and chocolate"
+ boozepwr = 25
+ glass_icon_state = "peppermint_patty"
+ glass_name = "Peppermint Patty"
+ glass_desc = "A boozy minty hot cocoa that warms your belly on a cold night."
+
+/datum/reagent/consumable/ethanol/peppermint_patty/on_mob_life(mob/living/carbon/M)
+ M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
+ ..()
+
/datum/reagent/consumable/ethanol/alexander
name = "Alexander"
id = "alexander"
- description = "A creamy, indulgent delight that is stronger than it seems."
+ description = "Named after a Greek hero, this mix is said to embolden a user's shield as if they were in a phalanx."
color = "#F5E9D3"
boozepwr = 80
taste_description = "bitter, creamy cacao"
glass_icon_state = "alexander"
glass_name = "Alexander"
glass_desc = "A creamy, indulgent delight that is stronger than it seems."
+ var/obj/item/shield/mighty_shield
+
+/datum/reagent/consumable/ethanol/alexander/on_mob_add(mob/living/L)
+ if(ishuman(L))
+ var/mob/living/carbon/human/thehuman = L
+ for(var/obj/item/shield/theshield in thehuman.contents)
+ mighty_shield = theshield
+ mighty_shield.block_chance += 10
+ to_chat(thehuman, "[theshield] appears polished, although you don't recall polishing it.")
+ return TRUE
+
+/datum/reagent/consumable/ethanol/alexander/on_mob_life(mob/living/L)
+ ..()
+ if(mighty_shield && !(mighty_shield in L.contents)) //If you had a shield and lose it, you lose the reagent as well. Otherwise this is just a normal drink.
+ L.reagents.del_reagent("alexander")
+
+/datum/reagent/consumable/ethanol/alexander/on_mob_delete(mob/living/L)
+ if(mighty_shield)
+ mighty_shield.block_chance -= 10
+ to_chat(L,"You notice [mighty_shield] looks worn again. Weird.")
+ ..()
/datum/reagent/consumable/ethanol/sidecar
name = "Sidecar"
id = "sidecar"
- description = "The one ride you’ll gladly give up the wheel for."
+ description = "The one ride you'll gladly give up the wheel for."
color = "#FFC55B"
boozepwr = 80
taste_description = "delicious freedom"
glass_icon_state = "sidecar"
glass_name = "Sidecar"
- glass_desc = "The one ride you’ll gladly give up the wheel for."
+ glass_desc = "The one ride you'll gladly give up the wheel for."
/datum/reagent/consumable/ethanol/between_the_sheets
name = "Between the Sheets"
id = "between_the_sheets"
- description = "A provocatively named classic."
+ description = "A provocatively named classic. Funny enough, doctors recommend drinking it before taking a nap."
color = "#F4C35A"
boozepwr = 80
taste_description = "seduction"
glass_icon_state = "between_the_sheets"
glass_name = "Between the Sheets"
- glass_desc = "A provocatively named classic."
+ glass_desc = "The only drink that comes with a label reminding you of Nanotrasen's zero-tolerance promiscuity policy."
+
+/datum/reagent/consumable/ethanol/between_the_sheets/on_mob_life(mob/living/L)
+ ..()
+ if(L.IsSleeping())
+ if(L.bruteloss && L.fireloss) //If you are damaged by both types, slightly increased healing but it only heals one. The more the merrier wink wink.
+ if(prob(50))
+ L.adjustBruteLoss(-0.25)
+ else
+ L.adjustFireLoss(-0.25)
+ else if(L.bruteloss && !L.fireloss) //If you have only one, it still heals but not as well.
+ L.adjustBruteLoss(-0.2)
+ else if(!L.bruteloss && L.fireloss)
+ L.adjustFireLoss(-0.2)
/datum/reagent/consumable/ethanol/kamikaze
name = "Kamikaze"
@@ -1613,7 +1668,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "mojito"
glass_name = "Mojito"
glass_desc = "A drink that looks as refreshing as it tastes."
-
+
/datum/reagent/consumable/ethanol/fernet
name = "Fernet"
id = "fernet"
@@ -1624,8 +1679,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of fernet"
glass_desc = "A glass of pure Fernet. Only an absolute madman would drink this alone." //Hi Kevum
-/datum/reagent/consumable/ethanol/fernet/on_mob_life(mob/living/M)
-
+/datum/reagent/consumable/ethanol/fernet/on_mob_life(mob/living/carbon/M)
if(M.nutrition <= NUTRITION_LEVEL_STARVING)
M.adjustToxLoss(1*REM, 0)
M.nutrition = max(M.nutrition - 5, 0)
@@ -1643,8 +1697,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of fernet cola"
glass_desc = "A sawed-off cola bottle filled with Fernet Cola. Nothing better after eating like a lardass."
-/datum/reagent/consumable/ethanol/fernetcola/on_mob_life(mob/living/M)
-
+/datum/reagent/consumable/ethanol/fernetcola/on_mob_life(mob/living/carbon/M)
if(M.nutrition <= NUTRITION_LEVEL_STARVING)
M.adjustToxLoss(0.5*REM, 0)
M.nutrition = max(M.nutrition - 3, 0)
@@ -1662,9 +1715,8 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "fanciulli"
glass_name = "glass of fanciulli"
glass_desc = "A glass of Fanciulli. It's just Manhattan with Fernet."
-
-/datum/reagent/consumable/ethanol/fanciulli/on_mob_life(mob/living/M)
-
+
+/datum/reagent/consumable/ethanol/fanciulli/on_mob_life(mob/living/carbon/M)
M.nutrition = max(M.nutrition - 5, 0)
M.overeatduration = 0
return ..()
@@ -1688,12 +1740,8 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "A glass of Branca Menta, perfect for those lazy and hot sunday summer afternoons." //Get lazy literally by drinking this
-/datum/reagent/consumable/ethanol/branca_menta/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ethanol/branca_menta/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(-20 * TEMPERATURE_DAMAGE_COEFFICIENT, T0C)
- if(M.nutrition <= NUTRITION_LEVEL_STARVING)
- M.adjustToxLoss(1*REM, 0)
- M.nutrition = max(M.nutrition - 5, 0)
- M.overeatduration = 0
return ..()
/datum/reagent/consumable/ethanol/branca_menta/on_mob_add(mob/living/M)
diff --git a/code/modules/reagents/chemistry/reagents/blob_reagents.dm b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
index 0d5c8218ea..8ee9449468 100644
--- a/code/modules/reagents/chemistry/reagents/blob_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
@@ -199,11 +199,9 @@
M.reagents.add_reagent("spore", 0.2*reac_volume)
M.apply_damage(0.7*reac_volume, TOX)
-/datum/reagent/blob/regenerative_materia/on_mob_life(mob/living/M)
- M.adjustToxLoss(1*REM)
- if(iscarbon(M))
- var/mob/living/carbon/N = M
- N.hal_screwyhud = SCREWYHUD_HEALTHY //fully healed, honest
+/datum/reagent/blob/regenerative_materia/on_mob_life(mob/living/carbon/C)
+ C.adjustToxLoss(1*REM)
+ C.hal_screwyhud = SCREWYHUD_HEALTHY //fully healed, honest
..()
/datum/reagent/blob/regenerative_materia/on_mob_delete(mob/living/M)
@@ -346,7 +344,7 @@
M.reagents.add_reagent("cryogenic_poison", 0.3*reac_volume)
M.apply_damage(0.2*reac_volume, BRUTE)
-/datum/reagent/blob/cryogenic_poison/on_mob_life(mob/living/M)
+/datum/reagent/blob/cryogenic_poison/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(0.3*REM, 0)
M.adjustFireLoss(0.3*REM, 0)
M.adjustToxLoss(0.3*REM, 0)
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index 67b3d3c280..4d2dba4659 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -14,7 +14,7 @@
glass_name = "glass of orange juice"
glass_desc = "Vitamins! Yay!"
-/datum/reagent/consumable/orangejuice/on_mob_life(mob/living/M)
+/datum/reagent/consumable/orangejuice/on_mob_life(mob/living/carbon/M)
if(M.getOxyLoss() && prob(30))
M.adjustOxyLoss(-1, 0)
. = 1
@@ -30,7 +30,7 @@
glass_name = "glass of tomato juice"
glass_desc = "Are you sure this is tomato juice?"
-/datum/reagent/consumable/tomatojuice/on_mob_life(mob/living/M)
+/datum/reagent/consumable/tomatojuice/on_mob_life(mob/living/carbon/M)
if(M.getFireLoss() && prob(20))
M.heal_bodypart_damage(0,1, 0)
. = 1
@@ -46,7 +46,7 @@
glass_name = "glass of lime juice"
glass_desc = "A glass of sweet-sour lime juice."
-/datum/reagent/consumable/limejuice/on_mob_life(mob/living/M)
+/datum/reagent/consumable/limejuice/on_mob_life(mob/living/carbon/M)
if(M.getToxLoss() && prob(20))
M.adjustToxLoss(-1*REM, 0)
. = 1
@@ -62,7 +62,7 @@
glass_name = "glass of carrot juice"
glass_desc = "It's just like a carrot but without crunching."
-/datum/reagent/consumable/carrotjuice/on_mob_life(mob/living/M)
+/datum/reagent/consumable/carrotjuice/on_mob_life(mob/living/carbon/M)
M.adjust_blurriness(-1)
M.adjust_blindness(-1)
switch(current_cycle)
@@ -101,7 +101,7 @@
glass_name = "glass of berry juice"
glass_desc = "Berry juice. Or maybe it's poison. Who cares?"
-/datum/reagent/consumable/poisonberryjuice/on_mob_life(mob/living/M)
+/datum/reagent/consumable/poisonberryjuice/on_mob_life(mob/living/carbon/M)
M.adjustToxLoss(1, 0)
. = 1
..()
@@ -136,8 +136,8 @@
glass_name = "glass of banana juice"
glass_desc = "The raw essence of a banana. HONK."
-/datum/reagent/consumable/banana/on_mob_life(mob/living/M)
- if((ishuman(M) && M.job in list("Clown") ) || ismonkey(M))
+/datum/reagent/consumable/banana/on_mob_life(mob/living/carbon/M)
+ if((ishuman(M) && M.job == "Clown") || ismonkey(M))
M.heal_bodypart_damage(1,1, 0)
. = 1
..()
@@ -152,8 +152,8 @@
glass_desc = "Absolutely nothing."
shot_glass_icon_state = "shotglass"
-/datum/reagent/consumable/nothing/on_mob_life(mob/living/M)
- if(ishuman(M) && M.job in list("Mime"))
+/datum/reagent/consumable/nothing/on_mob_life(mob/living/carbon/M)
+ if(ishuman(M) && M.job == "Mime")
M.heal_bodypart_damage(1,1, 0)
. = 1
..()
@@ -167,8 +167,6 @@
taste_description = "laughter"
/datum/reagent/consumable/laughter/on_mob_life(mob/living/carbon/M)
- if(!iscarbon(M))
- return
M.emote("laugh")
..()
@@ -181,8 +179,6 @@
taste_description = "laughter"
/datum/reagent/consumable/superlaughter/on_mob_life(mob/living/carbon/M)
- if(!iscarbon(M))
- return
if(prob(30))
M.visible_message("[M] bursts out into a fit of uncontrollable laughter!", "You burst out in a fit of uncontrollable laughter!")
M.Stun(5)
@@ -216,7 +212,7 @@
glass_name = "glass of milk"
glass_desc = "White and nutritious goodness!"
-/datum/reagent/consumable/milk/on_mob_life(mob/living/M)
+/datum/reagent/consumable/milk/on_mob_life(mob/living/carbon/M)
if(M.getBruteLoss() && prob(20))
M.heal_bodypart_damage(1,0, 0)
. = 1
@@ -238,7 +234,7 @@
glass_name = "glass of soy milk"
glass_desc = "White and nutritious soy goodness!"
-/datum/reagent/consumable/soymilk/on_mob_life(mob/living/M)
+/datum/reagent/consumable/soymilk/on_mob_life(mob/living/carbon/M)
if(M.getBruteLoss() && prob(20))
M.heal_bodypart_damage(1,0, 0)
. = 1
@@ -254,7 +250,7 @@
glass_name = "glass of cream"
glass_desc = "Ewwww..."
-/datum/reagent/consumable/cream/on_mob_life(mob/living/M)
+/datum/reagent/consumable/cream/on_mob_life(mob/living/carbon/M)
if(M.getBruteLoss() && prob(20))
M.heal_bodypart_damage(1,0, 0)
. = 1
@@ -276,7 +272,7 @@
M.Jitter(5)
..()
-/datum/reagent/consumable/coffee/on_mob_life(mob/living/M)
+/datum/reagent/consumable/coffee/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.AdjustSleeping(-40, FALSE)
@@ -298,7 +294,7 @@
glass_name = "glass of tea"
glass_desc = "Drinking it from here would not seem right."
-/datum/reagent/consumable/tea/on_mob_life(mob/living/M)
+/datum/reagent/consumable/tea/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-2)
M.drowsyness = max(0,M.drowsyness-1)
M.jitteriness = max(0,M.jitteriness-3)
@@ -320,7 +316,7 @@
glass_name = "Arnold Palmer"
glass_desc = "You feel like taking a few golf swings after a few swigs of this."
-/datum/reagent/consumable/tea/arnold_palmer/on_mob_life(mob/living/M)
+/datum/reagent/consumable/tea/arnold_palmer/on_mob_life(mob/living/carbon/M)
if(prob(5))
to_chat(M, "[pick("You remember to square your shoulders.","You remember to keep your head down.","You can't decide between squaring your shoulders and keeping your head down.","You remember to relax.","You think about how someday you'll get two strokes off your golf game.")]")
..()
@@ -337,7 +333,7 @@
glass_name = "iced coffee"
glass_desc = "A drink to perk you up and refresh you!"
-/datum/reagent/consumable/icecoffee/on_mob_life(mob/living/M)
+/datum/reagent/consumable/icecoffee/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.AdjustSleeping(-40, FALSE)
@@ -357,7 +353,7 @@
glass_name = "iced tea"
glass_desc = "All natural, antioxidant-rich flavour sensation."
-/datum/reagent/consumable/icetea/on_mob_life(mob/living/M)
+/datum/reagent/consumable/icetea/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-2)
M.drowsyness = max(0,M.drowsyness-1)
M.AdjustSleeping(-40, FALSE)
@@ -377,7 +373,7 @@
glass_name = "glass of Space Cola"
glass_desc = "A glass of refreshing Space Cola."
-/datum/reagent/consumable/space_cola/on_mob_life(mob/living/M)
+/datum/reagent/consumable/space_cola/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(0,M.drowsyness-5)
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
..()
@@ -392,19 +388,15 @@
glass_name = "glass of Nuka Cola"
glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland."
-/datum/reagent/consumable/nuka_cola/on_mob_add(mob/M)
+/datum/reagent/consumable/nuka_cola/on_mob_add(mob/living/L)
..()
- if(isliving(M))
- var/mob/living/L = M
- L.add_trait(TRAIT_GOTTAGOFAST, id)
+ L.add_trait(TRAIT_GOTTAGOFAST, id)
-/datum/reagent/consumable/nuka_cola/on_mob_delete(mob/M)
- if(isliving(M))
- var/mob/living/L = M
- L.remove_trait(TRAIT_GOTTAGOFAST, id)
+/datum/reagent/consumable/nuka_cola/on_mob_delete(mob/living/L)
+ L.remove_trait(TRAIT_GOTTAGOFAST, id)
..()
-/datum/reagent/consumable/nuka_cola/on_mob_life(mob/living/M)
+/datum/reagent/consumable/nuka_cola/on_mob_life(mob/living/carbon/M)
M.Jitter(20)
M.set_drugginess(30)
M.dizziness +=1.5
@@ -424,7 +416,7 @@
glass_name = "glass of Space Mountain Wind"
glass_desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind."
-/datum/reagent/consumable/spacemountainwind/on_mob_life(mob/living/M)
+/datum/reagent/consumable/spacemountainwind/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(0,M.drowsyness-7)
M.AdjustSleeping(-20, FALSE)
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
@@ -442,7 +434,7 @@
glass_name = "glass of Dr. Gibb"
glass_desc = "Dr. Gibb. Not as dangerous as the glass_name might imply."
-/datum/reagent/consumable/dr_gibb/on_mob_life(mob/living/M)
+/datum/reagent/consumable/dr_gibb/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(0,M.drowsyness-6)
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
..()
@@ -458,7 +450,7 @@
glass_desc = "Space-up. It helps you keep your cool."
-/datum/reagent/consumable/space_up/on_mob_life(mob/living/M)
+/datum/reagent/consumable/space_up/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
..()
@@ -473,7 +465,7 @@
glass_desc = "You're pretty certain a real fruit has never actually touched this."
-/datum/reagent/consumable/lemon_lime/on_mob_life(mob/living/M)
+/datum/reagent/consumable/lemon_lime/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
..()
@@ -487,7 +479,7 @@
glass_name = "glass of Pwr Game"
glass_desc = "Goes well with a Vlad's salad."
-/datum/reagent/consumable/pwr_game/on_mob_life(mob/living/M)
+/datum/reagent/consumable/pwr_game/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
..()
@@ -501,7 +493,7 @@
glass_name = "glass of Shambler's juice"
glass_desc = "Mmm mm, shambly."
-/datum/reagent/consumable/shamblers/on_mob_life(mob/living/M)
+/datum/reagent/consumable/shamblers/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
..()
/datum/reagent/consumable/sodawater
@@ -514,7 +506,7 @@
glass_name = "glass of soda water"
glass_desc = "Soda water. Why not make a scotch and soda?"
-/datum/reagent/consumable/sodawater/on_mob_life(mob/living/M)
+/datum/reagent/consumable/sodawater/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
@@ -530,7 +522,7 @@
glass_name = "glass of tonic water"
glass_desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
-/datum/reagent/consumable/tonic/on_mob_life(mob/living/M)
+/datum/reagent/consumable/tonic/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.AdjustSleeping(-40, FALSE)
@@ -549,7 +541,7 @@
glass_name = "glass of ice"
glass_desc = "Generally, you're supposed to put something else in there too..."
-/datum/reagent/consumable/ice/on_mob_life(mob/living/M)
+/datum/reagent/consumable/ice/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
..()
@@ -563,7 +555,7 @@
glass_name = "soy latte"
glass_desc = "A nice and refreshing beverage while you're reading."
-/datum/reagent/consumable/soy_latte/on_mob_life(mob/living/M)
+/datum/reagent/consumable/soy_latte/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.SetSleeping(0, FALSE)
@@ -584,7 +576,7 @@
glass_name = "cafe latte"
glass_desc = "A nice, strong and refreshing beverage while you're reading."
-/datum/reagent/consumable/cafe_latte/on_mob_life(mob/living/M)
+/datum/reagent/consumable/cafe_latte/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.SetSleeping(0, FALSE)
@@ -605,7 +597,7 @@
glass_name = "Doctor's Delight"
glass_desc = "The space doctor's favorite. Guaranteed to restore bodily injury; side effects include cravings and hunger."
-/datum/reagent/consumable/doctor_delight/on_mob_life(mob/living/M)
+/datum/reagent/consumable/doctor_delight/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-0.5, 0)
M.adjustFireLoss(-0.5, 0)
M.adjustToxLoss(-0.5, 0)
@@ -721,11 +713,11 @@
description = "Milk for cool kids."
color = "#7D4E29"
taste_description = "chocolate milk"
-
+
/datum/reagent/consumable/menthol
name = "Menthol"
id = "menthol"
- description = "Tastes naturally minty, and imparts a very mild numbing sensation."
+ description = "Alleviates coughing symptoms one might have."
color = "#80AF9C"
taste_description = "mint"
glass_icon_state = "glass_green"
diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index 377ddc47fd..33511c8905 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -7,7 +7,7 @@
/datum/reagent/drug/on_mob_delete(mob/living/M)
if(trippy)
- M.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "[id]_high")
+ SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "[id]_high")
/datum/reagent/drug/space_drugs
name = "Space drugs"
@@ -16,7 +16,7 @@
color = "#60A584" // rgb: 96, 165, 132
overdose_threshold = 30
-/datum/reagent/drug/space_drugs/on_mob_life(mob/living/M)
+/datum/reagent/drug/space_drugs/on_mob_life(mob/living/carbon/M)
M.set_drugginess(15)
if(isturf(M.loc) && !isspaceturf(M.loc))
if(M.canmove)
@@ -28,7 +28,7 @@
/datum/reagent/drug/space_drugs/overdose_start(mob/living/M)
to_chat(M, "You start tripping hard!")
- M.SendSignal(COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/drugs/overdose, name)
+ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/drugs/overdose, name)
/datum/reagent/drug/space_drugs/overdose_process(mob/living/M)
if(M.hallucination < volume && prob(20))
@@ -45,11 +45,11 @@
taste_description = "smoke"
trippy = FALSE
-/datum/reagent/drug/nicotine/on_mob_life(mob/living/M)
+/datum/reagent/drug/nicotine/on_mob_life(mob/living/carbon/M)
if(prob(1))
var/smoke_message = pick("You feel relaxed.", "You feel calmed.","You feel alert.","You feel rugged.")
to_chat(M, "[smoke_message]")
- M.SendSignal(COMSIG_ADD_MOOD_EVENT, "smoked", /datum/mood_event/drugs/smoked, name)
+ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "smoked", /datum/mood_event/drugs/smoked, name)
M.AdjustStun(-20, 0)
M.AdjustKnockdown(-20, 0)
M.AdjustUnconscious(-20, 0)
@@ -66,7 +66,7 @@
overdose_threshold = 20
addiction_threshold = 10
-/datum/reagent/drug/crank/on_mob_life(mob/living/M)
+/datum/reagent/drug/crank/on_mob_life(mob/living/carbon/M)
if(prob(5))
var/high_message = pick("You feel jittery.", "You feel like you gotta go fast.", "You feel like you need to step it up.")
to_chat(M, "[high_message]")
@@ -114,7 +114,7 @@
addiction_threshold = 15
-/datum/reagent/drug/krokodil/on_mob_life(mob/living/M)
+/datum/reagent/drug/krokodil/on_mob_life(mob/living/carbon/M)
var/high_message = pick("You feel calm.", "You feel collected.", "You feel like you need to relax.")
if(prob(5))
to_chat(M, "[high_message]")
@@ -165,19 +165,15 @@
addiction_threshold = 10
metabolization_rate = 0.75 * REAGENTS_METABOLISM
-/datum/reagent/drug/methamphetamine/on_mob_add(mob/M)
+/datum/reagent/drug/methamphetamine/on_mob_add(mob/living/L)
..()
- if(isliving(M))
- var/mob/living/L = M
- L.add_trait(TRAIT_GOTTAGOREALLYFAST, id)
+ L.add_trait(TRAIT_GOTTAGOREALLYFAST, id)
-/datum/reagent/drug/methamphetamine/on_mob_delete(mob/M)
- if(isliving(M))
- var/mob/living/L = M
- L.remove_trait(TRAIT_GOTTAGOREALLYFAST, id)
+/datum/reagent/drug/methamphetamine/on_mob_delete(mob/living/L)
+ L.remove_trait(TRAIT_GOTTAGOREALLYFAST, id)
..()
-/datum/reagent/drug/methamphetamine/on_mob_life(mob/living/M)
+/datum/reagent/drug/methamphetamine/on_mob_life(mob/living/carbon/M)
var/high_message = pick("You feel hyper.", "You feel like you need to go faster.", "You feel like you can run the world.")
if(prob(5))
to_chat(M, "[high_message]")
@@ -252,27 +248,23 @@
taste_description = "salt" // because they're bathsalts?
var/datum/brain_trauma/special/psychotic_brawling/bath_salts/rage
-/datum/reagent/drug/bath_salts/on_mob_add(mob/M)
+/datum/reagent/drug/bath_salts/on_mob_add(mob/living/L)
..()
- if(isliving(M))
- var/mob/living/L = M
- L.add_trait(TRAIT_STUNIMMUNE, id)
- L.add_trait(TRAIT_SLEEPIMMUNE, id)
- if(iscarbon(L))
- var/mob/living/carbon/C = L
- rage = new()
- C.gain_trauma(rage, TRAUMA_RESILIENCE_ABSOLUTE)
+ L.add_trait(TRAIT_STUNIMMUNE, id)
+ L.add_trait(TRAIT_SLEEPIMMUNE, id)
+ if(iscarbon(L))
+ var/mob/living/carbon/C = L
+ rage = new()
+ C.gain_trauma(rage, TRAUMA_RESILIENCE_ABSOLUTE)
-/datum/reagent/drug/bath_salts/on_mob_delete(mob/M)
- if(isliving(M))
- var/mob/living/L = M
- L.remove_trait(TRAIT_STUNIMMUNE, id)
- L.remove_trait(TRAIT_SLEEPIMMUNE, id)
- if(rage)
- QDEL_NULL(rage)
+/datum/reagent/drug/bath_salts/on_mob_delete(mob/living/L)
+ L.remove_trait(TRAIT_STUNIMMUNE, id)
+ L.remove_trait(TRAIT_SLEEPIMMUNE, id)
+ if(rage)
+ QDEL_NULL(rage)
..()
-/datum/reagent/drug/bath_salts/on_mob_life(mob/living/M)
+/datum/reagent/drug/bath_salts/on_mob_life(mob/living/carbon/M)
var/high_message = pick("You feel amped up.", "You feel ready.", "You feel like you can push it to the limit.")
if(prob(5))
to_chat(M, "[high_message]")
@@ -352,7 +344,7 @@
reagent_state = LIQUID
color = "#78FFF0"
-/datum/reagent/drug/aranesp/on_mob_life(mob/living/M)
+/datum/reagent/drug/aranesp/on_mob_life(mob/living/carbon/M)
var/high_message = pick("You feel amped up.", "You feel ready.", "You feel like you can push it to the limit.")
if(prob(5))
to_chat(M, "[high_message]")
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index b98f3c0760..459cbefaa2 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -14,7 +14,7 @@
taste_mult = 4
var/nutriment_factor = 1 * REAGENTS_METABOLISM
-/datum/reagent/consumable/on_mob_life(mob/living/M)
+/datum/reagent/consumable/on_mob_life(mob/living/carbon/M)
current_cycle++
M.nutrition += nutriment_factor
holder.remove_reagent(src.id, metabolization_rate)
@@ -30,7 +30,7 @@
var/brute_heal = 1
var/burn_heal = 0
-/datum/reagent/consumable/nutriment/on_mob_life(mob/living/M)
+/datum/reagent/consumable/nutriment/on_mob_life(mob/living/carbon/M)
if(prob(50))
M.heal_bodypart_damage(brute_heal,burn_heal, 0)
. = 1
@@ -78,7 +78,7 @@
brute_heal = 1
burn_heal = 1
-/datum/reagent/consumable/nutriment/vitamin/on_mob_life(mob/living/M)
+/datum/reagent/consumable/nutriment/vitamin/on_mob_life(mob/living/carbon/M)
if(M.satiety < 600)
M.satiety += 30
. = ..()
@@ -183,7 +183,7 @@
taste_description = "hot peppers"
taste_mult = 1.5
-/datum/reagent/consumable/capsaicin/on_mob_life(mob/living/M)
+/datum/reagent/consumable/capsaicin/on_mob_life(mob/living/carbon/M)
var/heating = 0
switch(current_cycle)
if(1 to 15)
@@ -214,7 +214,7 @@
color = "#8BA6E9" // rgb: 139, 166, 233
taste_description = "mint"
-/datum/reagent/consumable/frostoil/on_mob_life(mob/living/M)
+/datum/reagent/consumable/frostoil/on_mob_life(mob/living/carbon/M)
var/cooling = 0
switch(current_cycle)
if(1 to 15)
@@ -283,10 +283,10 @@
if(ishuman(victim))
var/mob/living/carbon/human/H = victim
if( H.head )
- if ( H.head.flags_cover & MASKCOVERSEYES )
+ if ( H.head.flags_cover & HEADCOVERSEYES )
eyes_covered = 1
safe_thing = H.head
- if ( H.head.flags_cover & MASKCOVERSMOUTH )
+ if ( H.head.flags_cover & HEADCOVERSMOUTH )
mouth_covered = 1
safe_thing = H.head
if(H.glasses)
@@ -320,7 +320,7 @@
victim.Knockdown(100)
victim.update_damage_hud()
-/datum/reagent/consumable/condensedcapsaicin/on_mob_life(mob/living/M)
+/datum/reagent/consumable/condensedcapsaicin/on_mob_life(mob/living/carbon/M)
if(prob(5))
M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!")]")
..()
@@ -374,7 +374,7 @@
glass_name = "glass of chocolate"
glass_desc = "Tasty."
-/datum/reagent/consumable/hot_coco/on_mob_life(mob/living/M)
+/datum/reagent/consumable/hot_coco/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
..()
@@ -386,7 +386,7 @@
metabolization_rate = 0.2 * REAGENTS_METABOLISM
taste_description = "mushroom"
-/datum/reagent/mushroomhallucinogen/on_mob_life(mob/living/M)
+/datum/reagent/mushroomhallucinogen/on_mob_life(mob/living/carbon/M)
if(!M.slurring)
M.slurring = 1
switch(current_cycle)
@@ -416,7 +416,7 @@
color = "#FF00FF" // rgb: 255, 0, 255
taste_description = "childhood whimsy"
-/datum/reagent/consumable/sprinkles/on_mob_life(mob/living/M)
+/datum/reagent/consumable/sprinkles/on_mob_life(mob/living/carbon/M)
if(ishuman(M) && M.job in list("Security Officer", "Head of Security", "Detective", "Warden"))
M.heal_bodypart_damage(1,1, 0)
. = 1
@@ -465,7 +465,7 @@
color = "#302000" // rgb: 48, 32, 0
taste_description = "wet and cheap noodles"
-/datum/reagent/consumable/hot_ramen/on_mob_life(mob/living/M)
+/datum/reagent/consumable/hot_ramen/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
..()
@@ -477,7 +477,7 @@
color = "#302000" // rgb: 48, 32, 0
taste_description = "wet and cheap noodles on fire"
-/datum/reagent/consumable/hell_ramen/on_mob_life(mob/living/M)
+/datum/reagent/consumable/hell_ramen/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT)
..()
@@ -549,20 +549,20 @@
metabolization_rate = 3 * REAGENTS_METABOLISM
taste_description = "sweet slime"
-/datum/reagent/consumable/corn_syrup/on_mob_life(mob/living/M)
+/datum/reagent/consumable/corn_syrup/on_mob_life(mob/living/carbon/M)
holder.add_reagent("sugar", 3)
..()
/datum/reagent/consumable/honey
name = "honey"
id = "honey"
- description = "Sweet sweet honey, decays into sugar and has natural healing properties."
+ description = "Sweet sweet honey that decays into sugar. Has antibacterial and natural healing properties."
color = "#d3a308"
nutriment_factor = 15 * REAGENTS_METABOLISM
metabolization_rate = 1 * REAGENTS_METABOLISM
taste_description = "sweetness"
-/datum/reagent/consumable/honey/on_mob_life(mob/living/M)
+/datum/reagent/consumable/honey/on_mob_life(mob/living/carbon/M)
M.reagents.add_reagent("sugar",3)
if(prob(55))
M.adjustBruteLoss(-1*REM, 0)
@@ -571,6 +571,14 @@
M.adjustToxLoss(-1*REM, 0)
..()
+/datum/reagent/consumable/honey/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
+ if(iscarbon(M) && (method in list(TOUCH, VAPOR, PATCH)))
+ var/mob/living/carbon/C = M
+ for(var/s in C.surgeries)
+ var/datum/surgery/S = s
+ S.success_multiplier = max(0.6, S.success_multiplier) // +60% success probability on each step, compared to bacchus' blessing's ~46%
+ ..()
+
/datum/reagent/consumable/mayonnaise
name = "Mayonnaise"
id = "mayonnaise"
@@ -607,7 +615,7 @@
M.blur_eyes(5)
..()
-/datum/reagent/consumable/tearjuice/on_mob_life(mob/living/M)
+/datum/reagent/consumable/tearjuice/on_mob_life(mob/living/carbon/M)
..()
if(M.eye_blurry) //Don't worsen vision if it was otherwise fine
M.blur_eyes(4)
@@ -624,7 +632,7 @@
nutriment_factor = 15 * REAGENTS_METABOLISM
color = "#664330" // rgb: 102, 67, 48
-/datum/reagent/consumable/nutriment/stabilized/on_mob_life(mob/living/M)
+/datum/reagent/consumable/nutriment/stabilized/on_mob_life(mob/living/carbon/M)
if(M.nutrition > NUTRITION_LEVEL_FULL - 25)
M.nutrition -= 3*nutriment_factor
..()
@@ -639,7 +647,7 @@
color = "#1d043d"
taste_description = "bitter mushroom"
-/datum/reagent/consumable/entpoly/on_mob_life(mob/living/M)
+/datum/reagent/consumable/entpoly/on_mob_life(mob/living/carbon/M)
if(current_cycle >= 10)
M.Unconscious(40, 0)
. = 1
@@ -673,7 +681,7 @@
nutriment_factor = 3 * REAGENTS_METABOLISM
taste_description = "fruity mushroom"
-/datum/reagent/consumable/vitfro/on_mob_life(mob/living/M)
+/datum/reagent/consumable/vitfro/on_mob_life(mob/living/carbon/M)
if(prob(80))
M.adjustBruteLoss(-1*REM, 0)
M.adjustFireLoss(-1*REM, 0)
@@ -686,4 +694,4 @@
description = "The sorrow and melancholy of a thousand bereaved clowns, forever denied their Honkmechs."
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#eef442" // rgb: 238, 244, 66
- taste_description = "mournful honking"
\ No newline at end of file
+ taste_description = "mournful honking"
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index ddc9878546..474e24f5a5 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -10,7 +10,7 @@
id = "medicine"
taste_description = "bitterness"
-/datum/reagent/medicine/on_mob_life(mob/living/M)
+/datum/reagent/medicine/on_mob_life(mob/living/carbon/M)
current_cycle++
holder.remove_reagent(src.id, metabolization_rate / M.metabolism_efficiency) //medicine reagents stay longer if you have a better metabolism
@@ -20,7 +20,7 @@
description = "Leporazine will effectively regulate a patient's body temperature, ensuring it never leaves safe levels."
color = "#C8A5DC" // rgb: 200, 165, 220
-/datum/reagent/medicine/leporazine/on_mob_life(mob/living/M)
+/datum/reagent/medicine/leporazine/on_mob_life(mob/living/carbon/M)
if(M.bodytemperature > BODYTEMP_NORMAL)
M.adjust_bodytemperature(-40 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
else if(M.bodytemperature < (BODYTEMP_NORMAL + 1))
@@ -80,7 +80,7 @@
description = "Increases resistance to stuns as well as reducing drowsiness and hallucinations."
color = "#FF00FF"
-/datum/reagent/medicine/synaptizine/on_mob_life(mob/living/M)
+/datum/reagent/medicine/synaptizine/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(M.drowsyness-5, 0)
M.AdjustStun(-20, 0)
M.AdjustKnockdown(-20, 0)
@@ -99,7 +99,7 @@
description = "Reduces drowsiness, hallucinations, and Histamine from body."
color = "#EC536D" // rgb: 236, 83, 109
-/datum/reagent/medicine/synaphydramine/on_mob_life(mob/living/M)
+/datum/reagent/medicine/synaphydramine/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(M.drowsyness-5, 0)
if(holder.has_reagent("mindbreaker"))
holder.remove_reagent("mindbreaker", 5)
@@ -117,7 +117,7 @@
description = "Instantly restores all hearing to the patient, but does not cure deafness."
color = "#6600FF" // rgb: 100, 165, 255
-/datum/reagent/medicine/inacusiate/on_mob_life(mob/living/M)
+/datum/reagent/medicine/inacusiate/on_mob_life(mob/living/carbon/M)
M.restoreEars()
..()
@@ -128,7 +128,7 @@
color = "#0000C8"
taste_description = "sludge"
-/datum/reagent/medicine/cryoxadone/on_mob_life(mob/living/M)
+/datum/reagent/medicine/cryoxadone/on_mob_life(mob/living/carbon/M)
var/power = -0.00003 * (M.bodytemperature ** 2) + 3
if(M.bodytemperature < T0C)
M.adjustOxyLoss(-3 * power, 0)
@@ -149,7 +149,7 @@
taste_description = "muscle"
metabolization_rate = 1.5 * REAGENTS_METABOLISM
-/datum/reagent/medicine/clonexadone/on_mob_life(mob/living/M)
+/datum/reagent/medicine/clonexadone/on_mob_life(mob/living/carbon/M)
if(M.bodytemperature < T0C)
M.adjustCloneLoss(0.00006 * (M.bodytemperature ** 2) - 6, 0)
M.remove_trait(TRAIT_DISFIGURED, TRAIT_GENERIC)
@@ -164,7 +164,7 @@
color = "#f7832a"
taste_description = "spicy jelly"
-/datum/reagent/medicine/pyroxadone/on_mob_life(mob/living/M)
+/datum/reagent/medicine/pyroxadone/on_mob_life(mob/living/carbon/M)
if(M.bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT)
var/power = 0
switch(M.bodytemperature)
@@ -195,7 +195,7 @@
overdose_threshold = 30
taste_description = "fish"
-/datum/reagent/medicine/rezadone/on_mob_life(mob/living/M)
+/datum/reagent/medicine/rezadone/on_mob_life(mob/living/carbon/M)
M.setCloneLoss(0) //Rezadone is almost never used in favor of cryoxadone. Hopefully this will change that.
M.heal_bodypart_damage(1,1)
M.remove_trait(TRAIT_DISFIGURED, TRAIT_GENERIC)
@@ -237,7 +237,7 @@
M.emote("scream")
..()
-/datum/reagent/medicine/silver_sulfadiazine/on_mob_life(mob/living/M)
+/datum/reagent/medicine/silver_sulfadiazine/on_mob_life(mob/living/carbon/M)
M.adjustFireLoss(-2*REM, 0)
..()
. = 1
@@ -251,7 +251,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
overdose_threshold = 25
-/datum/reagent/medicine/oxandrolone/on_mob_life(mob/living/M)
+/datum/reagent/medicine/oxandrolone/on_mob_life(mob/living/carbon/M)
if(M.getFireLoss() > 50)
M.adjustFireLoss(-4*REM, 0) //Twice as effective as silver sulfadiazine for severe burns
else
@@ -286,7 +286,7 @@
..()
-/datum/reagent/medicine/styptic_powder/on_mob_life(mob/living/M)
+/datum/reagent/medicine/styptic_powder/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-2*REM, 0)
..()
. = 1
@@ -303,7 +303,7 @@
var/last_added = 0
var/maximum_reachable = BLOOD_VOLUME_NORMAL - 10 //So that normal blood regeneration can continue with salglu active
-/datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/M)
+/datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/carbon/M)
if(last_added)
M.blood_volume -= last_added
last_added = 0
@@ -315,7 +315,7 @@
if(prob(33))
M.adjustBruteLoss(-0.5*REM, 0)
M.adjustFireLoss(-0.5*REM, 0)
- . = 1
+ . = TRUE
..()
/datum/reagent/medicine/salglu_solution/overdose_process(mob/living/M)
@@ -330,7 +330,7 @@
if(prob(33))
M.adjustBruteLoss(0.5*REM, 0)
M.adjustFireLoss(0.5*REM, 0)
- . = 1
+ . = TRUE
..()
/datum/reagent/medicine/mine_salve
@@ -341,14 +341,12 @@
color = "#6D6374"
metabolization_rate = 0.4 * REAGENTS_METABOLISM
-/datum/reagent/medicine/mine_salve/on_mob_life(mob/living/M)
- if(iscarbon(M))
- var/mob/living/carbon/N = M
- N.hal_screwyhud = SCREWYHUD_HEALTHY
- M.adjustBruteLoss(-0.25*REM, 0)
- M.adjustFireLoss(-0.25*REM, 0)
+/datum/reagent/medicine/mine_salve/on_mob_life(mob/living/carbon/C)
+ C.hal_screwyhud = SCREWYHUD_HEALTHY
+ C.adjustBruteLoss(-0.25*REM, 0)
+ C.adjustFireLoss(-0.25*REM, 0)
..()
- . = 1
+ return TRUE
/datum/reagent/medicine/mine_salve/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
if(iscarbon(M) && M.stat != DEAD)
@@ -400,7 +398,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
taste_description = "ash"
-/datum/reagent/medicine/charcoal/on_mob_life(mob/living/M)
+/datum/reagent/medicine/charcoal/on_mob_life(mob/living/carbon/M)
M.adjustToxLoss(-2*REM, 0)
. = 1
for(var/datum/reagent/R in M.reagents.reagent_list)
@@ -417,7 +415,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
overdose_threshold = 30
-/datum/reagent/medicine/omnizine/on_mob_life(mob/living/M)
+/datum/reagent/medicine/omnizine/on_mob_life(mob/living/carbon/M)
M.adjustToxLoss(-0.5*REM, 0)
M.adjustOxyLoss(-0.5*REM, 0)
M.adjustBruteLoss(-0.5*REM, 0)
@@ -442,7 +440,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
taste_description = "acid"
-/datum/reagent/medicine/calomel/on_mob_life(mob/living/M)
+/datum/reagent/medicine/calomel/on_mob_life(mob/living/carbon/M)
for(var/datum/reagent/R in M.reagents.reagent_list)
if(R != src)
M.reagents.remove_reagent(R.id,2.5)
@@ -459,7 +457,7 @@
color = "#14FF3C"
metabolization_rate = 2 * REAGENTS_METABOLISM
-/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/M)
+/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/carbon/M)
if(M.radiation > 0)
M.radiation -= min(M.radiation, 8)
..()
@@ -472,7 +470,7 @@
color = "#E6FFF0"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
-/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/M)
+/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/carbon/M)
M.radiation -= max(M.radiation-RAD_MOB_SAFE, 0)/50
M.adjustToxLoss(-2*REM, 0)
for(var/datum/reagent/R in M.reagents.reagent_list)
@@ -491,7 +489,7 @@
overdose_threshold = 25
-/datum/reagent/medicine/sal_acid/on_mob_life(mob/living/M)
+/datum/reagent/medicine/sal_acid/on_mob_life(mob/living/carbon/M)
if(M.getBruteLoss() > 50)
M.adjustBruteLoss(-4*REM, 0) //Twice as effective as styptic powder for severe bruising
else
@@ -513,7 +511,7 @@
color = "#00FFFF"
metabolization_rate = 0.25 * REAGENTS_METABOLISM
-/datum/reagent/medicine/salbutamol/on_mob_life(mob/living/M)
+/datum/reagent/medicine/salbutamol/on_mob_life(mob/living/carbon/M)
M.adjustOxyLoss(-3*REM, 0)
if(M.losebreath >= 4)
M.losebreath -= 2
@@ -535,7 +533,7 @@
M.adjustBruteLoss(-0.5*REM, 0)
M.adjustFireLoss(-0.5*REM, 0)
..()
- . = 1
+ return TRUE
/datum/reagent/medicine/ephedrine
name = "Ephedrine"
@@ -547,32 +545,28 @@
overdose_threshold = 45
addiction_threshold = 30
-/datum/reagent/medicine/ephedrine/on_mob_add(mob/M)
+/datum/reagent/medicine/ephedrine/on_mob_add(mob/living/L)
..()
- if(isliving(M))
- var/mob/living/L = M
- L.add_trait(TRAIT_GOTTAGOFAST, id)
+ L.add_trait(TRAIT_GOTTAGOFAST, id)
-/datum/reagent/medicine/ephedrine/on_mob_delete(mob/M)
- if(isliving(M))
- var/mob/living/L = M
- L.remove_trait(TRAIT_GOTTAGOFAST, id)
+/datum/reagent/medicine/ephedrine/on_mob_delete(mob/living/L)
+ L.remove_trait(TRAIT_GOTTAGOFAST, id)
..()
-/datum/reagent/medicine/ephedrine/on_mob_life(mob/living/M)
+/datum/reagent/medicine/ephedrine/on_mob_life(mob/living/carbon/M)
M.AdjustStun(-20, 0)
M.AdjustKnockdown(-20, 0)
M.AdjustUnconscious(-20, 0)
M.adjustStaminaLoss(-1*REM, 0)
..()
- . = 1
+ return TRUE
/datum/reagent/medicine/ephedrine/overdose_process(mob/living/M)
if(prob(33))
M.adjustToxLoss(0.5*REM, 0)
M.losebreath++
. = 1
- ..()
+ return TRUE
/datum/reagent/medicine/ephedrine/addiction_act_stage1(mob/living/M)
if(prob(33))
@@ -610,7 +604,7 @@
color = "#64FFE6"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
-/datum/reagent/medicine/diphenhydramine/on_mob_life(mob/living/M)
+/datum/reagent/medicine/diphenhydramine/on_mob_life(mob/living/carbon/M)
if(prob(10))
M.drowsyness += 1
M.jitteriness -= 1
@@ -627,19 +621,15 @@
overdose_threshold = 30
addiction_threshold = 25
-/datum/reagent/medicine/morphine/on_mob_add(mob/M)
+/datum/reagent/medicine/morphine/on_mob_add(mob/living/L)
..()
- if(isliving(M))
- var/mob/living/L = M
- L.add_trait(TRAIT_IGNORESLOWDOWN, id)
+ L.add_trait(TRAIT_IGNORESLOWDOWN, id)
-/datum/reagent/medicine/morphine/on_mob_delete(mob/M)
- if(isliving(M))
- var/mob/living/L = M
- L.remove_trait(TRAIT_IGNORESLOWDOWN, id)
+/datum/reagent/medicine/morphine/on_mob_delete(mob/living/L)
+ L.remove_trait(TRAIT_IGNORESLOWDOWN, id)
..()
-/datum/reagent/medicine/morphine/on_mob_life(mob/living/M)
+/datum/reagent/medicine/morphine/on_mob_life(mob/living/carbon/M)
switch(current_cycle)
if(11)
to_chat(M, "You start to feel tired..." )
@@ -699,7 +689,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
taste_description = "dull toxin"
-/datum/reagent/medicine/oculine/on_mob_life(mob/living/M)
+/datum/reagent/medicine/oculine/on_mob_life(mob/living/carbon/M)
var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES)
if (!eyes)
return
@@ -730,7 +720,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
overdose_threshold = 35
-/datum/reagent/medicine/atropine/on_mob_life(mob/living/M)
+/datum/reagent/medicine/atropine/on_mob_life(mob/living/carbon/M)
if(M.health < 0)
M.adjustToxLoss(-2*REM, 0)
M.adjustBruteLoss(-2*REM, 0)
@@ -759,7 +749,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
overdose_threshold = 30
-/datum/reagent/medicine/epinephrine/on_mob_life(mob/living/M)
+/datum/reagent/medicine/epinephrine/on_mob_life(mob/living/carbon/M)
if(M.health < 0)
M.adjustToxLoss(-0.5*REM, 0)
M.adjustBruteLoss(-0.5*REM, 0)
@@ -816,7 +806,7 @@
add_logs(M, M, "revived", src)
..()
-/datum/reagent/medicine/strange_reagent/on_mob_life(mob/living/M)
+/datum/reagent/medicine/strange_reagent/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(0.5*REM, 0)
M.adjustFireLoss(0.5*REM, 0)
..()
@@ -828,12 +818,10 @@
description = "Efficiently restores brain damage."
color = "#DCDCFF"
-/datum/reagent/medicine/mannitol/on_mob_life(mob/living/M)
- M.adjustBrainLoss(-2*REM)
- if(iscarbon(M))
- var/mob/living/carbon/C = M
- if(prob(10))
- C.cure_trauma_type(resilience = TRAUMA_RESILIENCE_BASIC)
+/datum/reagent/medicine/mannitol/on_mob_life(mob/living/carbon/C)
+ C.adjustBrainLoss(-2*REM)
+ if(prob(10))
+ C.cure_trauma_type(resilience = TRAUMA_RESILIENCE_BASIC)
..()
/datum/reagent/medicine/mutadone
@@ -843,7 +831,7 @@
color = "#5096C8"
taste_description = "acid"
-/datum/reagent/medicine/mutadone/on_mob_life(mob/living/carbon/human/M)
+/datum/reagent/medicine/mutadone/on_mob_life(mob/living/carbon/M)
M.jitteriness = 0
if(M.has_dna())
M.dna.remove_all_mutations()
@@ -857,7 +845,7 @@
color = "#00B4C8"
taste_description = "raw egg"
-/datum/reagent/medicine/antihol/on_mob_life(mob/living/M)
+/datum/reagent/medicine/antihol/on_mob_life(mob/living/carbon/M)
M.dizziness = 0
M.drowsyness = 0
M.slurring = 0
@@ -878,19 +866,15 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
overdose_threshold = 60
-/datum/reagent/medicine/stimulants/on_mob_add(mob/M)
+/datum/reagent/medicine/stimulants/on_mob_add(mob/living/L)
..()
- if(isliving(M))
- var/mob/living/L = M
- L.add_trait(TRAIT_GOTTAGOFAST, id)
+ L.add_trait(TRAIT_GOTTAGOFAST, id)
-/datum/reagent/medicine/stimulants/on_mob_delete(mob/M)
- if(isliving(M))
- var/mob/living/L = M
- L.remove_trait(TRAIT_GOTTAGOFAST, id)
+/datum/reagent/medicine/stimulants/on_mob_delete(mob/living/L)
+ L.remove_trait(TRAIT_GOTTAGOFAST, id)
..()
-/datum/reagent/medicine/stimulants/on_mob_life(mob/living/M)
+/datum/reagent/medicine/stimulants/on_mob_life(mob/living/carbon/M)
if(M.health < 50 && M.health > 0)
M.adjustOxyLoss(-1*REM, 0)
M.adjustToxLoss(-1*REM, 0)
@@ -919,7 +903,7 @@
color = "#FFFFF0"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
-/datum/reagent/medicine/insulin/on_mob_life(mob/living/M)
+/datum/reagent/medicine/insulin/on_mob_life(mob/living/carbon/M)
if(M.AdjustSleeping(-20, FALSE))
. = 1
M.reagents.remove_reagent("sugar", 3)
@@ -931,10 +915,10 @@
id = "bicaridine"
description = "Restores bruising. Overdose causes it instead."
reagent_state = LIQUID
- color = "#BF0000"
+ color = "#C8A5DC"
overdose_threshold = 30
-/datum/reagent/medicine/bicaridine/on_mob_life(mob/living/M)
+/datum/reagent/medicine/bicaridine/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-2*REM, 0)
..()
. = 1
@@ -949,10 +933,10 @@
id = "dexalin"
description = "Restores oxygen loss. Overdose causes it instead."
reagent_state = LIQUID
- color = "#0080FF"
+ color = "#C8A5DC"
overdose_threshold = 30
-/datum/reagent/medicine/dexalin/on_mob_life(mob/living/M)
+/datum/reagent/medicine/dexalin/on_mob_life(mob/living/carbon/M)
M.adjustOxyLoss(-2*REM, 0)
..()
. = 1
@@ -967,10 +951,10 @@
id = "kelotane"
description = "Restores fire damage. Overdose causes it instead."
reagent_state = LIQUID
- color = "#FFA800"
+ color = "#C8A5DC"
overdose_threshold = 30
-/datum/reagent/medicine/kelotane/on_mob_life(mob/living/M)
+/datum/reagent/medicine/kelotane/on_mob_life(mob/living/carbon/M)
M.adjustFireLoss(-2*REM, 0)
..()
. = 1
@@ -985,11 +969,11 @@
id = "antitoxin"
description = "Heals toxin damage and removes toxins in the bloodstream. Overdose causes toxin damage."
reagent_state = LIQUID
- color = "#00A000"
+ color = "#C8A5DC"
overdose_threshold = 30
taste_description = "a roll of gauze"
-/datum/reagent/medicine/antitoxin/on_mob_life(mob/living/M)
+/datum/reagent/medicine/antitoxin/on_mob_life(mob/living/carbon/M)
M.adjustToxLoss(-2*REM, 0)
for(var/datum/reagent/toxin/R in M.reagents.reagent_list)
M.reagents.remove_reagent(R.id,1)
@@ -1006,9 +990,9 @@
id = "inaprovaline"
description = "Stabilizes the breathing of patients. Good for those in critical condition."
reagent_state = LIQUID
- color = "#00BFFF"
+ color = "#C8A5DC"
-/datum/reagent/medicine/inaprovaline/on_mob_life(mob/living/M)
+/datum/reagent/medicine/inaprovaline/on_mob_life(mob/living/carbon/M)
if(M.losebreath >= 5)
M.losebreath -= 5
..()
@@ -1018,11 +1002,11 @@
id = "tricordrazine"
description = "Has a high chance to heal all types of damage. Overdose instead causes it."
reagent_state = LIQUID
- color = "#8040FF"
+ color = "#C8A5DC"
overdose_threshold = 30
taste_description = "grossness"
-/datum/reagent/medicine/tricordrazine/on_mob_life(mob/living/M)
+/datum/reagent/medicine/tricordrazine/on_mob_life(mob/living/carbon/M)
if(prob(80))
M.adjustBruteLoss(-1*REM, 0)
M.adjustFireLoss(-1*REM, 0)
@@ -1047,7 +1031,7 @@
color = "#91D865"
taste_description = "jelly"
-/datum/reagent/medicine/regen_jelly/on_mob_life(mob/living/M)
+/datum/reagent/medicine/regen_jelly/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-1.5*REM, 0)
M.adjustFireLoss(-1.5*REM, 0)
M.adjustOxyLoss(-1.5*REM, 0)
@@ -1062,7 +1046,7 @@
reagent_state = SOLID
color = "#555555"
-/datum/reagent/medicine/syndicate_nanites/on_mob_life(mob/living/M)
+/datum/reagent/medicine/syndicate_nanites/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-5*REM, 0) //A ton of healing - this is a 50 telecrystal investment.
M.adjustFireLoss(-5*REM, 0)
M.adjustOxyLoss(-15, 0)
@@ -1079,7 +1063,7 @@
color = rgb(255, 175, 0)
overdose_threshold = 25
-/datum/reagent/medicine/earthsblood/on_mob_life(mob/living/M)
+/datum/reagent/medicine/earthsblood/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-3 * REM, 0)
M.adjustFireLoss(-3 * REM, 0)
M.adjustOxyLoss(-15 * REM, 0)
@@ -1106,7 +1090,7 @@
color = "#27870a"
metabolization_rate = 0.4 * REAGENTS_METABOLISM
-/datum/reagent/medicine/haloperidol/on_mob_life(mob/living/M)
+/datum/reagent/medicine/haloperidol/on_mob_life(mob/living/carbon/M)
for(var/datum/reagent/drug/R in M.reagents.reagent_list)
M.reagents.remove_reagent(R.id,5)
M.drowsyness += 2
@@ -1118,7 +1102,7 @@
M.adjustBrainLoss(1*REM, 50)
M.adjustStaminaLoss(2.5*REM, 0)
..()
- . = 1
+ return TRUE
/datum/reagent/medicine/miningnanites
name = "Nanites"
@@ -1128,17 +1112,17 @@
overdose_threshold = 3 //To prevent people stacking massive amounts of a very strong healing reagent
can_synth = FALSE
-/datum/reagent/medicine/miningnanites/on_mob_life(mob/living/M)
+/datum/reagent/medicine/miningnanites/on_mob_life(mob/living/carbon/M)
M.heal_bodypart_damage(5,5)
..()
- . = 1
+ return TRUE
/datum/reagent/medicine/miningnanites/overdose_process(mob/living/M)
M.adjustBruteLoss(3*REM, 0)
M.adjustFireLoss(3*REM, 0)
M.adjustToxLoss(3*REM, 0)
..()
- . = 1
+ return TRUE
//used for changeling's adrenaline power
/datum/reagent/medicine/changelingadrenaline
@@ -1148,18 +1132,18 @@
color = "#C8A5DC"
overdose_threshold = 30
-/datum/reagent/medicine/changelingadrenaline/on_mob_life(mob/living/M as mob)
+/datum/reagent/medicine/changelingadrenaline/on_mob_life(mob/living/carbon/M as mob)
M.AdjustUnconscious(-20, 0)
M.AdjustStun(-20, 0)
M.AdjustKnockdown(-20, 0)
M.adjustStaminaLoss(-1, 0)
- . = 1
..()
+ return TRUE
/datum/reagent/medicine/changelingadrenaline/overdose_process(mob/living/M as mob)
M.adjustToxLoss(1, 0)
- . = 1
..()
+ return TRUE
/datum/reagent/medicine/changelinghaste
name = "Changeling Haste"
@@ -1168,22 +1152,18 @@
color = "#C8A5DC"
metabolization_rate = 1
-/datum/reagent/medicine/changelinghaste/on_mob_add(mob/M)
+/datum/reagent/medicine/changelinghaste/on_mob_add(mob/living/L)
..()
- if(isliving(M))
- var/mob/living/L = M
- L.add_trait(TRAIT_GOTTAGOREALLYFAST, id)
+ L.add_trait(TRAIT_GOTTAGOREALLYFAST, id)
-/datum/reagent/medicine/changelinghaste/on_mob_delete(mob/M)
- if(isliving(M))
- var/mob/living/L = M
- L.remove_trait(TRAIT_GOTTAGOREALLYFAST, id)
+/datum/reagent/medicine/changelinghaste/on_mob_delete(mob/living/L)
+ L.remove_trait(TRAIT_GOTTAGOREALLYFAST, id)
..()
-/datum/reagent/medicine/changelinghaste/on_mob_life(mob/living/M as mob)
+/datum/reagent/medicine/changelinghaste/on_mob_life(mob/living/carbon/M)
M.adjustToxLoss(2, 0)
- . = 1
..()
+ return TRUE
/datum/reagent/medicine/corazone
// Heart attack code will not do damage if corazone is present
@@ -1226,7 +1206,7 @@
M.remove_trait(TRAIT_SLEEPIMMUNE, id)
..()
-/datum/reagent/medicine/modafinil/on_mob_life(mob/living/M)
+/datum/reagent/medicine/modafinil/on_mob_life(mob/living/carbon/M)
if(!overdosed) // We do not want any effects on OD
overdose_threshold = overdose_threshold + rand(-10,10)/10 // for extra fun
M.AdjustStun(-5, 0)
@@ -1235,7 +1215,7 @@
M.adjustStaminaLoss(-0.5*REM, 0)
M.Jitter(1)
metabolization_rate = 0.01 * REAGENTS_METABOLISM * rand(5,20) // randomizes metabolism between 0.02 and 0.08 per tick
- . = 1
+ . = TRUE
..()
/datum/reagent/medicine/modafinil/overdose_start(mob/living/M)
@@ -1272,5 +1252,4 @@
M.adjustOxyLoss(1.5*REM, 0)
M.adjustStaminaLoss(1.5*REM, 0)
..()
- . = 1
-
+ return TRUE
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 81d55830d2..039f41a471 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -11,7 +11,7 @@
glass_desc = "Are you sure this is tomato juice?"
shot_glass_icon_state = "shotglassred"
-/datum/reagent/blood/reaction_mob(mob/M, method=TOUCH, reac_volume)
+/datum/reagent/blood/reaction_mob(mob/living/L, method=TOUCH, reac_volume)
if(data && data["viruses"])
for(var/thing in data["viruses"])
var/datum/disease/D = thing
@@ -19,15 +19,13 @@
if((D.spread_flags & DISEASE_SPREAD_SPECIAL) || (D.spread_flags & DISEASE_SPREAD_NON_CONTAGIOUS))
continue
- if(isliving(M))
- var/mob/living/L = M
- if((method == TOUCH || method == VAPOR) && (D.spread_flags & DISEASE_SPREAD_CONTACT_FLUIDS))
- L.ContactContractDisease(D)
- else //ingest, patch or inject
- L.ForceContractDisease(D)
+ if((method == TOUCH || method == VAPOR) && (D.spread_flags & DISEASE_SPREAD_CONTACT_FLUIDS))
+ L.ContactContractDisease(D)
+ else //ingest, patch or inject
+ L.ForceContractDisease(D)
- if(iscarbon(M))
- var/mob/living/carbon/C = M
+ if(iscarbon(L))
+ var/mob/living/carbon/C = L
if(C.get_blood_id() == "blood" && (method == INJECT || (method == INGEST && C.dna && C.dna.species && (DRINKSBLOOD in C.dna.species.species_traits))))
if(!data || !(data["blood_type"] in get_safe_blood(C.dna.blood_type)))
C.reagents.add_reagent("toxin", reac_volume * 0.5)
@@ -99,10 +97,7 @@
color = "#C81040" // rgb: 200, 16, 64
taste_description = "slime"
-/datum/reagent/vaccine/reaction_mob(mob/M, method=TOUCH, reac_volume)
- if(!isliving(M))
- return
- var/mob/living/L = M
+/datum/reagent/vaccine/reaction_mob(mob/living/L, method=TOUCH, reac_volume)
if(islist(data) && (method == INGEST || method == INJECT))
for(var/thing in L.diseases)
var/datum/disease/D = thing
@@ -195,16 +190,12 @@
glass_name = "glass of holy water"
glass_desc = "A glass of holy water."
-/datum/reagent/water/holywater/on_mob_add(mob/M)
+/datum/reagent/water/holywater/on_mob_add(mob/living/L)
..()
- if(isliving(M))
- var/mob/living/L = M
- L.add_trait(TRAIT_HOLY, id)
+ L.add_trait(TRAIT_HOLY, id)
-/datum/reagent/water/holywater/on_mob_delete(mob/M)
- if(isliving(M))
- var/mob/living/L = M
- L.remove_trait(TRAIT_HOLY, id)
+/datum/reagent/water/holywater/on_mob_delete(mob/living/L)
+ L.remove_trait(TRAIT_HOLY, id)
..()
/datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
@@ -212,7 +203,7 @@
to_chat(M, "A darkness begins to spread its unholy tendrils through your mind, purging the Justiciar's influence!")
..()
-/datum/reagent/water/holywater/on_mob_life(mob/living/M)
+/datum/reagent/water/holywater/on_mob_life(mob/living/carbon/M)
if(!data)
data = 1
data++
@@ -276,7 +267,7 @@
return
return ..()
-/datum/reagent/fuel/unholywater/on_mob_life(mob/living/M)
+/datum/reagent/fuel/unholywater/on_mob_life(mob/living/carbon/M)
if(iscultist(M))
M.drowsyness = max(M.drowsyness-5, 0)
M.AdjustUnconscious(-20, 0)
@@ -296,7 +287,7 @@
M.adjustOxyLoss(2, 0)
M.adjustBruteLoss(2, 0)
holder.remove_reagent(id, 1)
- . = 1
+ return TRUE
/datum/reagent/hellwater //if someone has this in their system they've really pissed off an eldrich god
name = "Hell Water"
@@ -304,13 +295,13 @@
description = "YOUR FLESH! IT BURNS!"
taste_description = "burning"
-/datum/reagent/hellwater/on_mob_life(mob/living/M)
+/datum/reagent/hellwater/on_mob_life(mob/living/carbon/M)
M.fire_stacks = min(5,M.fire_stacks + 3)
M.IgniteMob() //Only problem with igniting people is currently the commonly availible fire suits make you immune to being on fire
M.adjustToxLoss(1, 0)
M.adjustFireLoss(1, 0) //Hence the other damages... ain't I a bastard?
M.adjustBrainLoss(5, 150)
- holder.remove_reagent(src.id, 1)
+ holder.remove_reagent(id, 1)
/datum/reagent/medicine/omnizine/godblood
name = "Godblood"
@@ -620,10 +611,12 @@
taste_description = "slime"
/datum/reagent/mulligan/on_mob_life(mob/living/carbon/human/H)
+ ..()
+ if (!istype(H))
+ return
to_chat(H, "You grit your teeth in pain as your body rapidly mutates!")
H.visible_message("[H] suddenly transforms!")
randomize_human(H)
- ..()
/datum/reagent/aslimetoxin
name = "Advanced Mutation Toxin"
@@ -632,10 +625,7 @@
color = "#13BC5E" // rgb: 19, 188, 94
taste_description = "slime"
-/datum/reagent/aslimetoxin/reaction_mob(mob/M, method=TOUCH, reac_volume)
- if(!isliving(M))
- return
- var/mob/living/L = M
+/datum/reagent/aslimetoxin/reaction_mob(mob/living/L, method=TOUCH, reac_volume)
if(method != TOUCH)
L.ForceContractDisease(new /datum/disease/transformation/slime(), FALSE, TRUE)
@@ -647,10 +637,7 @@
can_synth = FALSE
taste_description = "decay"
-/datum/reagent/gluttonytoxin/reaction_mob(mob/M, method=TOUCH, reac_volume)
- if(!isliving(M))
- return
- var/mob/living/L = M
+/datum/reagent/gluttonytoxin/reaction_mob(mob/living/L, method=TOUCH, reac_volume)
L.ForceContractDisease(new /datum/disease/transformation/morph(), FALSE, TRUE)
/datum/reagent/serotrotium
@@ -661,7 +648,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
taste_description = "bitterness"
-/datum/reagent/serotrotium/on_mob_life(mob/living/M)
+/datum/reagent/serotrotium/on_mob_life(mob/living/carbon/M)
if(ishuman(M))
if(prob(7))
M.emote(pick("twitch","drool","moan","gasp"))
@@ -745,7 +732,7 @@
color = "#484848" // rgb: 72, 72, 72A
taste_mult = 0 // apparently tasteless.
-/datum/reagent/mercury/on_mob_life(mob/living/M)
+/datum/reagent/mercury/on_mob_life(mob/living/carbon/M)
if(M.canmove && !isspaceturf(M.loc))
step(M, pick(GLOB.cardinals))
if(prob(5))
@@ -783,7 +770,7 @@
color = "#808080" // rgb: 128, 128, 128
taste_description = "chlorine"
-/datum/reagent/chlorine/on_mob_life(mob/living/M)
+/datum/reagent/chlorine/on_mob_life(mob/living/carbon/M)
M.take_bodypart_damage(1*REM, 0, 0, 0)
. = 1
..()
@@ -796,7 +783,7 @@
color = "#808080" // rgb: 128, 128, 128
taste_description = "acid"
-/datum/reagent/fluorine/on_mob_life(mob/living/M)
+/datum/reagent/fluorine/on_mob_life(mob/living/carbon/M)
M.adjustToxLoss(1*REM, 0)
. = 1
..()
@@ -825,7 +812,7 @@
color = "#808080" // rgb: 128, 128, 128
taste_description = "metal"
-/datum/reagent/lithium/on_mob_life(mob/living/M)
+/datum/reagent/lithium/on_mob_life(mob/living/carbon/M)
if(M.canmove && !isspaceturf(M.loc))
step(M, pick(GLOB.cardinals))
if(prob(5))
@@ -847,7 +834,7 @@
color = "#C7C7C7" // rgb: 199,199,199
taste_description = "the colour blue and regret"
-/datum/reagent/radium/on_mob_life(mob/living/M)
+/datum/reagent/radium/on_mob_life(mob/living/carbon/M)
M.apply_effect(2*REM/M.metabolism_efficiency,EFFECT_IRRADIATE,0)
..()
@@ -866,9 +853,8 @@
color = "#C8A5DC" // rgb: 200, 165, 220
taste_description = "bitterness"
-/datum/reagent/space_cleaner/sterilizine/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
- if(iscarbon(M) && (method in list(TOUCH, VAPOR, PATCH)))
- var/mob/living/carbon/C = M
+/datum/reagent/space_cleaner/sterilizine/reaction_mob(mob/living/carbon/C, method=TOUCH, reac_volume)
+ if(method in list(TOUCH, VAPOR, PATCH))
for(var/s in C.surgeries)
var/datum/surgery/S = s
S.success_multiplier = max(0.2, S.success_multiplier)
@@ -884,16 +870,12 @@
color = "#C8A5DC" // rgb: 200, 165, 220
-/datum/reagent/iron/on_mob_life(mob/living/M)
- if(iscarbon(M))
- var/mob/living/carbon/C = M
- if(C.blood_volume < BLOOD_VOLUME_NORMAL)
- C.blood_volume += 0.5
+/datum/reagent/iron/on_mob_life(mob/living/carbon/C)
+ if(C.blood_volume < BLOOD_VOLUME_NORMAL)
+ C.blood_volume += 0.5
..()
/datum/reagent/iron/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
- if(!isliving(M))
- return
if(M.has_bane(BANE_IRON)) //If the target is weak to cold iron, then poison them.
if(holder && holder.chem_temp < 100) // COLD iron.
M.reagents.add_reagent("toxin", reac_volume)
@@ -916,8 +898,6 @@
taste_description = "expensive yet reasonable metal"
/datum/reagent/silver/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
- if(!isliving(M))
- return
if(M.has_bane(BANE_SILVER))
M.reagents.add_reagent("toxin", reac_volume)
..()
@@ -930,7 +910,7 @@
color = "#B8B8C0" // rgb: 184, 184, 192
taste_description = "the inside of a reactor"
-/datum/reagent/uranium/on_mob_life(mob/living/M)
+/datum/reagent/uranium/on_mob_life(mob/living/carbon/M)
M.apply_effect(1/M.metabolism_efficiency,EFFECT_IRRADIATE,0)
..()
@@ -955,14 +935,17 @@
do_teleport(M, get_turf(M), (reac_volume / 5), asoundin = 'sound/effects/phasein.ogg') //4 tiles per crystal
..()
-/datum/reagent/bluespace/on_mob_life(mob/living/M)
+/datum/reagent/bluespace/on_mob_life(mob/living/carbon/M)
if(current_cycle > 10 && prob(15))
to_chat(M, "You feel unstable...")
M.Jitter(2)
current_cycle = 1
- addtimer(CALLBACK(GLOBAL_PROC, .proc/do_teleport, M, get_turf(M), 5, null, null, null, 'sound/effects/phasein.ogg'), 30)
+ addtimer(CALLBACK(M, /mob/living/proc/bluespace_shuffle), 30)
..()
+/mob/living/proc/bluespace_shuffle()
+ do_teleport(src, get_turf(src), 5, asoundin = 'sound/effects/phasein.ogg')
+
/datum/reagent/aluminium
name = "Aluminium"
id = "aluminium"
@@ -990,17 +973,15 @@
glass_desc = "Unless you're an industrial tool, this is probably not safe for consumption."
/datum/reagent/fuel/reaction_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with welding fuel to make them easy to ignite!
- if(!isliving(M))
- return
if(method == TOUCH || method == VAPOR)
M.adjust_fire_stacks(reac_volume / 10)
return
..()
-/datum/reagent/fuel/on_mob_life(mob/living/M)
+/datum/reagent/fuel/on_mob_life(mob/living/carbon/M)
M.adjustToxLoss(1, 0)
- . = 1
..()
+ return TRUE
/datum/reagent/space_cleaner
name = "Space cleaner"
@@ -1015,19 +996,19 @@
else
if(O)
O.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
- O.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+ SEND_SIGNAL(O, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
/datum/reagent/space_cleaner/reaction_turf(turf/T, reac_volume)
if(reac_volume >= 1)
T.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
- T.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+ SEND_SIGNAL(T, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
for(var/obj/effect/decal/cleanable/C in T)
qdel(C)
for(var/mob/living/simple_animal/slime/M in T)
M.adjustToxLoss(rand(5,10))
-/datum/reagent/space_cleaner/reaction_mob(mob/M, method=TOUCH, reac_volume)
+/datum/reagent/space_cleaner/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
if(method == TOUCH || method == VAPOR)
M.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
if(iscarbon(M))
@@ -1038,26 +1019,26 @@
H.lip_style = null
H.update_body()
for(var/obj/item/I in C.held_items)
- I.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+ SEND_SIGNAL(I, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
if(C.wear_mask)
- if(C.wear_mask.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
+ if(SEND_SIGNAL(C.wear_mask, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
C.update_inv_wear_mask()
if(ishuman(M))
var/mob/living/carbon/human/H = C
if(H.head)
- if(H.head.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
+ if(SEND_SIGNAL(H.head, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
H.update_inv_head()
if(H.wear_suit)
- if(H.wear_suit.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
+ if(SEND_SIGNAL(H.wear_suit, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
H.update_inv_wear_suit()
else if(H.w_uniform)
- if(H.w_uniform.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
+ if(SEND_SIGNAL(H.w_uniform, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
H.update_inv_w_uniform()
if(H.shoes)
- if(H.shoes.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
+ if(SEND_SIGNAL(H.shoes, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
H.update_inv_shoes()
H.wash_cream()
- M.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+ SEND_SIGNAL(M, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
/datum/reagent/space_cleaner/ez_clean
name = "EZ Clean"
@@ -1066,7 +1047,7 @@
metabolization_rate = 1.5 * REAGENTS_METABOLISM
taste_description = "acid"
-/datum/reagent/space_cleaner/ez_clean/on_mob_life(mob/living/M)
+/datum/reagent/space_cleaner/ez_clean/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(3.33)
M.adjustFireLoss(3.33)
M.adjustToxLoss(3.33)
@@ -1086,7 +1067,7 @@
metabolization_rate = 1.5 * REAGENTS_METABOLISM
taste_description = "sourness"
-/datum/reagent/cryptobiolin/on_mob_life(mob/living/M)
+/datum/reagent/cryptobiolin/on_mob_life(mob/living/carbon/M)
M.Dizzy(1)
if(!M.confused)
M.confused = 1
@@ -1100,7 +1081,7 @@
color = "#C8A5DC" // rgb: 200, 165, 220A
taste_description = "numbness"
-/datum/reagent/impedrezene/on_mob_life(mob/living/M)
+/datum/reagent/impedrezene/on_mob_life(mob/living/carbon/M)
M.jitteriness = max(M.jitteriness-5,0)
if(prob(80))
M.adjustBrainLoss(2*REM)
@@ -1118,10 +1099,7 @@
can_synth = FALSE
taste_description = "sludge"
-/datum/reagent/nanites/reaction_mob(mob/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0)
- if(!isliving(M))
- return
- var/mob/living/L = M
+/datum/reagent/nanites/reaction_mob(mob/living/L, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0)
if(method==PATCH || method==INGEST || method==INJECT || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection))))
L.ForceContractDisease(new /datum/disease/transformation/robot(), FALSE, TRUE)
@@ -1133,10 +1111,7 @@
can_synth = FALSE
taste_description = "sludge"
-/datum/reagent/xenomicrobes/reaction_mob(mob/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0)
- if(!isliving(M))
- return
- var/mob/living/L = M
+/datum/reagent/xenomicrobes/reaction_mob(mob/living/L, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0)
if(method==PATCH || method==INGEST || method==INJECT || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection))))
L.ForceContractDisease(new /datum/disease/transformation/xeno(), FALSE, TRUE)
@@ -1148,10 +1123,7 @@
can_synth = FALSE
taste_description = "slime"
-/datum/reagent/fungalspores/reaction_mob(mob/M, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0)
- if(!isliving(M))
- return
- var/mob/living/L = M
+/datum/reagent/fungalspores/reaction_mob(mob/living/L, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0)
if(method==PATCH || method==INGEST || method==INJECT || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection))))
L.ForceContractDisease(new /datum/disease/tuberculosis(), FALSE, TRUE)
@@ -1233,11 +1205,11 @@
var/temp = holder ? holder.chem_temp : T20C
T.atmos_spawn_air("n2o=[reac_volume/5];TEMP=[temp]")
-/datum/reagent/nitrous_oxide/reaction_mob(mob/M, method=TOUCH, reac_volume)
+/datum/reagent/nitrous_oxide/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
if(method == VAPOR)
M.drowsyness += max(round(reac_volume, 1), 2)
-/datum/reagent/nitrous_oxide/on_mob_life(mob/living/M)
+/datum/reagent/nitrous_oxide/on_mob_life(mob/living/carbon/M)
M.drowsyness += 2
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -1256,19 +1228,15 @@
color = "E1A116"
taste_description = "sourness"
-/datum/reagent/stimulum/on_mob_add(mob/M)
+/datum/reagent/stimulum/on_mob_add(mob/living/L)
..()
- if(isliving(M))
- var/mob/living/L = M
- L.add_trait(TRAIT_GOTTAGOFAST, id)
+ L.add_trait(TRAIT_GOTTAGOFAST, id)
-/datum/reagent/stimulum/on_mob_delete(mob/M)
- if(isliving(M))
- var/mob/living/L = M
- L.remove_trait(TRAIT_GOTTAGOFAST, id)
+/datum/reagent/stimulum/on_mob_delete(mob/living/L)
+ L.remove_trait(TRAIT_GOTTAGOFAST, id)
..()
-/datum/reagent/stimulum/on_mob_life(mob/living/M) // Has a speedup, and the anti-stun effects of nicotine.
+/datum/reagent/stimulum/on_mob_life(mob/living/carbon/M) // Has a speedup, and the anti-stun effects of nicotine.
M.AdjustStun(-20, 0)
M.AdjustKnockdown(-20, 0)
M.AdjustUnconscious(-20, 0)
@@ -1286,16 +1254,12 @@
color = "90560B"
taste_description = "burning"
-/datum/reagent/nitryl/on_mob_add(mob/M)
+/datum/reagent/nitryl/on_mob_add(mob/living/L)
..()
- if(isliving(M))
- var/mob/living/L = M
- L.add_trait(TRAIT_GOTTAGOFAST, id)
+ L.add_trait(TRAIT_GOTTAGOFAST, id)
-/datum/reagent/nitryl/on_mob_delete(mob/M)
- if(isliving(M))
- var/mob/living/L = M
- L.remove_trait(TRAIT_GOTTAGOFAST, id)
+/datum/reagent/nitryl/on_mob_delete(mob/living/L)
+ L.remove_trait(TRAIT_GOTTAGOFAST, id)
..()
/////////////////////////Coloured Crayon Powder////////////////////////////
@@ -1391,7 +1355,7 @@
var/tox_prob = 0
taste_description = "plant food"
-/datum/reagent/plantnutriment/on_mob_life(mob/living/M)
+/datum/reagent/plantnutriment/on_mob_life(mob/living/carbon/M)
if(prob(tox_prob))
M.adjustToxLoss(1*REM, 0)
. = 1
@@ -1445,12 +1409,9 @@
taste_description = "bitterness"
taste_mult = 1.5
-/datum/reagent/stable_plasma/on_mob_life(mob/living/M)
- if(iscarbon(M))
- var/mob/living/carbon/C = M
- C.adjustPlasma(10)
+/datum/reagent/stable_plasma/on_mob_life(mob/living/carbon/C)
+ C.adjustPlasma(10)
..()
- return
/datum/reagent/iodine
name = "Iodine"
@@ -1473,7 +1434,6 @@
var/turf/open/floor/F = T
F.PlaceOnTop(/turf/open/floor/carpet)
..()
- return
/datum/reagent/bromine
name = "Bromine"
@@ -1517,14 +1477,12 @@
taste_description = "rainbows"
-/datum/reagent/colorful_reagent/on_mob_life(mob/living/M)
- if(M && isliving(M))
- M.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY)
+/datum/reagent/colorful_reagent/on_mob_life(mob/living/carbon/M)
+ M.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY)
..()
/datum/reagent/colorful_reagent/reaction_mob(mob/living/M, reac_volume)
- if(M && isliving(M))
- M.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY)
+ M.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY)
..()
/datum/reagent/colorful_reagent/reaction_obj(obj/O, reac_volume)
@@ -1683,7 +1641,7 @@
color = "#00ff80"
taste_description = "strange honey"
-/datum/reagent/royal_bee_jelly/on_mob_life(mob/living/M)
+/datum/reagent/royal_bee_jelly/on_mob_life(mob/living/carbon/M)
if(prob(2))
M.say(pick("Bzzz...","BZZ BZZ","Bzzzzzzzzzzz..."))
..()
@@ -1804,16 +1762,12 @@
taste_description = "water"
metabolization_rate = 0.25 * REAGENTS_METABOLISM
-/datum/reagent/pax/on_mob_add(mob/M)
+/datum/reagent/pax/on_mob_add(mob/living/L)
..()
- if(isliving(M))
- var/mob/living/L = M
- L.add_trait(TRAIT_PACIFISM, id)
+ L.add_trait(TRAIT_PACIFISM, id)
-/datum/reagent/pax/on_mob_delete(mob/M)
- if(isliving(M))
- var/mob/living/L = M
- L.remove_trait(TRAIT_PACIFISM, id)
+/datum/reagent/pax/on_mob_delete(mob/living/L)
+ L.remove_trait(TRAIT_PACIFISM, id)
..()
/datum/reagent/bz_metabolites
@@ -1852,7 +1806,7 @@
metabolization_rate = 1.5 * REAGENTS_METABOLISM
taste_description = "dizziness"
-/datum/reagent/peaceborg/confuse/on_mob_life(mob/living/M)
+/datum/reagent/peaceborg/confuse/on_mob_life(mob/living/carbon/M)
if(M.confused < 6)
M.confused = CLAMP(M.confused + 3, 0, 5)
if(M.dizziness < 6)
@@ -1868,7 +1822,7 @@
metabolization_rate = 1.5 * REAGENTS_METABOLISM
taste_description = "tiredness"
-/datum/reagent/peaceborg/tire/on_mob_life(mob/living/M)
+/datum/reagent/peaceborg/tire/on_mob_life(mob/living/carbon/M)
var/healthcomp = (100 - M.health) //DOES NOT ACCOUNT FOR ADMINBUS THINGS THAT MAKE YOU HAVE MORE THAN 200/210 HEALTH, OR SOMETHING OTHER THAN A HUMAN PROCESSING THIS.
if(M.getStaminaLoss() < (45 - healthcomp)) //At 50 health you would have 200 - 150 health meaning 50 compensation. 60 - 50 = 10, so would only do 10-19 stamina.)
M.adjustStaminaLoss(10)
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
index 07f19a8462..90cb732a1f 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
@@ -11,10 +11,10 @@
if(reac_volume >= 1)
T.AddComponent(/datum/component/thermite, reac_volume)
-/datum/reagent/thermite/on_mob_life(mob/living/M)
+/datum/reagent/thermite/on_mob_life(mob/living/carbon/M)
M.adjustFireLoss(1, 0)
..()
- . = 1
+ return TRUE
/datum/reagent/nitroglycerin
name = "Nitroglycerin"
@@ -40,12 +40,12 @@
metabolization_rate = 4
taste_description = "burning"
-/datum/reagent/clf3/on_mob_life(mob/living/M)
+/datum/reagent/clf3/on_mob_life(mob/living/carbon/M)
M.adjust_fire_stacks(2)
var/burndmg = max(0.3*M.fire_stacks, 0.3)
M.adjustFireLoss(burndmg, 0)
..()
- . = 1
+ return TRUE
/datum/reagent/clf3/reaction_turf(turf/T, reac_volume)
if(isplatingturf(T))
@@ -100,7 +100,7 @@
metabolization_rate = 0.05
taste_description = "salt"
-/datum/reagent/blackpowder/on_mob_life(mob/living/M)
+/datum/reagent/blackpowder/on_mob_life(mob/living/carbon/M)
..()
if(isplasmaman(M))
M.hallucination += 5
@@ -151,12 +151,12 @@
M.IgniteMob()
..()
-/datum/reagent/phlogiston/on_mob_life(mob/living/M)
+/datum/reagent/phlogiston/on_mob_life(mob/living/carbon/M)
M.adjust_fire_stacks(1)
var/burndmg = max(0.3*M.fire_stacks, 0.3)
M.adjustFireLoss(burndmg, 0)
..()
- . = 1
+ return TRUE
/datum/reagent/napalm
name = "Napalm"
@@ -166,7 +166,7 @@
color = "#FA00AF"
taste_description = "burning"
-/datum/reagent/napalm/on_mob_life(mob/living/M)
+/datum/reagent/napalm/on_mob_life(mob/living/carbon/M)
M.adjust_fire_stacks(1)
..()
@@ -184,7 +184,7 @@
taste_description = "bitterness"
-/datum/reagent/cryostylane/on_mob_life(mob/living/M) //TODO: code freezing into an ice cube
+/datum/reagent/cryostylane/on_mob_life(mob/living/carbon/M) //TODO: code freezing into an ice cube
if(M.reagents.has_reagent("oxygen"))
M.reagents.remove_reagent("oxygen", 0.5)
M.adjust_bodytemperature(-15)
@@ -203,7 +203,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
taste_description = "bitterness"
-/datum/reagent/pyrosium/on_mob_life(mob/living/M)
+/datum/reagent/pyrosium/on_mob_life(mob/living/carbon/M)
if(M.reagents.has_reagent("oxygen"))
M.reagents.remove_reagent("oxygen", 0.5)
M.adjust_bodytemperature(15)
@@ -219,7 +219,7 @@
taste_description = "charged metal"
var/shock_timer = 0
-/datum/reagent/teslium/on_mob_life(mob/living/M)
+/datum/reagent/teslium/on_mob_life(mob/living/carbon/M)
shock_timer++
if(shock_timer >= rand(5,30)) //Random shocks are wildly unpredictable
shock_timer = 0
@@ -235,7 +235,7 @@
color = "#CAFF43"
taste_description = "jelly"
-/datum/reagent/teslium/energized_jelly/on_mob_life(mob/living/M)
+/datum/reagent/teslium/energized_jelly/on_mob_life(mob/living/carbon/M)
if(isjellyperson(M))
shock_timer = 0 //immune to shocks
M.AdjustStun(-40, 0)
@@ -280,9 +280,7 @@
O.extinguish()
/datum/reagent/firefighting_foam/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
- if(!istype(M))
- return
if(method in list(VAPOR, TOUCH))
M.adjust_fire_stacks(-reac_volume)
M.ExtinguishMob()
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index 74ef9167c9..0700aeb799 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -10,10 +10,10 @@
taste_mult = 1.2
var/toxpwr = 1.5
-/datum/reagent/toxin/on_mob_life(mob/living/M)
+/datum/reagent/toxin/on_mob_life(mob/living/carbon/M)
if(toxpwr)
M.adjustToxLoss(toxpwr*REM, 0)
- . = 1
+ . = TRUE
..()
/datum/reagent/toxin/amatoxin
@@ -48,9 +48,8 @@
M.domutcheck()
..()
-/datum/reagent/toxin/mutagen/on_mob_life(mob/living/carbon/M)
- if(istype(M))
- M.apply_effect(5,EFFECT_IRRADIATE,0)
+/datum/reagent/toxin/mutagen/on_mob_life(mob/living/carbon/C)
+ C.apply_effect(5,EFFECT_IRRADIATE,0)
return ..()
/datum/reagent/toxin/plasma
@@ -58,16 +57,15 @@
id = "plasma"
description = "Plasma in its liquid form."
taste_description = "bitterness"
+ specific_heat = SPECIFIC_HEAT_PLASMA
taste_mult = 1.5
color = "#8228A0"
toxpwr = 3
-/datum/reagent/toxin/plasma/on_mob_life(mob/living/M)
+/datum/reagent/toxin/plasma/on_mob_life(mob/living/carbon/C)
if(holder.has_reagent("epinephrine"))
holder.remove_reagent("epinephrine", 2*REM)
- if(iscarbon(M))
- var/mob/living/carbon/C = M
- C.adjustPlasma(20)
+ C.adjustPlasma(20)
return ..()
/datum/reagent/toxin/plasma/reaction_obj(obj/O, reac_volume)
@@ -83,8 +81,6 @@
return
/datum/reagent/toxin/plasma/reaction_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with plasma is stronger than fuel!
- if(!isliving(M))
- return
if(method == TOUCH || method == VAPOR)
M.adjust_fire_stacks(reac_volume / 5)
return
@@ -98,19 +94,17 @@
toxpwr = 0
taste_description = "acid"
-/datum/reagent/toxin/lexorin/on_mob_life(mob/living/M)
+/datum/reagent/toxin/lexorin/on_mob_life(mob/living/carbon/C)
. = TRUE
- if(M.has_trait(TRAIT_NOBREATH))
+ if(C.has_trait(TRAIT_NOBREATH))
. = FALSE
if(.)
- M.adjustOxyLoss(5, 0)
- if(iscarbon(M))
- var/mob/living/carbon/C = M
- C.losebreath += 2
+ C.adjustOxyLoss(5, 0)
+ C.losebreath += 2
if(prob(20))
- M.emote("gasp")
+ C.emote("gasp")
..()
/datum/reagent/toxin/slimejelly
@@ -122,7 +116,7 @@
taste_description = "slime"
taste_mult = 1.3
-/datum/reagent/toxin/slimejelly/on_mob_life(mob/living/M)
+/datum/reagent/toxin/slimejelly/on_mob_life(mob/living/carbon/M)
if(prob(10))
to_chat(M, "Your insides are burning!")
M.adjustToxLoss(rand(20,60)*REM, 0)
@@ -140,7 +134,7 @@
toxpwr = 0
taste_description = "mint"
-/datum/reagent/toxin/minttoxin/on_mob_life(mob/living/M)
+/datum/reagent/toxin/minttoxin/on_mob_life(mob/living/carbon/M)
if(M.has_trait(TRAIT_FAT))
M.gib()
return ..()
@@ -162,16 +156,12 @@
toxpwr = 0.5
taste_description = "death"
-/datum/reagent/toxin/zombiepowder/on_mob_add(mob/M)
+/datum/reagent/toxin/zombiepowder/on_mob_add(mob/living/L)
..()
- if(isliving(M))
- var/mob/living/L = M
- L.fakedeath(id)
+ L.fakedeath(id)
-/datum/reagent/toxin/zombiepowder/on_mob_delete(mob/M)
- if(isliving(M))
- var/mob/living/L = M
- L.cure_fakedeath(id)
+/datum/reagent/toxin/zombiepowder/on_mob_delete(mob/living/L)
+ L.cure_fakedeath(id)
..()
/datum/reagent/toxin/zombiepowder/on_mob_life(mob/living/carbon/M)
@@ -187,7 +177,7 @@
toxpwr = 0
taste_description = "sourness"
-/datum/reagent/toxin/mindbreaker/on_mob_life(mob/living/M)
+/datum/reagent/toxin/mindbreaker/on_mob_life(mob/living/carbon/M)
M.hallucination += 5
return ..()
@@ -243,12 +233,10 @@
color = "#9ACD32"
toxpwr = 1
-/datum/reagent/toxin/spore/on_mob_life(mob/living/M)
- if(iscarbon(M))
- var/mob/living/carbon/C = M
- C.damageoverlaytemp = 60
- C.update_damage_hud()
- M.blur_eyes(3)
+/datum/reagent/toxin/spore/on_mob_life(mob/living/carbon/C)
+ C.damageoverlaytemp = 60
+ C.update_damage_hud()
+ C.blur_eyes(3)
return ..()
/datum/reagent/toxin/spore_burning
@@ -259,7 +247,7 @@
toxpwr = 0.5
taste_description = "burning"
-/datum/reagent/toxin/spore_burning/on_mob_life(mob/living/M)
+/datum/reagent/toxin/spore_burning/on_mob_life(mob/living/carbon/M)
M.adjust_fire_stacks(2)
M.IgniteMob()
return ..()
@@ -273,7 +261,7 @@
toxpwr = 0
metabolization_rate = 1.5 * REAGENTS_METABOLISM
-/datum/reagent/toxin/chloralhydrate/on_mob_life(mob/living/M)
+/datum/reagent/toxin/chloralhydrate/on_mob_life(mob/living/carbon/M)
switch(current_cycle)
if(1 to 10)
M.confused += 2
@@ -296,7 +284,7 @@
toxpwr = 0
metabolization_rate = 1.5 * REAGENTS_METABOLISM
-/datum/reagent/toxin/chloralhydratedelayed/on_mob_life(mob/living/M)
+/datum/reagent/toxin/chloralhydratedelayed/on_mob_life(mob/living/carbon/M)
switch(current_cycle)
if(10 to 20)
M.confused += 1
@@ -316,7 +304,7 @@
glass_name = "glass of beer"
glass_desc = "A freezing pint of beer."
-/datum/reagent/toxin/fakebeer/on_mob_life(mob/living/M)
+/datum/reagent/toxin/fakebeer/on_mob_life(mob/living/carbon/M)
switch(current_cycle)
if(1 to 50)
M.Sleeping(40, 0)
@@ -376,7 +364,7 @@
metabolization_rate = 0.125 * REAGENTS_METABOLISM
toxpwr = 0
-/datum/reagent/toxin/polonium/on_mob_life(mob/living/M)
+/datum/reagent/toxin/polonium/on_mob_life(mob/living/carbon/M)
M.radiation += 4
..()
@@ -390,7 +378,7 @@
overdose_threshold = 30
toxpwr = 0
-/datum/reagent/toxin/histamine/on_mob_life(mob/living/M)
+/datum/reagent/toxin/histamine/on_mob_life(mob/living/carbon/M)
if(prob(50))
switch(pick(1, 2, 3, 4))
if(1)
@@ -423,7 +411,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
toxpwr = 1
-/datum/reagent/toxin/formaldehyde/on_mob_life(mob/living/M)
+/datum/reagent/toxin/formaldehyde/on_mob_life(mob/living/carbon/M)
if(prob(5))
holder.add_reagent("histamine", pick(5,15))
holder.remove_reagent("formaldehyde", 1.2)
@@ -439,7 +427,7 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
toxpwr = 0
-/datum/reagent/toxin/venom/on_mob_life(mob/living/M)
+/datum/reagent/toxin/venom/on_mob_life(mob/living/carbon/M)
toxpwr = 0.2*volume
M.adjustBruteLoss((0.3*volume)*REM, 0)
. = 1
@@ -458,14 +446,14 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
toxpwr = 0
-/datum/reagent/toxin/fentanyl/on_mob_life(mob/living/M)
+/datum/reagent/toxin/fentanyl/on_mob_life(mob/living/carbon/M)
M.adjustBrainLoss(3*REM, 150)
- . = 1
if(M.toxloss <= 60)
M.adjustToxLoss(1*REM, 0)
if(current_cycle >= 18)
M.Sleeping(40, 0)
..()
+ return TRUE
/datum/reagent/toxin/cyanide
name = "Cyanide"
@@ -476,7 +464,7 @@
metabolization_rate = 0.125 * REAGENTS_METABOLISM
toxpwr = 1.25
-/datum/reagent/toxin/cyanide/on_mob_life(mob/living/M)
+/datum/reagent/toxin/cyanide/on_mob_life(mob/living/carbon/M)
if(prob(5))
M.losebreath += 1
if(prob(8))
@@ -508,7 +496,7 @@
if(method == TOUCH || method == VAPOR)
M.reagents.add_reagent("itching_powder", reac_volume)
-/datum/reagent/toxin/itching_powder/on_mob_life(mob/living/M)
+/datum/reagent/toxin/itching_powder/on_mob_life(mob/living/carbon/M)
if(prob(15))
to_chat(M, "You scratch at your head.")
M.adjustBruteLoss(0.2*REM, 0)
@@ -536,28 +524,26 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
toxpwr = 2.5
-/datum/reagent/toxin/initropidril/on_mob_life(mob/living/M)
+/datum/reagent/toxin/initropidril/on_mob_life(mob/living/carbon/C)
if(prob(25))
var/picked_option = rand(1,3)
switch(picked_option)
if(1)
- M.Knockdown(60, 0)
- . = 1
+ C.Knockdown(60, 0)
+ . = TRUE
if(2)
- M.losebreath += 10
- M.adjustOxyLoss(rand(5,25), 0)
- . = 1
+ C.losebreath += 10
+ C.adjustOxyLoss(rand(5,25), 0)
+ . = TRUE
if(3)
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(!H.undergoing_cardiac_arrest() && H.can_heartattack())
- H.set_heartattack(TRUE)
- if(H.stat == CONSCIOUS)
- H.visible_message("[H] clutches at [H.p_their()] chest as if [H.p_their()] heart stopped!")
- else
- H.losebreath += 10
- H.adjustOxyLoss(rand(5,25), 0)
- . = 1
+ if(!C.undergoing_cardiac_arrest() && C.can_heartattack())
+ C.set_heartattack(TRUE)
+ if(C.stat == CONSCIOUS)
+ C.visible_message("[C] clutches at [C.p_their()] chest as if [C.p_their()] heart stopped!")
+ else
+ C.losebreath += 10
+ C.adjustOxyLoss(rand(5,25), 0)
+ . = TRUE
return ..() || .
/datum/reagent/toxin/pancuronium
@@ -570,10 +556,10 @@
toxpwr = 0
taste_mult = 0 // undetectable, I guess?
-/datum/reagent/toxin/pancuronium/on_mob_life(mob/living/M)
+/datum/reagent/toxin/pancuronium/on_mob_life(mob/living/carbon/M)
if(current_cycle >= 10)
M.Stun(40, 0)
- . = 1
+ . = TRUE
if(prob(20))
M.losebreath += 4
..()
@@ -587,12 +573,12 @@
metabolization_rate = 0.75 * REAGENTS_METABOLISM
toxpwr = 0
-/datum/reagent/toxin/sodium_thiopental/on_mob_life(mob/living/M)
+/datum/reagent/toxin/sodium_thiopental/on_mob_life(mob/living/carbon/M)
if(current_cycle >= 10)
M.Sleeping(40, 0)
M.adjustStaminaLoss(10*REM, 0)
..()
- . = 1
+ return TRUE
/datum/reagent/toxin/sulfonal
name = "Sulfonal"
@@ -603,7 +589,7 @@
metabolization_rate = 0.125 * REAGENTS_METABOLISM
toxpwr = 0.5
-/datum/reagent/toxin/sulfonal/on_mob_life(mob/living/M)
+/datum/reagent/toxin/sulfonal/on_mob_life(mob/living/carbon/M)
if(current_cycle >= 22)
M.Sleeping(40, 0)
return ..()
@@ -633,7 +619,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
toxpwr = 0
-/datum/reagent/toxin/lipolicide/on_mob_life(mob/living/M)
+/datum/reagent/toxin/lipolicide/on_mob_life(mob/living/carbon/M)
if(M.nutrition <= NUTRITION_LEVEL_STARVING)
M.adjustToxLoss(1*REM, 0)
M.nutrition = max(M.nutrition - 3, 0) // making the chef more valuable, one meme trap at a time
@@ -649,7 +635,7 @@
metabolization_rate = 0.06 * REAGENTS_METABOLISM
toxpwr = 1.75
-/datum/reagent/toxin/coniine/on_mob_life(mob/living/M)
+/datum/reagent/toxin/coniine/on_mob_life(mob/living/carbon/M)
M.losebreath += 5
return ..()
@@ -664,22 +650,20 @@
toxpwr = 0
taste_description = "vomit"
-/datum/reagent/toxin/spewium/on_mob_life(mob/living/M)
+/datum/reagent/toxin/spewium/on_mob_life(mob/living/carbon/C)
.=..()
- if(current_cycle >=11 && prob(min(50,current_cycle)) && ishuman(M))
- var/mob/living/carbon/human/H = M
- H.vomit(10, prob(10), prob(50), rand(0,4), TRUE, prob(30))
- for(var/datum/reagent/toxin/R in M.reagents.reagent_list)
+ if(current_cycle >=11 && prob(min(50,current_cycle)))
+ C.vomit(10, prob(10), prob(50), rand(0,4), TRUE, prob(30))
+ for(var/datum/reagent/toxin/R in C.reagents.reagent_list)
if(R != src)
- H.reagents.remove_reagent(R.id,1)
+ C.reagents.remove_reagent(R.id,1)
-/datum/reagent/toxin/spewium/overdose_process(mob/living/M)
+/datum/reagent/toxin/spewium/overdose_process(mob/living/carbon/C)
. = ..()
- if(current_cycle >=33 && prob(15) && ishuman(M))
- var/mob/living/carbon/human/H = M
- H.spew_organ()
- H.vomit(0, TRUE, TRUE, 4)
- to_chat(H, "You feel something lumpy come up as you vomit.")
+ if(current_cycle >=33 && prob(15))
+ C.spew_organ()
+ C.vomit(0, TRUE, TRUE, 4)
+ to_chat(C, "You feel something lumpy come up as you vomit.")
/datum/reagent/toxin/curare
name = "Curare"
@@ -690,7 +674,7 @@
metabolization_rate = 0.125 * REAGENTS_METABOLISM
toxpwr = 1
-/datum/reagent/toxin/curare/on_mob_life(mob/living/M)
+/datum/reagent/toxin/curare/on_mob_life(mob/living/carbon/M)
if(current_cycle >= 11)
M.Knockdown(60, 0)
M.adjustOxyLoss(1*REM, 0)
@@ -706,7 +690,7 @@
metabolization_rate = 0.2 * REAGENTS_METABOLISM
toxpwr = 0
-/datum/reagent/toxin/heparin/on_mob_life(mob/living/M)
+/datum/reagent/toxin/heparin/on_mob_life(mob/living/carbon/M)
if(ishuman(M))
var/mob/living/carbon/human/H = M
H.bleed_rate = min(H.bleed_rate + 2, 8)
@@ -725,7 +709,7 @@
toxpwr = 0.5
taste_description = "spinning"
-/datum/reagent/toxin/rotatium/on_mob_life(mob/living/M)
+/datum/reagent/toxin/rotatium/on_mob_life(mob/living/carbon/M)
if(M.hud_used)
if(current_cycle >= 20 && current_cycle%20 == 0)
var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
@@ -752,7 +736,7 @@
toxpwr = 0.25
taste_description = "skewing"
-/datum/reagent/toxin/skewium/on_mob_life(mob/living/M)
+/datum/reagent/toxin/skewium/on_mob_life(mob/living/carbon/M)
if(M.hud_used)
if(current_cycle >= 5 && current_cycle % 3 == 0)
var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
@@ -787,7 +771,7 @@
metabolization_rate = 0.08 * REAGENTS_METABOLISM
toxpwr = 0.15
-/datum/reagent/toxin/anacea/on_mob_life(mob/living/M)
+/datum/reagent/toxin/anacea/on_mob_life(mob/living/carbon/M)
var/remove_amt = 5
if(holder.has_reagent("calomel") || holder.has_reagent("pen_acid"))
remove_amt = 0.5
@@ -840,7 +824,7 @@
toxpwr = 2
acidpwr = 42.0
-/datum/reagent/toxin/acid/fluacid/on_mob_life(mob/living/M)
+/datum/reagent/toxin/acid/fluacid/on_mob_life(mob/living/carbon/M)
M.adjustFireLoss(current_cycle/10, 0)
. = 1
..()
@@ -856,7 +840,7 @@
var/actual_toxpwr = 5
var/delay = 30
-/datum/reagent/toxin/delayed/on_mob_life(mob/living/M)
+/datum/reagent/toxin/delayed/on_mob_life(mob/living/carbon/M)
if(current_cycle > delay)
holder.remove_reagent(id, actual_metaboliztion_rate * M.metabolism_efficiency)
M.adjustToxLoss(actual_toxpwr*REM, 0)
diff --git a/code/modules/reagents/chemistry/recipes.dm b/code/modules/reagents/chemistry/recipes.dm
index 51fda371c1..e19d2c20d7 100644
--- a/code/modules/reagents/chemistry/recipes.dm
+++ b/code/modules/reagents/chemistry/recipes.dm
@@ -24,7 +24,7 @@
if(holder && holder.my_atom)
var/atom/A = holder.my_atom
var/turf/T = get_turf(A)
- var/message = "A [reaction_name] reaction has occurred in [get_area_name(T)] [ADMIN_COORDJMP(T)]"
+ var/message = "A [reaction_name] reaction has occurred in [ADMIN_VERBOSEJMP(T)]"
message += " (VV)"
var/mob/M = get(A, /mob)
@@ -34,7 +34,7 @@
message += " - Last Fingerprint: [(A.fingerprintslast ? A.fingerprintslast : "N/A")]"
message_admins(message, 0, 1)
- log_game("[reaction_name] chemical mob spawn reaction occuring at [COORD(T)]([get_area_name(T)]) carried by [key_name(M)] with last fingerprint [A.fingerprintslast? A.fingerprintslast : "N/A"]")
+ log_game("[reaction_name] chemical mob spawn reaction occuring at [AREACOORD(T)] carried by [key_name(M)] with last fingerprint [A.fingerprintslast? A.fingerprintslast : "N/A"]")
playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
index 0fa4ddd479..8b8c009a43 100644
--- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
@@ -6,18 +6,17 @@
/datum/chemical_reaction/reagent_explosion/on_reaction(datum/reagents/holder, created_volume)
var/turf/T = get_turf(holder.my_atom)
- var/area/A = get_area(T)
var/inside_msg
if(ismob(holder.my_atom))
var/mob/M = holder.my_atom
- inside_msg = " inside [key_name_admin(M)]"
+ inside_msg = " inside [ADMIN_LOOKUPFLW(M)]"
var/lastkey = holder.my_atom.fingerprintslast
var/touch_msg = "N/A"
if(lastkey)
var/mob/toucher = get_mob_by_key(lastkey)
touch_msg = "[ADMIN_LOOKUPFLW(toucher)]"
- message_admins("Reagent explosion reaction occurred at [A] [ADMIN_COORDJMP(T)][inside_msg]. Last Fingerprint: [touch_msg].")
- log_game("Reagent explosion reaction occurred at [A] [COORD(T)]. Last Fingerprint: [lastkey ? lastkey : "N/A"]." )
+ message_admins("Reagent explosion reaction occurred at [ADMIN_VERBOSEJMP(T)][inside_msg]. Last Fingerprint: [touch_msg].")
+ log_game("Reagent explosion reaction occurred at [AREACOORD(T)]. Last Fingerprint: [lastkey ? lastkey : "N/A"]." )
var/datum/effect_system/reagents_explosion/e = new()
e.set_up(modifier + round(created_volume/strengthdiv, 1), T, 0, 0)
e.start()
@@ -393,6 +392,7 @@
modifier = -100
mix_message = "The teslium starts to spark as electricity arcs away from it!"
mix_sound = 'sound/machines/defib_zap.ogg'
+ var/tesla_flags = TESLA_MOB_DAMAGE | TESLA_OBJ_DAMAGE | TESLA_MOB_STUN
/datum/chemical_reaction/reagent_explosion/teslium_lightning/on_reaction(datum/reagents/holder, created_volume)
var/T1 = created_volume * 20 //100 units : Zap 3 times, with powers 2000/5000/12000. Tesla revolvers have a power of 10000 for comparison.
@@ -400,15 +400,15 @@
var/T3 = created_volume * 120
sleep(5)
if(created_volume >= 75)
- tesla_zap(holder.my_atom, 7, T1)
+ tesla_zap(holder.my_atom, 7, T1, tesla_flags)
playsound(holder.my_atom, 'sound/machines/defib_zap.ogg', 50, 1)
sleep(15)
if(created_volume >= 40)
- tesla_zap(holder.my_atom, 7, T2)
+ tesla_zap(holder.my_atom, 7, T2, tesla_flags)
playsound(holder.my_atom, 'sound/machines/defib_zap.ogg', 50, 1)
sleep(15)
if(created_volume >= 10) //10 units minimum for lightning, 40 units for secondary blast, 75 units for tertiary blast.
- tesla_zap(holder.my_atom, 7, T3)
+ tesla_zap(holder.my_atom, 7, T3, tesla_flags)
playsound(holder.my_atom, 'sound/machines/defib_zap.ogg', 50, 1)
..()
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index 0ab98a1f99..c68c0a16b0 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -428,14 +428,13 @@
/datum/chemical_reaction/slime/slimeexplosion/on_reaction(datum/reagents/holder)
var/turf/T = get_turf(holder.my_atom)
- var/area/A = get_area(T)
var/lastkey = holder.my_atom.fingerprintslast
var/touch_msg = "N/A"
if(lastkey)
var/mob/toucher = get_mob_by_key(lastkey)
touch_msg = "[ADMIN_LOOKUPFLW(toucher)]."
- message_admins("Slime Explosion reaction started at [A] [ADMIN_COORDJMP(T)]. Last Fingerprint: [touch_msg]")
- log_game("Slime Explosion reaction started at [A] [COORD(T)]. Last Fingerprint: [lastkey ? lastkey : "N/A"].")
+ message_admins("Slime Explosion reaction started at [ADMIN_VERBOSEJMP(T)]. Last Fingerprint: [touch_msg]")
+ log_game("Slime Explosion reaction started at [AREACOORD(T)]. Last Fingerprint: [lastkey ? lastkey : "N/A"].")
T.visible_message("The slime extract begins to vibrate violently !")
addtimer(CALLBACK(src, .proc/boom, holder), 50)
var/obj/item/slime_extract/M = holder.my_atom
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 054fe077c3..4a40addc5d 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -110,9 +110,9 @@
else
if(isturf(target) && reagents.reagent_list.len && thrownby)
- add_logs(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]", "at [target][COORD(target)]")
- log_game("[key_name(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] at [COORD(target)].")
- message_admins("[key_name_admin(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] at [ADMIN_COORDJMP(target)].")
+ add_logs(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]", "in [AREACOORD(target)]")
+ log_game("[key_name(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] in [AREACOORD(target)].")
+ message_admins("[ADMIN_LOOKUPFLW(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] in [ADMIN_VERBOSEJMP(target)].")
visible_message("[src] spills its contents all over [target].")
reagents.reaction(target, TOUCH)
if(QDELETED(src))
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index 561dbf2733..911571a3bd 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -180,7 +180,7 @@ Borg Shaker
recharge_time = 3
accepts_reagent_upgrades = FALSE
- reagent_ids = list("beer", "orangejuice", "grenadine" ,"limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale")
+ reagent_ids = list("beer", "orangejuice", "grenadine", "limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale", "milk", "coffee", "banana", "lemonjuice")
/obj/item/reagent_containers/borghypo/borgshaker/attack(mob/M, mob/user)
return //Can't inject stuff with a shaker, can we? //not with that attitude
@@ -235,7 +235,7 @@ Borg Shaker
recharge_time = 3
accepts_reagent_upgrades = FALSE
- reagent_ids = list("fakebeer")
+ reagent_ids = list("fakebeer", "fernet")
/obj/item/reagent_containers/borghypo/peace
name = "Peace Hypospray"
diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm
index 4b797cbd73..4d737657f8 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/bottle.dm
@@ -226,25 +226,10 @@
desc = "A small bottle of Romerol. The REAL zombie powder."
list_reagents = list("romerol" = 30)
-/obj/item/reagent_containers/glass/bottle/flu_virion
- name = "Flu virion culture bottle"
- desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium."
- spawned_disease = /datum/disease/advance/flu
-
-/obj/item/reagent_containers/glass/bottle/epiglottis_virion
- name = "Epiglottis virion culture bottle"
- desc = "A small bottle. Contains Epiglottis virion culture in synthblood medium."
- spawned_disease = /datum/disease/advance/voice_change
-
-/obj/item/reagent_containers/glass/bottle/liver_enhance_virion
- name = "Liver enhancement virion culture bottle"
- desc = "A small bottle. Contains liver enhancement virion culture in synthblood medium."
- spawned_disease = /datum/disease/advance/heal
-
-/obj/item/reagent_containers/glass/bottle/hallucigen_virion
- name = "Hallucigen virion culture bottle"
- desc = "A small bottle. Contains hallucigen virion culture in synthblood medium."
- spawned_disease = /datum/disease/advance/hallucigen
+/obj/item/reagent_containers/glass/bottle/random_virus
+ name = "Experimental disease culture bottle"
+ desc = "A small bottle. Contains an untested viral culture in synthblood medium."
+ spawned_disease = /datum/disease/advance/random
/obj/item/reagent_containers/glass/bottle/pierrot_throat
name = "Pierrot's Throat culture bottle"
@@ -255,6 +240,11 @@
name = "Rhinovirus culture bottle"
desc = "A small bottle. Contains XY-rhinovirus culture in synthblood medium."
spawned_disease = /datum/disease/advance/cold
+
+/obj/item/reagent_containers/glass/bottle/flu_virion
+ name = "Flu virion culture bottle"
+ desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium."
+ spawned_disease = /datum/disease/advance/flu
/obj/item/reagent_containers/glass/bottle/retrovirus
name = "Retrovirus culture bottle"
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 7dfe095a6d..596973a2c4 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -29,9 +29,9 @@
R += A.id + " ("
R += num2text(A.volume) + "),"
if(isturf(target) && reagents.reagent_list.len && thrownby)
- add_logs(thrownby, target, "splashed [english_list(reagents.reagent_list)]", "at [target][COORD(target)]")
- log_game("[key_name(thrownby)] splashed [english_list(reagents.reagent_list)] at [COORD(target)].")
- message_admins("[key_name_admin(thrownby)] splashed [english_list(reagents.reagent_list)] at [ADMIN_COORDJMP(target)].")
+ add_logs(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]", "in [AREACOORD(target)]")
+ log_game("[key_name(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] in [AREACOORD(target)].")
+ message_admins("[ADMIN_LOOKUPFLW(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] at [ADMIN_VERBOSEJMP(target)].")
reagents.reaction(M, TOUCH)
add_logs(user, M, "splashed", R)
reagents.clear_reagents()
@@ -286,10 +286,16 @@
/obj/item/reagent_containers/glass/bucket/equipped(mob/user, slot)
..()
- if(slot == SLOT_HEAD && reagents.total_volume)
- to_chat(user, "[src]'s contents spill all over you!")
- reagents.reaction(user, TOUCH)
- reagents.clear_reagents()
+ if (slot == SLOT_HEAD)
+ if(reagents.total_volume)
+ to_chat(user, "[src]'s contents spill all over you!")
+ reagents.reaction(user, TOUCH)
+ reagents.clear_reagents()
+ container_type = NONE
+
+/obj/item/reagent_containers/glass/bucket/dropped(mob/user)
+ . = ..()
+ container_type = initial(container_type)
/obj/item/reagent_containers/glass/bucket/equip_to_best_slot(var/mob/M)
if(reagents.total_volume) //If there is water in a bucket, don't quick equip it to the head
diff --git a/code/modules/reagents/reagent_containers/medspray.dm b/code/modules/reagents/reagent_containers/medspray.dm
index 2eae912556..fdb6a60894 100644
--- a/code/modules/reagents/reagent_containers/medspray.dm
+++ b/code/modules/reagents/reagent_containers/medspray.dm
@@ -6,7 +6,7 @@
item_state = "spraycan"
lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
- flags_1 = NOBLUDGEON_1
+ item_flags = NOBLUDGEON
obj_flags = UNIQUE_RENAME
container_type = OPENCONTAINER
slot_flags = ITEM_SLOT_BELT
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index f5d46a240e..d2f840cda3 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -151,10 +151,32 @@
icon_state = "pill18"
list_reagents = list("insulin" = 50)
roundstart = 1
-
+///////////////////////////////////////// this pill is used only in a legion mob drop
/obj/item/reagent_containers/pill/shadowtoxin
name = "black pill"
desc = "I wouldn't eat this if I were you."
icon_state = "pill9"
color = "#454545"
- list_reagents = list("shadowmutationtoxin" = 1)
\ No newline at end of file
+ list_reagents = list("shadowmutationtoxin" = 1)
+//////////////////////////////////////// drugs
+/obj/item/reagent_containers/pill/zoom
+ name = "zoom pill"
+ list_reagents = list("synaptizine" = 10, "nicotine" = 10, "methamphetamine" = 1)
+
+
+/obj/item/reagent_containers/pill/happy
+ name = "happy pill"
+ list_reagents = list("sugar" = 10, "space_drugs" = 10)
+
+
+/obj/item/reagent_containers/pill/lsd
+ name = "hallucinogen pill"
+ list_reagents = list("mushroomhallucinogen" = 15, "mindbreaker" = 15)
+
+
+/obj/item/reagent_containers/pill/aranesp
+ name = "speedy pill"
+ list_reagents = list("aranesp" = 10)
+
+
+
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 9a492d9a33..91a22ff1fb 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -6,7 +6,7 @@
item_state = "cleaner"
lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
- flags_1 = NOBLUDGEON_1
+ item_flags = NOBLUDGEON
container_type = OPENCONTAINER
slot_flags = ITEM_SLOT_BELT
throwforce = 0
@@ -50,16 +50,15 @@
user.changeNext_move(CLICK_CD_RANGE*2)
user.newtonian_move(get_dir(A, user))
var/turf/T = get_turf(src)
- var/area/area = get_area(src)
if(reagents.has_reagent("sacid"))
- message_admins("[ADMIN_LOOKUPFLW(user)] fired sulphuric acid from \a [src] at [area] [ADMIN_COORDJMP(T)].")
- log_game("[key_name(user)] fired sulphuric acid from \a [src] at [area] ([T.x], [T.y], [T.z]).")
+ message_admins("[ADMIN_LOOKUPFLW(user)] fired sulphuric acid from \a [src] at [ADMIN_VERBOSEJMP(T)].")
+ log_game("[key_name(user)] fired sulphuric acid from \a [src] at [AREACOORD(T)].")
if(reagents.has_reagent("facid"))
- message_admins("[ADMIN_LOOKUPFLW(user)] fired Fluacid from \a [src] at [area] [ADMIN_COORDJMP(T)].")
- log_game("[key_name(user)] fired Fluacid from \a [src] at [area] [COORD(T)].")
+ message_admins("[ADMIN_LOOKUPFLW(user)] fired Fluacid from \a [src] at [ADMIN_VERBOSEJMP(T)].")
+ log_game("[key_name(user)] fired Fluacid from \a [src] at [AREACOORD(T)].")
if(reagents.has_reagent("lube"))
- message_admins("[ADMIN_LOOKUPFLW(user)] fired Space lube from \a [src] at [area] [ADMIN_COORDJMP(T)].")
- log_game("[key_name(user)] fired Space lube from \a [src] at [area] [COORD(T)].")
+ message_admins("[ADMIN_LOOKUPFLW(user)] fired Space lube from \a [src] at [ADMIN_VERBOSEJMP(T)].")
+ log_game("[key_name(user)] fired Space lube from \a [src] at [AREACOORD(T)].")
return
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index ddc88301b2..072c1b051f 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -51,6 +51,13 @@
icon_state = "water_high" //I was gonna clean my room...
tank_volume = 100000
+/obj/structure/reagent_dispensers/foamtank
+ name = "firefighting foam tank"
+ desc = "A tank full of firefighting foam."
+ icon_state = "foam"
+ reagent_id = "firefighting_foam"
+ tank_volume = 500
+
/obj/structure/reagent_dispensers/fueltank
name = "fuel tank"
desc = "A tank full of industrial welding fuel. Do not consume."
@@ -78,7 +85,7 @@
..()
if(!QDELETED(src)) //wasn't deleted by the projectile's effects.
if(!P.nodamage && ((P.damage_type == BURN) || (P.damage_type == BRUTE)))
- var/boom_message = "[key_name_admin(P.firer)] triggered a fueltank explosion via projectile."
+ var/boom_message = "[ADMIN_LOOKUPFLW(P.firer)] triggered a fueltank explosion via projectile."
GLOB.bombers += boom_message
message_admins(boom_message)
var/log_message = "triggered a fueltank explosion via projectile."
@@ -102,12 +109,11 @@
W.update_icon()
else
var/turf/T = get_turf(src)
- var/area/A = get_area(T)
user.visible_message("[user] catastrophically fails at refilling [user.p_their()] [W.name]!", "That was stupid of you.")
- var/message_admins = "[key_name_admin(user)] triggered a fueltank explosion via welding tool at [A] [ADMIN_COORDJMP(T)]."
+ var/message_admins = "[ADMIN_LOOKUPFLW(user)] triggered a fueltank explosion via welding tool at [ADMIN_VERBOSEJMP(T)]."
GLOB.bombers += message_admins
message_admins(message_admins)
- var/message_log = "triggered a fueltank explosion via welding tool at [A] [COORD(T)]."
+ var/message_log = "triggered a fueltank explosion via welding tool at [AREACOORD(T)]."
user.log_message(message_log, INDIVIDUAL_ATTACK_LOG)
log_game("[key_name(user)] [message_log]")
log_attack("[key_name(user)] [message_log]")
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 41fbc5092d..8acecf25a1 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -8,7 +8,6 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
icon_state = "conveyor_map"
name = "conveyor belt"
desc = "A conveyor belt."
- anchored = TRUE
layer = BELOW_OPEN_DOOR_LAYER
var/operating = 0 // 1 if running forward, -1 if backwards, 0 if off
var/operable = 1 // true if can operate (no broken segments in this belt run)
@@ -32,7 +31,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
/obj/machinery/conveyor/inverted/Initialize(mapload)
. = ..()
if(mapload && !(dir in GLOB.diagonals))
- log_game("### MAPPING ERROR: [src] at [COORD(src)] spawned without using a diagonal dir. Please replace with a normal version.")
+ log_game("### MAPPING ERROR: [src] at [AREACOORD(src)] spawned without using a diagonal dir. Please replace with a normal version.")
// Auto conveyour is always on unless unpowered
@@ -215,11 +214,12 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
//
/obj/machinery/conveyor_switch
-
name = "conveyor switch"
desc = "A conveyor control switch."
icon = 'icons/obj/recycling.dmi'
icon_state = "switch-off"
+ speed_process = TRUE
+
var/position = 0 // 0 off, -1 reverse, 1 forward
var/last_pos = -1 // last direction setting
var/operated = 1 // true if just operated
@@ -228,11 +228,6 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
var/id = "" // must match conveyor IDs to control them
- anchored = TRUE
- speed_process = TRUE
-
-
-
/obj/machinery/conveyor_switch/Initialize(mapload, newid)
. = ..()
if (newid)
@@ -315,7 +310,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
var/obj/item/conveyor_switch_construct/C = new/obj/item/conveyor_switch_construct(src.loc)
C.id = id
transfer_fingerprints_to(C)
- to_chat(user, "You deattach the conveyor switch.")
+ to_chat(user, "You detach the conveyor switch.")
qdel(src)
/obj/machinery/conveyor_switch/oneway
diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm
index 6defa464b9..737f50859d 100644
--- a/code/modules/recycling/disposal/bin.dm
+++ b/code/modules/recycling/disposal/bin.dm
@@ -4,7 +4,6 @@
/obj/machinery/disposal
icon = 'icons/obj/atmospherics/pipes/disposal.dmi'
- anchored = TRUE
density = TRUE
armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30)
max_integrity = 200
@@ -97,7 +96,7 @@
return
if(user.a_intent != INTENT_HARM)
- if((I.flags_1 & ABSTRACT_1) || !user.temporarilyRemoveItemFromInventory(I))
+ if((I.item_flags & ABSTRACT) || !user.temporarilyRemoveItemFromInventory(I))
return
place_item_in_disposal(I, user)
update_icon()
diff --git a/code/modules/recycling/disposal/construction.dm b/code/modules/recycling/disposal/construction.dm
index 9b0a0dc21e..624d5e0e05 100644
--- a/code/modules/recycling/disposal/construction.dm
+++ b/code/modules/recycling/disposal/construction.dm
@@ -52,7 +52,7 @@
layer = initial(layer)
else if(ispath(pipe_type, /obj/machinery/disposal/bin))
- // Disposal bins recieve special icon treating
+ // Disposal bins receive special icon treating
if(anchored)
icon_state = "disposal"
else
diff --git a/code/modules/recycling/disposal/pipe.dm b/code/modules/recycling/disposal/pipe.dm
index ba089f6fb2..bc073d5e32 100644
--- a/code/modules/recycling/disposal/pipe.dm
+++ b/code/modules/recycling/disposal/pipe.dm
@@ -62,7 +62,7 @@
return dpdir & (~turn(H.dir, 180))
// transfer the holder through this pipe segment
-// overriden for special behaviour
+// overridden for special behaviour
/obj/structure/disposalpipe/proc/transfer(obj/structure/disposalholder/H)
return transfer_to_dir(H, nextdir(H))
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 28609e921d..0a36394bc9 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -423,10 +423,11 @@
/datum/design/healthanalyzer
name = "Health Analyzer"
id = "healthanalyzer"
- build_type = AUTOLATHE
+ build_type = AUTOLATHE | PROTOLATHE
materials = list(MAT_METAL = 500, MAT_GLASS = 50)
build_path = /obj/item/healthanalyzer
category = list("initial", "Medical")
+ departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/pillbottle
name = "Pill Bottle"
@@ -655,7 +656,7 @@
/datum/design/receiver
name = "Modular Receiver"
- id = "reciever"
+ id = "receiver"
build_type = AUTOLATHE
materials = list(MAT_METAL = 15000)
build_path = /obj/item/weaponcrafting/receiver
diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm
index b2d02e9d04..e2d5652a35 100644
--- a/code/modules/research/designs/biogenerator_designs.dm
+++ b/code/modules/research/designs/biogenerator_designs.dm
@@ -113,7 +113,15 @@
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 50)
build_path = /obj/item/stack/sheet/cloth
- category = list("initial","Leather and Cloth")
+ category = list("initial","Organic Materials")
+
+/datum/design/cardboard
+ name = "Sheet of Cardboard"
+ id = "cardboard"
+ build_type = BIOGENERATOR
+ materials = list(MAT_BIOMASS = 25)
+ build_path = /obj/item/stack/sheet/cardboard
+ category = list("initial","Organic Materials")
/datum/design/leather
name = "Sheet of Leather"
@@ -121,7 +129,7 @@
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 150)
build_path = /obj/item/stack/sheet/leather
- category = list("initial","Leather and Cloth")
+ category = list("initial","Organic Materials")
/datum/design/secbelt
name = "Security Belt"
diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm
index 08ffec82ae..0522166f72 100644
--- a/code/modules/research/designs/comp_board_designs.dm
+++ b/code/modules/research/designs/comp_board_designs.dm
@@ -222,6 +222,14 @@
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_CARGO
+/datum/design/board/bounty
+ name = "Computer Design (Bounty Console)"
+ desc = "Allows for the construction of circuit boards used to build a Bounty Console."
+ id = "bounty"
+ build_path = /obj/item/circuitboard/computer/bounty
+ category = list("Computer Boards")
+ departmental_flags = DEPARTMENTAL_FLAG_CARGO
+
/datum/design/board/mining
name = "Computer Design (Outpost Status Display)"
desc = "Allows for the construction of circuit boards used to build an outpost status display console."
diff --git a/code/modules/research/designs/electronics_designs.dm b/code/modules/research/designs/electronics_designs.dm
index 68bfbfc42e..29ed3505d8 100644
--- a/code/modules/research/designs/electronics_designs.dm
+++ b/code/modules/research/designs/electronics_designs.dm
@@ -58,7 +58,7 @@
/datum/design/integrated_printer
name = "Integrated circuit printer"
- desc = "This machine provides all neccesary things for circuitry."
+ desc = "This machine provides all necessary things for circuitry."
id = "icprinter"
build_type = PROTOLATHE
materials = list(MAT_GLASS = 5000, MAT_METAL = 10000)
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index 5771ff9891..89f1eb85b9 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -10,6 +10,22 @@
category = list ("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+/datum/design/board/circulator
+ name = "Machine Design (Circulator Board)"
+ desc = "The circuit board for a circulator."
+ id = "circulator"
+ build_path = /obj/item/circuitboard/machine/circulator
+ category = list ("Engineering Machinery")
+ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/board/teg
+ name = "Machine Design (TEG Board)"
+ desc = "The circuit board for a TEG."
+ id = "teg"
+ build_path = /obj/item/circuitboard/machine/generator
+ category = list ("Engineering Machinery")
+ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
/datum/design/board/announcement_system
name = "Machine Design (Automated Announcement System Board)"
desc = "The circuit board for an automated announcement system."
@@ -122,6 +138,14 @@
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_MEDICAL
category = list ("Medical Machinery")
+/datum/design/board/vr_sleeper
+ name = "Machine Design (VR Sleeper Board)"
+ desc = "The circuit board for a VR sleeper."
+ id = "vr_sleeper"
+ build_path = /obj/item/circuitboard/machine/vr_sleeper
+ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
+ category = list ("Medical Machinery")
+
/datum/design/board/cryotube
name = "Machine Design (Cryotube Board)"
desc = "The circuit board for a cryotube."
@@ -324,7 +348,7 @@
/datum/design/board/processor
name = "Machine Design (Food/Slime Processor Board)"
- desc = "The circuit board for a processing unit. Screwdrive the circuit to switch between food (default) or slime processing."
+ desc = "The circuit board for a processing unit. Screwdriver the circuit to switch between food (default) or slime processing."
id = "processor"
build_path = /obj/item/circuitboard/machine/processor
category = list ("Misc. Machinery")
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index eaa18aaf43..e4ba942c84 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -651,6 +651,15 @@
construction_time = 120
category = list("Cyborg Upgrade Modules")
+/datum/design/borg_transform_clown
+ name = "Cyborg Upgrade (Clown Module)"
+ id = "borg_transform_clown"
+ build_type = MECHFAB
+ build_path = /obj/item/borg/upgrade/transform/clown
+ materials = list(MAT_METAL=10000, MAT_GLASS=15000, MAT_BANANIUM = 1000)
+ construction_time = 120
+ category = list("Cyborg Upgrade Modules")
+
/datum/design/borg_upgrade_selfrepair
name = "Cyborg Upgrade (Self-repair)"
id = "borg_upgrade_selfrepair"
@@ -696,6 +705,24 @@
construction_time = 120
category = list("Cyborg Upgrade Modules")
+/datum/design/borg_upgrade_trashofholding
+ name = "Cyborg Upgrade (Trash Bag of Holding)"
+ id = "borg_upgrade_trashofholding"
+ build_type = MECHFAB
+ build_path = /obj/item/borg/upgrade/tboh
+ materials = list(MAT_METAL=10000, MAT_GOLD=1500, MAT_URANIUM=250, MAT_PLASMA=1500)
+ construction_time = 120
+ category = list("Cyborg Upgrade Modules")
+
+/datum/design/borg_upgrade_advancedmop
+ name = "Cyborg Upgrade (Advanced Mop)"
+ id = "borg_upgrade_advancedmop"
+ build_type = MECHFAB
+ build_path = /obj/item/borg/upgrade/amop
+ materials = list(MAT_METAL=10000, MAT_GLASS=200, MAT_TITANIUM=1000)
+ construction_time = 120
+ category = list("Cyborg Upgrade Modules")
+
/datum/design/borg_upgrade_expand
name = "Cyborg Upgrade (Expand)"
id = "borg_upgrade_expand"
@@ -751,17 +778,6 @@
construction_time = 50
category = list("Misc")
-/datum/design/drone_shell
- name = "Drone Shell"
- desc = "A shell of a maintenance drone, an expendable robot built to perform station repairs."
- id = "drone_shell"
- build_type = MECHFAB | PROTOLATHE
- materials = list(MAT_METAL = 800, MAT_GLASS = 350)
- construction_time=150
- build_path = /obj/item/drone_shell
- category = list("Misc")
- departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
-
/datum/design/synthetic_flash
name = "Flash"
desc = "When a problem arises, SCIENCE is the solution."
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 9df3df3c31..5f1e5ea520 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -200,7 +200,17 @@
materials = list(MAT_METAL = 2000, MAT_SILVER = 1500, MAT_PLASMA = 500, MAT_TITANIUM = 1500)
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
+
+/datum/design/healthanalyzer_advanced
+ name = "advanced health analyzer"
+ desc = "A hand-held body scanner able to distinguish vital signs of the subject with high accuracy."
+ id = "healthanalyzer_advanced"
+ build_path = /obj/item/healthanalyzer/advanced
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 5000, MAT_GLASS = 2500, MAT_SILVER = 2000, MAT_GOLD = 1500)
+ category = list("Medical Designs")
+ departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+
/////////////////////////////////////////
//////////Cybernetic Implants////////////
/////////////////////////////////////////
@@ -283,7 +293,7 @@
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/cyberimp_xray
- name = "X-Ray Eyes"
+ name = "X-ray Eyes"
desc = "These cybernetic eyes will give you X-ray vision. Blinking is futile."
id = "ci-xray"
build_type = PROTOLATHE | MECHFAB
diff --git a/code/modules/research/designs/mining_designs.dm b/code/modules/research/designs/mining_designs.dm
index b2a6c34269..18934d021c 100644
--- a/code/modules/research/designs/mining_designs.dm
+++ b/code/modules/research/designs/mining_designs.dm
@@ -14,7 +14,7 @@
/datum/design/bluespace_pod
name = "Supply Drop Pod Upgrade Disk"
- desc = "Allows the Cargo Express Console to call down the Bluespace Drop Pod, greatly increasing user saftey."//who?
+ desc = "Allows the Cargo Express Console to call down the Bluespace Drop Pod, greatly increasing user safety."//who?
id = "bluespace_pod"//the coder reading this
build_type = PROTOLATHE
materials = list(MAT_GLASS = 1000)
diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm
index b30470036e..e1648559a7 100644
--- a/code/modules/research/designs/power_designs.dm
+++ b/code/modules/research/designs/power_designs.dm
@@ -59,7 +59,7 @@
/datum/design/light_replacer
name = "Light Replacer"
- desc = "A device to automatically replace lights. Refill with working lightbulbs."
+ desc = "A device to automatically replace lights. Refill with working light bulbs."
id = "light_replacer"
build_type = PROTOLATHE
materials = list(MAT_METAL = 1500, MAT_SILVER = 150, MAT_GLASS = 3000)
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 2fcb20a498..0c7b7327fa 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -181,7 +181,7 @@
departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL
/datum/design/xray
- name = "Xray Laser Gun"
+ name = "X-ray Laser Gun"
desc = "Not quite as menacing as it sounds"
id = "xray_laser"
build_type = PROTOLATHE
diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm
index b4ab8872e0..37a83eb04f 100644
--- a/code/modules/research/destructive_analyzer.dm
+++ b/code/modules/research/destructive_analyzer.dm
@@ -79,7 +79,6 @@ Note: Must be placed within 3 tiles of the R&D Console
use_power(250)
if(thing == loaded_item)
loaded_item = null
- update_icon()
var/list/food = thing.GetDeconstructableContents()
for(var/obj/item/innerthing in food)
destroy_item(innerthing, TRUE)
@@ -90,10 +89,13 @@ Note: Must be placed within 3 tiles of the R&D Console
var/obj/item/stack/sheet/S = thing
if(S.amount > 1 && !innermode)
S.amount--
+ loaded_item = S
else
qdel(S)
else
qdel(thing)
+ if (!innermode)
+ update_icon()
return TRUE
/obj/machinery/rnd/destructive_analyzer/proc/user_try_decon_id(id, mob/user)
@@ -104,9 +106,6 @@ Note: Must be placed within 3 tiles of the R&D Console
var/datum/techweb_node/TN = get_techweb_node_by_id(id)
if(!istype(TN))
return FALSE
- var/list/can_boost = techweb_item_boost_check(loaded_item)
- if(isnull(can_boost[id]))
- return FALSE
var/dpath = loaded_item.type
var/list/worths = TN.boost_item_paths[dpath]
var/list/differences = list()
@@ -116,7 +115,7 @@ Note: Must be placed within 3 tiles of the R&D Console
var/value = min(worths[i], TN.research_costs[i]) - used
if(value > 0)
differences[i] = value
- if(!length(differences))
+ if(length(worths) && !length(differences))
return FALSE
var/choice = input("Are you sure you want to destroy [loaded_item] to [!length(worths) ? "reveal [TN.display_name]" : "boost [TN.display_name] by [json_encode(differences)] point\s"]?") in list("Proceed", "Cancel")
if(choice == "Cancel")
@@ -131,7 +130,12 @@ Note: Must be placed within 3 tiles of the R&D Console
var/list/point_value = techweb_item_point_check(loaded_item)
if(linked_console.stored_research.deconstructed_items[loaded_item.type])
point_value = list()
- var/choice = input("Are you sure you want to destroy [loaded_item] for [length(point_value) ? "[json_encode(point_value)] points" : "material reclamation"]?") in list("Proceed", "Cancel")
+ var/user_mode_string = ""
+ if(length(point_value))
+ user_mode_string = " for [json_encode(point_value)] points"
+ else if(loaded_item.materials.len)
+ user_mode_string = " for material reclamation"
+ var/choice = input("Are you sure you want to destroy [loaded_item][user_mode_string]?") in list("Proceed", "Cancel")
if(choice == "Cancel")
return FALSE
if(QDELETED(loaded_item) || QDELETED(linked_console) || !user.Adjacent(linked_console) || QDELETED(src))
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index a0eb2ada49..ccd9872b46 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -19,11 +19,10 @@
#define FAIL 8
/obj/machinery/rnd/experimentor
name = "\improper E.X.P.E.R.I-MENTOR"
- desc = "A \"replacement\" for the deconstructive analyzer with a slight tendency to catastrophically fail."
+ desc = "A \"replacement\" for the destructive analyzer with a slight tendency to catastrophically fail."
icon = 'icons/obj/machines/heavy_lathe.dmi'
icon_state = "h_lathe"
density = TRUE
- anchored = TRUE
use_power = IDLE_POWER_USE
circuit = /obj/item/circuitboard/machine/experimentor
var/recentlyExperimented = 0
@@ -45,7 +44,7 @@
/obj/machinery/rnd/experimentor/proc/SetTypeReactions()
for(var/I in typesof(/obj/item))
- if(istype(I, /obj/item/relic))
+ if(ispath(I, /obj/item/relic))
item_reactions["[I]"] = SCANTYPE_DISCOVER
else
item_reactions["[I]"] = pick(SCANTYPE_POKE,SCANTYPE_IRRADIATE,SCANTYPE_GAS,SCANTYPE_HEAT,SCANTYPE_COLD,SCANTYPE_OBLITERATE)
@@ -53,7 +52,7 @@
if(ispath(I, /obj/item/stock_parts) || ispath(I, /obj/item/grenade/chem_grenade) || ispath(I, /obj/item/kitchen))
var/obj/item/tempCheck = I
if(initial(tempCheck.icon_state) != null) //check it's an actual usable item, in a hacky way
- if(istype(I, /obj/item/grenade/chem_grenade/tuberculosis))
+ if(ispath(I, /obj/item/grenade/chem_grenade/tuberculosis))
continue
valid_items["[I]"] += 15
@@ -250,7 +249,7 @@
var/mob/living/target = locate(/mob/living) in oview(7,src)
if(target)
var/obj/item/throwing = loaded_item
- investigate_log("Experimentor has thrown [loaded_item] at [target]", INVESTIGATE_EXPERIMENTOR)
+ investigate_log("Experimentor has thrown [loaded_item] at [key_name(target)]", INVESTIGATE_EXPERIMENTOR)
ejectItem()
if(throwing)
throwing.throw_at(target, 10, 1)
@@ -372,7 +371,7 @@
throwSmoke(loc)
for(var/mob/living/m in oview(1, src))
m.apply_damage(5, BURN, pick(BODY_ZONE_HEAD,BODY_ZONE_CHEST,BODY_ZONE_PRECISE_GROIN))
- investigate_log("Experimentor has dealt minor burn damage to [m]", INVESTIGATE_EXPERIMENTOR)
+ investigate_log("Experimentor has dealt minor burn damage to [key_name(m)]", INVESTIGATE_EXPERIMENTOR)
ejectItem()
////////////////////////////////////////////////////////////////////////////////////////////////
if(exp == SCANTYPE_COLD)
@@ -513,8 +512,8 @@
/obj/machinery/rnd/experimentor/proc/warn_admins(user, ReactionName)
var/turf/T = get_turf(user)
- message_admins("Experimentor reaction: [ReactionName] generated by [ADMIN_LOOKUPFLW(user)] at [ADMIN_COORDJMP(T)]",0,1)
- log_game("Experimentor reaction: [ReactionName] generated by [key_name(user)] in ([T.x],[T.y],[T.z])")
+ message_admins("Experimentor reaction: [ReactionName] generated by [ADMIN_LOOKUPFLW(user)] at [ADMIN_VERBOSEJMP(T)]")
+ log_game("Experimentor reaction: [ReactionName] generated by [key_name(user)] in [AREACOORD(T)]")
#undef SCANTYPE_POKE
#undef SCANTYPE_IRRADIATE
@@ -659,8 +658,8 @@
//Admin Warning proc for relics
/obj/item/relic/proc/warn_admins(mob/user, RelicType, priority = 1)
var/turf/T = get_turf(src)
- var/log_msg = "[RelicType] relic used by [key_name(user)] in ([T.x],[T.y],[T.z])"
+ var/log_msg = "[RelicType] relic used by [key_name(user)] in [AREACOORD(T)]"
if(priority) //For truly dangerous relics that may need an admin's attention. BWOINK!
- message_admins("[RelicType] relic activated by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(T)]",0,1)
+ message_admins("[RelicType] relic activated by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)]")
log_game(log_msg)
investigate_log(log_msg, "experimentor")
diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm
index 76712dd55e..75ed53e936 100644
--- a/code/modules/research/machinery/_production.dm
+++ b/code/modules/research/machinery/_production.dm
@@ -24,7 +24,7 @@
create_reagents(0)
materials = AddComponent(/datum/component/material_container,
list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC), 0,
- FALSE, list(/obj/item/stack), CALLBACK(src, .proc/is_insertion_ready), CALLBACK(src, .proc/AfterMaterialInsert))
+ TRUE, list(/obj/item/stack), CALLBACK(src, .proc/is_insertion_ready), CALLBACK(src, .proc/AfterMaterialInsert))
materials.precise_insertion = TRUE
RefreshParts()
matching_designs = list()
diff --git a/code/modules/research/machinery/departmental_circuit_imprinter.dm b/code/modules/research/machinery/departmental_circuit_imprinter.dm
index c51288b685..e47bd97494 100644
--- a/code/modules/research/machinery/departmental_circuit_imprinter.dm
+++ b/code/modules/research/machinery/departmental_circuit_imprinter.dm
@@ -1,6 +1,6 @@
/obj/machinery/rnd/production/circuit_imprinter/department
name = "department circuit imprinter"
- desc = "A special circuit imprinter with a built in interface meant for departmental usage, with built in ExoSync recievers allowing it to print designs researched that match its ROM-encoded department type."
+ desc = "A special circuit imprinter with a built in interface meant for departmental usage, with built in ExoSync receivers allowing it to print designs researched that match its ROM-encoded department type."
icon_state = "circuit_imprinter"
container_type = OPENCONTAINER
circuit = /obj/item/circuitboard/machine/circuit_imprinter/department
diff --git a/code/modules/research/machinery/departmental_protolathe.dm b/code/modules/research/machinery/departmental_protolathe.dm
index ddc0b7c749..f91f3282d5 100644
--- a/code/modules/research/machinery/departmental_protolathe.dm
+++ b/code/modules/research/machinery/departmental_protolathe.dm
@@ -1,6 +1,6 @@
/obj/machinery/rnd/production/protolathe/department
name = "department protolathe"
- desc = "A special protolathe with a built in interface meant for departmental usage, with built in ExoSync recievers allowing it to print designs researched that match its ROM-encoded department type."
+ desc = "A special protolathe with a built in interface meant for departmental usage, with built in ExoSync receivers allowing it to print designs researched that match its ROM-encoded department type."
icon_state = "protolathe"
container_type = OPENCONTAINER
circuit = /obj/item/circuitboard/machine/protolathe/department
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 8e99b64239..0ba9312314 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -594,9 +594,9 @@ Nothing else in the console has ID requirements.
l += "This item is worth: [techweb_point_display_generic(point_values)]!"
l += "[RDSCREEN_NOBREAK]"
- var/list/materials = linked_destroy.loaded_item.materials
- if (materials.len)
- l += "
Material Reclamation"
+ if(!(linked_destroy.loaded_item.resistance_flags & INDESTRUCTIBLE))
+ var/list/materials = linked_destroy.loaded_item.materials
+ l += "
[RDSCREEN_NOBREAK]"
@@ -861,7 +861,7 @@ Nothing else in the console has ID requirements.
switch(ls["disconnect"])
if("destroy")
if(QDELETED(linked_destroy))
- say("No Deconstructive Analyzer Linked!")
+ say("No Destructive Analyzer Linked!")
return
linked_destroy.linked_console = null
linked_destroy = null
@@ -887,9 +887,10 @@ Nothing else in the console has ID requirements.
say("Ejecting Technology Disk")
if(ls["deconstruct"])
if(QDELETED(linked_destroy))
- say("No Deconstructive Analyzer Linked!")
+ say("No Destructive Analyzer Linked!")
return
- linked_destroy.user_try_decon_id(ls["deconstruct"], usr)
+ if(!linked_destroy.user_try_decon_id(ls["deconstruct"], usr))
+ say("Destructive analysis failed!")
//Protolathe Materials
if(ls["disposeP"]) //Causes the protolathe to dispose of a single reagent (all of it)
if(QDELETED(linked_lathe))
@@ -995,7 +996,7 @@ Nothing else in the console has ID requirements.
screen = RDSCREEN_DESIGNDISK
if(ls["eject_item"]) //Eject the item inside the destructive analyzer.
if(QDELETED(linked_destroy))
- say("No Deconstructive Analyzer Linked!")
+ say("No Destructive Analyzer Linked!")
return
if(linked_destroy.busy)
to_chat(usr, "The destructive analyzer is busy at the moment.")
diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm
index 47f34a9b15..23d515cf88 100644
--- a/code/modules/research/rdmachines.dm
+++ b/code/modules/research/rdmachines.dm
@@ -6,7 +6,6 @@
name = "R&D Device"
icon = 'icons/obj/machines/research.dmi'
density = TRUE
- anchored = TRUE
use_power = IDLE_POWER_USE
var/busy = FALSE
var/hacked = FALSE
@@ -45,6 +44,9 @@
return
if(default_deconstruction_crowbar(O))
return
+ if(panel_open && is_wire_tool(O))
+ wires.interact(user)
+ return TRUE
if(is_refillable() && O.is_drainable())
return FALSE //inserting reagents into the machine
if(Insert_Item(O, user))
@@ -66,6 +68,7 @@
to_chat(user, "You can't load [src] while it's opened!")
return FALSE
if(disabled)
+ to_chat(user, "The insertion belts of [src] won't engage!")
return FALSE
if(requires_console && !linked_console)
to_chat(user, "[src] must be linked to an R&D console first!")
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index 98da69b646..20e05782ef 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -41,10 +41,12 @@
working = TRUE
/obj/machinery/rnd/server/emp_act()
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
stat |= EMPED
addtimer(CALLBACK(src, .proc/unemp), 600)
refresh_working()
- return ..()
/obj/machinery/rnd/server/proc/unemp()
stat &= ~EMPED
diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm
index 4bd318de21..af004c4701 100644
--- a/code/modules/research/stock_parts.dm
+++ b/code/modules/research/stock_parts.dm
@@ -58,10 +58,8 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
-//Sorts stock parts inside an RPED by their rating.
-//Only use /obj/item/stock_parts/ with this sort proc!
-/proc/cmp_rped_sort(obj/item/stock_parts/A, obj/item/stock_parts/B)
- return B.rating - A.rating
+/proc/cmp_rped_sort(obj/item/A, obj/item/B)
+ return B.get_part_rating() - A.get_part_rating()
/obj/item/stock_parts
name = "stock part"
diff --git a/code/modules/research/techweb/__techweb_helpers.dm b/code/modules/research/techweb/__techweb_helpers.dm
index 1b814ede1d..1e90f0f28d 100644
--- a/code/modules/research/techweb/__techweb_helpers.dm
+++ b/code/modules/research/techweb/__techweb_helpers.dm
@@ -72,43 +72,44 @@
SSresearch.invalid_design_ids[id] = 1
/proc/node_boost_error(id, message)
+ WARNING("Invalid boost information for node \[[id]\]: [message]")
SSresearch.invalid_node_boost[id] = message
/proc/verify_techweb_nodes()
for(var/n in SSresearch.techweb_nodes)
var/datum/techweb_node/N = SSresearch.techweb_nodes[n]
if(!istype(N))
- stack_trace("WARNING: Invalid research node with ID [n] detected and removed.")
+ WARNING("Invalid research node with ID [n] detected and removed.")
SSresearch.techweb_nodes -= n
research_node_id_error(n)
for(var/p in N.prereq_ids)
var/datum/techweb_node/P = SSresearch.techweb_nodes[p]
if(!istype(P))
- stack_trace("WARNING: Invalid research prerequisite node with ID [p] detected in node [N.display_name]\[[N.id]\] removed.")
+ WARNING("Invalid research prerequisite node with ID [p] detected in node [N.display_name]\[[N.id]\] removed.")
N.prereq_ids -= p
research_node_id_error(p)
for(var/d in N.design_ids)
var/datum/design/D = SSresearch.techweb_designs[d]
if(!istype(D))
- stack_trace("WARNING: Invalid research design with ID [d] detected in node [N.display_name]\[[N.id]\] removed.")
+ WARNING("Invalid research design with ID [d] detected in node [N.display_name]\[[N.id]\] removed.")
N.designs -= d
design_id_error(d)
for(var/p in N.prerequisites)
var/datum/techweb_node/P = N.prerequisites[p]
if(!istype(P))
- stack_trace("WARNING: Invalid research prerequisite node with ID [p] detected in node [N.display_name]\[[N.id]\] removed.")
+ WARNING("Invalid research prerequisite node with ID [p] detected in node [N.display_name]\[[N.id]\] removed.")
N.prerequisites -= p
research_node_id_error(p)
for(var/u in N.unlocks)
var/datum/techweb_node/U = N.unlocks[u]
if(!istype(U))
- stack_trace("WARNING: Invalid research unlock node with ID [u] detected in node [N.display_name]\[[N.id]\] removed.")
+ WARNING("Invalid research unlock node with ID [u] detected in node [N.display_name]\[[N.id]\] removed.")
N.unlocks -= u
research_node_id_error(u)
for(var/d in N.designs)
var/datum/design/D = N.designs[d]
if(!istype(D))
- stack_trace("WARNING: Invalid research design with ID [d] detected in node [N.display_name]\[[N.id]\] removed.")
+ WARNING("Invalid research design with ID [d] detected in node [N.display_name]\[[N.id]\] removed.")
N.designs -= d
design_id_error(d)
for(var/p in N.boost_item_paths)
@@ -116,15 +117,15 @@
N.boost_item_paths -= p
node_boost_error(N.id, "[p] is not a valid path.")
var/list/points = N.boost_item_paths[p]
- if(!islist(points))
- N.boost_item_paths -= p
- node_boost_error(N.id, "No valid list.")
- else
+ if(islist(points))
for(var/i in points)
if(!isnum(points[i]))
node_boost_error(N.id, "[points[i]] is not a valid number.")
else if(!SSresearch.point_types[i])
node_boost_error(N.id, "[i] is not a valid point type.")
+ else if(!isnull(points))
+ N.boost_item_paths -= p
+ node_boost_error(N.id, "No valid list.")
CHECK_TICK
/proc/verify_techweb_designs()
diff --git a/code/modules/research/techweb/_techweb.dm b/code/modules/research/techweb/_techweb.dm
index a34476ce1c..7c23609c21 100644
--- a/code/modules/research/techweb/_techweb.dm
+++ b/code/modules/research/techweb/_techweb.dm
@@ -106,19 +106,19 @@
l[i] = amount
modify_point_list(l)
-/datum/techweb/proc/copy_research_to(datum/techweb/reciever, unlock_hidden = TRUE) //Adds any missing research to theirs.
+/datum/techweb/proc/copy_research_to(datum/techweb/receiver, unlock_hidden = TRUE) //Adds any missing research to theirs.
for(var/i in researched_nodes)
CHECK_TICK
- reciever.research_node_id(i, TRUE, FALSE)
+ receiver.research_node_id(i, TRUE, FALSE)
for(var/i in researched_designs)
CHECK_TICK
- reciever.add_design_by_id(i)
+ receiver.add_design_by_id(i)
if(unlock_hidden)
- for(var/i in reciever.hidden_nodes)
+ for(var/i in receiver.hidden_nodes)
CHECK_TICK
if(!hidden_nodes[i])
- reciever.hidden_nodes -= i //We can see it so let them see it too.
- reciever.recalculate_nodes()
+ receiver.hidden_nodes -= i //We can see it so let them see it too.
+ receiver.recalculate_nodes()
/datum/techweb/proc/copy()
var/datum/techweb/returned = new()
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 847519f042..a65ad7de0a 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -18,7 +18,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", "sleeper", "pandemic", "defibmount", "operating", "soda_dispenser", "beer_dispenser")
+ design_ids = list("chem_heater", "chem_master", "chem_dispenser", "sleeper", "vr_sleeper", "pandemic", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -27,7 +27,7 @@
display_name = "Advanced Biotechnology"
description = "Advanced Biotechnology"
prereq_ids = list("biotech")
- design_ids = list("piercesyringe", "smoke_machine", "plasmarefiller", "limbgrower", "defibrillator", "meta_beaker")
+ design_ids = list("piercesyringe", "smoke_machine", "plasmarefiller", "limbgrower", "defibrillator", "meta_beaker", "healthanalyzer_advanced")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -130,7 +130,7 @@
display_name = "Advanced Power Manipulation"
description = "How to get more zap."
prereq_ids = list("engineering")
- design_ids = list("smes", "super_cell", "hyper_cell", "super_capacitor", "superpacman", "mrspacman", "power_turbine", "power_turbine_console", "power_compressor")
+ design_ids = list("smes", "super_cell", "hyper_cell", "super_capacitor", "superpacman", "mrspacman", "power_turbine", "power_turbine_console", "power_compressor", "circulator", "teg")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -198,7 +198,7 @@
display_name = "Basic Robotics Research"
description = "Programmable machines that make our lives lazier."
prereq_ids = list("base")
- design_ids = list("paicard", "drone_shell")
+ design_ids = list("paicard")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -207,7 +207,7 @@
display_name = "Advanced Robotics Research"
description = "It can even do the dishes!"
prereq_ids = list("robotics")
- design_ids = list("borg_upgrade_diamonddrill")
+ design_ids = list("borg_upgrade_diamonddrill", "borg_upgrade_trashofholding", "borg_upgrade_advancedmop")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -320,7 +320,7 @@
description = "Honk?!"
prereq_ids = list("base")
design_ids = list("air_horn", "honker_main", "honker_peri", "honker_targ", "honk_chassis", "honk_head", "honk_torso", "honk_left_arm", "honk_right_arm",
- "honk_left_leg", "honk_right_leg", "mech_banana_mortar", "mech_mousetrap_mortar", "mech_honker", "mech_punching_face", "implant_trombone")
+ "honk_left_leg", "honk_right_leg", "mech_banana_mortar", "mech_mousetrap_mortar", "mech_honker", "mech_punching_face", "implant_trombone", "borg_transform_clown")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
diff --git a/code/modules/research/xenobiology/crossbreeding/_corecross.dm b/code/modules/research/xenobiology/crossbreeding/_corecross.dm
index 45cc0c1efc..43f23d013d 100644
--- a/code/modules/research/xenobiology/crossbreeding/_corecross.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_corecross.dm
@@ -39,7 +39,7 @@ To add a crossbreed:
/obj/item/slimecross/Initialize()
..()
- name = colour + " " + name
+ name = effect + " " + colour + " extract"
var/itemcolor = "#FFFFFF"
switch(colour)
if("orange")
diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
index b100e73bc7..ca334497a7 100644
--- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
@@ -564,6 +564,7 @@ datum/status_effect/stabilized/blue/on_remove()
/datum/status_effect/stabilized/cerulean/on_remove()
if(clone)
clone.visible_message("[clone] dissolves into a puddle of goo!")
+ clone.unequip_everything()
qdel(clone)
/datum/status_effect/stabilized/pyrite
@@ -760,9 +761,18 @@ datum/status_effect/stabilized/blue/on_remove()
var/mob/living/simple_animal/familiar
/datum/status_effect/stabilized/gold/tick()
- if(!familiar)
- familiar = create_random_mob(get_turf(owner.loc), FRIENDLY_SPAWN)
+ var/obj/item/slimecross/stabilized/gold/linked = linked_extract
+ if(QDELETED(familiar))
+ familiar = new linked.mob_type(get_turf(owner.loc))
+ familiar.name = linked.mob_name
familiar.del_on_death = TRUE
+ familiar.copy_known_languages_from(owner, FALSE)
+ if(linked.saved_mind)
+ linked.saved_mind.transfer_to(familiar)
+ familiar.ckey = linked.saved_mind.key
+ else
+ if(familiar.mind)
+ linked.saved_mind = familiar.mind
return ..()
/datum/status_effect/stabilized/gold/on_remove()
diff --git a/code/modules/research/xenobiology/crossbreeding/charged.dm b/code/modules/research/xenobiology/crossbreeding/charged.dm
index 7183ece045..8ae7bf8d54 100644
--- a/code/modules/research/xenobiology/crossbreeding/charged.dm
+++ b/code/modules/research/xenobiology/crossbreeding/charged.dm
@@ -386,6 +386,9 @@ Charged extracts:
if(user == M)
to_chat(user, "You can't drink the love potion. What are you, a narcissist?")
return ..()
+ if(M.has_status_effect(STATUS_EFFECT_INLOVE))
+ to_chat(user, "[M] is already lovestruck!")
+ return ..()
M.visible_message("[user] starts to feed [M] a love potion!",
"[user] starts to feed you a love potion!")
@@ -393,10 +396,11 @@ Charged extracts:
if(!do_after(user, 50, target = M))
return
to_chat(user, "You feed [M] the love potion!")
- to_chat(M, "You develop feelings for [user], and anyone [p_they(user)] like.")
- if(!("[REF(user)]" in M.faction) && M.mind)
- M.mind.store_memory("You have strong feelings for [user].")
+ to_chat(M, "You develop feelings for [user], and anyone [user.p_they()] like.")
+ if(M.mind)
+ M.mind.store_memory("You are in love with [user].")
M.faction |= "[REF(user)]"
+ M.apply_status_effect(STATUS_EFFECT_INLOVE, user)
qdel(src)
/obj/item/slimepotion/peacepotion
diff --git a/code/modules/research/xenobiology/crossbreeding/recurring.dm b/code/modules/research/xenobiology/crossbreeding/recurring.dm
index cc36bbb215..8a6e5c3cbb 100644
--- a/code/modules/research/xenobiology/crossbreeding/recurring.dm
+++ b/code/modules/research/xenobiology/crossbreeding/recurring.dm
@@ -21,6 +21,7 @@ Recurring extracts:
extract.desc = desc
extract.icon = icon
extract.icon_state = icon_state
+ extract.color = color
extract.recurring = TRUE
src.forceMove(extract)
START_PROCESSING(SSobj,src)
diff --git a/code/modules/research/xenobiology/crossbreeding/reproductive.dm b/code/modules/research/xenobiology/crossbreeding/reproductive.dm
index 878e17c1e7..2f6ca9555a 100644
--- a/code/modules/research/xenobiology/crossbreeding/reproductive.dm
+++ b/code/modules/research/xenobiology/crossbreeding/reproductive.dm
@@ -19,7 +19,7 @@ Reproductive extracts:
return
if(istype(O, /obj/item/storage/bag/bio))
var/list/inserted = list()
- O.SendSignal(COMSIG_TRY_STORAGE_TAKE_TYPE, /obj/item/reagent_containers/food/snacks/monkeycube, src, 1, null, null, user, inserted)
+ SEND_SIGNAL(O, COMSIG_TRY_STORAGE_TAKE_TYPE, /obj/item/reagent_containers/food/snacks/monkeycube, src, 1, null, null, user, inserted)
if(inserted.len)
var/obj/item/reagent_containers/food/snacks/monkeycube/M = inserted[1]
if(istype(M))
diff --git a/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm b/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm
index 7bb723bc3d..93e5a8e739 100644
--- a/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm
+++ b/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm
@@ -4,7 +4,7 @@ Self-sustaining extracts:
*/
/obj/item/slimecross/selfsustaining
name = "self-sustaining extract"
- effect = "selfsustaining"
+ effect = "self-sustaining"
icon_state = "selfsustaining"
var/extract_type = /obj/item/slime_extract
@@ -23,6 +23,7 @@ Self-sustaining extracts:
A.extract = X
A.icon = icon
A.icon_state = icon_state
+ A.color = color
qdel(src)
/obj/item/autoslime/Initialize()
diff --git a/code/modules/research/xenobiology/crossbreeding/stabilized.dm b/code/modules/research/xenobiology/crossbreeding/stabilized.dm
index aea4f47576..fe1b498667 100644
--- a/code/modules/research/xenobiology/crossbreeding/stabilized.dm
+++ b/code/modules/research/xenobiology/crossbreeding/stabilized.dm
@@ -96,6 +96,49 @@ Stabilized extracts:
/obj/item/slimecross/stabilized/gold
colour = "gold"
+ var/mob_type
+ var/datum/mind/saved_mind
+ var/mob_name = "Familiar"
+
+/obj/item/slimecross/stabilized/gold/proc/generate_mobtype()
+ var/static/list/mob_spawn_pets = list()
+ if(mob_spawn_pets.len <= 0)
+ for(var/T in typesof(/mob/living/simple_animal))
+ var/mob/living/simple_animal/SA = T
+ switch(initial(SA.gold_core_spawnable))
+ if(FRIENDLY_SPAWN)
+ mob_spawn_pets += T
+ mob_type = pick(mob_spawn_pets)
+
+/obj/item/slimecross/stabilized/gold/Initialize()
+ ..()
+ generate_mobtype()
+
+/obj/item/slimecross/stabilized/gold/attack_self(mob/user)
+ var/choice = input(user, "Which do you want to reset?", "Familiar Adjustment") as null|anything in list("Familiar Location", "Familiar Species", "Familiar Sentience", "Familiar Name")
+ if(!user.canUseTopic(src, BE_CLOSE))
+ return
+ if(isliving(user))
+ var/mob/living/L = user
+ if(L.has_status_effect(/datum/status_effect/stabilized/gold))
+ L.remove_status_effect(/datum/status_effect/stabilized/gold)
+ if(choice == "Familiar Location")
+ to_chat(user, "You prod [src], and it shudders slightly.")
+ START_PROCESSING(SSobj, src)
+ if(choice == "Familiar Species")
+ to_chat(user, "You squeeze [src], and a shape seems to shift around inside.")
+ generate_mobtype()
+ START_PROCESSING(SSobj, src)
+ if(choice == "Familiar Sentience")
+ to_chat(user, "You poke [src], and it lets out a glowing pulse.")
+ saved_mind = null
+ START_PROCESSING(SSobj, src)
+ if(choice == "Familiar Name")
+ var/newname = copytext(sanitize(input(user, "Would you like to change the name of [mob_name]", "Name change", mob_name) as null|text),1,MAX_NAME_LEN)
+ if(newname)
+ mob_name = newname
+ to_chat(user, "You speak softly into [src], and it shakes slightly in response.")
+ START_PROCESSING(SSobj, src)
/obj/item/slimecross/stabilized/oil
colour = "oil"
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index a5998400c8..b8cc61df97 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -702,7 +702,7 @@
imp.implant(SM, user)
SM.access_card = new /obj/item/card/id/syndicate(SM)
- SM.access_card.flags_1 |= NODROP_1
+ SM.access_card.item_flags |= NODROP
/obj/item/slimepotion/transference
name = "consciousness transference potion"
@@ -725,7 +725,11 @@
if(SM.sentience_type != animal_type)
to_chat(user, "You cannot transfer your consciousness to [SM]." )
return ..()
- if(jobban_isbanned(user, ROLE_ALIEN)) //ideally sentience and trasnference potions should be their own unique role.
+ var/jb = jobban_isbanned(user, ROLE_ALIEN)
+ if(QDELETED(src) || QDELETED(M) || QDELETED(user))
+ return
+
+ if(jb) //ideally sentience and trasnference potions should be their own unique role.
to_chat(user, "Your mind goes blank as you attempt to use the potion.")
return
@@ -909,7 +913,7 @@
/obj/item/slimepotion/slime/slimeradio
name = "bluespace radio potion"
- desc = "A strange chemical that grants those who ingest it the ability to broadcast and recieve subscape radio waves."
+ desc = "A strange chemical that grants those who ingest it the ability to broadcast and receive subscape radio waves."
icon = 'icons/obj/chemical.dmi'
icon_state = "potgrey"
diff --git a/code/modules/ruins/lavalandruin_code/surface.dm b/code/modules/ruins/lavalandruin_code/surface.dm
index b2312ded87..72896c08a3 100644
--- a/code/modules/ruins/lavalandruin_code/surface.dm
+++ b/code/modules/ruins/lavalandruin_code/surface.dm
@@ -2,4 +2,21 @@
/obj/item/paper/fluff/stations/lavaland/surface/henderson_report
name = "Important Notice - Mrs. Henderson"
- info = "Nothing of interest to report."
\ No newline at end of file
+ info = "Nothing of interest to report."
+
+//ratvar
+
+/obj/structure/dead_ratvar
+ name = "hulking wreck"
+ desc = "The remains of a monstrous war machine."
+ icon = 'icons/obj/lavaland/dead_ratvar.dmi'
+ icon_state = "dead_ratvar"
+ flags_1 = ON_BORDER_1
+ appearance_flags = 0
+ layer = FLY_LAYER
+ anchored = TRUE
+ density = TRUE
+ bound_width = 416
+ bound_height = 64
+ pixel_y = -10
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
diff --git a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm
index cf45b91dfe..26e5f1a9c0 100644
--- a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm
+++ b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm
@@ -74,6 +74,7 @@
pixel_y = -32
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
opacity = TRUE
+ anchored = TRUE
/obj/structure/opacity_blocker/singularity_pull()
return 0
@@ -176,8 +177,8 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate)
message_admins("Legion took damage while the necropolis gate was closed, and has released itself!")
log_game("Legion took damage while the necropolis gate was closed and released itself.")
else
- message_admins("[user ? key_name_admin(user):"Unknown"] has released Legion!")
- log_game("[user ? key_name(user):"Unknown"] released Legion.")
+ message_admins("[user ? ADMIN_LOOKUPFLW(user):"Unknown"] has released Legion!")
+ log_game("[user ? key_name(user) : "Unknown"] released Legion.")
var/sound/legion_sound = sound('sound/creatures/legion_spawn.ogg')
for(var/mob/M in GLOB.player_list)
diff --git a/code/modules/ruins/spaceruin_code/listeningstation.dm b/code/modules/ruins/spaceruin_code/listeningstation.dm
index ff0bad8257..8efeaaabff 100644
--- a/code/modules/ruins/spaceruin_code/listeningstation.dm
+++ b/code/modules/ruins/spaceruin_code/listeningstation.dm
@@ -32,11 +32,11 @@
/obj/item/paper/fluff/ruins/listeningstation/receipt
name = "receipt"
- info = "1 x Stechtkin pistol - $600 1 x silencer - $200 shipping charge - $4360 total - $5160"
+ info = "1 x Stechkin pistol - $600 1 x silencer - $200 shipping charge - $4360 total - $5160"
/obj/item/paper/fluff/ruins/listeningstation/odd_report
name = "odd report"
- info = "I wonder how much longer they will accept my empty reports. They will cancel the case soon without results. When the pickup comes, I will tell them I have lost faith in our cause, and beg them to consider a diplomatic solution. How many nuclear teams have been dispatched with those nukes? I must try and prevent more from ever being sent. If they will not listen to reason, I will detonate the warehouse myself. Maybe some day in the immediate future, space will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that stabilized your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should it ever rear its ugly head again. -Donk Co. Operative #451"
+ info = "I wonder how much longer they will accept my empty reports. They will cancel the case soon without results. When the pickup comes, I will tell them I have lost faith in our cause, and beg them to consider a diplomatic solution. How many nuclear teams have been dispatched with those nukes? I must try and prevent more from ever being sent. If they will not listen to reason, I will detonate the warehouse myself. Maybe some day in the immediate future, space will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that stabilized your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should it ever rear its ugly head again. -DonkCo Operative #451"
/obj/item/paper/fluff/ruins/listeningstation/briefing
name = "mission briefing"
diff --git a/code/modules/ruins/spaceruin_code/oldstation.dm b/code/modules/ruins/spaceruin_code/oldstation.dm
index d023760061..b216145023 100644
--- a/code/modules/ruins/spaceruin_code/oldstation.dm
+++ b/code/modules/ruins/spaceruin_code/oldstation.dm
@@ -1,7 +1,7 @@
/////////// Oldstation items
/obj/item/paper/fluff/ruins/oldstation
- name = "Cyro Awakening Alert"
+ name = "Cryo Awakening Alert"
info = "**WARNING**
Catastrophic damage sustained to station. Powernet exhausted to reawaken crew.
Immediate Objectives
1: Activate emergency power generator 2: Lift station lockdown on the bridge
Please locate the 'Damage Report' on the bridge for a detailed situation report."
/obj/item/paper/fluff/ruins/oldstation/damagereport
@@ -43,7 +43,7 @@
/obj/item/paper/fluff/ruins/oldstation/report
name = "Crew Reawakening Report"
- info = "Artifical Program's report to surviving crewmembers.
Crew were placed into cryostasis on March 10th, 2445.
Crew were awoken from cryostasis around June, 2557.
\
+ info = "Artificial Program's report to surviving crewmembers.
Crew were placed into cryostasis on March 10th, 2445.
Crew were awoken from cryostasis around June, 2557.
\
SIGNIFICANT EVENTS OF NOTE 1: The primary radiation detectors were taken offline after 112 years due to power failure, secondary radiation detectors showed no residual \
radiation on station. Deduction, primarily detector was malfunctioning and was producing a radiation signal when there was none.
2: A data burst from a nearby Nanotrasen Space \
- Station was recieved, this data burst contained research data that has been uploaded to our RnD labs.
3: Unknown invasion force has occupied Delta station."
+ Station was received, this data burst contained research data that has been uploaded to our RnD labs.
3: Unknown invasion force has occupied Delta station."
diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm
index 15d5abf5e8..162942d1d8 100644
--- a/code/modules/security_levels/keycard_authentication.dm
+++ b/code/modules/security_levels/keycard_authentication.dm
@@ -9,7 +9,6 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
desc = "This device is used to trigger station functions, which require more than one ID card to authenticate."
icon = 'icons/obj/monitors.dmi'
icon_state = "auth_off"
- anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 2
active_power_usage = 6
diff --git a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm
index 5090800ff4..60998215de 100644
--- a/code/modules/shuttle/arrivals.dm
+++ b/code/modules/shuttle/arrivals.dm
@@ -76,8 +76,9 @@
damaged = TRUE
if(console)
console.say("Alert, hull breach detected!")
- var/obj/machinery/announcement_system/announcer = pick(GLOB.announcement_systems)
- announcer.announce("ARRIVALS_BROKEN", channels = list())
+ var/obj/machinery/announcement_system/announcer = safepick(GLOB.announcement_systems)
+ if(!QDELETED(announcer))
+ announcer.announce("ARRIVALS_BROKEN", channels = list())
if(mode != SHUTTLE_CALL)
sound_played = FALSE
mode = SHUTTLE_IDLE
diff --git a/code/modules/shuttle/assault_pod.dm b/code/modules/shuttle/assault_pod.dm
index 84f0ac493d..43b273914c 100644
--- a/code/modules/shuttle/assault_pod.dm
+++ b/code/modules/shuttle/assault_pod.dm
@@ -19,7 +19,7 @@
/obj/item/assault_pod
- name = "Assault Pod Targetting Device"
+ name = "Assault Pod Targeting Device"
icon = 'icons/obj/device.dmi'
icon_state = "gangtool-red"
item_state = "radio"
diff --git a/code/modules/shuttle/docking.dm b/code/modules/shuttle/docking.dm
index c0052845c7..d881396092 100644
--- a/code/modules/shuttle/docking.dm
+++ b/code/modules/shuttle/docking.dm
@@ -16,7 +16,7 @@
// The area that gets placed under where the shuttle moved from
var/underlying_area_type = SHUTTLE_DEFAULT_UNDERLYING_AREA
-
+
if(old_dock) //Dock overwrites
underlying_area_type = old_dock.area_type
@@ -99,13 +99,7 @@
return DOCKING_SUCCESS
-/obj/docking_port/mobile/proc/preflight_check(
- list/old_turfs,
- list/new_turfs,
- list/areas_to_move,
- rotation,
- )
-
+/obj/docking_port/mobile/proc/preflight_check(list/old_turfs, list/new_turfs, list/areas_to_move, rotation)
for(var/i in 1 to old_turfs.len)
CHECK_TICK
var/turf/oldT = old_turfs[i]
@@ -134,16 +128,7 @@
old_turfs[oldT] = move_mode
-/obj/docking_port/mobile/proc/takeoff(
- list/old_turfs,
- list/new_turfs,
- list/moved_atoms,
- rotation,
- movement_direction,
- old_dock,
- area/underlying_old_area,
- )
-
+/obj/docking_port/mobile/proc/takeoff(list/old_turfs, list/new_turfs, list/moved_atoms, rotation, movement_direction, old_dock, area/underlying_old_area)
for(var/i in 1 to old_turfs.len)
var/turf/oldT = old_turfs[i]
var/turf/newT = new_turfs[i]
@@ -163,17 +148,7 @@
var/area/shuttle_area = oldT.loc
shuttle_area.onShuttleMove(oldT, newT, underlying_old_area) //areas
-/obj/docking_port/mobile/proc/cleanup_runway(
- obj/docking_port/stationary/new_dock,
- list/old_turfs,
- list/new_turfs,
- list/areas_to_move,
- list/moved_atoms,
- rotation,
- movement_direction,
- area/underlying_old_area,
- )
-
+/obj/docking_port/mobile/proc/cleanup_runway(obj/docking_port/stationary/new_dock, list/old_turfs, list/new_turfs, list/areas_to_move, list/moved_atoms, rotation, movement_direction, area/underlying_old_area)
underlying_old_area.afterShuttleMove()
// Parallax handling
@@ -202,14 +177,28 @@
var/turf/oldT = moved_atoms[moved_object]
moved_object.afterShuttleMove(oldT, movement_force, dir, preferred_direction, movement_direction, rotation)//atoms
+ // lateShuttleMove (There had better be a really good reason for additional stages beyond this)
+
+ underlying_old_area.lateShuttleMove()
+
+ for(var/i in 1 to areas_to_move.len)
+ CHECK_TICK
+ var/area/internal_area = areas_to_move[i]
+ internal_area.lateShuttleMove()
+
for(var/i in 1 to old_turfs.len)
CHECK_TICK
- // Objects can block air so either turf or content changes means an air update is needed
if(!(old_turfs[old_turfs[i]] & MOVE_CONTENTS | MOVE_TURF))
continue
var/turf/oldT = old_turfs[i]
var/turf/newT = new_turfs[i]
- oldT.blocks_air = initial(oldT.blocks_air)
- oldT.air_update_turf(TRUE)
- newT.blocks_air = initial(newT.blocks_air)
- newT.air_update_turf(TRUE)
\ No newline at end of file
+ newT.lateShuttleMove(oldT)
+
+ for(var/i in 1 to moved_atoms.len)
+ CHECK_TICK
+ var/atom/movable/moved_object = moved_atoms[i]
+ if(QDELETED(moved_object))
+ continue
+ var/turf/oldT = moved_atoms[moved_object]
+ moved_object.lateShuttleMove(oldT, movement_force, movement_direction)
+
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 1f262b285c..20b8c26d83 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -104,7 +104,7 @@
authorized += ID
- message_admins("[ADMIN_LOOKUPFLW(user)] has authorized early shuttle launch", 0, 1)
+ message_admins("[ADMIN_LOOKUPFLW(user)] has authorized early shuttle launch")
log_game("[key_name(user)] has authorized early shuttle launch in [COORD(src)]")
// Now check if we're on our way
. = TRUE
@@ -143,12 +143,8 @@
return
var/time = TIME_LEFT
- message_admins("[key_name_admin(user.client)] \
- (?) \
- (FLW) \
- has emagged the emergency shuttle [time] seconds before launch.", 0, 1)
- log_game("[key_name(user)] has emagged the emergency shuttle in \
- [COORD(src)] [time] seconds before launch.")
+ message_admins("[ADMIN_LOOKUPFLW(user.client)] has emagged the emergency shuttle [time] seconds before launch.")
+ log_game("[key_name(user)] has emagged the emergency shuttle in [COORD(src)] [time] seconds before launch.")
obj_flags |= EMAGGED
SSshuttle.emergency.movement_force = list("KNOCKDOWN" = 60, "THROW" = 20)//YOUR PUNY SEATBELTS can SAVE YOU NOW, MORTAL
var/datum/species/S = new
@@ -267,6 +263,14 @@
return has_people
+/obj/docking_port/mobile/emergency/proc/ShuttleDBStuff()
+ set waitfor = FALSE
+ if(!SSdbcore.Connect())
+ return
+ var/datum/DBQuery/query_round_shuttle_name = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET shuttle_name = '[name]' WHERE id = [GLOB.round_id]")
+ query_round_shuttle_name.Execute()
+ qdel(query_round_shuttle_name)
+
/obj/docking_port/mobile/emergency/check()
if(!timer)
return
@@ -297,9 +301,7 @@
setTimer(SSshuttle.emergencyDockTime)
send2irc("Server", "The Emergency Shuttle has docked with the station.")
priority_announce("The Emergency Shuttle has docked with the station. You have [timeLeft(600)] minutes to board the Emergency Shuttle.", null, 'sound/ai/shuttledock.ogg', "Priority")
- if(SSdbcore.Connect())
- var/datum/DBQuery/query_round_shuttle_name = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET shuttle_name = '[name]' WHERE id = [GLOB.round_id]")
- query_round_shuttle_name.Execute()
+ ShuttleDBStuff()
if(SHUTTLE_DOCKED)
@@ -415,14 +417,15 @@
/obj/docking_port/mobile/pod/request()
var/obj/machinery/computer/shuttle/S = getControlConsole()
-
- if(GLOB.security_level == SEC_LEVEL_RED || GLOB.security_level == SEC_LEVEL_DELTA || (S && (S.obj_flags & EMAGGED)))
+ if(!istype(S, /obj/machinery/computer/shuttle/pod))
+ return ..()
+ if(GLOB.security_level >= SEC_LEVEL_RED || (S && (S.obj_flags & EMAGGED)))
if(launch_status == UNLAUNCHED)
launch_status = EARLY_LAUNCHED
return ..()
else
to_chat(usr, "Escape pods will only launch during \"Code Red\" security alert.")
- return 1
+ return TRUE
/obj/docking_port/mobile/pod/Initialize()
. = ..()
@@ -535,13 +538,24 @@
new /obj/item/storage/toolbox/emergency(src)
/obj/item/storage/pod/attackby(obj/item/W, mob/user, params)
- return
+ if (can_interact(user))
+ return ..()
+
+/obj/item/storage/pod/attack_hand(mob/user)
+ if (can_interact(user))
+ SEND_SIGNAL(src, COMSIG_TRY_STORAGE_SHOW, user)
+ return TRUE
/obj/item/storage/pod/MouseDrop(over_object, src_location, over_location)
+ if(can_interact(usr))
+ return ..()
+
+/obj/item/storage/pod/can_interact(mob/user)
+ if(!..())
+ return FALSE
if(GLOB.security_level == SEC_LEVEL_RED || GLOB.security_level == SEC_LEVEL_DELTA || unlocked)
- . = ..()
- else
- to_chat(usr, "The storage unit will only unlock during a Red or Delta security alert.")
+ return TRUE
+ to_chat(user, "The storage unit will only unlock during a Red or Delta security alert.")
/obj/docking_port/mobile/emergency/backup
name = "backup shuttle"
diff --git a/code/modules/shuttle/ferry.dm b/code/modules/shuttle/ferry.dm
index f2d56686e0..eaa1f36b75 100644
--- a/code/modules/shuttle/ferry.dm
+++ b/code/modules/shuttle/ferry.dm
@@ -36,5 +36,5 @@
if(last_request && (last_request + cooldown > world.time))
return
last_request = world.time
- to_chat(usr, "Your request has been recieved by CentCom.")
+ to_chat(usr, "Your request has been received by CentCom.")
to_chat(GLOB.admins, "FERRY: [ADMIN_LOOKUPFLW(usr)] (Move Ferry) is requesting to move the transport ferry to CentCom.")
diff --git a/code/modules/shuttle/manipulator.dm b/code/modules/shuttle/manipulator.dm
index 1d8732cda9..ee12d7cf37 100644
--- a/code/modules/shuttle/manipulator.dm
+++ b/code/modules/shuttle/manipulator.dm
@@ -9,7 +9,6 @@
icon = 'icons/obj/machines/shuttle_manipulator.dmi'
icon_state = "holograph_on"
- anchored = TRUE
density = TRUE
// UI state variables
@@ -156,8 +155,7 @@
if(M.id == params["id"] && M.timer && M.timeLeft() >= 50)
M.setTimer(50)
. = TRUE
- message_admins("[key_name_admin(usr)] fast travelled \
- [M]")
+ message_admins("[key_name_admin(usr)] fast travelled [M]")
log_admin("[key_name(usr)] fast travelled [M]")
SSblackbox.record_feedback("text", "shuttle_manipulator", 1, "[M.name]")
break
@@ -182,10 +180,8 @@
var/obj/docking_port/mobile/mdp = action_load(S)
if(mdp)
user.forceMove(get_turf(mdp))
- message_admins("[key_name_admin(usr)] loaded [mdp] \
- with the shuttle manipulator.")
- log_admin("[key_name(usr)] loaded [mdp] with the \
- shuttle manipulator.")
+ message_admins("[key_name_admin(usr)] loaded [mdp] with the shuttle manipulator.")
+ log_admin("[key_name(usr)] loaded [mdp] with the shuttle manipulator.")
SSblackbox.record_feedback("text", "shuttle_manipulator", 1, "[mdp.name]")
update_icon()
@@ -228,7 +224,11 @@
if(existing_shuttle)
existing_shuttle.jumpToNullSpace()
+ var/list/force_memory = preview_shuttle.movement_force
+ preview_shuttle.movement_force = list("KNOCKDOWN" = 0, "THROW" = 0)
preview_shuttle.initiate_docking(D)
+ preview_shuttle.movement_force = force_memory
+
. = preview_shuttle
// Shuttle state involves a mode and a timer based on world.time, so
@@ -279,7 +279,7 @@
if(istype(P, /obj/docking_port/stationary))
log_world("Map warning: Shuttle Template [S.mappath] has a stationary docking port.")
if(!found)
- var/msg = "load_template(): Shuttle Template [S.mappath] has no mobile docking port. Aborting import."
+ var/msg = "load_template(): Shuttle Template [S.mappath] has no mobile docking port. Aborting import."
for(var/T in affected)
var/turf/T0 = T
T0.empty()
diff --git a/code/modules/shuttle/monastery.dm b/code/modules/shuttle/monastery.dm
new file mode 100644
index 0000000000..b04c202dca
--- /dev/null
+++ b/code/modules/shuttle/monastery.dm
@@ -0,0 +1,7 @@
+/obj/machinery/computer/shuttle/monastery_shuttle
+ name = "monastery shuttle console"
+ desc = "Used to control the monastery shuttle."
+ circuit = /obj/item/circuitboard/computer/monastery_shuttle
+ shuttleId = "pod1"
+ possible_destinations = "monastery_shuttle_asteroid;monastery_shuttle_station"
+ no_destination_swap = TRUE
diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm
index 29c0de1b27..c58b3eee7b 100644
--- a/code/modules/shuttle/navigation_computer.dm
+++ b/code/modules/shuttle/navigation_computer.dm
@@ -31,6 +31,9 @@
if(jammed)
to_chat(user, "The Syndicate is jamming the console!")
return
+ if(!shuttle_port)
+ to_chat(user,"Warning: Shuttle connection severed!")
+ return
return ..()
/obj/machinery/computer/camera_advanced/shuttle_docker/GrantActions(mob/living/user)
diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index bce22d05cf..9767334166 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -53,7 +53,7 @@ All ShuttleMove procs go here
if(!shuttle_boundary)
CRASH("A turf queued to move via shuttle somehow had no skipover in baseturfs. [src]([type]):[loc]")
var/depth = baseturfs.len - shuttle_boundary + 1
- newT.CopyOnTop(src, 1, depth)
+ newT.CopyOnTop(src, 1, depth, TRUE)
//Air stuff
newT.blocks_air = TRUE
newT.air_update_turf(TRUE)
@@ -78,6 +78,13 @@ All ShuttleMove procs go here
return TRUE
+/turf/proc/lateShuttleMove(turf/oldT)
+ blocks_air = initial(blocks_air)
+ air_update_turf(TRUE)
+ oldT.blocks_air = initial(oldT.blocks_air)
+ oldT.air_update_turf(TRUE)
+
+
/////////////////////////////////////////////////////////////////////////////////////
// Called on every atom in shuttle turf contents before anything has been moved
@@ -91,9 +98,8 @@ All ShuttleMove procs go here
if(newT == oldT) // In case of in place shuttle rotation shenanigans.
return
- if(locs && locs.len > 1) // This is for multi tile objects
- if(loc != oldT)
- return
+ if(loc != oldT) // This is for multi tile objects
+ return
loc = newT
@@ -111,12 +117,22 @@ All ShuttleMove procs go here
if(rotation)
shuttleRotate(rotation)
-
-
update_parallax_contents()
return TRUE
+/atom/movable/proc/lateShuttleMove(turf/oldT, list/movement_force, move_dir)
+ if(!movement_force || anchored)
+ return
+ var/throw_force = movement_force["THROW"]
+ if(!throw_force)
+ return
+ var/turf/target = get_edge_target_turf(src, move_dir)
+ var/range = throw_force * 10
+ range = CEILING(rand(range-(range*0.1), range+(range*0.1)), 10)/10
+ var/speed = range/5
+ throw_at(target, range, speed)
+
/////////////////////////////////////////////////////////////////////////////////////
// Called on areas before anything has been moved
@@ -149,6 +165,9 @@ All ShuttleMove procs go here
parallax_movedir = new_parallax_dir
return TRUE
+/area/proc/lateShuttleMove()
+ return
+
/************************************Turf move procs************************************/
/************************************Area move procs************************************/
@@ -204,11 +223,6 @@ All ShuttleMove procs go here
on = TRUE
update_list()
-/obj/machinery/thruster/beforeShuttleMove(turf/newT, rotation, move_mode, obj/docking_port/mobile/moving_dock)
- . = ..()
- if(. & MOVE_AREA)
- . |= MOVE_CONTENTS
-
/obj/machinery/atmospherics/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
var/missing_nodes = FALSE
@@ -270,8 +284,11 @@ All ShuttleMove procs go here
/obj/item/storage/pod/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
- unlocked = TRUE
- // If the pod was launched, the storage will always open.
+ // If the pod was launched, the storage will always open. The CentCom check
+ // ignores the movement of the shuttle from the staging area on CentCom to
+ // the station as it is loaded in.
+ if (oldT && !is_centcom_level(oldT.z))
+ unlocked = TRUE
/************************************Mob move procs************************************/
@@ -290,17 +307,16 @@ All ShuttleMove procs go here
shake_force *= 0.25
shake_camera(src, shake_force, 1)
-/mob/living/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+/mob/living/lateShuttleMove(turf/oldT, list/movement_force, move_dir)
+ if(buckled)
+ return
+
. = ..()
- if(movement_force && !buckled)
- if(movement_force["THROW"])
- var/throw_dir = move_dir
- var/turf/target = get_edge_target_turf(src, throw_dir)
- var/range = movement_force["THROW"]
- var/speed = range/5
- src.throw_at(target, range, speed)
- if(movement_force["KNOCKDOWN"])
- Knockdown(movement_force["KNOCKDOWN"])
+
+ var/knockdown = movement_force["KNOCKDOWN"]
+ if(knockdown)
+ Knockdown(knockdown)
+
/mob/living/simple_animal/hostile/megafauna/onShuttleMove(turf/newT, turf/oldT, list/movement_force, move_dir, obj/docking_port/stationary/old_dock, obj/docking_port/mobile/moving_dock)
. = ..()
@@ -333,6 +349,21 @@ All ShuttleMove procs go here
if(. & MOVE_AREA)
. |= MOVE_CONTENTS
+/obj/structure/ladder/beforeShuttleMove(turf/newT, rotation, move_mode, obj/docking_port/mobile/moving_dock)
+ . = ..()
+ if (!(resistance_flags & INDESTRUCTIBLE))
+ disconnect()
+
+/obj/structure/ladder/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+ . = ..()
+ if (!(resistance_flags & INDESTRUCTIBLE))
+ LateInitialize()
+
+/obj/structure/ladder/onShuttleMove(turf/newT, turf/oldT, list/movement_force, move_dir, obj/docking_port/stationary/old_dock, obj/docking_port/mobile/moving_dock)
+ if (resistance_flags & INDESTRUCTIBLE)
+ // simply don't be moved
+ return FALSE
+ return ..()
/************************************Misc move procs************************************/
diff --git a/code/modules/shuttle/ripple.dm b/code/modules/shuttle/ripple.dm
index 06675c39a3..4bf6eac0eb 100644
--- a/code/modules/shuttle/ripple.dm
+++ b/code/modules/shuttle/ripple.dm
@@ -1,4 +1,4 @@
-/obj/effect/temp_visual/ripple
+/obj/effect/abstract/ripple
name = "hyperspace ripple"
desc = "Something is coming through hyperspace, you can see the \
visual disturbances. It's probably best not to be on top of these \
@@ -11,12 +11,10 @@
mouse_opacity = MOUSE_OPACITY_ICON
alpha = 0
- duration = 3 * SHUTTLE_RIPPLE_TIME
-
-/obj/effect/temp_visual/ripple/Initialize(mapload, time_left)
+/obj/effect/abstract/ripple/Initialize(mapload, time_left)
. = ..()
animate(src, alpha=255, time=time_left)
addtimer(CALLBACK(src, .proc/stop_animation), 8, TIMER_CLIENT_TIME)
-/obj/effect/temp_visual/ripple/proc/stop_animation()
+/obj/effect/abstract/ripple/proc/stop_animation()
icon_state = "medi_holo_no_anim"
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index a687fa5bbe..32c186023b 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -202,7 +202,7 @@
/obj/docking_port/stationary/transit
name = "In Transit"
- var/list/turf/assigned_turfs = list()
+ var/datum/turf_reservation/reserved_area
var/area/shuttle/transit/assigned_area
var/obj/docking_port/mobile/owner
@@ -210,14 +210,6 @@
. = ..()
SSshuttle.transit += src
-/obj/docking_port/stationary/transit/proc/dezone()
- for(var/i in 1 to assigned_turfs.len)
- var/turf/T = assigned_turfs[i]
- if(istype(T, /turf/open/space/transit))
- T.ChangeTurf(/turf/open/space)
- T.assemble_baseturfs(initial(T.baseturfs))
- T.flags_1 |= UNUSED_TRANSIT_TURF_1
-
/obj/docking_port/stationary/transit/Destroy(force=FALSE)
if(force)
if(get_docked())
@@ -227,11 +219,10 @@
if(owner.assigned_transit == src)
owner.assigned_transit = null
owner = null
- if(assigned_turfs)
- dezone()
- assigned_turfs.Cut()
- assigned_turfs = null
- . = ..()
+ if(!QDELETED(reserved_area))
+ qdel(reserved_area)
+ reserved_area = null
+ return ..()
/obj/docking_port/mobile
name = "shuttle"
@@ -282,8 +273,9 @@
SSshuttle.mobile -= src
destination = null
previous = null
- assigned_transit = null
+ QDEL_NULL(assigned_transit) //don't need it where we're goin'!
shuttle_areas = null
+ remove_ripples()
. = ..()
/obj/docking_port/mobile/Initialize(mapload)
@@ -432,7 +424,7 @@
underlying_area_type = current_dock.area_type
var/list/old_turfs = return_ordered_turfs(x, y, z, dir)
-
+
var/area/underlying_area
for(var/i in GLOB.sortedAreas)
var/area/place = i
@@ -450,7 +442,7 @@
underlying_area.contents += oldT
oldT.change_area(old_area, underlying_area)
oldT.empty(FALSE)
-
+
// Here we locate the bottomost shuttle boundary and remove all turfs above it
var/list/baseturf_cache = oldT.baseturfs
for(var/k in 1 to length(baseturf_cache))
@@ -463,12 +455,10 @@
/obj/docking_port/mobile/proc/create_ripples(obj/docking_port/stationary/S1, animate_time)
var/list/turfs = ripple_area(S1)
for(var/t in turfs)
- ripples += new /obj/effect/temp_visual/ripple(t, animate_time)
+ ripples += new /obj/effect/abstract/ripple(t, animate_time)
/obj/docking_port/mobile/proc/remove_ripples()
- for(var/R in ripples)
- qdel(R)
- ripples.Cut()
+ QDEL_LIST(ripples)
/obj/docking_port/mobile/proc/ripple_area(obj/docking_port/stationary/S1)
var/list/L0 = return_ordered_turfs(x, y, z, dir)
@@ -478,13 +468,14 @@
for(var/i in 1 to L0.len)
var/turf/T0 = L0[i]
- if(!T0 || !istype(T0.loc, area_type))
- continue
var/turf/T1 = L1[i]
- if(!T1)
- continue
- if(T0.type != T0.baseturfs)
- ripple_turfs += T1
+ if(!T0 || !T1)
+ continue // out of bounds
+ if(T0.type == T0.baseturfs)
+ continue // indestructible
+ if(!istype(T0.loc, area_type) || istype(T0.loc, /area/shuttle/transit))
+ continue // not part of the shuttle
+ ripple_turfs += T1
return ripple_turfs
diff --git a/code/modules/shuttle/shuttle_rotate.dm b/code/modules/shuttle/shuttle_rotate.dm
index cc69fb5d15..a2159a50fd 100644
--- a/code/modules/shuttle/shuttle_rotate.dm
+++ b/code/modules/shuttle/shuttle_rotate.dm
@@ -25,7 +25,7 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
pixel_x = oldPY
pixel_y = (oldPX*(-1))
- SendSignal(COMSIG_ATOM_ROTATE, rotation, params)
+ SEND_SIGNAL(src, COMSIG_ATOM_ROTATE, rotation, params)
/************************************Turf rotate procs************************************/
diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm
index a5a15b3d30..0f005f69f7 100644
--- a/code/modules/shuttle/special.dm
+++ b/code/modules/shuttle/special.dm
@@ -136,7 +136,6 @@
/mob/living/simple_animal/drone/snowflake/bardrone
name = "Bardrone"
desc = "A barkeeping drone, an indestructible robot built to tend bars."
- seeStatic = FALSE
hacked = TRUE
laws = "1. Serve drinks.\n\
2. Talk to patrons.\n\
@@ -166,7 +165,7 @@
var/datum/job/captain/C = new /datum/job/captain
access_card.access = C.get_access()
access_card.access |= ACCESS_CENT_BAR
- access_card.flags_1 |= NODROP_1
+ access_card.item_flags |= NODROP
/mob/living/simple_animal/hostile/alien/maid/barmaid/Destroy()
qdel(access_card)
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index 75bac53d17..6f2997a078 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -13,7 +13,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
/obj/machinery/clonepod,
/obj/effect/mob_spawn,
/obj/effect/hierophant,
- /obj/structure/recieving_pad,
+ /obj/structure/receiving_pad,
/obj/effect/clockwork/spatial_gateway,
/obj/structure/destructible/clockwork/powered/clockwork_obelisk,
/obj/item/warp_cube,
@@ -35,6 +35,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
width = 12
dwidth = 5
height = 7
+ movement_force = list("KNOCKDOWN" = 0, "THROW" = 0)
// When TRUE, these vars allow exporting emagged/contraband items, and add some special interactions to existing exports.
var/contraband = FALSE
@@ -102,7 +103,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
SSblackbox.record_feedback("nested tally", "cargo_imports", 1, list("[SO.pack.cost]", "[SO.pack.name]"))
investigate_log("Order #[SO.id] ([SO.pack.name], placed by [key_name(SO.orderer_ckey)]) has shipped.", INVESTIGATE_CARGO)
if(SO.pack.dangerous)
- message_admins("\A [SO.pack.name] ordered by [key_name_admin(SO.orderer_ckey)] has shipped.")
+ message_admins("\A [SO.pack.name] ordered by [ADMIN_LOOKUPFLW(SO.orderer_ckey)] has shipped.")
purchases++
investigate_log("[purchases] orders in this shipment, worth [value] credits. [SSshuttle.points] credits left.", INVESTIGATE_CARGO)
@@ -114,18 +115,25 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
setupExports()
var/msg = ""
+ var/matched_bounty = FALSE
var/sold_atoms = ""
for(var/place in shuttle_areas)
var/area/shuttle/shuttle_area = place
for(var/atom/movable/AM in shuttle_area)
- if(AM.anchored || iscameramob(AM))
+ if(iscameramob(AM))
continue
- sold_atoms += export_item_and_contents(AM, contraband, emagged, dry_run = FALSE)
+ if(bounty_ship_item_and_contents(AM, dry_run = FALSE))
+ matched_bounty = TRUE
+ if(!AM.anchored || istype(AM, /obj/mecha))
+ sold_atoms += export_item_and_contents(AM, contraband, emagged, dry_run = FALSE)
if(sold_atoms)
sold_atoms += "."
+ if(matched_bounty)
+ msg += "Bounty items received. An update has been sent to all bounty consoles. "
+
for(var/a in GLOB.exports_list)
var/datum/export/E = a
var/export_text = E.total_printout()
diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm
index 89e513fd60..4e6ef7ed9b 100644
--- a/code/modules/spells/spell.dm
+++ b/code/modules/spells/spell.dm
@@ -68,27 +68,19 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
return
user.ranged_ability = src
user.click_intercept = src
- add_mousepointer(user.client)
+ user.update_mouse_pointer()
ranged_ability_user = user
if(msg)
to_chat(ranged_ability_user, msg)
active = TRUE
update_icon()
-/obj/effect/proc_holder/proc/add_mousepointer(client/C)
- if(C && ranged_mousepointer && C.mouse_pointer_icon == initial(C.mouse_pointer_icon))
- C.mouse_pointer_icon = ranged_mousepointer
-
-/obj/effect/proc_holder/proc/remove_mousepointer(client/C)
- if(C && ranged_mousepointer && C.mouse_pointer_icon == ranged_mousepointer)
- C.mouse_pointer_icon = initial(C.mouse_pointer_icon)
-
/obj/effect/proc_holder/proc/remove_ranged_ability(msg)
if(!ranged_ability_user || !ranged_ability_user.client || (ranged_ability_user.ranged_ability && ranged_ability_user.ranged_ability != src)) //To avoid removing the wrong ability
return
ranged_ability_user.ranged_ability = null
ranged_ability_user.click_intercept = null
- remove_mousepointer(ranged_ability_user.client)
+ ranged_ability_user.update_mouse_pointer()
if(msg)
to_chat(ranged_ability_user, msg)
ranged_ability_user = null
@@ -381,7 +373,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
if("unconscious")
target.AdjustUnconscious(amount)
else
- target.vars[type] += amount //I bear no responsibility for the runtimes that'll happen if you try to adjust non-numeric or even non-existant vars
+ target.vars[type] += amount //I bear no responsibility for the runtimes that'll happen if you try to adjust non-numeric or even non-existent vars
/obj/effect/proc_holder/spell/targeted //can mean aoe for mobs (limited/unlimited number) or one target mob
var/max_targets = 1 //leave 0 for unlimited targets in range, 1 for one selectable target in range, more for limited number of casts (can all target one guy, depends on target_ignore_prev) in range
diff --git a/code/modules/spells/spell_types/aimed.dm b/code/modules/spells/spell_types/aimed.dm
index 6c860fda9b..35f9a8f50a 100644
--- a/code/modules/spells/spell_types/aimed.dm
+++ b/code/modules/spells/spell_types/aimed.dm
@@ -29,7 +29,7 @@
remove_ranged_ability(msg)
on_deactivation(user)
else
- msg = "[active_msg]Left-click to shoot it at a target!"
+ msg = "[active_msg] Left-click to shoot it at a target!"
current_amount = projectile_amount
add_ranged_ability(user, msg, TRUE)
on_activation(user)
@@ -101,7 +101,7 @@
base_icon_state = "lightning"
sound = 'sound/magic/lightningbolt.ogg'
active = FALSE
- projectile_var_overrides = list("tesla_range" = 15, "tesla_power" = 20000, "tesla_boom" = FALSE)
+ projectile_var_overrides = list("tesla_range" = 15, "tesla_power" = 20000, "tesla_flags" = TESLA_MOB_DAMAGE)
active_msg = "You energize your hand with arcane lightning!"
deactive_msg = "You let the energy flow out of your hands back into yourself..."
projectile_type = /obj/item/projectile/magic/aoe/lightning
diff --git a/code/modules/spells/spell_types/barnyard.dm b/code/modules/spells/spell_types/barnyard.dm
index 70b33919b7..01b24fef98 100644
--- a/code/modules/spells/spell_types/barnyard.dm
+++ b/code/modules/spells/spell_types/barnyard.dm
@@ -44,7 +44,7 @@
var/choice = masks[randM]
var/obj/item/clothing/mask/magichead = new choice
- magichead.flags_1 |= NODROP_1
+ magichead.item_flags |= NODROP
magichead.flags_inv = null
target.visible_message("[target]'s face bursts into flames, and a barnyard animal's head takes its place!", \
"Your face burns up, and shortly after the fire you realise you have the face of a barnyard animal!")
diff --git a/code/modules/spells/spell_types/conjure.dm b/code/modules/spells/spell_types/conjure.dm
index 18bfb54935..3ebded7487 100644
--- a/code/modules/spells/spell_types/conjure.dm
+++ b/code/modules/spells/spell_types/conjure.dm
@@ -38,7 +38,7 @@
for(var/varName in newVars)
if(varName in newVars)
summoned_object.vv_edit_var(varName, newVars[varName])
- summoned_object.admin_spawned = TRUE
+ summoned_object.flags_1 |= ADMIN_SPAWNED_1
if(summon_lifespan)
QDEL_IN(summoned_object, summon_lifespan)
diff --git a/code/modules/spells/spell_types/construct_spells.dm b/code/modules/spells/spell_types/construct_spells.dm
index ff71ad8e68..8e1957f524 100644
--- a/code/modules/spells/spell_types/construct_spells.dm
+++ b/code/modules/spells/spell_types/construct_spells.dm
@@ -220,7 +220,7 @@
/obj/effect/proc_holder/spell/targeted/dominate
name = "Dominate"
- desc = "This spell dominates the mind of a lesser creature, causing it to see you as an ally."
+ desc = "This spell dominates the mind of a lesser creature to the will of Nar'sie, allying it only to her direct followers."
charge_max = 600
range = 7
diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm
index bf402b7a6a..27cfc9208b 100644
--- a/code/modules/spells/spell_types/godhand.dm
+++ b/code/modules/spells/spell_types/godhand.dm
@@ -7,7 +7,7 @@
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "syndballoon"
item_state = null
- flags_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1
+ item_flags = NEEDS_PERMIT | ABSTRACT | NODROP | DROPDEL
w_class = WEIGHT_CLASS_HUGE
force = 0
throwforce = 0
@@ -60,10 +60,7 @@
target.visible_message("[target]'s [A] glows brightly as it wards off the spell!")
user.visible_message("The feedback blows [user]'s arm off!","The spell bounces from [M]'s skin back into your arm!")
user.flash_act()
- var/obj/item/bodypart/part
- var/index = user.get_held_index_of_item(src)
- if(index)
- part = user.hand_bodyparts[index]
+ var/obj/item/bodypart/part = user.get_holding_bodypart_of_item(src)
if(part)
part.dismember()
..()
diff --git a/code/modules/spells/spell_types/lichdom.dm b/code/modules/spells/spell_types/lichdom.dm
index 33b555ad21..d88ee7fb22 100644
--- a/code/modules/spells/spell_types/lichdom.dm
+++ b/code/modules/spells/spell_types/lichdom.dm
@@ -31,10 +31,10 @@
var/obj/item/marked_item
- for(var/obj/item in hand_items)
+ for(var/obj/item/item in hand_items)
// I ensouled the nuke disk once. But it's probably a really
// mean tactic, so probably should discourage it.
- if((item.flags_1 & ABSTRACT_1) || (item.flags_1 & NODROP_1) || item.SendSignal(COMSIG_ITEM_IMBUE_SOUL, user))
+ if((item.item_flags & ABSTRACT) || (item.item_flags & NODROP) || SEND_SIGNAL(item, COMSIG_ITEM_IMBUE_SOUL, user))
continue
marked_item = item
to_chat(M, "You begin to focus your very being into [item]...")
diff --git a/code/modules/spells/spell_types/mime.dm b/code/modules/spells/spell_types/mime.dm
index 2b904df277..e3177dbb4f 100644
--- a/code/modules/spells/spell_types/mime.dm
+++ b/code/modules/spells/spell_types/mime.dm
@@ -58,9 +58,9 @@
H.mind.miming=!H.mind.miming
if(H.mind.miming)
to_chat(H, "You make a vow of silence.")
- H.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "vow")
+ SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "vow")
else
- H.SendSignal(COMSIG_ADD_MOOD_EVENT, "vow", /datum/mood_event/broken_vow)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "vow", /datum/mood_event/broken_vow)
to_chat(H, "You break your vow of silence.")
// These spells can only be gotten from the "Guide for Advanced Mimery series" for Mime Traitors.
@@ -131,17 +131,26 @@
/obj/item/book/granter/spell/mimery_blockade
spell = /obj/effect/proc_holder/spell/targeted/forcewall/mime
- spellname = ""
+ spellname = "Invisible Blockade"
name = "Guide to Advanced Mimery Vol 1"
desc = "The pages don't make any sound when turned."
icon_state ="bookmime"
remarks = list("...")
+/obj/item/book/granter/spell/mimery_blockade/attack_self(mob/user)
+ ..()
+ if(!locate(/obj/effect/proc_holder/spell/targeted/mime/speak) in user.mind.spell_list)
+ user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mime/speak)
/obj/item/book/granter/spell/mimery_guns
spell = /obj/effect/proc_holder/spell/aimed/finger_guns
- spellname = ""
+ spellname = "Finger Guns"
name = "Guide to Advanced Mimery Vol 2"
desc = "There aren't any words written..."
icon_state ="bookmime"
remarks = list("...")
+
+/obj/item/book/granter/spell/mimery_guns/attack_self(mob/user)
+ ..()
+ if(!locate(/obj/effect/proc_holder/spell/targeted/mime/speak) in user.mind.spell_list)
+ user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mime/speak)
\ No newline at end of file
diff --git a/code/modules/spells/spell_types/rightandwrong.dm b/code/modules/spells/spell_types/rightandwrong.dm
index 61048e9cbd..414aa10933 100644
--- a/code/modules/spells/spell_types/rightandwrong.dm
+++ b/code/modules/spells/spell_types/rightandwrong.dm
@@ -137,7 +137,7 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE)
/proc/rightandwrong(summon_type, mob/user, survivor_probability)
if(user) //in this case either someone holding a spellbook or a badmin
to_chat(user, "You summoned [summon_type]!")
- message_admins("[key_name_admin(user, 1)] summoned [summon_type]!")
+ message_admins("[key_name_admin(user, TRUE)] summoned [summon_type]!")
log_game("[key_name(user)] summoned [summon_type]!")
if(summon_type == SUMMON_MAGIC)
@@ -148,6 +148,9 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE)
CRASH("Bad summon_type given: [summon_type]")
for(var/mob/living/carbon/human/H in GLOB.player_list)
+ var/turf/T = get_turf(H)
+ if(T && is_away_level(T.z))
+ continue
if(summon_type == SUMMON_MAGIC)
give_magic(H)
else
diff --git a/code/modules/spells/spell_types/summonitem.dm b/code/modules/spells/spell_types/summonitem.dm
index bd5099da68..0bb79eba21 100644
--- a/code/modules/spells/spell_types/summonitem.dm
+++ b/code/modules/spells/spell_types/summonitem.dm
@@ -22,10 +22,10 @@
if(!marked_item) //linking item to the spell
message = ""
- for(var/obj/item in hand_items)
- if(item.flags_1 & ABSTRACT_1)
+ for(var/obj/item/item in hand_items)
+ if(item.item_flags & ABSTRACT)
continue
- if(item.flags_1 & NODROP_1)
+ if(item.item_flags & NODROP)
message += "Though it feels redundant, "
marked_item = item
message += "You mark [item] for recall."
@@ -83,7 +83,7 @@
to_chat(C, "The [item_to_retrieve] that was embedded in your [L] has mysteriously vanished. How fortunate!")
if(!C.has_embedded_objects())
C.clear_alert("embeddedobject")
- C.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "embedded")
+ SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "embedded")
break
else
diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm
index 9e56e94d74..be2c4f92bd 100644
--- a/code/modules/station_goals/bsa.dm
+++ b/code/modules/station_goals/bsa.dm
@@ -185,7 +185,7 @@
T.ex_act(EXPLODE_DEVASTATE)
point.Beam(get_target_turf(),icon_state="bsa_beam",time=50,maxdistance = world.maxx) //ZZZAP
- message_admins("[key_name_admin(user)] has launched an artillery strike.")
+ message_admins("[ADMIN_LOOKUPFLW(user)] has launched an artillery strike.")
explosion(bullseye,ex_power,ex_power*2,ex_power*4)
reload()
diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm
index 9be68103c3..0601ff28e1 100644
--- a/code/modules/station_goals/dna_vault.dm
+++ b/code/modules/station_goals/dna_vault.dm
@@ -67,7 +67,7 @@
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
icon_state = "hypo"
- flags_1 = NOBLUDGEON_1
+ item_flags = NOBLUDGEON
var/list/animals = list()
var/list/plants = list()
var/list/dna = list()
diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm
index 9c92ac4bd5..44746e595e 100644
--- a/code/modules/station_goals/shield.dm
+++ b/code/modules/station_goals/shield.dm
@@ -87,10 +87,11 @@
desc = ""
icon = 'icons/obj/machines/satellite.dmi'
icon_state = "sat_inactive"
- var/mode = "NTPROBEV0.8"
- var/active = FALSE
+ anchored = FALSE
density = TRUE
use_power = FALSE
+ var/mode = "NTPROBEV0.8"
+ var/active = FALSE
var/static/gid = 0
var/id = 0
diff --git a/code/modules/stock_market/stockmarket.dm b/code/modules/stock_market/stockmarket.dm
deleted file mode 100644
index 9a00cfce05..0000000000
--- a/code/modules/stock_market/stockmarket.dm
+++ /dev/null
@@ -1,171 +0,0 @@
-
-
-/datum/stockMarket
- var/list/stocks = list()
- var/list/balances = list()
- var/list/last_read = list()
- var/list/stockBrokers = list()
- var/list/logs = list()
-
-/datum/stockMarket/New()
- ..()
- generateBrokers()
- generateStocks()
- START_PROCESSING(SSobj, src)
-
-/datum/stockMarket/proc/balanceLog(var/whose, var/net)
- if (!(whose in balances))
- balances[whose] = net
- else
- balances[whose] += net
-/datum/stockMarket/proc/generateBrokers()
- stockBrokers = list()
- var/list/fnames = list("Goldman", "Edward", "James", "Luis", "Alexander", "Walter", "Eugene", "Mary", "Morgan", "Jane", "Elizabeth", "Xavier", "Hayden", "Samuel", "Lee")
- var/list/names = list("Johnson", "Rothschild", "Sachs", "Stanley", "Hepburn", "Brown", "McColl", "Fischer", "Edwards", "Becker", "Witter", "Walker", "Lambert", "Smith", "Montgomery", "Lynch", "Roosevelt", "Lehman")
- var/list/locations = list("Earth", "Luna", "Mars", "Saturn", "Jupiter", "Uranus", "Pluto", "Europa", "Io", "Phobos", "Deimos", "Space", "Venus", "Neptune", "Mercury", "Kalliope", "Ganymede", "Callisto", "Amalthea", "Himalia", "Sybil", "Basil", "Badger", "Terry", "Artyom")
- var/list/first = list("The", "First", "Premier", "Finest", "Prime")
- var/list/company = list("Investments", "Securities", "Corporation", "Bank", "Brokerage", "& Co.", "Brothers", "& Sons", "Investement Firm", "Union", "Partners", "Capital", "Trade", "Holdings")
- for(var/i in 1 to 5)
- var/pname = ""
- switch (rand(1,5))
- if (1)
- pname = "[prob(10) ? pick(first) + " " : null][pick(names)] [pick(company)]"
- if (2)
- pname = "[pick(names)] & [pick(names)][prob(25) ? " " + pick(company) : null]"
- if (3)
- pname = "[prob(45) ? pick(first) + " " : null][pick(locations)] [pick(company)]"
- if (4)
- pname = "[prob(10) ? "The " : null][pick(names)] [pick(locations)] [pick(company)]"
- if (5)
- pname = "[prob(10) ? "The " : null][pick(fnames)] [pick(names)][prob(10) ? " " + pick(company) : null]"
- if (pname in stockBrokers)
- i--
- continue
- stockBrokers += pname
-
-/datum/stockMarket/proc/generateDesignation(var/name)
- if (length(name) <= 4)
- return uppertext(name)
- var/list/w = splittext(name, " ")
- if (w.len >= 2)
- var/d = ""
- for(var/i in 1 to min(5, w.len))
- d += uppertext(ascii2text(text2ascii(w[i], 1)))
- return d
- else
- var/d = uppertext(ascii2text(text2ascii(name, 1)))
- for(var/i in 2 to length(name))
- if (prob(100 / i))
- d += uppertext(ascii2text(text2ascii(name, i)))
- return d
-
-/datum/stockMarket/proc/generateStocks(var/amt = 15)
- var/list/fruits = list("Banana", "Mimana", "Watermelon", "Ambrosia", "Pomegranate", "Reishi", "Papaya", "Mango", "Tomato", "Conkerberry", "Wood", "Lychee", "Mandarin", "Harebell", "Pumpkin", "Rhubarb", "Tamarillo", "Yantok", "Ziziphus", "Oranges", "Gatfruit", "Daisy", "Kudzu")
- var/list/tech_prefix = list("Nano", "Cyber", "Funk", "Astro", "Fusion", "Tera", "Exo", "Star", "Virtual", "Plasma", "Robust", "Bit", "Future", "Hugbox", "Carbon", "Nerf", "Buff", "Nova", "Space", "Meta", "Cyber")
- var/list/tech_short = list("soft", "tech", "prog", "tec", "tek", "ware", "", "gadgets", "nics", "tric", "trasen", "tronic", "coin")
- var/list/random_nouns = list("Johnson", "Cluwne", "General", "Specific", "Master", "King", "Queen", "Table", "Rupture", "Dynamic", "Massive", "Mega", "Giga", "Certain", "Singulo", "State", "National", "International", "Interplanetary", "Sector", "Planet", "Burn", "Robust", "Exotic", "Solar", "Lunar", "Chelp", "Corgi", "Lag", "Lizard")
- var/list/company = list("Company", "Factory", "Incorporated", "Industries", "Group", "Consolidated", "GmbH", "LLC", "Ltd", "Inc.", "Association", "Limited", "Software", "Technology", "Programming", "IT Group", "Electronics", "Nanotechnology", "Farms", "Stores", "Mobile", "Motors", "Electric", "Designs", "Energy", "Pharmaceuticals", "Communications", "Wholesale", "Holding", "Health", "Machines", "Astrotech", "Gadgets", "Kinetics")
- for (var/i = 1, i <= amt, i++)
- var/datum/stock/S = new
- var/sname = ""
- switch (rand(1,6))
- if(1)
- while (sname == "" || sname == "FAG") // honestly it's a 0.6% chance per round this happens - or once in 166 rounds - so i'm accounting for it before someone yells at me
- sname = "[consonant()][vowel()][consonant()]"
- if (2)
- sname = "[pick(tech_prefix)][pick(tech_short)][prob(20) ? " " + pick(company) : null]"
- if (3 to 4)
- var/fruit = pick(fruits)
- fruits -= fruit
- sname = "[prob(10) ? "The " : null][fruit][prob(40) ? " " + pick(company): null]"
- if (5 to 6)
- var/pname = pick(random_nouns)
- random_nouns -= pname
- switch (rand(1,3))
- if (1)
- sname = "[pname] & [pname]"
- if (2)
- sname = "[pname] [pick(company)]"
- if (3)
- sname = "[pname]"
- S.name = sname
- S.short_name = generateDesignation(S.name)
- S.current_value = rand(10, 125)
- var/dv = rand(10, 40) / 10
- S.fluctuational_coefficient = prob(50) ? (1 / dv) : dv
- S.average_optimism = rand(-10, 10) / 100
- S.optimism = S.average_optimism + (rand(-40, 40) / 100)
- S.current_trend = rand(-200, 200) / 10
- S.last_trend = S.current_trend
- S.disp_value_change = rand(-1, 1)
- S.speculation = rand(-20, 20)
- S.average_shares = round(rand(500, 10000) / 10)
- S.outside_shareholders = rand(1000, 30000)
- S.available_shares = rand(200000, 800000)
- S.fluctuation_rate = rand(6, 20)
- S.generateIndustry()
- S.generateEvents()
- stocks += S
- last_read[S] = list()
-
-/datum/stockMarket/process()
- for (var/stock in stocks)
- var/datum/stock/S = stock
- S.process()
-
-/datum/stockMarket/proc/add_log(var/log_type, var/user, var/company_name, var/stocks, var/shareprice, var/money)
- var/datum/stock_log/L = new log_type
- L.user_name = user
- L.company_name = company_name
- L.stocks = stocks
- L.shareprice = shareprice
- L.money = money
- L.time = time2text(world.timeofday, "hh:mm")
- logs += L
-
-GLOBAL_DATUM_INIT(stockExchange, /datum/stockMarket, new)
-
-/proc/plotBarGraph(var/list/points, var/base_text, var/width=400, var/height=400)
- var/output = "
"
- if (points.len && height > 20 && width > 20)
- var/min = points[1]
- var/max = points[1]
- for (var/v in points)
- if (v < min)
- min = v
- if (v > max)
- max = v
- var/cells = (height - 20) / 20
- if (cells > round(cells))
- cells = round(cells) + 1
- var/diff = max - min
- var/ost = diff / cells
- if (min > 0)
- min = max(min - ost, 0)
- diff = max - min
- ost = diff / cells
- var/cval = max
- var/cwid = width / (points.len + 1)
- for (var/y = cells, y > 0, y--)
- if (y == cells)
- output += "
"
- else
- output += "
"
- for (var/x = 0, x <= points.len, x++)
- if (x == 0)
- output += "
[round(cval - ost)]
"
- else
- var/v = points[x]
- if (v >= cval)
- output += "
"
- else
- output += "
"
- output += "
"
- cval -= ost
- output += "
[base_text]
"
- else
- output += "
"
- output += "
[base_text]
"
-
- return "[output]
"
-
diff --git a/code/modules/surgery/advanced/brainwashing.dm b/code/modules/surgery/advanced/brainwashing.dm
index 0c67b8267d..03215aa6d6 100644
--- a/code/modules/surgery/advanced/brainwashing.dm
+++ b/code/modules/surgery/advanced/brainwashing.dm
@@ -46,7 +46,7 @@
user.visible_message("[user] successfully brainwashes [target]!", "You succeed in brainwashing [target].")
to_chat(target, "A new compulsion fills your mind... you feel forced to obey it!")
brainwash(target, objective)
- message_admins("[key_name_admin(user)] surgically brainwashed [key_name_admin(target)] with the objective '[objective]'.")
+ message_admins("[ADMIN_LOOKUPFLW(user)] surgically brainwashed [ADMIN_LOOKUPFLW(target)] with the objective '[objective]'.")
log_game("[key_name(user)] surgically brainwashed [key_name(target)] with the objective '[objective]'.")
return TRUE
diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
index aa0b714cc8..87e13955fe 100644
--- a/code/modules/surgery/bodyparts/dismemberment.dm
+++ b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -19,7 +19,7 @@
affecting.receive_damage(CLAMP(brute_dam/2, 15, 50), CLAMP(burn_dam/2, 0, 50)) //Damage the chest based on limb's existing damage
C.visible_message("[C]'s [src.name] has been violently dismembered!")
C.emote("scream")
- C.SendSignal(COMSIG_ADD_MOOD_EVENT, "dismembered", /datum/mood_event/dismembered)
+ SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "dismembered", /datum/mood_event/dismembered)
drop_limb()
if(dam_type == BURN)
@@ -102,7 +102,7 @@
I.forceMove(src)
if(!C.has_embedded_objects())
C.clear_alert("embeddedobject")
- C.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "embedded")
+ SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "embedded")
if(!special)
if(C.dna)
@@ -199,7 +199,7 @@
/obj/item/bodypart/r_leg/drop_limb(special)
if(owner && !special)
if(owner.legcuffed)
- owner.legcuffed.forceMove(drop_location())
+ owner.legcuffed.forceMove(owner.drop_location()) //At this point bodypart is still in nullspace
owner.legcuffed.dropped(owner)
owner.legcuffed = null
owner.update_inv_legcuffed()
@@ -210,7 +210,7 @@
/obj/item/bodypart/l_leg/drop_limb(special) //copypasta
if(owner && !special)
if(owner.legcuffed)
- owner.legcuffed.forceMove(drop_location())
+ owner.legcuffed.forceMove(owner.drop_location())
owner.legcuffed.dropped(owner)
owner.legcuffed = null
owner.update_inv_legcuffed()
diff --git a/code/modules/surgery/bodyparts/helpers.dm b/code/modules/surgery/bodyparts/helpers.dm
index 12531a9ee5..91336331c4 100644
--- a/code/modules/surgery/bodyparts/helpers.dm
+++ b/code/modules/surgery/bodyparts/helpers.dm
@@ -121,7 +121,7 @@
I.forceMove(T)
clear_alert("embeddedobject")
- SendSignal(COMSIG_CLEAR_MOOD_EVENT, "embedded")
+ SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "embedded")
/mob/living/carbon/proc/has_embedded_objects()
. = 0
diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm
index fe4f1a6edf..e57f8f686b 100644
--- a/code/modules/surgery/cavity_implant.dm
+++ b/code/modules/surgery/cavity_implant.dm
@@ -29,9 +29,13 @@
/datum/surgery_step/handle_cavity/success(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/bodypart/chest/CH = target.get_bodypart(BODY_ZONE_CHEST)
if(tool)
- if(IC || tool.w_class > WEIGHT_CLASS_NORMAL || (tool.flags_1 & NODROP_1) || istype(tool, /obj/item/organ))
+ if(IC || tool.w_class > WEIGHT_CLASS_NORMAL || (tool.item_flags & NODROP) || istype(tool, /obj/item/organ))
to_chat(user, "You can't seem to fit [tool] in [target]'s [target_zone]!")
return 0
+ var/obj/item/electronic_assembly/EA = tool
+ if(istype(EA) && EA.combat_circuits && tool.w_class > WEIGHT_CLASS_SMALL)
+ to_chat(user, "[tool] is too dangerous to put in [target]'s [target_zone]! Maybe if it was smaller...")
+ return 0
else
user.visible_message("[user] stuffs [tool] into [target]'s [target_zone]!", "You stuff [tool] into [target]'s [target_zone].")
user.transferItemToLoc(tool, target, TRUE)
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index 5c442c1369..ea2385ce5f 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -56,11 +56,13 @@
..()
/obj/item/organ/cyberimp/arm/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
if(prob(15/severity) && owner)
to_chat(owner, "[src] is hit by EMP!")
// give the owner an idea about why his implant is glitching
Retract()
- ..()
/obj/item/organ/cyberimp/arm/proc/Retract()
if(!holder || (holder in src))
@@ -84,7 +86,7 @@
holder = item
- holder.flags_1 |= NODROP_1
+ holder.item_flags |= NODROP
holder.resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
holder.slot_flags = null
holder.materials = null
@@ -134,6 +136,9 @@
/obj/item/organ/cyberimp/arm/gun/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
if(prob(30/severity) && owner && !crit_fail)
Retract()
owner.visible_message("A loud bang comes from [owner]\'s [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm!")
@@ -143,8 +148,6 @@
owner.IgniteMob()
owner.adjustFireLoss(25)
crit_fail = 1
- else // The gun will still discharge anyway.
- ..()
/obj/item/organ/cyberimp/arm/gun/laser
diff --git a/code/modules/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm
index e50e0e3fc3..0302dd2cae 100644
--- a/code/modules/surgery/organs/augments_chest.dm
+++ b/code/modules/surgery/organs/augments_chest.dm
@@ -13,7 +13,7 @@
var/hunger_threshold = NUTRITION_LEVEL_STARVING
var/synthesizing = 0
var/poison_amount = 5
- slot = ORGAN_SLOT_STOMACH
+ slot = ORGAN_SLOT_STOMACH_AID
/obj/item/organ/cyberimp/chest/nutriment/on_life()
if(synthesizing)
@@ -29,7 +29,8 @@
synthesizing = FALSE
/obj/item/organ/cyberimp/chest/nutriment/emp_act(severity)
- if(!owner)
+ . = ..()
+ if(!owner || . & EMP_PROTECT_SELF)
return
owner.reagents.add_reagent("bad_food", poison_amount / severity)
to_chat(owner, "You feel like your insides are burning.")
@@ -89,7 +90,8 @@
revive_cost += 40
/obj/item/organ/cyberimp/chest/reviver/emp_act(severity)
- if(!owner)
+ . = ..()
+ if(!owner || . & EMP_PROTECT_SELF)
return
if(reviving)
@@ -198,4 +200,3 @@
toggle(silent = TRUE)
return 0
-
diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
index 57d81cad28..38967711fe 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -30,12 +30,12 @@
w_class = WEIGHT_CLASS_TINY
/obj/item/organ/cyberimp/brain/emp_act(severity)
- if(!owner)
+ . = ..()
+ if(!owner || . & EMP_PROTECT_SELF)
return
var/stun_amount = 200/severity
owner.Stun(stun_amount)
to_chat(owner, "Your body seizes up!")
- return stun_amount
/obj/item/organ/cyberimp/brain/anti_drop
@@ -51,7 +51,7 @@
active = !active
if(active)
for(var/obj/item/I in owner.held_items)
- if(!(I.flags_1 & NODROP_1))
+ if(!(I.item_flags & NODROP))
stored_items += I
var/list/L = owner.get_empty_held_indexes()
@@ -62,7 +62,7 @@
else
for(var/obj/item/I in stored_items)
to_chat(owner, "Your [owner.get_held_index_name(owner.get_held_index_of_item(I))]'s grip tightens.")
- I.flags_1 |= NODROP_1
+ I.item_flags |= NODROP
else
release_items()
@@ -70,13 +70,13 @@
/obj/item/organ/cyberimp/brain/anti_drop/emp_act(severity)
- if(!owner)
+ . = ..()
+ if(!owner || . & EMP_PROTECT_SELF)
return
var/range = severity ? 10 : 5
var/atom/A
if(active)
release_items()
- ..()
for(var/obj/item/I in stored_items)
A = pick(oview(range))
I.throw_at(A, range, 2)
@@ -86,7 +86,7 @@
/obj/item/organ/cyberimp/brain/anti_drop/proc/release_items()
for(var/obj/item/I in stored_items)
- I.flags_1 &= ~NODROP_1
+ I.item_flags &= ~NODROP
stored_items = list()
@@ -113,11 +113,11 @@
owner.SetKnockdown(STUN_SET_AMOUNT)
/obj/item/organ/cyberimp/brain/anti_stun/emp_act(severity)
- if(crit_fail)
+ . = ..()
+ if(crit_fail || . & EMP_PROTECT_SELF)
return
crit_fail = TRUE
addtimer(CALLBACK(src, .proc/reboot), 90 / severity)
- ..()
/obj/item/organ/cyberimp/brain/anti_stun/proc/reboot()
crit_fail = FALSE
@@ -135,12 +135,13 @@
w_class = WEIGHT_CLASS_TINY
/obj/item/organ/cyberimp/mouth/breathing_tube/emp_act(severity)
+ . = ..()
+ if(!owner || . & EMP_PROTECT_SELF)
+ return
if(prob(60/severity))
to_chat(owner, "Your breathing tube suddenly closes!")
owner.losebreath += 2
-
-
//BOX O' IMPLANTS
/obj/item/storage/box/cyber_implants
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index fc0bdd4c04..d38e76ae6e 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -89,16 +89,16 @@
status = ORGAN_ROBOTIC
/obj/item/organ/eyes/robotic/emp_act(severity)
- if(!owner)
+ . = ..()
+ if(!owner || . & EMP_PROTECT_SELF)
+ return
+ if(prob(10 * severity))
return
- if(severity > 1)
- if(prob(10 * severity))
- return
to_chat(owner, "Static obfuscates your vision!")
owner.flash_act(visual = 1)
/obj/item/organ/eyes/robotic/xray
- name = "X-ray eyes"
+ name = "\improper X-ray eyes"
desc = "These cybernetic eyes will give you X-ray vision. Blinking is futile."
eye_color = "000"
see_in_dark = 8
@@ -232,9 +232,11 @@
owner.cut_overlay(mob_overlay)
/obj/item/organ/eyes/robotic/glow/emp_act()
- if(active)
- deactivate(silent = TRUE)
-
+ . = ..()
+ if(!active || . & EMP_PROTECT_SELF)
+ return
+ deactivate(silent = TRUE)
+
/obj/item/organ/eyes/robotic/glow/Insert(mob/living/carbon/M, special = FALSE, drop_if_replaced = FALSE)
. = ..()
if (mobhook && mobhook.parent != M)
diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index 6de223e67b..5424486649 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -152,6 +152,9 @@
synthetic = TRUE
/obj/item/organ/heart/cybernetic/emp_act()
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
Stop()
/obj/item/organ/heart/freedom
@@ -167,4 +170,4 @@
to_chat(owner, "You feel yourself dying, but you refuse to give up!")
owner.heal_overall_damage(15, 15)
if(owner.reagents.get_reagent_amount("ephedrine") < 20)
- owner.reagents.add_reagent("ephedrine", 10)
\ No newline at end of file
+ owner.reagents.add_reagent("ephedrine", 10)
diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm
index 360e58924b..cd9e60d3d1 100755
--- a/code/modules/surgery/organs/liver.dm
+++ b/code/modules/surgery/organs/liver.dm
@@ -27,10 +27,9 @@
if(filterToxins && !owner.has_trait(TRAIT_TOXINLOVER))
//handle liver toxin filtration
- var/static/list/toxinstypecache = typecacheof(/datum/reagent/toxin)
for(var/I in C.reagents.reagent_list)
var/datum/reagent/pickedreagent = I
- if(is_type_in_typecache(pickedreagent, toxinstypecache))
+ if(istype(pickedreagent, /datum/reagent/toxin))
var/thisamount = C.reagents.get_reagent_amount(initial(pickedreagent.id))
if (thisamount <= toxTolerance && thisamount)
C.reagents.remove_reagent(initial(pickedreagent.id), 1)
@@ -78,6 +77,9 @@
toxLethality = 0.008 //20% less damage than a normal liver
/obj/item/organ/liver/cybernetic/emp_act(severity)
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
switch(severity)
if(1)
damage+=100
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index a3fe2202b6..9e53a902a2 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -267,7 +267,7 @@
H.adjustFireLoss(nitryl_pp/4)
gas_breathed = breath_gases[/datum/gas/nitryl][MOLES]
if (gas_breathed > gas_stimulation_min)
- H.reagents.add_reagent("nitryl_gas",1)
+ H.reagents.add_reagent("no2",1)
breath_gases[/datum/gas/nitryl][MOLES]-=gas_breathed
// Stimulum
@@ -346,6 +346,9 @@
synthetic = TRUE
/obj/item/organ/lungs/cybernetic/emp_act()
+ . = ..()
+ if(. & EMP_PROTECT_SELF)
+ return
owner.losebreath = 20
diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm
index 3ddf658ecd..cb7833a373 100755
--- a/code/modules/surgery/organs/stomach.dm
+++ b/code/modules/surgery/organs/stomach.dm
@@ -39,22 +39,22 @@
switch(H.disgust)
if(0 to DISGUST_LEVEL_GROSS)
H.clear_alert("disgust")
- H.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "disgust")
+ SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "disgust")
if(DISGUST_LEVEL_GROSS to DISGUST_LEVEL_VERYGROSS)
H.throw_alert("disgust", /obj/screen/alert/gross)
- H.SendSignal(COMSIG_ADD_MOOD_EVENT, "disgust", /datum/mood_event/disgust/gross)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "disgust", /datum/mood_event/disgust/gross)
if(DISGUST_LEVEL_VERYGROSS to DISGUST_LEVEL_DISGUSTED)
H.throw_alert("disgust", /obj/screen/alert/verygross)
- H.SendSignal(COMSIG_ADD_MOOD_EVENT, "disgust", /datum/mood_event/disgust/verygross)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "disgust", /datum/mood_event/disgust/verygross)
if(DISGUST_LEVEL_DISGUSTED to INFINITY)
H.throw_alert("disgust", /obj/screen/alert/disgusted)
- H.SendSignal(COMSIG_ADD_MOOD_EVENT, "disgust", /datum/mood_event/disgust/disgusted)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "disgust", /datum/mood_event/disgust/disgusted)
/obj/item/organ/stomach/Remove(mob/living/carbon/M, special = 0)
var/mob/living/carbon/human/H = owner
if(istype(H))
H.clear_alert("disgust")
- H.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "disgust")
+ SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "disgust")
..()
/obj/item/organ/stomach/fly
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index 10c825cb4a..48392f70a3 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -488,7 +488,7 @@
L.lay_down() //aka get up
L.SetStun(0)
L.SetKnockdown(0)
- L.SetUnconscious(0) //i said get up i don't care if you're being tazed
+ L.SetUnconscious(0) //i said get up i don't care if you're being tased
//SIT
else if((findtext(message, sit_words)))
@@ -569,7 +569,7 @@
cooldown = COOLDOWN_NONE
if(message_admins)
- message_admins("[key_name_admin(user)] has said '[log_message]' with a Voice of God, affecting [english_list(listeners)], with a power multiplier of [power_multiplier].")
+ message_admins("[ADMIN_LOOKUPFLW(user)] has said '[log_message]' with a Voice of God, affecting [english_list(listeners)], with a power multiplier of [power_multiplier].")
log_game("[key_name(user)] has said '[log_message]' with a Voice of God, affecting [english_list(listeners)], with a power multiplier of [power_multiplier].")
SSblackbox.record_feedback("tally", "voice_of_god", 1, log_message)
diff --git a/code/modules/surgery/remove_embedded_object.dm b/code/modules/surgery/remove_embedded_object.dm
index 548a73627d..451ae02dac 100644
--- a/code/modules/surgery/remove_embedded_object.dm
+++ b/code/modules/surgery/remove_embedded_object.dm
@@ -30,7 +30,7 @@
L.embedded_objects -= I
if(!H.has_embedded_objects())
H.clear_alert("embeddedobject")
- H.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "embedded")
+ SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "embedded")
if(objects > 0)
user.visible_message("[user] successfully removes [objects] objects from [H]'s [L]!", "You successfully remove [objects] objects from [H]'s [L.name].")
diff --git a/code/modules/tgui/states/default.dm b/code/modules/tgui/states/default.dm
index 0e4844dced..c6741f20b8 100644
--- a/code/modules/tgui/states/default.dm
+++ b/code/modules/tgui/states/default.dm
@@ -7,7 +7,7 @@
GLOBAL_DATUM_INIT(default_state, /datum/ui_state/default, new)
/datum/ui_state/default/can_use_topic(src_object, mob/user)
- return user.default_can_use_topic(src_object) // Call the individual mob-overriden procs.
+ return user.default_can_use_topic(src_object) // Call the individual mob-overridden procs.
/mob/proc/default_can_use_topic(src_object)
return UI_CLOSE // Don't allow interaction by default.
diff --git a/code/modules/uplink/uplink.dm b/code/modules/uplink/uplink.dm
index 8586244180..4c735a2e3c 100644
--- a/code/modules/uplink/uplink.dm
+++ b/code/modules/uplink/uplink.dm
@@ -13,6 +13,7 @@ GLOBAL_LIST_EMPTY(uplinks)
var/active = FALSE
var/lockable = TRUE
var/locked = TRUE
+ var/allow_restricted = TRUE
var/telecrystals
var/selected_cat
var/owner = null
@@ -25,9 +26,9 @@ GLOBAL_LIST_EMPTY(uplinks)
if(!isitem(parent))
return COMPONENT_INCOMPATIBLE
GLOB.uplinks += src
- uplink_items = get_uplink_items(gamemode)
- RegisterSignal(COMSIG_PARENT_ATTACKBY, .proc/OnAttackBy)
- RegisterSignal(COMSIG_ITEM_ATTACK_SELF, .proc/interact)
+ uplink_items = get_uplink_items(gamemode, TRUE, allow_restricted)
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/OnAttackBy)
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/interact)
owner = _owner
if(owner)
LAZYINITLIST(GLOB.uplink_purchase_logs_by_key)
@@ -66,32 +67,24 @@ GLOBAL_LIST_EMPTY(uplinks)
/datum/component/uplink/proc/set_gamemode(_gamemode)
gamemode = _gamemode
- uplink_items = get_uplink_items(gamemode)
+ uplink_items = get_uplink_items(gamemode, TRUE, allow_restricted)
/datum/component/uplink/proc/OnAttackBy(obj/item/I, mob/user)
if(!active)
return //no hitting everyone/everything just to try to slot tcs in!
if(istype(I, /obj/item/stack/telecrystal))
LoadTC(user, I)
- for(var/item in subtypesof(/datum/uplink_item))
- var/datum/uplink_item/UI = item
- var/path = null
- if(initial(UI.refund_path))
- path = initial(UI.refund_path)
- else
- path = initial(UI.item)
- var/cost = 0
- if(initial(UI.refund_amount))
- cost = initial(UI.refund_amount)
- else
- cost = initial(UI.cost)
- var/refundable = initial(UI.refundable)
- if(I.type == path && refundable && I.check_uplink_validity())
- telecrystals += cost
- purchase_log.total_spent -= cost
- to_chat(user, "[I] refunded.")
- qdel(I)
- return
+ for(var/category in uplink_items)
+ for(var/item in uplink_items[category])
+ var/datum/uplink_item/UI = uplink_items[category][item]
+ var/path = UI.refund_path || UI.item
+ var/cost = UI.refund_amount || UI.cost
+ if(I.type == path && UI.refundable && I.check_uplink_validity())
+ telecrystals += cost
+ purchase_log.total_spent -= cost
+ to_chat(user, "[I] refunded.")
+ qdel(I)
+ return
/datum/component/uplink/proc/interact(mob/user)
if(locked)
@@ -185,4 +178,3 @@ GLOBAL_LIST_EMPTY(uplinks)
SSblackbox.record_feedback("nested tally", "traitor_uplink_items_bought", 1, list("[initial(U.name)]", "[U.cost]"))
return TRUE
-
diff --git a/code/modules/uplink/uplink_devices.dm b/code/modules/uplink/uplink_devices.dm
index 2ce717f0de..2e91879006 100644
--- a/code/modules/uplink/uplink_devices.dm
+++ b/code/modules/uplink/uplink_devices.dm
@@ -1,36 +1,60 @@
-
// A collection of pre-set uplinks, for admin spawns.
-/obj/item/radio/uplink/Initialize(mapload, _owner, _tc_amount = 20)
- . = ..()
+
+// Radio-like uplink; not an actual radio because this uplink is most commonly
+// used for nuke ops, for whom opening the radio GUI and the uplink GUI
+// simultaneously is an annoying distraction.
+/obj/item/uplink
+ name = "station bounced radio"
+ icon = 'icons/obj/radio.dmi'
icon_state = "radio"
+ item_state = "walkietalkie"
+ desc = "A basic handheld radio that communicates with local telecommunication networks."
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
- AddComponent(/datum/component/uplink, _owner, FALSE, TRUE, null, _tc_amount)
+ dog_fashion = /datum/dog_fashion/back
-/obj/item/radio/uplink/nuclear/Initialize()
+ flags_1 = CONDUCT_1
+ slot_flags = ITEM_SLOT_BELT
+ throw_speed = 3
+ throw_range = 7
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/uplink/Initialize(mapload, owner, tc_amount = 20)
+ . = ..()
+ AddComponent(/datum/component/uplink, owner, FALSE, TRUE, null, tc_amount)
+
+/obj/item/uplink/nuclear/Initialize()
. = ..()
GET_COMPONENT(hidden_uplink, /datum/component/uplink)
hidden_uplink.set_gamemode(/datum/game_mode/nuclear)
-/obj/item/radio/uplink/clownop/Initialize()
+/obj/item/uplink/nuclear_restricted/Initialize()
+ . = ..()
+ GET_COMPONENT(hidden_uplink, /datum/component/uplink)
+ hidden_uplink.allow_restricted = FALSE
+ hidden_uplink.set_gamemode(/datum/game_mode/nuclear)
+
+/obj/item/uplink/clownop/Initialize()
. = ..()
GET_COMPONENT(hidden_uplink, /datum/component/uplink)
hidden_uplink.set_gamemode(/datum/game_mode/nuclear/clown_ops)
-/obj/item/multitool/uplink/Initialize(mapload, _owner, _tc_amount = 20)
- . = ..()
- AddComponent(/datum/component/uplink, _owner, FALSE, TRUE, null, _tc_amount)
-
-/obj/item/pen/uplink/Initialize(mapload, _owner, _tc_amount = 20)
- . = ..()
- AddComponent(/datum/component/uplink)
- traitor_unlock_degrees = 360
-
-/obj/item/radio/uplink/old
+/obj/item/uplink/old
name = "dusty radio"
desc = "A dusty looking radio."
-/obj/item/radio/uplink/old/Initialize(mapload, _owner, _tc_amount = 10)
+/obj/item/uplink/old/Initialize(mapload, owner, tc_amount = 10)
. = ..()
GET_COMPONENT(hidden_uplink, /datum/component/uplink)
hidden_uplink.name = "dusty radio"
+
+// Multitool uplink
+/obj/item/multitool/uplink/Initialize(mapload, owner, tc_amount = 20)
+ . = ..()
+ AddComponent(/datum/component/uplink, owner, FALSE, TRUE, null, tc_amount)
+
+// Pen uplink
+/obj/item/pen/uplink/Initialize(mapload, owner, tc_amount = 20)
+ . = ..()
+ AddComponent(/datum/component/uplink, owner, TRUE, FALSE, null, tc_amount)
+ traitor_unlock_degrees = 360
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index 2fba13522c..a9f2c63e13 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -1,6 +1,6 @@
GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
-/proc/get_uplink_items(var/datum/game_mode/gamemode = null, allow_sales = TRUE)
+/proc/get_uplink_items(var/datum/game_mode/gamemode = null, allow_sales = TRUE, allow_restricted = TRUE)
var/list/filtered_uplink_items = list()
var/list/sale_items = list()
@@ -20,6 +20,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
continue
if(I.player_minimum && I.player_minimum > GLOB.joined_player_list.len)
continue
+ if (I.restricted && !allow_restricted)
+ continue
if(!filtered_uplink_items[I.category])
filtered_uplink_items[I.category] = list()
@@ -72,6 +74,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
var/list/restricted_roles = list() //If this uplink item is only available to certain roles. Roles are dependent on the frequency chip or stored ID.
var/player_minimum //The minimum crew size needed for this item to be added to uplinks.
var/purchase_log_vis = TRUE // Visible in the purchase log?
+ var/restricted = FALSE // Adds restrictions for VR/Events
/datum/uplink_item/New()
. = ..()
@@ -379,6 +382,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
cost = 12
surplus = 35
include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+ restricted = TRUE
/datum/uplink_item/dangerous/guardian
name = "Holoparasites"
@@ -389,6 +393,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
surplus = 0
exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
player_minimum = 25
+ restricted = TRUE
// Ammunition
/datum/uplink_item/ammo
@@ -584,6 +589,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
cost = 25
refundable = TRUE
include_modes = list(/datum/game_mode/nuclear)
+ restricted = TRUE
/datum/uplink_item/support/reinforcement/assault_borg
name = "Syndicate Assault Cyborg"
@@ -591,6 +597,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
item = /obj/item/antag_spawner/nuke_ops/borg_tele/assault
refundable = TRUE
cost = 65
+ restricted = TRUE
/datum/uplink_item/support/reinforcement/medical_borg
name = "Syndicate Medical Cyborg"
@@ -598,6 +605,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
item = /obj/item/antag_spawner/nuke_ops/borg_tele/medical
refundable = TRUE
cost = 35
+ restricted = TRUE
/datum/uplink_item/support/gygax
name = "Gygax Exosuit"
@@ -627,6 +635,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
item = /obj/item/antag_spawner/nuke_ops/clown
cost = 20
include_modes = list(/datum/game_mode/nuclear/clown_ops)
+ restricted = TRUE
// Stealthy Weapons
/datum/uplink_item/stealthy_weapons
@@ -719,6 +728,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
them for longer. Beware, it has a chance to detonate your PDA."
item = /obj/item/cartridge/virus/syndicate
cost = 6
+ restricted = TRUE
/datum/uplink_item/stealthy_weapons/suppressor
name = "Universal Suppressor"
@@ -780,7 +790,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "Combat Banana Shoes"
desc = "While making the wearer immune to most slipping attacks like regular combat clown shoes, these shoes \
can generate a large number of synthetic banana peels as the wearer walks, slipping up would-be pursuers. They also \
- squeek significantly louder."
+ squeak significantly louder."
item = /obj/item/clothing/shoes/clown_shoes/banana_shoes/combat
cost = 6
surplus = 0
@@ -794,6 +804,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
telecrystals normally."
item = /obj/item/cartridge/virus/frame
cost = 4
+ restricted = TRUE
/datum/uplink_item/stealthy_tools/agent_card
name = "Agent Identification Card"
@@ -978,6 +989,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
item = /obj/item/encryptionkey/binary
cost = 5
surplus = 75
+ restricted = TRUE
/datum/uplink_item/device_tools/encryptionkey
name = "Syndicate Encryption Key"
@@ -986,6 +998,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
item = /obj/item/encryptionkey/syndicate
cost = 2
surplus = 75
+ restricted = TRUE
/datum/uplink_item/device_tools/ai_detector
name = "Artificial Intelligence Detector"
@@ -1110,6 +1123,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
cost = 30
surplus = 0
include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+ restricted = TRUE
/datum/uplink_item/device_tools/shield
name = "Energy Shield"
@@ -1144,6 +1158,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
desc = "A potion recovered at great risk by undercover syndicate operatives and then subsequently modified with syndicate technology. Using it will make any animal sentient, and bound to serve you, as well as implanting an internal radio for communication and an internal ID card for opening doors."
cost = 4
include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+ restricted = TRUE
/datum/uplink_item/device_tools/telecrystal
name = "Raw Telecrystal"
@@ -1199,6 +1214,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
cost = 4
// An empty uplink is kinda useless.
surplus = 0
+ restricted = TRUE
/datum/uplink_item/implants/adrenal
name = "Adrenal Implant"
@@ -1231,13 +1247,14 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
item = /obj/item/storage/box/syndie_kit/imp_macrobomb
cost = 20
include_modes = list(/datum/game_mode/nuclear)
+ restricted = TRUE
/datum/uplink_item/implants/radio
name = "Internal Syndicate Radio Implant"
desc = "An implant injected into the body, allowing the use of an internal syndicate radio. Used just like a regular headset, but can be disabled to use external headsets normally and to avoid detection."
item = /obj/item/storage/box/syndie_kit/imp_radio
cost = 4
-
+ restricted = TRUE
// Cybernetics
/datum/uplink_item/cyber_implants
@@ -1252,7 +1269,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
cost = 8
/datum/uplink_item/cyber_implants/xray
- name = "X-Ray Vision Implant"
+ name = "X-ray Vision Implant"
desc = "These cybernetic eyes will give you X-ray vision. Comes with an autosurgeon."
item = /obj/item/autosurgeon/xray_eyes
cost = 10
@@ -1395,6 +1412,16 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
limited_stock = 2 //you can't use more than two!
restricted_roles = list("Shaft Miner")
+/datum/uplink_item/role_restricted/blastcannon
+ name = "Blast Cannon"
+ desc = "A highly specialized weapon, the Blast Cannon is actually relatively simple. It contains an attachment for a tank transfer valve mounted to an angled pipe specially constructed \
+ withstand extreme pressure and temperatures, and has a mechanical trigger for triggering the transfer valve. Essentially, it turns the explosive force of a bomb into a narrow-angle \
+ blast wave \"projectile\". Aspiring scientists may find this highly useful, as forcing the pressure shockwave into a narrow angle seems to be able to bypass whatever quirk of physics \
+ disallows explosive ranges above a certain distance, allowing for the device to use the theoretical yield of a transfer valve bomb, instead of the factual yield."
+ item = /obj/item/gun/blastcannon
+ cost = 14 //High cost because of the potential for extreme damage in the hands of a skilled scientist.
+ restricted_roles = list("Research Director", "Scientist")
+
/datum/uplink_item/device_tools/clown_bomb
name = "Clown Bomb"
desc = "The Clown bomb is a hilarious device capable of massive pranks. It has an adjustable timer, \
diff --git a/code/modules/uplink/uplink_purchase_log.dm b/code/modules/uplink/uplink_purchase_log.dm
index 1226fcd27a..293191b170 100644
--- a/code/modules/uplink/uplink_purchase_log.dm
+++ b/code/modules/uplink/uplink_purchase_log.dm
@@ -3,12 +3,10 @@ GLOBAL_LIST(uplink_purchase_logs_by_key) //assoc key = /datum/uplink_purchase_lo
/datum/uplink_purchase_log
var/owner
var/list/purchase_log //assoc path-of-item = /datum/uplink_purchase_entry
- var/datum/component/uplink/parent
var/total_spent = 0
/datum/uplink_purchase_log/New(_owner, datum/component/uplink/_parent)
owner = _owner
- parent = _parent
LAZYINITLIST(GLOB.uplink_purchase_logs_by_key)
if(owner)
if(GLOB.uplink_purchase_logs_by_key[owner])
@@ -19,7 +17,6 @@ GLOBAL_LIST(uplink_purchase_logs_by_key) //assoc key = /datum/uplink_purchase_lo
/datum/uplink_purchase_log/Destroy()
purchase_log = null
- parent = null
if(GLOB.uplink_purchase_logs_by_key[owner] == src)
GLOB.uplink_purchase_logs_by_key -= owner
return ..()
diff --git a/code/modules/vehicles/atv.dm b/code/modules/vehicles/atv.dm
index ac5be5b51c..eb6a9a92e2 100644
--- a/code/modules/vehicles/atv.dm
+++ b/code/modules/vehicles/atv.dm
@@ -32,7 +32,6 @@
/obj/machinery/porta_turret/syndicate/vehicle_turret
name = "mounted turret"
scan_range = 7
- emp_vunerable = 1
density = FALSE
/obj/vehicle/ridden/atv/turret/Initialize()
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index ae4c83d016..5a12635963 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -1,7 +1,3 @@
-#define STANDARD_CHARGE 1
-#define CONTRABAND_CHARGE 2
-#define COIN_CHARGE 3
-
/*
* Vending machine types - Can be found under /code/modules/vending/
*/
@@ -21,7 +17,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
*/
/datum/data/vending_product
- var/product_name = "generic"
+ name = "generic"
var/product_path = null
var/amount = 0
var/max_amount = 0
@@ -33,7 +29,6 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
icon = 'icons/obj/vending.dmi'
icon_state = "generic"
layer = BELOW_OBJ_LAYER
- anchored = TRUE
density = TRUE
verb_say = "beeps"
verb_ask = "beeps"
@@ -75,7 +70,6 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
var/dish_quants = list() //used by the snack machine's custom compartment to count dishes.
var/obj/item/vending_refill/refill_canister = null //The type of refill canisters used by this machine.
- var/refill_count = 3 //The number of canisters the vending machine uses
/obj/machinery/vending/Initialize()
var/build_inv = FALSE
@@ -85,9 +79,9 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
. = ..()
wires = new /datum/wires/vending(src)
if(build_inv) //non-constructable vending machine
- build_inventory(products)
- build_inventory(contraband, 1)
- build_inventory(premium, 0, 1)
+ build_inventory(products, product_records)
+ build_inventory(contraband, hidden_records)
+ build_inventory(premium, coin_records)
slogan_list = splittext(product_slogans, ";")
// So not all machines speak at the exact same time.
@@ -103,17 +97,17 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
return ..()
/obj/machinery/vending/RefreshParts() //Better would be to make constructable child
- if(component_parts)
- product_records = list()
- hidden_records = list()
- coin_records = list()
- build_inventory(products, start_empty = 1)
- build_inventory(contraband, 1, start_empty = 1)
- build_inventory(premium, 0, 1, start_empty = 1)
- for(var/obj/item/vending_refill/VR in component_parts)
- refill_inventory(VR, product_records, STANDARD_CHARGE)
- refill_inventory(VR, coin_records, COIN_CHARGE)
- refill_inventory(VR, hidden_records, CONTRABAND_CHARGE)
+ if(!component_parts)
+ return
+
+ product_records = list()
+ hidden_records = list()
+ coin_records = list()
+ build_inventory(products, product_records, start_empty = TRUE)
+ build_inventory(contraband, hidden_records, start_empty = TRUE)
+ build_inventory(premium, coin_records, start_empty = TRUE)
+ for(var/obj/item/vending_refill/VR in component_parts)
+ restock(VR)
/obj/machinery/vending/deconstruct(disassembled = TRUE)
if(!refill_canister) //the non constructable vendors drop metal instead of a machine frame.
@@ -125,25 +119,33 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/machinery/vending/obj_break(damage_flag)
if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1))
- var/dump_amount = 0
- for(var/datum/data/vending_product/R in product_records)
- if(R.amount <= 0) //Try to use a record that actually has something to dump.
- continue
- var/dump_path = R.product_path
- if(!dump_path)
- continue
-
- while(R.amount>0)
- var/obj/O = new dump_path(loc)
- step(O, pick(GLOB.alldirs)) //we only drop 20% of the total of each products and spread it
- R.amount -= 5 //around to not fill the turf with too many objects.
- dump_amount++
- if(dump_amount > 15) //so we don't drop too many items (e.g. ClothesMate)
- break
stat |= BROKEN
icon_state = "[initial(icon_state)]-broken"
-/obj/machinery/vending/proc/build_inventory(list/productlist, hidden=0, req_coin=0, start_empty = null)
+ var/dump_amount = 0
+ var/found_anything = TRUE
+ while (found_anything)
+ found_anything = FALSE
+ for(var/record in shuffle(product_records))
+ var/datum/data/vending_product/R = record
+ if(R.amount <= 0) //Try to use a record that actually has something to dump.
+ continue
+ var/dump_path = R.product_path
+ if(!dump_path)
+ continue
+ R.amount--
+ // busting open a vendor will destroy some of the contents
+ if(found_anything && prob(80))
+ continue
+
+ var/obj/O = new dump_path(loc)
+ step(O, pick(GLOB.alldirs))
+ found_anything = TRUE
+ dump_amount++
+ if (dump_amount >= 16)
+ return
+
+/obj/machinery/vending/proc/build_inventory(list/productlist, list/recordlist, start_empty = FALSE)
for(var/typepath in productlist)
var/amount = productlist[typepath]
if(isnull(amount))
@@ -151,47 +153,54 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
var/atom/temp = typepath
var/datum/data/vending_product/R = new /datum/data/vending_product()
- R.product_name = initial(temp.name)
+ R.name = initial(temp.name)
R.product_path = typepath
if(!start_empty)
R.amount = amount
R.max_amount = amount
- R.display_color = pick("red","blue","green")
+ R.display_color = pick("#ff8080","#80ff80","#8080ff")
+ recordlist += R
- if(hidden)
- hidden_records += R
- else if(req_coin)
- coin_records += R
- else
- product_records += R
+/obj/machinery/vending/proc/restock(obj/item/vending_refill/canister)
+ if (!canister.products)
+ canister.products = products.Copy()
+ if (!canister.contraband)
+ canister.contraband = contraband.Copy()
+ if (!canister.premium)
+ canister.premium = premium.Copy()
+ . = 0
+ . += refill_inventory(canister.products, product_records)
+ . += refill_inventory(canister.contraband, hidden_records)
+ . += refill_inventory(canister.premium, coin_records)
-/obj/machinery/vending/proc/refill_inventory(obj/item/vending_refill/refill, datum/data/vending_product/machine, var/charge_type = STANDARD_CHARGE)
- var/total = 0
- var/to_restock = 0
+/obj/machinery/vending/proc/refill_inventory(list/productlist, list/recordlist)
+ . = 0
+ for(var/R in recordlist)
+ var/datum/data/vending_product/record = R
+ var/diff = min(record.max_amount - record.amount, productlist[record.product_path])
+ if (diff)
+ productlist[record.product_path] -= diff
+ record.amount += diff
+ . += diff
- for(var/datum/data/vending_product/machine_content in machine)
- if(machine_content.amount == 0 && refill.charges[charge_type] > 0)
- machine_content.amount++
- refill.charges[charge_type]--
- total++
- to_restock += machine_content.max_amount - machine_content.amount
- if(to_restock <= refill.charges[charge_type])
- for(var/datum/data/vending_product/machine_content in machine)
- machine_content.amount = machine_content.max_amount
- refill.charges[charge_type] -= to_restock
- total += to_restock
- else
- var/tmp_charges = refill.charges[charge_type]
- for(var/datum/data/vending_product/machine_content in machine)
- if(refill.charges[charge_type] == 0)
- break
- var/restock = CEILING(((machine_content.max_amount - machine_content.amount)/to_restock)*tmp_charges, 1)
- if(restock > refill.charges[charge_type])
- restock = refill.charges[charge_type]
- machine_content.amount += restock
- refill.charges[charge_type] -= restock
- total += restock
- return total
+/obj/machinery/vending/proc/update_canister()
+ if (!component_parts)
+ return
+
+ var/obj/item/vending_refill/R = locate() in component_parts
+ if (!R)
+ CRASH("Constructible vending machine did not have a refill canister")
+ return
+
+ R.products = unbuild_inventory(product_records)
+ R.contraband = unbuild_inventory(hidden_records)
+ R.premium = unbuild_inventory(coin_records)
+
+/obj/machinery/vending/proc/unbuild_inventory(list/recordlist)
+ . = list()
+ for(var/R in recordlist)
+ var/datum/data/vending_product/record = R
+ .[record.product_path] += record.amount
/obj/machinery/vending/crowbar_act(mob/living/user, obj/item/I)
if(!component_parts)
@@ -249,46 +258,52 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
bill = new S.type(src, 1)
to_chat(user, "You insert [I] into [src].")
return
- else if(istype(I, refill_canister) && refill_canister != null)
- if(stat & (BROKEN|NOPOWER))
- to_chat(user, "It does nothing.")
- else if(panel_open)
+ else if(refill_canister && istype(I, refill_canister))
+ if (!panel_open)
+ to_chat(user, "You should probably unscrew the service panel first.")
+ else if (stat & (BROKEN|NOPOWER))
+ to_chat(user, "[src] does not respond.")
+ else
//if the panel is open we attempt to refill the machine
var/obj/item/vending_refill/canister = I
- if(canister.charges[STANDARD_CHARGE] == 0)
- to_chat(user, "This [canister.name] is empty!")
+ if(canister.get_part_rating() == 0)
+ to_chat(user, "[canister] is empty!")
else
- var/transfered = refill_inventory(canister,product_records,STANDARD_CHARGE)
- transfered += refill_inventory(canister,coin_records,COIN_CHARGE)
- transfered += refill_inventory(canister,hidden_records,CONTRABAND_CHARGE)
- if(transfered)
- to_chat(user, "You loaded [transfered] items in \the [name].")
+ // instantiate canister if needed
+ var/transferred = restock(canister)
+ if(transferred)
+ to_chat(user, "You loaded [transferred] items in [src].")
else
- to_chat(user, "The [name] is fully stocked.")
+ to_chat(user, "There's nothing to restock!")
return
- else
- to_chat(user, "You should probably unscrew the service panel first.")
else
return ..()
+/obj/machinery/vending/exchange_parts(mob/user, obj/item/storage/part_replacer/W)
+ if(!istype(W))
+ return FALSE
+ if((flags_1 & NODECONSTRUCT_1) && !W.works_from_distance)
+ return FALSE
+ if(!component_parts || !refill_canister)
+ return FALSE
+
+ var/moved = 0
+ if(panel_open || W.works_from_distance)
+ if(W.works_from_distance)
+ display_parts(user)
+ for(var/I in W)
+ if(istype(I, refill_canister))
+ moved += restock(I)
+ else
+ display_parts(user)
+ if(moved)
+ to_chat(user, "[moved] items restocked.")
+ W.play_rped_sound()
+ return TRUE
+
/obj/machinery/vending/on_deconstruction()
- var/product_list = list(product_records, hidden_records, coin_records)
- for(var/i=1, i<=3, i++)
- for(var/datum/data/vending_product/machine_content in product_list[i])
- while(machine_content.amount !=0)
- var/safety = 0 //to avoid infinite loop
- for(var/obj/item/vending_refill/VR in component_parts)
- safety++
- if(VR.charges[i] < VR.init_charges[i])
- VR.charges[i]++
- machine_content.amount--
- if(!machine_content.amount)
- break
- else
- safety--
- if(safety <= 0) // all refill canisters are full
- break
- ..()
+ update_canister()
+ . = ..()
/obj/machinery/vending/emag_act(mob/user)
if(obj_flags & EMAGGED)
@@ -324,7 +339,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
dat += "Vend "
else
dat += "Sold out "
- dat += "[sanitize(R.product_name)]:"
+ dat += "[sanitize(R.name)]:"
dat += " [R.amount]"
dat += ""
dat += ""
@@ -359,17 +374,11 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
to_chat(usr, "There is no money in this machine.")
return
if(coin)
- if(!usr.get_active_held_item())
- usr.put_in_hands(coin)
- else
- coin.forceMove(get_turf(src))
+ usr.put_in_hands(coin)
to_chat(usr, "You remove [coin] from [src].")
coin = null
if(bill)
- if(!usr.get_active_held_item())
- usr.put_in_hands(bill)
- else
- bill.forceMove(get_turf(src))
+ usr.put_in_hands(bill)
to_chat(usr, "You remove [bill] from [src].")
bill = null
@@ -435,7 +444,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
else if (!(R in product_records))
vend_ready = 1
- message_admins("Vending machine exploit attempted by [key_name(usr, usr.client)]!")
+ message_admins("Vending machine exploit attempted by [ADMIN_LOOKUPFLW(usr)]!")
return
if (R.amount <= 0)
@@ -538,7 +547,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
if(!prob(prb))
return FALSE
do_sparks(5, TRUE, src)
- var/tmp/check_range = TRUE
+ var/check_range = TRUE
if(electrocute_mob(user, get_area(src), src, 0.7, check_range))
return TRUE
else
@@ -546,7 +555,3 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/machinery/vending/onTransitZ()
return
-
-#undef STANDARD_CHARGE
-#undef CONTRABAND_CHARGE
-#undef COIN_CHARGE
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index c0cfe661d7..5cfa454bd9 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -3,7 +3,7 @@
desc = "A vending machine for costumes."
icon_state = "theater"
icon_deny = "theater-deny"
- req_access_txt = "46" //Theatre access needed, unless hacked.
+ req_access = list(ACCESS_THEATRE)
product_slogans = "Dress for success!;Suited and booted!;It's show time!;Why leave style up to fate? Use AutoDrobe!"
vend_reply = "Thank you for using AutoDrobe!"
products = list(/obj/item/clothing/suit/chickensuit = 1,
@@ -115,15 +115,25 @@
premium = list(/obj/item/clothing/suit/pirate/captain = 2,
/obj/item/clothing/head/pirate/captain = 2,
/obj/item/clothing/head/helmet/roman/fake = 1,
- /obj/item/clothing/head/helmet/roman/legionaire/fake = 1,
+ /obj/item/clothing/head/helmet/roman/legionnaire/fake = 1,
/obj/item/clothing/under/roman = 1,
/obj/item/clothing/shoes/roman = 1,
/obj/item/shield/riot/roman/fake = 1,
- /obj/item/skub = 1)
+ /obj/item/skub = 1,
+ /obj/item/clothing/under/lobster = 1, // CIT CHANGES
+ /obj/item/clothing/head/lobsterhat = 1,
+ /obj/item/clothing/head/drfreezehat = 1,
+ /obj/item/clothing/suit/dracula = 1,
+ /obj/item/clothing/suit/drfreeze_coat = 1,
+ /obj/item/clothing/suit/gothcoat = 2,
+ /obj/item/clothing/under/draculass = 1,
+ /obj/item/clothing/under/drfreeze = 1) //End of Cit Changes
refill_canister = /obj/item/vending_refill/autodrobe
+/obj/machinery/vending/autodrobe/all_access
+ desc = "A vending machine for costumes. This model appears to have no access restrictions."
+ req_access = null
+
/obj/item/vending_refill/autodrobe
machine_name = "AutoDrobe"
icon_state = "refill_costume"
- charges = list(32, 2, 3)// of 96 standard, 6 contraband, 9 premium
- init_charges = list(32, 2, 3)
diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm
index 2738e18b19..0d193c451d 100644
--- a/code/modules/vending/boozeomat.dm
+++ b/code/modules/vending/boozeomat.dm
@@ -16,7 +16,6 @@
/obj/item/reagent_containers/food/drinks/bottle/absinthe = 5,
/obj/item/reagent_containers/food/drinks/bottle/grappa = 5,
/obj/item/reagent_containers/food/drinks/bottle/sake = 5,
- /obj/item/reagent_containers/food/drinks/bottle/fernet = 5,
/obj/item/reagent_containers/food/drinks/ale = 6,
/obj/item/reagent_containers/food/drinks/bottle/orangejuice = 4,
/obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 4,
@@ -32,14 +31,38 @@
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 12,
/obj/item/reagent_containers/food/drinks/flask = 3,
/obj/item/reagent_containers/food/drinks/beer = 6)
- contraband = list(/obj/item/reagent_containers/food/drinks/mug/tea = 12)
+ contraband = list(/obj/item/reagent_containers/food/drinks/mug/tea = 12,
+ /obj/item/reagent_containers/food/drinks/bottle/fernet = 5)
product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?"
product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!"
- req_access_txt = "25"
+ req_access = list(ACCESS_BAR)
refill_canister = /obj/item/vending_refill/boozeomat
+/obj/machinery/vending/boozeomat/all_access
+ desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one. This model appears to have no access restrictions."
+ req_access = null
+
+/obj/machinery/vending/boozeomat/pubby_maint //abandoned bar on Pubbystation
+ products = list(/obj/item/reagent_containers/food/drinks/bottle/whiskey = 1,
+ /obj/item/reagent_containers/food/drinks/bottle/absinthe = 1,
+ /obj/item/reagent_containers/food/drinks/bottle/limejuice = 1,
+ /obj/item/reagent_containers/food/drinks/bottle/cream = 1,
+ /obj/item/reagent_containers/food/drinks/soda_cans/tonic = 1,
+ /obj/item/reagent_containers/food/drinks/drinkingglass = 10,
+ /obj/item/reagent_containers/food/drinks/ice = 3,
+ /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 6,
+ /obj/item/reagent_containers/food/drinks/flask = 1)
+ req_access = null
+
+/obj/machinery/vending/boozeomat/pubby_captain //Captain's quarters on Pubbystation
+ products = list(/obj/item/reagent_containers/food/drinks/bottle/rum = 1,
+ /obj/item/reagent_containers/food/drinks/bottle/wine = 1,
+ /obj/item/reagent_containers/food/drinks/ale = 1,
+ /obj/item/reagent_containers/food/drinks/drinkingglass = 6,
+ /obj/item/reagent_containers/food/drinks/ice = 1,
+ /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 4);
+ req_access = list(ACCESS_CAPTAIN)
+
/obj/item/vending_refill/boozeomat
machine_name = "Booze-O-Mat"
icon_state = "refill_booze"
- charges = list(61, 4, 0)//of 182 standard, 12 contraband
- init_charges = list(61, 4, 0)
diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm
index 15b370833f..6b9334362d 100644
--- a/code/modules/vending/cigarette.dm
+++ b/code/modules/vending/cigarette.dm
@@ -20,11 +20,27 @@
/obj/item/storage/fancy/cigarettes/cigars/cohiba = 1)
refill_canister = /obj/item/vending_refill/cigarette
+/obj/machinery/vending/cigarette/beach //Used in the lavaland_biodome_beach.dmm ruin
+ name = "\improper ShadyCigs Ultra"
+ desc = "Now with extra premium products!"
+ product_ads = "Probably not bad for you!;Dope will get you through times of no money better than money will get you through times of no dope!;It's good for you!"
+ product_slogans = "Turn on, tune in, drop out!;Better living through chemistry!;Toke!;Don't forget to keep a smile on your lips and a song in your heart!"
+ products = list(/obj/item/storage/fancy/cigarettes = 5,
+ /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,
+ /obj/item/storage/fancy/cigarettes/cigpack_robust = 3,
+ /obj/item/storage/fancy/cigarettes/cigpack_carp = 3,
+ /obj/item/storage/fancy/cigarettes/cigpack_midori = 3,
+ /obj/item/storage/fancy/cigarettes/cigpack_cannabis = 5,
+ /obj/item/storage/box/matches = 10,
+ /obj/item/lighter/greyscale = 4,
+ /obj/item/storage/fancy/rollingpapers = 5)
+ premium = list(/obj/item/storage/fancy/cigarettes/cigpack_mindbreaker = 5,
+ /obj/item/clothing/mask/vape = 5,
+ /obj/item/lighter = 3)
+
/obj/item/vending_refill/cigarette
machine_name = "ShadyCigs Deluxe"
icon_state = "refill_smoke"
- charges = list(12, 3, 2)// of 36 standard, 9 contraband, 6 premium
- init_charges = list(12, 3, 2)
/obj/machinery/vending/cigarette/pre_throw(obj/item/I)
if(istype(I, /obj/item/lighter))
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index c644b09cf2..80e422c6a0 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -3,6 +3,7 @@
name = "ClothesMate" //renamed to make the slogan rhyme
desc = "A vending machine for clothing."
icon_state = "clothes"
+ icon_deny = "clothes-deny"
product_slogans = "Dress for success!;Prepare to look swagalicious!;Look at all this free swag!;Why leave style up to fate? Use the ClothesMate!"
vend_reply = "Thank you for using the ClothesMate!"
products = list(/obj/item/clothing/head/that = 2,
@@ -34,6 +35,7 @@
/obj/item/clothing/neck/tie/red = 1,
/obj/item/clothing/neck/tie/black = 1,
/obj/item/clothing/neck/tie/horrible = 1,
+ /obj/item/clothing/neck/scarf/pink = 1,
/obj/item/clothing/neck/scarf/red = 1,
/obj/item/clothing/neck/scarf/green = 1,
/obj/item/clothing/neck/scarf/darkblue = 1,
@@ -117,5 +119,3 @@
/obj/item/vending_refill/clothing
machine_name = "ClothesMate"
icon_state = "refill_clothes"
- charges = list(37, 4, 4)// of 111 standard, 12 contraband, 10 premium(?)
- init_charges = list(37, 4, 4)
diff --git a/code/modules/vending/coffee.dm b/code/modules/vending/coffee.dm
index d70cf4ae76..6ac9dd648d 100644
--- a/code/modules/vending/coffee.dm
+++ b/code/modules/vending/coffee.dm
@@ -4,8 +4,8 @@
product_ads = "Have a drink!;Drink up!;It's good for you!;Would you like a hot joe?;I'd kill for some coffee!;The best beans in the galaxy.;Only the finest brew for you.;Mmmm. Nothing like a coffee.;I like coffee, don't you?;Coffee helps you work!;Try some tea.;We hope you like the best!;Try our new chocolate!;Admin conspiracies"
icon_state = "coffee"
icon_vend = "coffee-vend"
- products = list(/obj/item/reagent_containers/food/drinks/coffee = 25,
- /obj/item/reagent_containers/food/drinks/mug/tea = 25,
+ products = list(/obj/item/reagent_containers/food/drinks/coffee = 25,
+ /obj/item/reagent_containers/food/drinks/mug/tea = 25,
/obj/item/reagent_containers/food/drinks/mug/coco = 25)
contraband = list(/obj/item/reagent_containers/food/drinks/ice = 12)
refill_canister = /obj/item/vending_refill/coffee
@@ -13,5 +13,3 @@
/obj/item/vending_refill/coffee
machine_name = "Solar's Best Hot Drinks"
icon_state = "refill_joe"
- charges = list(25, 4, 0)//of 75 standard, 12 contraband
- init_charges = list(25, 4, 0)
diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm
index e675b29f81..f61c392ff7 100644
--- a/code/modules/vending/cola.dm
+++ b/code/modules/vending/cola.dm
@@ -22,8 +22,6 @@
/obj/item/vending_refill/cola
machine_name = "Robust Softdrinks"
icon_state = "refill_cola"
- charges = list(30, 4, 1)//of 90 standard, 12 contraband, 1 premium
- init_charges = list(30, 4, 1)
/obj/machinery/vending/cola/random
name = "\improper Random Drinkies"
diff --git a/code/modules/vending/engineering.dm b/code/modules/vending/engineering.dm
index 5933ab8fa9..d36f4a4849 100644
--- a/code/modules/vending/engineering.dm
+++ b/code/modules/vending/engineering.dm
@@ -4,7 +4,7 @@
desc = "Everything you need for do-it-yourself station repair."
icon_state = "engi"
icon_deny = "engi-deny"
- req_access_txt = "11"
+ req_access = list(ACCESS_ENGINE_EQUIP)
products = list(/obj/item/clothing/under/rank/chief_engineer = 4,
/obj/item/clothing/under/rank/engineer = 4,
/obj/item/clothing/shoes/sneakers/orange = 4,
diff --git a/code/modules/vending/engivend.dm b/code/modules/vending/engivend.dm
index 53106c09a6..0e64e0a367 100644
--- a/code/modules/vending/engivend.dm
+++ b/code/modules/vending/engivend.dm
@@ -3,7 +3,7 @@
desc = "Spare tool vending. What? Did you expect some witty description?"
icon_state = "engivend"
icon_deny = "engivend-deny"
- req_access_txt = "11" //Engineering Equipment access
+ req_access = list(ACCESS_ENGINE_EQUIP)
products = list(/obj/item/clothing/glasses/meson/engine = 2,
/obj/item/clothing/glasses/welding = 3,
/obj/item/multitool = 4,
diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm
index f76f67af46..4e4d336567 100644
--- a/code/modules/vending/games.dm
+++ b/code/modules/vending/games.dm
@@ -1,7 +1,7 @@
/obj/machinery/vending/games
name = "\improper Good Clean Fun"
desc = "Vends things that the Captain and Head of Personnel are probably not going to appreciate you fiddling with instead of your job..."
- product_ads = "Escape to a fantasy world!;Fuel your gambling addiction!;Ruin your friendships!;Roll for initative!;Elves and dwarves!;Paranoid computers!;Totally not satanic!;Fun times forever!"
+ product_ads = "Escape to a fantasy world!;Fuel your gambling addiction!;Ruin your friendships!;Roll for initiative!;Elves and dwarves!;Paranoid computers!;Totally not satanic!;Fun times forever!"
icon_state = "games"
products = list(/obj/item/toy/cards/deck = 5,
/obj/item/storage/pill_bottle/dice = 10,
@@ -13,5 +13,3 @@
/obj/item/vending_refill/games
machine_name = "\improper Good Clean Fun"
icon_state = "refill_games"
- charges = list(7, 3, 0) //of 21 standard, 9 contraband
- init_charges = list(7, 3, 0)
diff --git a/code/modules/vending/liberation.dm b/code/modules/vending/liberation.dm
index 6eafafb164..8415eff69f 100644
--- a/code/modules/vending/liberation.dm
+++ b/code/modules/vending/liberation.dm
@@ -2,11 +2,14 @@
name = "\improper Liberation Station"
desc = "An overwhelming amount of ancient patriotism washes over you just by looking at the machine."
icon_state = "liberationstation"
- req_access_txt = "1"
product_slogans = "Liberation Station: Your one-stop shop for all things second ammendment!;Be a patriot today, pick up a gun!;Quality weapons for cheap prices!;Better dead than red!"
product_ads = "Float like an astronaut, sting like a bullet!;Express your second ammendment today!;Guns don't kill people, but you can!;Who needs responsibilities when you have guns?"
vend_reply = "Remember the name: Liberation Station!"
- products = list(/obj/item/gun/ballistic/automatic/pistol/deagle/gold = 2,
+ products = list(/obj/item/reagent_containers/food/snacks/burger/plain = 5, //O say can you see, by the dawn's early light
+ /obj/item/reagent_containers/food/snacks/burger/baseball = 3, //What so proudly we hailed at the twilight's last gleaming
+ /obj/item/reagent_containers/food/snacks/fries = 5, //Whose broad stripes and bright stars through the perilous fight
+ /obj/item/reagent_containers/food/drinks/beer/light = 10, //O'er the ramparts we watched, were so gallantly streaming?
+ /obj/item/gun/ballistic/automatic/pistol/deagle/gold = 2,
/obj/item/gun/ballistic/automatic/pistol/deagle/camo = 2,
/obj/item/gun/ballistic/automatic/pistol/m1911 = 2,
/obj/item/gun/ballistic/automatic/proto/unrestricted = 2,
@@ -17,8 +20,11 @@
premium = list(/obj/item/ammo_box/magazine/smgm9mm = 2,
/obj/item/ammo_box/magazine/m50 = 4,
/obj/item/ammo_box/magazine/m45 = 2,
- /obj/item/ammo_box/magazine/m75 = 2)
- contraband = list(/obj/item/clothing/under/patriotsuit = 1,
- /obj/item/bedsheet/patriot = 3)
+ /obj/item/ammo_box/magazine/m75 = 2,
+ /obj/item/reagent_containers/food/snacks/cheesyfries = 5,
+ /obj/item/reagent_containers/food/snacks/burger/baconburger = 5) //Premium burgers for the premium section
+ contraband = list(/obj/item/clothing/under/patriotsuit = 3,
+ /obj/item/bedsheet/patriot = 5,
+ /obj/item/reagent_containers/food/snacks/burger/superbite = 3) //U S A
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
diff --git a/code/modules/vending/liberation_toy.dm b/code/modules/vending/liberation_toy.dm
index c912d3dd3e..3b387f6959 100644
--- a/code/modules/vending/liberation_toy.dm
+++ b/code/modules/vending/liberation_toy.dm
@@ -2,8 +2,7 @@
name = "\improper Syndicate Donksoft Toy Vendor"
desc = "An ages 8 and up approved vendor that dispenses toys. If you were to find the right wires, you can unlock the adult mode setting!"
icon_state = "syndi"
- req_access_txt = "1"
- product_slogans = "Get your cool toys today!;Trigger a valid hunter today!;Quality toy weapons for cheap prices!;Give them to HoPs for all access!;Give them to HoS to get perma briged!"
+ product_slogans = "Get your cool toys today!;Trigger a valid hunter today!;Quality toy weapons for cheap prices!;Give them to HoPs for all access!;Give them to HoS to get permabrigged!"
product_ads = "Feel robust with your toys!;Express your inner child today!;Toy weapons don't kill people, but valid hunters do!;Who needs responsibilities when you have toy weapons?;Make your next murder FUN!"
vend_reply = "Come back for more!"
circuit = /obj/item/circuitboard/machine/vending/syndicatedonksofttoyvendor
diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm
index b1a5edb867..bea449845c 100644
--- a/code/modules/vending/medical.dm
+++ b/code/modules/vending/medical.dm
@@ -4,25 +4,25 @@
icon_state = "med"
icon_deny = "med-deny"
product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!"
- req_access_txt = "5"
- products = list(/obj/item/reagent_containers/syringe = 12,
- /obj/item/reagent_containers/dropper = 3,
- /obj/item/healthanalyzer = 4,
- /obj/item/sensor_device = 2,
+ req_access = list(ACCESS_MEDICAL)
+ products = list(/obj/item/reagent_containers/syringe = 12,
+ /obj/item/reagent_containers/dropper = 3,
+ /obj/item/healthanalyzer = 4,
+ /obj/item/sensor_device = 2,
/obj/item/pinpointer/crew = 2,
/obj/item/reagent_containers/medspray/sterilizine = 1,
- /obj/item/stack/medical/gauze = 8,
- /obj/item/reagent_containers/pill/patch/styptic = 5,
- /obj/item/reagent_containers/medspray/styptic = 2,
- /obj/item/reagent_containers/pill/patch/silver_sulf = 5,
+ /obj/item/stack/medical/gauze = 8,
+ /obj/item/reagent_containers/pill/patch/styptic = 5,
+ /obj/item/reagent_containers/medspray/styptic = 2,
+ /obj/item/reagent_containers/pill/patch/silver_sulf = 5,
/obj/item/reagent_containers/medspray/silver_sulf = 2,
/obj/item/reagent_containers/pill/insulin = 10,
- /obj/item/reagent_containers/pill/salbutamol = 2,
- /obj/item/reagent_containers/glass/bottle/charcoal = 4,
- /obj/item/reagent_containers/glass/bottle/epinephrine = 4,
+ /obj/item/reagent_containers/pill/salbutamol = 2,
+ /obj/item/reagent_containers/glass/bottle/charcoal = 4,
+ /obj/item/reagent_containers/glass/bottle/epinephrine = 4,
/obj/item/reagent_containers/glass/bottle/salglu_solution = 3,
- /obj/item/reagent_containers/glass/bottle/morphine = 4,
- /obj/item/reagent_containers/glass/bottle/toxin = 3,
+ /obj/item/reagent_containers/glass/bottle/morphine = 4,
+ /obj/item/reagent_containers/glass/bottle/toxin = 3,
/obj/item/reagent_containers/syringe/antiviral = 6)
contraband = list(/obj/item/reagent_containers/pill/tox = 3,
/obj/item/reagent_containers/pill/morphine = 4,
@@ -36,7 +36,5 @@
refill_canister = /obj/item/vending_refill/medical
/obj/item/vending_refill/medical
- machine_name = "NanoMed"
+ machine_name = "NanoMed Plus"
icon_state = "refill_medical"
- charges = list(26, 5, 3)// of 76 standard, 13 contraband, 8 premium
- init_charges = list(26, 5, 3)
diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm
index 6b5005eee4..ef19ce3b9b 100644
--- a/code/modules/vending/medical_wall.dm
+++ b/code/modules/vending/medical_wall.dm
@@ -15,5 +15,8 @@
/obj/item/reagent_containers/pill/morphine = 2)
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
- refill_count = 1
+ refill_canister = /obj/item/vending_refill/wallmed
+
+/obj/item/vending_refill/wallmed
+ machine_name = "NanoMed"
+ icon_state = "refill_medical"
diff --git a/code/modules/vending/robotics.dm b/code/modules/vending/robotics.dm
index 8c577d47c1..4832aa7ad7 100644
--- a/code/modules/vending/robotics.dm
+++ b/code/modules/vending/robotics.dm
@@ -4,7 +4,7 @@
desc = "All the tools you need to create your own robot army."
icon_state = "robotics"
icon_deny = "robotics-deny"
- req_access_txt = "29"
+ req_access = list(ACCESS_ROBOTICS)
products = list(/obj/item/clothing/suit/toggle/labcoat = 4,
/obj/item/clothing/under/rank/roboticist = 4,
/obj/item/stack/cable_coil = 4,
diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm
index 3f3035f9e4..7e90a5ce18 100644
--- a/code/modules/vending/security.dm
+++ b/code/modules/vending/security.dm
@@ -4,7 +4,7 @@
product_ads = "Crack capitalist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?"
icon_state = "sec"
icon_deny = "sec-deny"
- req_access_txt = "1"
+ req_access = list(ACCESS_SECURITY)
products = list(/obj/item/restraints/handcuffs = 8,
/obj/item/restraints/handcuffs/cable/zipties = 10,
/obj/item/grenade/flashbang = 4,
diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm
index 8fcd189a4f..69e510ad5a 100644
--- a/code/modules/vending/snack.dm
+++ b/code/modules/vending/snack.dm
@@ -13,12 +13,10 @@
/obj/item/reagent_containers/food/snacks/cheesiehonkers = 6)
contraband = list(/obj/item/reagent_containers/food/snacks/syndicake = 6)
refill_canister = /obj/item/vending_refill/snack
- var/chef_compartment_access = "28"
+ var/chef_compartment_access = "28" //ACCESS_KITCHEN
/obj/item/vending_refill/snack
machine_name = "Getmore Chocolate Corp"
- charges = list(12, 2, 0)//of 36 standard, 6 contraband
- init_charges = list(12, 2, 0)
/obj/machinery/vending/snack/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/reagent_containers/food/snacks))
@@ -44,7 +42,7 @@
if(iscompartmentfull(user))
break
if(!S.junkiness)
- T.SendSignal(COMSIG_TRY_STORAGE_TAKE, S, src, TRUE)
+ SEND_SIGNAL(T, COMSIG_TRY_STORAGE_TAKE, S, src, TRUE)
food_load(S)
loaded++
else
diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm
index fc2f9c59b9..08bb4615bb 100644
--- a/code/modules/vending/toys.dm
+++ b/code/modules/vending/toys.dm
@@ -2,24 +2,26 @@
name = "\improper Donksoft Toy Vendor"
desc = "Ages 8 and up approved vendor that dispenses toys."
icon_state = "syndi"
- product_slogans = "Get your cool toys today!;Trigger a valid hunter today!;Quality toy weapons for cheap prices!;Give them to HoPs for all access!;Give them to HoS to get perma briged!"
+ product_slogans = "Get your cool toys today!;Trigger a valid hunter today!;Quality toy weapons for cheap prices!;Give them to HoPs for all access!;Give them to HoS to get permabrigged!"
product_ads = "Feel robust with your toys!;Express your inner child today!;Toy weapons don't kill people, but valid hunters do!;Who needs responsibilities when you have toy weapons?;Make your next murder FUN!"
vend_reply = "Come back for more!"
circuit = /obj/item/circuitboard/machine/vending/donksofttoyvendor
- products = list(/obj/item/gun/ballistic/automatic/toy/unrestricted = 10,
- /obj/item/gun/ballistic/automatic/toy/pistol/unrestricted = 10,
- /obj/item/gun/ballistic/shotgun/toy/unrestricted = 10,
- /obj/item/toy/sword = 10,
- /obj/item/ammo_box/foambox = 20,
- /obj/item/toy/foamblade = 10,
- /obj/item/toy/syndicateballoon = 10,
- /obj/item/clothing/suit/syndicatefake = 5,
- /obj/item/clothing/head/syndicatefake = 5)
- contraband = list(/obj/item/gun/ballistic/shotgun/toy/crossbow = 10,
- /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted = 10,
- /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted = 10,
- /obj/item/toy/katana = 10,
- /obj/item/twohanded/dualsaber/toy = 5)
+ products = list(
+ /obj/item/gun/ballistic/automatic/toy/unrestricted = 10,
+ /obj/item/gun/ballistic/automatic/toy/pistol/unrestricted = 10,
+ /obj/item/gun/ballistic/shotgun/toy/unrestricted = 10,
+ /obj/item/toy/sword = 10,
+ /obj/item/ammo_box/foambox = 20,
+ /obj/item/toy/foamblade = 10,
+ /obj/item/toy/syndicateballoon = 10,
+ /obj/item/clothing/suit/syndicatefake = 5,
+ /obj/item/clothing/head/syndicatefake = 5)
+ contraband = list(
+ /obj/item/gun/ballistic/shotgun/toy/crossbow = 10,
+ /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted = 10,
+ /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted = 10,
+ /obj/item/toy/katana = 10,
+ /obj/item/twohanded/dualsaber/toy = 5)
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/donksoft
@@ -27,5 +29,3 @@
/obj/item/vending_refill/donksoft
machine_name = "Donksoft Toy Vendor"
icon_state = "refill_donksoft"
- charges = list(32,28,0)// of 90 standard, 75 contraband, 0 premium
- init_charges = list(32,28,0)
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
new file mode 100644
index 0000000000..5a41beb88d
--- /dev/null
+++ b/code/modules/vending/wardrobes.dm
@@ -0,0 +1,351 @@
+/obj/item/vending_refill/wardrobe
+ icon_state = "refill_clothes"
+
+/obj/machinery/vending/wardrobe/sec_wardrobe
+ name = "\improper SecDrobe"
+ desc = "A vending machine for security and security-related clothing!"
+ icon_state = "secdrobe"
+ product_ads = "Beat perps in style!;It's red so you can't see the blood!;You have the right to be fashionable!;Now you can be the fashion police you always wanted to be!"
+ vend_reply = "Thank you for using the SecDrobe!"
+ products = list(/obj/item/clothing/suit/hooded/wintercoat/security = 1,
+ /obj/item/storage/backpack/security = 1,
+ /obj/item/storage/backpack/satchel/sec = 1,
+ /obj/item/storage/backpack/duffelbag/sec = 2,
+ /obj/item/clothing/under/rank/security = 3,
+ /obj/item/clothing/shoes/jackboots = 3,
+ /obj/item/clothing/head/beret/sec = 3,
+ /obj/item/clothing/head/soft/sec = 3,
+ /obj/item/clothing/mask/bandana/red = 3,
+ /obj/item/clothing/under/rank/security/skirt = 3,
+ /obj/item/clothing/under/rank/security/grey = 3,
+ /obj/item/clothing/under/pants/khaki = 3)
+ premium = list(/obj/item/clothing/under/rank/security/navyblue = 3,
+ /obj/item/clothing/suit/security/officer = 3,
+ /obj/item/clothing/head/beret/sec/navyofficer = 3)
+ refill_canister = /obj/item/vending_refill/wardrobe/sec_wardrobe
+
+/obj/item/vending_refill/wardrobe/sec_wardrobe
+ machine_name = "SecDrobe"
+
+/obj/machinery/vending/wardrobe/medi_wardrobe
+ name = "\improper MediDrobe"
+ desc = "A vending machine rumoured to be capable of dispensing clothing for medical personnel."
+ icon_state = "medidrobe"
+ product_ads = "Make those blood stains look fashionable!!"
+ vend_reply = "Thank you for using the MediDrobe!"
+ products = list(/obj/item/clothing/accessory/pocketprotector = 1,
+ /obj/item/storage/backpack/duffelbag/med = 1,
+ /obj/item/storage/backpack/medic = 1,
+ /obj/item/storage/backpack/satchel/med = 1,
+ /obj/item/clothing/suit/hooded/wintercoat/medical = 1,
+ /obj/item/clothing/under/rank/nursesuit = 1,
+ /obj/item/clothing/head/nursehat = 1,
+ /obj/item/clothing/under/rank/medical/blue = 1,
+ /obj/item/clothing/under/rank/medical/green = 1,
+ /obj/item/clothing/under/rank/medical/purple = 1,
+ /obj/item/clothing/under/rank/medical = 3,
+ /obj/item/clothing/suit/toggle/labcoat = 3,
+ /obj/item/clothing/suit/toggle/labcoat/emt = 3,
+ /obj/item/clothing/shoes/sneakers/white = 3,
+ /obj/item/clothing/head/soft/emt = 3,
+ /obj/item/clothing/suit/apron/surgical = 1,
+ /obj/item/clothing/mask/surgical = 1)
+ refill_canister = /obj/item/vending_refill/wardrobe/medi_wardrobe
+
+/obj/item/vending_refill/wardrobe/medi_wardrobe
+ machine_name = "MediDrobe"
+
+/obj/machinery/vending/wardrobe/engi_wardrobe
+ name = "EngiDrobe"
+ desc = "A vending machine renowned for vending industrial grade clothing."
+ icon_state = "engidrobe"
+ product_ads = "Guaranteed to protect your feet from industrial accidents!;Afraid of radiation? Then wear yellow!"
+ vend_reply = "Thank you for using the EngiDrobe!"
+ products = list(/obj/item/clothing/accessory/pocketprotector = 1,
+ /obj/item/storage/backpack/duffelbag/engineering = 1,
+ /obj/item/storage/backpack/industrial = 1,
+ /obj/item/storage/backpack/satchel/eng = 1,
+ /obj/item/clothing/suit/hooded/wintercoat/engineering = 1,
+ /obj/item/clothing/under/rank/engineer = 3,
+ /obj/item/clothing/suit/hazardvest = 3,
+ /obj/item/clothing/shoes/workboots = 3,
+ /obj/item/clothing/head/hardhat = 3)
+ refill_canister = /obj/item/vending_refill/wardrobe/engi_wardrobe
+
+/obj/item/vending_refill/wardrobe/engi_wardrobe
+ machine_name = "EngiDrobe"
+
+/obj/machinery/vending/wardrobe/atmos_wardrobe
+ name = "AtmosDrobe"
+ desc = "This relatively unknown vending machine delivers clothing for Atmospherics Technicians, an equally unknown job."
+ icon_state = "atmosdrobe"
+ product_ads = "Get your inflammable clothing right here!!!"
+ vend_reply = "Thank you for using the AtmosDrobe!"
+ products = list(/obj/item/clothing/accessory/pocketprotector = 1,
+ /obj/item/storage/backpack/duffelbag/engineering = 1,
+ /obj/item/storage/backpack/satchel/eng = 1,
+ /obj/item/storage/backpack/industrial = 1,
+ /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3,
+ /obj/item/clothing/under/rank/atmospheric_technician = 3,
+ /obj/item/clothing/shoes/sneakers/black = 3)
+ refill_canister = /obj/item/vending_refill/wardrobe/atmos_wardrobe
+
+/obj/item/vending_refill/wardrobe/atmos_wardrobe
+ machine_name = "AtmosDrobe"
+
+/obj/machinery/vending/wardrobe/cargo_wardrobe
+ name = "CargoDrobe"
+ desc = "A highly advanced vending machine for buying cargo related clothing for free."
+ icon_state = "cargodrobe"
+ product_ads = "Upgraded Assistant Style! Pick yours today!;These shorts are comfy and easy to wear, get yours now!"
+ vend_reply = "Thank you for using the CargoDrobe!"
+ products = list(/obj/item/clothing/suit/hooded/wintercoat/cargo = 1,
+ /obj/item/clothing/under/rank/cargotech = 3,
+ /obj/item/clothing/shoes/sneakers/black = 3,
+ /obj/item/clothing/gloves/fingerless = 3,
+ /obj/item/clothing/head/soft = 3,
+ /obj/item/radio/headset/headset_cargo = 1)
+ refill_canister = /obj/item/vending_refill/wardrobe/cargo_wardrobe
+
+/obj/item/vending_refill/wardrobe/cargo_wardrobe
+ machine_name = "CargoDrobe"
+
+/obj/machinery/vending/wardrobe/robo_wardrobe
+ name = "RoboDrobe"
+ desc = "A vending machine designed to dispense clothing known only to roboticists."
+ icon_state = "robodrobe"
+ product_ads = "You turn me TRUE, use defines!;0110001101101100011011110111010001101000011001010111001101101000011001010111001001100101"
+ vend_reply = "Thank you for using the RoboDrobe!"
+ products = list(/obj/item/clothing/glasses/hud/diagnostic = 2,
+ /obj/item/clothing/under/rank/roboticist = 2,
+ /obj/item/clothing/suit/toggle/labcoat = 2,
+ /obj/item/clothing/shoes/sneakers/black = 2,
+ /obj/item/clothing/gloves/fingerless = 2,
+ /obj/item/clothing/head/soft/black = 2,
+ /obj/item/clothing/mask/bandana/skull = 1)
+ refill_canister = /obj/item/vending_refill/wardrobe/robo_wardrobe
+
+/obj/item/vending_refill/wardrobe/robo_wardrobe
+ machine_name = "RoboDrobe"
+
+/obj/machinery/vending/wardrobe/science_wardrobe
+ name = "SciDrobe"
+ desc = "A simple vending machine suitable to dispense well tailored science clothing. Endorsed by Cubans."
+ icon_state = "scidrobe"
+ product_ads = "Longing for the smell of flesh plasma? Buy your science clothing now!;Made with 10% Auxetics, so you don't have to worry losing your arm!"
+ vend_reply = "Thank you for using the SciDrobe!"
+ products = list(/obj/item/clothing/accessory/pocketprotector = 1,
+ /obj/item/storage/backpack/science = 2,
+ /obj/item/storage/backpack/satchel/tox = 2,
+ /obj/item/clothing/suit/hooded/wintercoat/science = 1,
+ /obj/item/clothing/under/rank/scientist = 3,
+ /obj/item/clothing/suit/toggle/labcoat/science = 3,
+ /obj/item/clothing/shoes/sneakers/white = 3,
+ /obj/item/radio/headset/headset_sci = 2,
+ /obj/item/clothing/mask/gas = 3)
+ refill_canister = /obj/item/vending_refill/wardrobe/science_wardrobe
+
+/obj/item/vending_refill/wardrobe/science_wardrobe
+ machine_name = "SciDrobe"
+
+/obj/machinery/vending/wardrobe/hydro_wardrobe
+ name = "Hydrobe"
+ desc = "A machine with a catchy name. It dispenses botany related clothing and gear."
+ icon_state = "hydrobe"
+ product_ads = "Do you love soil? Then buy our clothes!;Get outfits to match your green thumb here!"
+ vend_reply = "Thank you for using the Hydrobe!"
+ products = list(/obj/item/storage/backpack/botany = 2,
+ /obj/item/storage/backpack/satchel/hyd = 2,
+ /obj/item/clothing/suit/hooded/wintercoat/hydro = 1,
+ /obj/item/clothing/suit/apron = 2,
+ /obj/item/clothing/suit/apron/overalls = 3,
+ /obj/item/clothing/under/rank/hydroponics = 3,
+ /obj/item/clothing/mask/bandana = 3)
+ refill_canister = /obj/item/vending_refill/wardrobe/hydro_wardrobe
+
+/obj/item/vending_refill/wardrobe/hydro_wardrobe
+ machine_name = "HyDrobe"
+
+/obj/machinery/vending/wardrobe/curator_wardrobe
+ name = "CuraDrobe"
+ desc = "A lowstock vendor only capable of vending clothing for curators and librarians."
+ icon_state = "curadrobe"
+ product_ads = "Our clothes are endorsed by treasure hunters everywhere!"
+ vend_reply = "Thank you for using the CuraDrobe!"
+ products = list(/obj/item/clothing/head/fedora/curator = 1,
+ /obj/item/clothing/suit/curator = 1,
+ /obj/item/clothing/under/rank/curator/treasure_hunter = 1,
+ /obj/item/clothing/shoes/workboots/mining = 1,
+ /obj/item/storage/backpack/satchel/explorer = 1,
+ /obj/item/storage/bag/books = 1)
+ refill_canister = /obj/item/vending_refill/wardrobe/curator_wardrobe
+
+/obj/item/vending_refill/wardrobe/curator_wardrobe
+ machine_name = "CuraDrobe"
+
+/obj/machinery/vending/wardrobe/bar_wardrobe
+ name = "BarDrobe"
+ desc = "A stylish vendor to dispense the most stylish bar clothing!"
+ icon_state = "bardrobe"
+ product_ads = "Guaranteed to prevent stains from spilled drinks!"
+ vend_reply = "Thank you for using the BarDrobe!"
+ products = list(/obj/item/clothing/head/that = 2,
+ /obj/item/radio/headset/headset_srv = 2,
+ /obj/item/clothing/under/sl_suit = 2,
+ /obj/item/clothing/under/rank/bartender = 2,
+ /obj/item/clothing/under/rank/bartender/purple = 1,
+ /obj/item/clothing/accessory/waistcoat = 2,
+ /obj/item/clothing/suit/apron/purple_bartender = 1,
+ /obj/item/clothing/head/soft/black = 2,
+ /obj/item/clothing/shoes/sneakers/black = 2,
+ /obj/item/reagent_containers/glass/rag = 2,
+ /obj/item/storage/box/beanbag = 1,
+ /obj/item/clothing/suit/armor/vest/alt = 1,
+ /obj/item/circuitboard/machine/dish_drive = 1,
+ /obj/item/clothing/glasses/sunglasses/reagent = 1,
+ /obj/item/clothing/neck/petcollar = 1,
+ /obj/item/storage/belt/bandolier = 1)
+ refill_canister = /obj/item/vending_refill/wardrobe/bar_wardrobe
+
+/obj/item/vending_refill/wardrobe/bar_wardrobe
+ machine_name = "BarDrobe"
+
+/obj/machinery/vending/wardrobe/chef_wardrobe
+ name = "ChefDrobe"
+ desc = "This vending machine might not dispense meat, but it certainly dispenses chef related clothing."
+ icon_state = "chefdrobe"
+ product_ads = "Our clothes are guaranteed to protect you from food splatters!"
+ vend_reply = "Thank you for using the ChefDrobe!"
+ products = list(/obj/item/clothing/under/waiter = 2,
+ /obj/item/radio/headset/headset_srv = 2,
+ /obj/item/clothing/accessory/waistcoat = 2,
+ /obj/item/clothing/suit/apron/chef = 3,
+ /obj/item/clothing/head/soft/mime = 2,
+ /obj/item/storage/box/mousetraps = 2,
+ /obj/item/circuitboard/machine/dish_drive = 1,
+ /obj/item/clothing/suit/toggle/chef = 1,
+ /obj/item/clothing/under/rank/chef = 1,
+ /obj/item/clothing/head/chefhat = 1,
+ /obj/item/reagent_containers/glass/rag = 1)
+ refill_canister = /obj/item/vending_refill/wardrobe/chef_wardrobe
+
+/obj/item/vending_refill/wardrobe/chef_wardrobe
+ machine_name = "ChefDrobe"
+
+/obj/machinery/vending/wardrobe/jani_wardrobe
+ name = "JaniDrobe"
+ desc = "A self cleaning vending machine capable of dispensing clothing for janitors."
+ icon_state = "janidrobe"
+ product_ads = "Come and get your janitorial clothing, now endorsed by lizard janitors everywhere!"
+ vend_reply = "Thank you for using the JaniDrobe!"
+ products = list(/obj/item/clothing/under/rank/janitor = 1,
+ /obj/item/cartridge/janitor = 1,
+ /obj/item/clothing/gloves/color/black = 1,
+ /obj/item/clothing/head/soft/purple = 1,
+ /obj/item/paint/paint_remover = 1,
+ /obj/item/melee/flyswatter = 1,
+ /obj/item/flashlight = 1,
+ /obj/item/caution = 6,
+ /obj/item/holosign_creator = 1,
+ /obj/item/lightreplacer = 1,
+ /obj/item/soap = 1,
+ /obj/item/storage/bag/trash = 1,
+ /obj/item/clothing/shoes/galoshes = 1,
+ /obj/item/watertank/janitor = 1,
+ /obj/item/storage/belt/janitor = 1)
+ refill_canister = /obj/item/vending_refill/wardrobe/jani_wardrobe
+
+/obj/item/vending_refill/wardrobe/jani_wardrobe
+ machine_name = "JaniDrobe"
+
+/obj/machinery/vending/wardrobe/law_wardrobe
+ name = "LawDrobe"
+ desc = "Objection! This wardrobe dispenses the rule of law... and lawyer clothing."
+ icon_state = "lawdrobe"
+ product_ads = "OBJECTION! Get the rule of law for yourself!"
+ vend_reply = "Thank you for using the LawDrobe!"
+ products = list(/obj/item/clothing/under/lawyer/female = 1,
+ /obj/item/clothing/under/lawyer/black = 1,
+ /obj/item/clothing/under/lawyer/red = 1,
+ /obj/item/clothing/under/lawyer/bluesuit = 1,
+ /obj/item/clothing/suit/toggle/lawyer = 1,
+ /obj/item/clothing/under/lawyer/purpsuit = 1,
+ /obj/item/clothing/suit/toggle/lawyer/purple = 1,
+ /obj/item/clothing/under/lawyer/blacksuit = 1,
+ /obj/item/clothing/suit/toggle/lawyer/black = 1,
+ /obj/item/clothing/shoes/laceup = 2,
+ /obj/item/clothing/accessory/lawyers_badge = 2)
+ refill_canister = /obj/item/vending_refill/wardrobe/law_wardrobe
+
+/obj/item/vending_refill/wardrobe/law_wardrobe
+ machine_name = "LawDrobe"
+
+/obj/machinery/vending/wardrobe/chap_wardrobe
+ name = "ChapDrobe"
+ desc = "This most blessed and holy machine vends clothing only suitable for chaplains to gaze upon."
+ icon_state = "chapdrobe"
+ product_ads = "Are you being bothered by cultists or pesky revenants? Then come and dress like the holy man!;Clothes for men of the cloth!"
+ vend_reply = "Thank you for using the ChapDrobe!"
+ products = list(/obj/item/holybeacon = 1,
+ /obj/item/storage/backpack/cultpack = 1,
+ /obj/item/clothing/accessory/pocketprotector/cosmetology = 1,
+ /obj/item/clothing/under/rank/chaplain = 1,
+ /obj/item/clothing/shoes/sneakers/black = 1,
+ /obj/item/clothing/suit/nun = 1,
+ /obj/item/clothing/head/nun_hood = 1,
+ /obj/item/clothing/suit/holidaypriest = 1,
+ /obj/item/storage/fancy/candle_box = 2)
+ refill_canister = /obj/item/vending_refill/wardrobe/chap_wardrobe
+
+/obj/item/vending_refill/wardrobe/chap_wardrobe
+ machine_name = "ChapDrobe"
+
+/obj/machinery/vending/wardrobe/chem_wardrobe
+ name = "ChemDrobe"
+ desc = "A vending machine for dispensing chemistry related clothing."
+ icon_state = "chemdrobe"
+ product_ads = "Our clothes are 0.5% more resistant to acid spills! Get yours now!"
+ vend_reply = "Thank you for using the ChemDrobe!"
+ products = list(/obj/item/clothing/under/rank/chemist = 2,
+ /obj/item/clothing/shoes/sneakers/white = 2,
+ /obj/item/clothing/suit/toggle/labcoat/chemist = 2,
+ /obj/item/storage/backpack/chemistry = 2,
+ /obj/item/storage/backpack/satchel/chem = 2,
+ /obj/item/storage/bag/chemistry = 2)
+ refill_canister = /obj/item/vending_refill/wardrobe/chem_wardrobe
+
+/obj/item/vending_refill/wardrobe/chem_wardrobe
+ machine_name = "ChemDrobe"
+
+/obj/machinery/vending/wardrobe/gene_wardrobe
+ name = "GeneDrobe"
+ desc = "A machine for dispensing clothing related to genetics."
+ icon_state = "genedrobe"
+ product_ads = "Perfect for the mad scientist in you!"
+ vend_reply = "Thank you for using the GeneDrobe!"
+ products = list(/obj/item/clothing/under/rank/geneticist = 2,
+ /obj/item/clothing/shoes/sneakers/white = 2,
+ /obj/item/clothing/suit/toggle/labcoat/genetics = 2,
+ /obj/item/storage/backpack/genetics = 2,
+ /obj/item/storage/backpack/satchel/gen = 2)
+ refill_canister = /obj/item/vending_refill/wardrobe/gene_wardrobe
+
+/obj/item/vending_refill/wardrobe/gene_wardrobe
+ machine_name = "GeneDrobe"
+
+/obj/machinery/vending/wardrobe/viro_wardrobe
+ name = "ViroDrobe"
+ desc = "An unsterilized machine for dispending virology related clothing."
+ icon_state = "virodrobe"
+ product_ads = " Viruses getting you down? Then upgrade to sterilized clothing today!"
+ vend_reply = "Thank you for using the ViroDrobe"
+ products = list(/obj/item/clothing/under/rank/virologist = 2,
+ /obj/item/clothing/shoes/sneakers/white = 2,
+ /obj/item/clothing/suit/toggle/labcoat/virologist = 2,
+ /obj/item/clothing/mask/surgical = 2,
+ /obj/item/storage/backpack/virology = 2,
+ /obj/item/storage/backpack/satchel/vir = 2)
+ refill_canister = /obj/item/vending_refill/wardrobe/viro_wardrobe
+
+/obj/item/vending_refill/wardrobe/viro_wardrobe
+ machine_name = "ViroDrobe"
diff --git a/code/modules/vending/youtool.dm b/code/modules/vending/youtool.dm
index 6c48b7a376..495d60a461 100644
--- a/code/modules/vending/youtool.dm
+++ b/code/modules/vending/youtool.dm
@@ -3,7 +3,6 @@
desc = "Tools for tools."
icon_state = "tool"
icon_deny = "tool-deny"
- //req_access_txt = "12" //Maintenance access
products = list(/obj/item/stack/cable_coil/random = 10,
/obj/item/crowbar = 5,
/obj/item/weldingtool = 3,
diff --git a/code/modules/zombie/items.dm b/code/modules/zombie/items.dm
index 154941ce70..03d2ac3921 100644
--- a/code/modules/zombie/items.dm
+++ b/code/modules/zombie/items.dm
@@ -4,7 +4,7 @@
humans, butchering all other living things to \
sustain the zombie, smashing open airlock doors and opening \
child-safe caps on bottles."
- flags_1 = NODROP_1|ABSTRACT_1|DROPDEL_1
+ item_flags = NODROP | ABSTRACT | DROPDEL
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
icon = 'icons/effects/blood.dmi'
icon_state = "bloodhand_left"
diff --git a/config/antag_rep.txt b/config/antag_rep.txt
new file mode 100644
index 0000000000..a26b157d5a
--- /dev/null
+++ b/config/antag_rep.txt
@@ -0,0 +1,5 @@
+## Custom antag reputation values
+## List of job titles followed by antag rep value, all prefixed with ANTAG_REP. See code/modules/jobs/job_types for titles
+## e.g.
+## ANTAG_REP Captain 10
+## ANTAG_REP Assistant 0
diff --git a/config/config.txt b/config/config.txt
index 57e0050d69..fba903477c 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -3,6 +3,7 @@
$include game_options.txt
$include dbconfig.txt
$include comms.txt
+$include antag_rep.txt
# You can use the @ character at the beginning of a config option to lock it from being edited in-game
# Example usage:
diff --git a/config/game_options.txt b/config/game_options.txt
index 6ecec1fc9e..953de2f923 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -16,9 +16,6 @@ REVIVAL_BRAIN_LIFE -1
## RENAMING ###
-## Uncomment to allow cyborgs to rename themselves at roundstart. Has no effect on roboticists renaming cyborgs the normal way.
-#RENAME_CYBORG
-
## OOC DURING ROUND ###
## Comment this out if you want OOC to be automatically disabled during the round, it will be enabled during the lobby and after the round end results.
OOC_DURING_ROUND
@@ -533,9 +530,6 @@ ALLOW_MISCREANTS
## Uncomment to let miscreants spawn during Extended. I hold no responsibility for fun that may occur while this is enabled.
#ALLOW_EXTENDED_MISCREANTS
-## Determines if players are allowed to print integrated circuits, uncomment to allow.
-#IC_PRINTING
-
## Uncomment to allow roundstart quirk selection in the character setup menu.
## This used to be named traits, hence the config name, but it handles quirks, not the other kind of trait!
ROUNDSTART_TRAITS
@@ -551,3 +545,6 @@ ROUNDSTART_TRAITS
## Sets shift time to server time at roundstart. Overridden by RANDOMIZE_SHIFT_TIME ##
#SHIFT_TIME_REALTIME
+
+## A cap on how many monkeys may be created via monkey cubes
+MONKEYCAP 64
diff --git a/goon/icons/obj/chairs.dmi b/goon/icons/obj/chairs.dmi
new file mode 100644
index 0000000000..462370ac37
Binary files /dev/null and b/goon/icons/obj/chairs.dmi differ
diff --git a/html/changelogs/AutoChangeLog-pr-38106.yml b/html/changelogs/AutoChangeLog-pr-38106.yml
new file mode 100644
index 0000000000..ca76e50b52
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-38106.yml
@@ -0,0 +1,5 @@
+author: "SpaceManiac"
+delete-after: True
+changes:
+ - bugfix: "The destructive analyzer can once again be used to reveal nodes."
+ - spellcheck: "Some references to \"deconstructive analyzer\" have been updated to \"destructive\"."
diff --git a/html/changelogs/AutoChangeLog-pr-38127.yml b/html/changelogs/AutoChangeLog-pr-38127.yml
new file mode 100644
index 0000000000..b8e6b66b33
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-38127.yml
@@ -0,0 +1,5 @@
+author: "Dax Dupont"
+delete-after: True
+changes:
+ - bugfix: "Fixes the wrong tiles in Syndicate VR trainer and uses different tiny fans."
+ - bugfix: "Access didn't append to VR IDs"
diff --git a/html/changelogs/AutoChangeLog-pr-6868.yml b/html/changelogs/AutoChangeLog-pr-6868.yml
new file mode 100644
index 0000000000..c6e55230aa
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6868.yml
@@ -0,0 +1,4 @@
+author: "Jay"
+delete-after: True
+changes:
+ - tweak: "Bans CMO, RD, CE, and HoP from antag/ling"
diff --git a/html/changelogs/AutoChangeLog-pr-6925.yml b/html/changelogs/AutoChangeLog-pr-6925.yml
new file mode 100644
index 0000000000..72db73db26
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6925.yml
@@ -0,0 +1,4 @@
+author: "Naksu"
+delete-after: True
+changes:
+ - rscadd: "Nuclear explosive-shaped beerkegs found on metastation can now be triggered with the nuclear disk and the syndicate's legacy nuclear code for a foamy surprise"
diff --git a/html/changelogs/AutoChangeLog-pr-6952.yml b/html/changelogs/AutoChangeLog-pr-6952.yml
new file mode 100644
index 0000000000..4932f9ed76
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6952.yml
@@ -0,0 +1,4 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - tweak: "Lavaland is no longer fullbright. We have memory to spare."
diff --git a/html/changelogs/AutoChangeLog-pr-6958.yml b/html/changelogs/AutoChangeLog-pr-6958.yml
new file mode 100644
index 0000000000..e59e3a143e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6958.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Moving diagonally past delivery chutes, transit tube pods, &c. no longer causes your camera to be stuck on them."
diff --git a/html/changelogs/AutoChangeLog-pr-6960.yml b/html/changelogs/AutoChangeLog-pr-6960.yml
new file mode 100644
index 0000000000..6ccfa63bff
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6960.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - config: "The limit of monkey's spawned via monkey cubes is now configurable"
diff --git a/html/changelogs/AutoChangeLog-pr-6963.yml b/html/changelogs/AutoChangeLog-pr-6963.yml
new file mode 100644
index 0000000000..ee8f0dadc9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6963.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Fixes cyborgs not being able to use two-handed modules while other modules are equipped."
diff --git a/html/changelogs/AutoChangeLog-pr-6964.yml b/html/changelogs/AutoChangeLog-pr-6964.yml
new file mode 100644
index 0000000000..9b57865956
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6964.yml
@@ -0,0 +1,4 @@
+author: "Cruix"
+delete-after: True
+changes:
+ - rscadd: "AIs now have an experimental multi-camera mode that allows them to view up to six map areas at the same time, accessible through two new buttons on their HUD."
diff --git a/html/changelogs/AutoChangeLog-pr-6966.yml b/html/changelogs/AutoChangeLog-pr-6966.yml
new file mode 100644
index 0000000000..e727e153fc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6966.yml
@@ -0,0 +1,4 @@
+author: "Dax Dupont"
+delete-after: True
+changes:
+ - bugfix: "Fixed rpeds throwing stock part rating related runtimes."
diff --git a/html/changelogs/AutoChangeLog-pr-6969.yml b/html/changelogs/AutoChangeLog-pr-6969.yml
new file mode 100644
index 0000000000..770043e579
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6969.yml
@@ -0,0 +1,4 @@
+author: "Nichlas0010"
+delete-after: True
+changes:
+ - bugfix: "You can no longer use a soapstone infinitely"
diff --git a/html/changelogs/AutoChangeLog-pr-6971.yml b/html/changelogs/AutoChangeLog-pr-6971.yml
new file mode 100644
index 0000000000..cfcfc7c801
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6971.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Pubby's auxiliary mining base now works again."
diff --git a/html/changelogs/AutoChangeLog-pr-6972.yml b/html/changelogs/AutoChangeLog-pr-6972.yml
new file mode 100644
index 0000000000..a9ffa8bf78
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6972.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "The overlay effects of cult flooring are now on the floor plane, fixing their odd ambient occlusion appearance."
diff --git a/html/changelogs/AutoChangeLog-pr-6973.yml b/html/changelogs/AutoChangeLog-pr-6973.yml
new file mode 100644
index 0000000000..04a93d79ff
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6973.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Cloning no longer breaks a character's connection to their family heirloom."
diff --git a/html/changelogs/AutoChangeLog-pr-6974.yml b/html/changelogs/AutoChangeLog-pr-6974.yml
new file mode 100644
index 0000000000..9b295ea168
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6974.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Beam rifle tracers no longer fall into chasms."
diff --git a/html/changelogs/AutoChangeLog-pr-6975.yml b/html/changelogs/AutoChangeLog-pr-6975.yml
new file mode 100644
index 0000000000..298fdf4cad
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6975.yml
@@ -0,0 +1,8 @@
+author: "Big Tobacco"
+delete-after: True
+changes:
+ - rscadd: "Cheap lighters now come in four different shapes and Zippos can have one of four different designs, collect them all and improve our sales!"
+ - imageadd: "All existing lighter sprites have been given a face-lift and the flames are now subtly animated."
+ - tweak: "Cheap lighters now use a fixed list of 16 colors to pick from instead of using totally randomized colors."
+ - imageadd: "Cigar cases have been tweaked to be a bit smaller and to have a modified design."
+ - imageadd: "Cohiba Robusto and Havanan cigars now use separate case sprites from the generic premium cigar cases."
diff --git a/html/changelogs/AutoChangeLog-pr-6976.yml b/html/changelogs/AutoChangeLog-pr-6976.yml
new file mode 100644
index 0000000000..eda65aebd0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6976.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Vomiting on the same tile a second time no deletes the vomited reagents."
diff --git a/html/changelogs/AutoChangeLog-pr-6978.yml b/html/changelogs/AutoChangeLog-pr-6978.yml
new file mode 100644
index 0000000000..79a17c8c34
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6978.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "fixed the clockwork helmet not dropping to ground when used by non-clock cultists"
diff --git a/html/changelogs/AutoChangeLog-pr-6979.yml b/html/changelogs/AutoChangeLog-pr-6979.yml
new file mode 100644
index 0000000000..83cc369bbf
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6979.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - refactor: "The base machinery type is now anchored by default."
diff --git a/html/changelogs/AutoChangeLog-pr-6983.yml b/html/changelogs/AutoChangeLog-pr-6983.yml
new file mode 100644
index 0000000000..b74d9635b3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6983.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "PDA style now gets loaded correctly."
diff --git a/html/changelogs/AutoChangeLog-pr-6985.yml b/html/changelogs/AutoChangeLog-pr-6985.yml
new file mode 100644
index 0000000000..7fa4518219
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6985.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Switching mobs into/out of a mech (by VR, ghosting, or mindswap) no longer improperly applies the mech's cursor."
diff --git a/html/changelogs/AutoChangeLog-pr-6987.yml b/html/changelogs/AutoChangeLog-pr-6987.yml
new file mode 100644
index 0000000000..491a186af9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6987.yml
@@ -0,0 +1,5 @@
+author: "Nichlas0010"
+delete-after: True
+changes:
+ - bugfix: "You now can't get multiple download objectives!"
+ - tweak: "RDs, Scientists and Roboticists can no longer get download objectives!"
diff --git a/html/changelogs/AutoChangeLog-pr-6988.yml b/html/changelogs/AutoChangeLog-pr-6988.yml
new file mode 100644
index 0000000000..4b29f0fb09
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6988.yml
@@ -0,0 +1,4 @@
+author: "cyclowns"
+delete-after: True
+changes:
+ - bugfix: "Fires no longer flicker back and forth like crazy"
diff --git a/html/changelogs/AutoChangeLog-pr-6989.yml b/html/changelogs/AutoChangeLog-pr-6989.yml
new file mode 100644
index 0000000000..b448b9a768
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6989.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - tweak: "roboticists have access to R&D windoors"
diff --git a/html/changelogs/AutoChangeLog-pr-6991.yml b/html/changelogs/AutoChangeLog-pr-6991.yml
new file mode 100644
index 0000000000..bf8b60a831
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6991.yml
@@ -0,0 +1,6 @@
+author: "ShizCalev"
+delete-after: True
+changes:
+ - bugfix: "Fixed cigar cases & cigarette packets taking two inventory slots"
+ - bugfix: "Fixed cigar cases showing the wrong icon for the cigars inside them."
+ - bugfix: "Fixed cigar cases & cigarette packets stating the wrong name of the cigar/cigarette when removed via altclick."
diff --git a/html/changelogs/AutoChangeLog-pr-6992.yml b/html/changelogs/AutoChangeLog-pr-6992.yml
new file mode 100644
index 0000000000..30168181c9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6992.yml
@@ -0,0 +1,11 @@
+author: "ShizCalev"
+delete-after: True
+changes:
+ - bugfix: "Fixed items in pockets vanishing when a mob is monkeyized."
+ - bugfix: "Fixed items in pockets vanishing when a mob is gorillized."
+ - bugfix: "Fixed items in pockets vanishing when a mob is infected with a transformation disease."
+ - bugfix: "Fixed items in pockets not being properly deleted when a mob goes through a recycler"
+ - bugfix: "Fixed items in pockets not being properly deleted when highlander mode is enabled."
+ - bugfix: "Fixed exploit allowing you to remove unremovable tanks from pockets."
+ - bugfix: "Fixed items in pockets dropping when a mob is equipped with a new outfit."
+ - bugfix: "Fixed items in pockets not being covered in blood when equipping the psycho outfit."
diff --git a/html/changelogs/AutoChangeLog-pr-6995.yml b/html/changelogs/AutoChangeLog-pr-6995.yml
new file mode 100644
index 0000000000..0d3751d794
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6995.yml
@@ -0,0 +1,5 @@
+author: "Denton"
+delete-after: True
+changes:
+ - tweak: "Pubbystation: Added a dual-port vent pump to the toxins burn chamber."
+ - code_imp: "Removed most airlock_controller/incinerator related varedits and replaced them with defines/subtypes."
diff --git a/html/changelogs/AutoChangeLog-pr-6996.yml b/html/changelogs/AutoChangeLog-pr-6996.yml
new file mode 100644
index 0000000000..8485bdb247
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6996.yml
@@ -0,0 +1,4 @@
+author: "Denton"
+delete-after: True
+changes:
+ - tweak: "The Deltastation toxins lab has its portable scrubber, air pump and intercom back."
diff --git a/html/changelogs/AutoChangeLog-pr-6997.yml b/html/changelogs/AutoChangeLog-pr-6997.yml
new file mode 100644
index 0000000000..fe6f96ec08
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6997.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - tweak: "switched the type of the space suit on the syndicate shuttle"
diff --git a/html/changelogs/AutoChangeLog-pr-6998.yml b/html/changelogs/AutoChangeLog-pr-6998.yml
new file mode 100644
index 0000000000..4c5fa0b950
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6998.yml
@@ -0,0 +1,4 @@
+author: "Naksu"
+delete-after: True
+changes:
+ - bugfix: "comms consoles now work in transit again, and no longer work in centcom"
diff --git a/html/changelogs/AutoChangeLog-pr-6999.yml b/html/changelogs/AutoChangeLog-pr-6999.yml
new file mode 100644
index 0000000000..5c646a8334
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-6999.yml
@@ -0,0 +1,4 @@
+author: "yorpan"
+delete-after: True
+changes:
+ - rscadd: "Brain damage makes you say one more thing."
diff --git a/html/changelogs/AutoChangeLog-pr-7000.yml b/html/changelogs/AutoChangeLog-pr-7000.yml
new file mode 100644
index 0000000000..c4aaff36e6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7000.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "fixed hydroponics tray weed light staying on when removing weeds with integrated circuits"
diff --git a/html/changelogs/AutoChangeLog-pr-7001.yml b/html/changelogs/AutoChangeLog-pr-7001.yml
new file mode 100644
index 0000000000..2721ba92e2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7001.yml
@@ -0,0 +1,4 @@
+author: "Naksu"
+delete-after: True
+changes:
+ - code_imp: "removed unnecessary getFlatIcons from holocalls"
diff --git a/html/changelogs/AutoChangeLog-pr-7002.yml b/html/changelogs/AutoChangeLog-pr-7002.yml
new file mode 100644
index 0000000000..df3104e20f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7002.yml
@@ -0,0 +1,4 @@
+author: "Naksu"
+delete-after: True
+changes:
+ - bugfix: "Screwdrivers and other items with overlays now show the proper appearance of the item when attacking something with them, or when put on a tray."
diff --git a/html/changelogs/AutoChangeLog-pr-7003.yml b/html/changelogs/AutoChangeLog-pr-7003.yml
new file mode 100644
index 0000000000..c60bd62fcf
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7003.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Atom initialization and icon smoothing no longer race, causing late-loading mineral turfs to have no icon."
diff --git a/html/changelogs/AutoChangeLog-pr-7004.yml b/html/changelogs/AutoChangeLog-pr-7004.yml
new file mode 100644
index 0000000000..a981bcaf98
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7004.yml
@@ -0,0 +1,4 @@
+author: "yenwodyah"
+delete-after: True
+changes:
+ - bugfix: "A few virus threshold effects should work now"
diff --git a/html/changelogs/AutoChangeLog-pr-7005.yml b/html/changelogs/AutoChangeLog-pr-7005.yml
new file mode 100644
index 0000000000..ca71f91693
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7005.yml
@@ -0,0 +1,4 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - rscadd: "Adds the wheelofsalt command to TGS3. Spin the wheel of salt to find out what the Citadel Station 13 players are salting about today!"
diff --git a/html/changelogs/AutoChangeLog-pr-7006.yml b/html/changelogs/AutoChangeLog-pr-7006.yml
new file mode 100644
index 0000000000..afe3a639db
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7006.yml
@@ -0,0 +1,4 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - rscadd: "You can now slam or slap your hands onto tables by right clicking them in combat mode."
diff --git a/html/changelogs/AutoChangeLog-pr-7007.yml b/html/changelogs/AutoChangeLog-pr-7007.yml
new file mode 100644
index 0000000000..9dcc0d988f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7007.yml
@@ -0,0 +1,4 @@
+author: "MrDoomBringer"
+delete-after: True
+changes:
+ - admin: "Central Command can now smite misbehaving crewmembers with supply pods (filled with whatever their hearts desire!)"
diff --git a/html/changelogs/AutoChangeLog-pr-7008.yml b/html/changelogs/AutoChangeLog-pr-7008.yml
new file mode 100644
index 0000000000..87b0ecdac1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7008.yml
@@ -0,0 +1,4 @@
+author: "Beachsprites"
+delete-after: True
+changes:
+ - imageadd: "added directional beach sprites"
diff --git a/html/changelogs/AutoChangeLog-pr-7012.yml b/html/changelogs/AutoChangeLog-pr-7012.yml
new file mode 100644
index 0000000000..b4ff596298
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7012.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - spellcheck: "Faceless persons no longer \"melt their face off\" in energy gun suicides."
diff --git a/html/changelogs/AutoChangeLog-pr-7013.yml b/html/changelogs/AutoChangeLog-pr-7013.yml
new file mode 100644
index 0000000000..51fda8cec2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7013.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "The Lightning Bolt spell now works again."
diff --git a/html/changelogs/AutoChangeLog-pr-7015.yml b/html/changelogs/AutoChangeLog-pr-7015.yml
new file mode 100644
index 0000000000..e15283155d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7015.yml
@@ -0,0 +1,4 @@
+author: "Denton"
+delete-after: True
+changes:
+ - bugfix: "Swarmers can no longer attack field generators and turret covers."
diff --git a/html/changelogs/AutoChangeLog-pr-7016.yml b/html/changelogs/AutoChangeLog-pr-7016.yml
new file mode 100644
index 0000000000..f8daa8581f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7016.yml
@@ -0,0 +1,4 @@
+author: "Denton"
+delete-after: True
+changes:
+ - rscadd: "Arcades have been stocked with preloaded tactical snack rigs."
diff --git a/html/changelogs/AutoChangeLog-pr-7019.yml b/html/changelogs/AutoChangeLog-pr-7019.yml
new file mode 100644
index 0000000000..5cf456ab6c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7019.yml
@@ -0,0 +1,4 @@
+author: "Naksu"
+delete-after: True
+changes:
+ - code_imp: "moved /datum.isprocessing into datum flags"
diff --git a/html/changelogs/AutoChangeLog-pr-7020.yml b/html/changelogs/AutoChangeLog-pr-7020.yml
new file mode 100644
index 0000000000..33f65b25df
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7020.yml
@@ -0,0 +1,4 @@
+author: "MrDoomBringer"
+delete-after: True
+changes:
+ - admin: "CentCom Supplypods now stun their target before landing, and won't damage the station as much"
diff --git a/html/changelogs/AutoChangeLog-pr-7021.yml b/html/changelogs/AutoChangeLog-pr-7021.yml
new file mode 100644
index 0000000000..db52a1d046
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7021.yml
@@ -0,0 +1,4 @@
+author: "Dax Dupont"
+delete-after: True
+changes:
+ - bugfix: "Fixes a sentience related exploit by blacklisting it in restricted uplinks."
diff --git a/html/changelogs/AutoChangeLog-pr-7022.yml b/html/changelogs/AutoChangeLog-pr-7022.yml
new file mode 100644
index 0000000000..7c9f43d2de
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7022.yml
@@ -0,0 +1,5 @@
+author: "iksyp"
+delete-after: True
+changes:
+ - bugfix: "Ever since the great emotion purge of 2558, people were able to work at top efficiency, even while starving to death. This is no longer the case, Nanotrasen Scientists say."
+ - admin: "Hunger slowdown only applies if mood is disabled in the config."
diff --git a/html/changelogs/AutoChangeLog-pr-7024.yml b/html/changelogs/AutoChangeLog-pr-7024.yml
new file mode 100644
index 0000000000..133c0feb43
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7024.yml
@@ -0,0 +1,4 @@
+author: "Denton"
+delete-after: True
+changes:
+ - bugfix: "The Pubbystation maint bar Booze-O-Mat now shows its contents correctly."
diff --git a/html/changelogs/AutoChangeLog-pr-7030.yml b/html/changelogs/AutoChangeLog-pr-7030.yml
new file mode 100644
index 0000000000..5f89cc6abb
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7030.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - tweak: "Vehicle speed changes now happen immediately instead of on the next movement cycle"
diff --git a/html/changelogs/AutoChangeLog-pr-7031.yml b/html/changelogs/AutoChangeLog-pr-7031.yml
new file mode 100644
index 0000000000..cb65231c9e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7031.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Picture-in-picture objects now are no longer overlapped by other certain objects"
diff --git a/html/changelogs/AutoChangeLog-pr-7039.yml b/html/changelogs/AutoChangeLog-pr-7039.yml
new file mode 100644
index 0000000000..4c5fce38d2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7039.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "A pAI dying while in holoform no longer deletes the card, instead merely emptying it."
diff --git a/html/changelogs/AutoChangeLog-pr-7040.yml b/html/changelogs/AutoChangeLog-pr-7040.yml
new file mode 100644
index 0000000000..0da19e008e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7040.yml
@@ -0,0 +1,4 @@
+author: "Denton"
+delete-after: True
+changes:
+ - tweak: "Added a warning to the shuttle purchase menu."
diff --git a/html/changelogs/AutoChangeLog-pr-7041.yml b/html/changelogs/AutoChangeLog-pr-7041.yml
new file mode 100644
index 0000000000..c6f54eb459
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7041.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "The thermal sight benefits of lantern wisps no longer disappear if you change glasses."
diff --git a/html/changelogs/AutoChangeLog-pr-7042.yml b/html/changelogs/AutoChangeLog-pr-7042.yml
new file mode 100644
index 0000000000..2a5553f3e2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7042.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - imageadd: "sandstone wall sprite for indestructible object"
diff --git a/html/changelogs/AutoChangeLog-pr-7045.yml b/html/changelogs/AutoChangeLog-pr-7045.yml
new file mode 100644
index 0000000000..65bd3e0c46
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7045.yml
@@ -0,0 +1,5 @@
+author: "Toriate"
+delete-after: True
+changes:
+ - rscadd: "It appears that ancient pieces of armor have wound up on the open market! These armors have degraded beyond usefulness. Grab one now in the loadout!"
+ - imageadd: "added flak jacket and M1 Helmet sprites"
diff --git a/html/changelogs/AutoChangeLog-pr-7056.yml b/html/changelogs/AutoChangeLog-pr-7056.yml
new file mode 100644
index 0000000000..0f580b7a48
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7056.yml
@@ -0,0 +1,6 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Stabilized gold extracts now respawn the familiar properly."
+ - bugfix: "Stabilized gold familiars retain the proper languages even after respawning."
+ - tweak: "Stabilized gold familiars can be renamed and have their positions reset at will."
diff --git a/html/changelogs/AutoChangeLog-pr-7059.yml b/html/changelogs/AutoChangeLog-pr-7059.yml
new file mode 100644
index 0000000000..ee666b26e1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7059.yml
@@ -0,0 +1,4 @@
+author: "XDTM"
+delete-after: True
+changes:
+ - bugfix: "Fixed anti-magic not working at all."
diff --git a/html/changelogs/AutoChangeLog-pr-7062.yml b/html/changelogs/AutoChangeLog-pr-7062.yml
new file mode 100644
index 0000000000..7a7917c2f3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7062.yml
@@ -0,0 +1,4 @@
+author: "CameronWoof"
+delete-after: True
+changes:
+ - tweak: "Quartermaster added to the list of changeling and traitor restricted jobs"
diff --git a/html/changelogs/AutoChangeLog-pr-7065.yml b/html/changelogs/AutoChangeLog-pr-7065.yml
new file mode 100644
index 0000000000..87272ee07c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7065.yml
@@ -0,0 +1,5 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Pulling objects diagonally no longer causes them to flail about when changing directions."
+ - bugfix: "Riders are no longer left behind if you move while pulling something that has since been anchored."
diff --git a/html/changelogs/AutoChangeLog-pr-7066.yml b/html/changelogs/AutoChangeLog-pr-7066.yml
new file mode 100644
index 0000000000..b4aff3cfa1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7066.yml
@@ -0,0 +1,5 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - tweak: "Fire alarms now redden all the room's lights, and emit light themselves, rather than applying an area-wide overlay."
+ - bugfix: "Fire alarms no longer visually conflict with radiation storms."
diff --git a/html/changelogs/AutoChangeLog-pr-7069.yml b/html/changelogs/AutoChangeLog-pr-7069.yml
new file mode 100644
index 0000000000..6025d9f1f5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7069.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Plasmamen now receive their suit and internals when entering VR."
diff --git a/html/changelogs/AutoChangeLog-pr-7070.yml b/html/changelogs/AutoChangeLog-pr-7070.yml
new file mode 100644
index 0000000000..ba904bd4af
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7070.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Deaf people can no longer hear cyborg system error alarms."
diff --git a/html/changelogs/AutoChangeLog-pr-7072.yml b/html/changelogs/AutoChangeLog-pr-7072.yml
new file mode 100644
index 0000000000..08ecf0313a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7072.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Lockboxes are now actually locked again."
diff --git a/html/changelogs/AutoChangeLog-pr-7073.yml b/html/changelogs/AutoChangeLog-pr-7073.yml
new file mode 100644
index 0000000000..608fb8d17d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7073.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Legion cores and admin revives now heal confusion."
diff --git a/html/changelogs/AutoChangeLog-pr-7078.yml b/html/changelogs/AutoChangeLog-pr-7078.yml
new file mode 100644
index 0000000000..03b49a795d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7078.yml
@@ -0,0 +1,5 @@
+author: "Toriate"
+delete-after: True
+changes:
+ - rscadd: "Gives the flak helmet a tiny storage compartment"
+ - balance: "Made the flak helmet even weaker against acid and fire so it crumbles into dust easier"
diff --git a/html/changelogs/AutoChangeLog-pr-7081.yml b/html/changelogs/AutoChangeLog-pr-7081.yml
new file mode 100644
index 0000000000..171ca4cf8a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7081.yml
@@ -0,0 +1,4 @@
+author: "Dax Dupont"
+delete-after: True
+changes:
+ - bugfix: "Botany trays don't magically refill anymore with a rped."
diff --git a/html/changelogs/AutoChangeLog-pr-7082.yml b/html/changelogs/AutoChangeLog-pr-7082.yml
new file mode 100644
index 0000000000..f66cb4ee49
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7082.yml
@@ -0,0 +1,4 @@
+author: "XDTM"
+delete-after: True
+changes:
+ - bugfix: "Diseases now properly lose scan invisibility if their stealth drops below the required threshold."
diff --git a/html/changelogs/AutoChangeLog-pr-7084.yml b/html/changelogs/AutoChangeLog-pr-7084.yml
new file mode 100644
index 0000000000..6db9a9182d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7084.yml
@@ -0,0 +1,5 @@
+author: "XDTM"
+delete-after: True
+changes:
+ - tweak: "Coldproof mobs can now be cooled down, but are still immune to the negative effects of cold."
+ - bugfix: "This also fixes some edge cases (freezing beams) where mobs could be cooled down and damaged despite cold resistance."
diff --git a/html/changelogs/AutoChangeLog-pr-7091.yml b/html/changelogs/AutoChangeLog-pr-7091.yml
new file mode 100644
index 0000000000..2e20d82152
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7091.yml
@@ -0,0 +1,4 @@
+author: "XDTM"
+delete-after: True
+changes:
+ - balance: "Androids are now immune to radiation."
diff --git a/html/changelogs/AutoChangeLog-pr-7092.yml b/html/changelogs/AutoChangeLog-pr-7092.yml
new file mode 100644
index 0000000000..26f4e3f19a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7092.yml
@@ -0,0 +1,4 @@
+author: "Mickyan"
+delete-after: True
+changes:
+ - bugfix: "Fixed pacifists being able to harm using bottles/screwdrivers"
diff --git a/html/changelogs/AutoChangeLog-pr-7094.yml b/html/changelogs/AutoChangeLog-pr-7094.yml
new file mode 100644
index 0000000000..4e8220596c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7094.yml
@@ -0,0 +1,4 @@
+author: "Armhulen code, Keekenox sprites and S_____ as the ideas guy :roll_eyes:"
+delete-after: True
+changes:
+ - rscadd: "New drinks: Peppermint Patty and the Candyland Extract!!"
diff --git a/html/changelogs/AutoChangeLog-pr-7095.yml b/html/changelogs/AutoChangeLog-pr-7095.yml
new file mode 100644
index 0000000000..82f3de8e7e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7095.yml
@@ -0,0 +1,4 @@
+author: "Dax Dupont"
+delete-after: True
+changes:
+ - balance: "It's now easier to become fat. Don't eat so much."
diff --git a/html/changelogs/AutoChangeLog-pr-7101.yml b/html/changelogs/AutoChangeLog-pr-7101.yml
new file mode 100644
index 0000000000..6c81196166
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7101.yml
@@ -0,0 +1,6 @@
+author: "cacogen"
+delete-after: True
+changes:
+ - rscadd: "You can now see what other people are eating or drinking."
+ - rscadd: "Borg shaker can now synthesise milk, lemon juice, banana juice and coffee"
+ - bugfix: "Renamed drinks no longer revert to their original name when their reagents change"
diff --git a/html/changelogs/AutoChangeLog-pr-7102.yml b/html/changelogs/AutoChangeLog-pr-7102.yml
new file mode 100644
index 0000000000..104a236587
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7102.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "checks to see if bullets are deleted if they are the ammo type and the bullet chambered."
diff --git a/html/changelogs/AutoChangeLog-pr-7104.yml b/html/changelogs/AutoChangeLog-pr-7104.yml
new file mode 100644
index 0000000000..d9834f2718
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7104.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - spellcheck: "Capitalization, propriety, and plurality on turfs have been improved."
diff --git a/html/changelogs/AutoChangeLog-pr-7110.yml b/html/changelogs/AutoChangeLog-pr-7110.yml
new file mode 100644
index 0000000000..f91aa7fe01
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7110.yml
@@ -0,0 +1,5 @@
+author: "Toriate"
+delete-after: True
+changes:
+ - rscadd: "Added the Corporate Uniform and the Silver Bike Horn"
+ - imageadd: "added sprites for the Corporate Uniform and Silver Bike Horn"
diff --git a/html/changelogs/AutoChangeLog-pr-7116.yml b/html/changelogs/AutoChangeLog-pr-7116.yml
new file mode 100644
index 0000000000..776a414f4e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7116.yml
@@ -0,0 +1,6 @@
+author: "Dax Dupont"
+delete-after: True
+changes:
+ - bugfix: "Fixed missing grilles under brig windows of the pubby shuttle."
+ - rscadd: "For the pubby shuttle, added some food in the fridge, mostly pie slices. Also added a sleeper to the minimedbay."
+ - tweak: "Reworded pubby shuttle description to be more inline with the new train shuttle."
diff --git a/html/changelogs/AutoChangeLog-pr-7117.yml b/html/changelogs/AutoChangeLog-pr-7117.yml
new file mode 100644
index 0000000000..ceabfe240e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7117.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Unbreakable ladders are now left behind when shuttles move."
diff --git a/html/changelogs/AutoChangeLog-pr-7120.yml b/html/changelogs/AutoChangeLog-pr-7120.yml
new file mode 100644
index 0000000000..48da0e70f5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7120.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - rscadd: "Players who edited a circuit assembly can scan it as a ghost."
diff --git a/html/changelogs/AutoChangeLog-pr-7121.yml b/html/changelogs/AutoChangeLog-pr-7121.yml
new file mode 100644
index 0000000000..c4ffb99f93
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7121.yml
@@ -0,0 +1,4 @@
+author: "Pubby"
+delete-after: True
+changes:
+ - bugfix: "PubbyStation: Fixed disposals issue in security hallway"
diff --git a/html/changelogs/AutoChangeLog-pr-7123.yml b/html/changelogs/AutoChangeLog-pr-7123.yml
new file mode 100644
index 0000000000..5c67a9ef6e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7123.yml
@@ -0,0 +1,5 @@
+author: "Dax Dupont"
+delete-after: True
+changes:
+ - refactor: "Syndicate and Centcom messages have been squashed together."
+ - admin: "You can now send both Syndicate and Centcom headset messages. Be mindful that the button was changed to HM in the playerpanel"
diff --git a/html/changelogs/AutoChangeLog-pr-7125.yml b/html/changelogs/AutoChangeLog-pr-7125.yml
new file mode 100644
index 0000000000..6e8960fa5e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7125.yml
@@ -0,0 +1,4 @@
+author: "Dax Dupont"
+delete-after: True
+changes:
+ - bugfix: "Fixes missing cream pies in the cream pie fridge."
diff --git a/html/changelogs/AutoChangeLog-pr-7131.yml b/html/changelogs/AutoChangeLog-pr-7131.yml
new file mode 100644
index 0000000000..1a809b9548
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7131.yml
@@ -0,0 +1,8 @@
+author: "cyclowns"
+delete-after: True
+changes:
+ - rscadd: "Fusion has been re-enabled! It works similarly to before, but with some slight modification."
+ - tweak: "Fusion now requires huge amounts of plasma and tritium, as well as a very high thermal energy and temperature to start. There are several tiers of fusion that cause different benefits and effects."
+ - tweak: "The fusion power of most gases has been tweaked to allow for more interesting interactions."
+ - tweak: "BZ now takes N2O and plasma to create, rather than tritium and plasma."
+ - bugfix: "Fusion no longer delivers server-crashingly large amounts of radiation and stationwide EMPs."
diff --git a/html/changelogs/AutoChangeLog-pr-7133.yml b/html/changelogs/AutoChangeLog-pr-7133.yml
new file mode 100644
index 0000000000..28f3ed6e91
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7133.yml
@@ -0,0 +1,6 @@
+author: "Dax Dupont"
+delete-after: True
+changes:
+ - bugfix: "Chem synths overlays aren't all kinds of fucked anymore."
+ - refactor: "Unfucked all of the remaining chem synth code."
+ - refactor: "Reagents no longer have an unused var that's always set to true. Who did this?"
diff --git a/html/changelogs/AutoChangeLog-pr-7134.yml b/html/changelogs/AutoChangeLog-pr-7134.yml
new file mode 100644
index 0000000000..73e6fb0cf2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7134.yml
@@ -0,0 +1,4 @@
+author: "Denton"
+delete-after: True
+changes:
+ - balance: "Pirates and Syndicate salvage workers have been beefed up around the caravan ambush ruin."
diff --git a/html/changelogs/AutoChangeLog-pr-7137.yml b/html/changelogs/AutoChangeLog-pr-7137.yml
new file mode 100644
index 0000000000..2fe89fa80f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7137.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "It is no longer possible to pull the mirages images at space transitions, and some other abstract effects."
diff --git a/html/changelogs/AutoChangeLog-pr-7138.yml b/html/changelogs/AutoChangeLog-pr-7138.yml
new file mode 100644
index 0000000000..3014c1edee
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7138.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Moving large amounts of items with bluespace launchpads no longer creates a laggy amount of sparks."
diff --git a/html/changelogs/AutoChangeLog-pr-7142.yml b/html/changelogs/AutoChangeLog-pr-7142.yml
new file mode 100644
index 0000000000..cbbc1c647e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7142.yml
@@ -0,0 +1,4 @@
+author: "Dax Dupont"
+delete-after: True
+changes:
+ - balance: "Makes the xeno nest ruin harder to cheese."
diff --git a/html/changelogs/AutoChangeLog-pr-7145.yml b/html/changelogs/AutoChangeLog-pr-7145.yml
new file mode 100644
index 0000000000..408aaf8095
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7145.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "The escape pod hallways on MetaStation and DeltaStation now have air again."
diff --git a/html/changelogs/AutoChangeLog-pr-7146.yml b/html/changelogs/AutoChangeLog-pr-7146.yml
new file mode 100644
index 0000000000..ad649a7065
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7146.yml
@@ -0,0 +1,4 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - tweak: "Non-admins can no longer use LOOC while dead, unconscious, in crit, or while ghosting."
diff --git a/html/changelogs/AutoChangeLog-pr-7148.yml b/html/changelogs/AutoChangeLog-pr-7148.yml
new file mode 100644
index 0000000000..b836a75771
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7148.yml
@@ -0,0 +1,4 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - balance: "Dogborgs will now reduce firestacks when they use their tongue to lick someone's face."
diff --git a/html/changelogs/AutoChangeLog-pr-7151.yml b/html/changelogs/AutoChangeLog-pr-7151.yml
new file mode 100644
index 0000000000..d881249df5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7151.yml
@@ -0,0 +1,5 @@
+author: "LetterN"
+delete-after: True
+changes:
+ - bugfix: "Fixes shock collars, they now fit on the neck slot"
+ - bugfix: "you can't put them on pockets anymore"
diff --git a/html/changelogs/AutoChangeLog-pr-7153.yml b/html/changelogs/AutoChangeLog-pr-7153.yml
new file mode 100644
index 0000000000..ff400b0661
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7153.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "It is no longer possible to repair cyborg headlamps even when their panel is closed."
diff --git a/html/changelogs/AutoChangeLog-pr-7154.yml b/html/changelogs/AutoChangeLog-pr-7154.yml
new file mode 100644
index 0000000000..5ac0eb3f80
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7154.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Item fortification scrolls no longer add multiple prefixes when applied to the same item."
diff --git a/html/changelogs/AutoChangeLog-pr-7157.yml b/html/changelogs/AutoChangeLog-pr-7157.yml
new file mode 100644
index 0000000000..3817543206
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7157.yml
@@ -0,0 +1,6 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - tweak: "The blob core (and only the blob core) now respawns randomly on the station when the core is taken off z-level"
+ - bugfix: "Prevents the round from going into an unending state"
+ - code_imp: "Added a variable to the stationloving component for objects that can be destroyed but not moved off z-level"
diff --git a/html/changelogs/AutoChangeLog-pr-7158.yml b/html/changelogs/AutoChangeLog-pr-7158.yml
new file mode 100644
index 0000000000..22c94970c7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7158.yml
@@ -0,0 +1,4 @@
+author: "Denton"
+delete-after: True
+changes:
+ - tweak: "NanoTours is proud to announce that the Lavaland beach club has been outfitted with a dance machine, state of the art bar equipment and more."
diff --git a/html/changelogs/AutoChangeLog-pr-7160.yml b/html/changelogs/AutoChangeLog-pr-7160.yml
new file mode 100644
index 0000000000..84c981026d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7160.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - rscadd: "After years of protests NT decided to update the fire security standards by adding 3 (three) advanced fire extinguishers to all the new stations."
diff --git a/html/changelogs/AutoChangeLog-pr-7162.yml b/html/changelogs/AutoChangeLog-pr-7162.yml
new file mode 100644
index 0000000000..7aa07cedd9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7162.yml
@@ -0,0 +1,4 @@
+author: "and Fel"
+delete-after: True
+changes:
+ - imageadd: "New chairs are on most shuttles! Finally, you can relax in style while escaping a metal death trap."
diff --git a/html/changelogs/AutoChangeLog-pr-7164.yml b/html/changelogs/AutoChangeLog-pr-7164.yml
new file mode 100644
index 0000000000..ade99d0165
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7164.yml
@@ -0,0 +1,5 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Hyperspace ripples now remain visible until the shuttle arrives, even during extreme lag."
+ - bugfix: "Ripples now correctly take the shape of the shuttle, rather than always being a rectangle."
diff --git a/html/changelogs/AutoChangeLog-pr-7165.yml b/html/changelogs/AutoChangeLog-pr-7165.yml
new file mode 100644
index 0000000000..9992f774c5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7165.yml
@@ -0,0 +1,4 @@
+author: "Dax Dupont"
+delete-after: True
+changes:
+ - bugfix: "Fixes the bathroom being airless in the Space Ninja anime jail."
diff --git a/html/changelogs/AutoChangeLog-pr-7166.yml b/html/changelogs/AutoChangeLog-pr-7166.yml
new file mode 100644
index 0000000000..d69c45ccd3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7166.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Non-secure windoors now properly support the \"One Required\" access mode of airlock electronics."
diff --git a/html/changelogs/AutoChangeLog-pr-7171.yml b/html/changelogs/AutoChangeLog-pr-7171.yml
new file mode 100644
index 0000000000..c103f34898
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7171.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "The gulag shuttle no longer moves instantly when returned via the claim console."
diff --git a/html/changelogs/AutoChangeLog-pr-7172.yml b/html/changelogs/AutoChangeLog-pr-7172.yml
new file mode 100644
index 0000000000..bf2f9c13bd
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7172.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - admin: "It is now possible to use the \".p\" (Asay) and \".d\" (Dsay) prefixes while an admin ghost."
diff --git a/html/changelogs/AutoChangeLog-pr-7177.yml b/html/changelogs/AutoChangeLog-pr-7177.yml
new file mode 100644
index 0000000000..1126202b20
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7177.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - admin: "Speaking in deadchat now shows your rank instead of ADMIN"
diff --git a/html/changelogs/AutoChangeLog-pr-7183.yml b/html/changelogs/AutoChangeLog-pr-7183.yml
new file mode 100644
index 0000000000..746baf1eb1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7183.yml
@@ -0,0 +1,4 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - bugfix: "The repo compiles again"
diff --git a/html/changelogs/AutoChangeLog-pr-7188.yml b/html/changelogs/AutoChangeLog-pr-7188.yml
new file mode 100644
index 0000000000..d27aee5b1b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7188.yml
@@ -0,0 +1,8 @@
+author: "JStheguy"
+delete-after: True
+changes:
+ - rscadd: "Added the data card reader circuit, a circuit that is able to read data cards, as well as write to them."
+ - tweak: "Data cards are now longer inexplicably called data disks despite clearly being cards, and can be printed from the \"tools\" section of the integrated circuit printer."
+ - tweak: "Data cards no longer have a special \"label card\" verb and instead can have their names and descriptions changed with a pen."
+ - rscadd: "Also, some aesthetically different variants of the data cards, because why not."
+ - imageadd: "Data cards have new sprites, with support for coloring them via the assembly detailer."
diff --git a/html/changelogs/AutoChangeLog-pr-7189.yml b/html/changelogs/AutoChangeLog-pr-7189.yml
new file mode 100644
index 0000000000..f0718609b9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7189.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - rscadd: "Added a pink scarf to vendomats"
diff --git a/html/changelogs/AutoChangeLog-pr-7190.yml b/html/changelogs/AutoChangeLog-pr-7190.yml
new file mode 100644
index 0000000000..ac2f2cf485
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7190.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - rscadd: "Players can now ctrl-click the PDA to remove the item in its pen slot"
diff --git a/html/changelogs/AutoChangeLog-pr-7195.yml b/html/changelogs/AutoChangeLog-pr-7195.yml
new file mode 100644
index 0000000000..2484f15f1f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7195.yml
@@ -0,0 +1,4 @@
+author: "ninjanomnom"
+delete-after: True
+changes:
+ - rscadd: "A plush that knows too much has found its way to the bus ruin."
diff --git a/html/changelogs/AutoChangeLog-pr-7199.yml b/html/changelogs/AutoChangeLog-pr-7199.yml
new file mode 100644
index 0000000000..d7dbe7c589
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7199.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "added a clamp so you can't set a negative multiplier to create materials and create more than 50 items."
diff --git a/html/changelogs/AutoChangeLog-pr-7201.yml b/html/changelogs/AutoChangeLog-pr-7201.yml
new file mode 100644
index 0000000000..562c8e4190
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7201.yml
@@ -0,0 +1,5 @@
+author: "Cobby"
+delete-after: True
+changes:
+ - rscdel: "Removed Advanced Mining Scanner from roundstart voucher kits."
+ - rscdel: "Removed Explorer Webbing from all voucher kits besides the shelter capsule pack."
diff --git a/html/changelogs/AutoChangeLog-pr-7207.yml b/html/changelogs/AutoChangeLog-pr-7207.yml
new file mode 100644
index 0000000000..ebdd247f5c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7207.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "anomaly cores no longer tend to dust"
diff --git a/html/changelogs/AutoChangeLog-pr-7218.yml b/html/changelogs/AutoChangeLog-pr-7218.yml
new file mode 100644
index 0000000000..6bb568d088
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7218.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - spellcheck: "Plant disks with potency genes clarify the percent is for potency scaling and not relative to max volume on examine."
diff --git a/html/changelogs/AutoChangeLog-pr-7219.yml b/html/changelogs/AutoChangeLog-pr-7219.yml
new file mode 100644
index 0000000000..b50be06a75
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7219.yml
@@ -0,0 +1,4 @@
+author: "Dax Dupont"
+delete-after: True
+changes:
+ - admin: "Create antags now checks for people being on station before applying."
diff --git a/html/changelogs/AutoChangeLog-pr-7220.yml b/html/changelogs/AutoChangeLog-pr-7220.yml
new file mode 100644
index 0000000000..ba87335d1e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7220.yml
@@ -0,0 +1,6 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - rscadd: "Blast cannons have been fixed and are now available for purchase by traitorous scientists for a low low price of 14TC."
+ - rscadd: "Blast cannons take the explosive power of a TTV bomb and ejects a linear projectile that will apply what the bomb would do to a certain tile at that distance to that tile. However, this will not cause breaches, or gib mobs, unless the gods (admins) so will it.
+experimental: Blast cannons do not respect maxcap. (Unless the admins so will it.)"
diff --git a/html/changelogs/AutoChangeLog-pr-7222.yml b/html/changelogs/AutoChangeLog-pr-7222.yml
new file mode 100644
index 0000000000..1fb99a2d63
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7222.yml
@@ -0,0 +1,4 @@
+author: "Kor"
+delete-after: True
+changes:
+ - rscadd: "Bubblegum has regained his original (deadlier) move set."
diff --git a/html/changelogs/AutoChangeLog-pr-7228.yml b/html/changelogs/AutoChangeLog-pr-7228.yml
new file mode 100644
index 0000000000..fd95cb055c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7228.yml
@@ -0,0 +1,4 @@
+author: "Improvedname"
+delete-after: True
+changes:
+ - rscadd: "Adds rubbershot secrifle shots"
diff --git a/html/changelogs/AutoChangeLog-pr-7230.yml b/html/changelogs/AutoChangeLog-pr-7230.yml
new file mode 100644
index 0000000000..b1674293b5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7230.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - rscadd: "Cyborgs now drop keys on deconstruction/detonation"
diff --git a/html/changelogs/AutoChangeLog-pr-7231.yml b/html/changelogs/AutoChangeLog-pr-7231.yml
new file mode 100644
index 0000000000..4bd894c04e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7231.yml
@@ -0,0 +1,4 @@
+author: "Time-Green"
+delete-after: True
+changes:
+ - bugfix: "Soda is no longer intangible to the laws of physics"
diff --git a/html/changelogs/AutoChangeLog-pr-7238.yml b/html/changelogs/AutoChangeLog-pr-7238.yml
new file mode 100644
index 0000000000..ea7e40df5f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7238.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "The \"Save Logs\" option in the chat now actually works (IE 10+ only)."
diff --git a/html/changelogs/AutoChangeLog-pr-7240.yml b/html/changelogs/AutoChangeLog-pr-7240.yml
new file mode 100644
index 0000000000..4bc6b87ee7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7240.yml
@@ -0,0 +1,5 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Fixed cyborgs not getting their names at round start"
+ - bugfix: "Fixed cyborgs and A.I.s being able to bypass appearance bans"
diff --git a/html/changelogs/AutoChangeLog-pr-7244.yml b/html/changelogs/AutoChangeLog-pr-7244.yml
new file mode 100644
index 0000000000..e90d1d33d0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7244.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "fixes cult shuttle message repeating"
diff --git a/html/changelogs/AutoChangeLog-pr-7245.yml b/html/changelogs/AutoChangeLog-pr-7245.yml
new file mode 100644
index 0000000000..764069b653
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7245.yml
@@ -0,0 +1,4 @@
+author: "Dax Dupont"
+delete-after: True
+changes:
+ - admin: "Malf AI machine overloads now are logged/admin messaged."
diff --git a/html/changelogs/AutoChangeLog-pr-7249.yml b/html/changelogs/AutoChangeLog-pr-7249.yml
new file mode 100644
index 0000000000..8adf528526
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7249.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Hardsuit helmets now protect the wearer from pepperspray"
diff --git a/html/changelogs/AutoChangeLog-pr-7250.yml b/html/changelogs/AutoChangeLog-pr-7250.yml
new file mode 100644
index 0000000000..5036847eef
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7250.yml
@@ -0,0 +1,4 @@
+author: "Naksu"
+delete-after: True
+changes:
+ - code_imp: "Removed unused effect object that could be used to spawn a list of humans"
diff --git a/html/changelogs/AutoChangeLog-pr-7251.yml b/html/changelogs/AutoChangeLog-pr-7251.yml
new file mode 100644
index 0000000000..1f4c5cf012
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7251.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "It is once again possible for Cargo to export mechs."
diff --git a/html/changelogs/AutoChangeLog-pr-7253.yml b/html/changelogs/AutoChangeLog-pr-7253.yml
new file mode 100644
index 0000000000..153cb9131e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7253.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - tweak: "tourettes doesnt stack on itself anymore"
diff --git a/html/changelogs/AutoChangeLog-pr-7254.yml b/html/changelogs/AutoChangeLog-pr-7254.yml
new file mode 100644
index 0000000000..f9295c0c92
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7254.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - refactor: "AI static now uses visual contents and should perform better in theory."
diff --git a/html/changelogs/AutoChangeLog-pr-7259.yml b/html/changelogs/AutoChangeLog-pr-7259.yml
new file mode 100644
index 0000000000..c99b4f74e3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7259.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Bucket helmets cannot have reagents transferred into them until after they are removed"
diff --git a/html/changelogs/AutoChangeLog-pr-7262.yml b/html/changelogs/AutoChangeLog-pr-7262.yml
new file mode 100644
index 0000000000..13c4d49dbf
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7262.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - rscadd: "R&D deconstructors can now destroy things regardless of if there's a point value or material"
diff --git a/html/changelogs/AutoChangeLog-pr-7264.yml b/html/changelogs/AutoChangeLog-pr-7264.yml
new file mode 100644
index 0000000000..2bc45d3036
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7264.yml
@@ -0,0 +1,4 @@
+author: "Zxaber"
+delete-after: True
+changes:
+ - rscadd: "Cyborgs can wear more hats now."
diff --git a/html/changelogs/AutoChangeLog-pr-7265.yml b/html/changelogs/AutoChangeLog-pr-7265.yml
new file mode 100644
index 0000000000..de2d14842a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7265.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "You should now receive your destroy AI objectives properly during IAA"
diff --git a/html/changelogs/AutoChangeLog-pr-7267.yml b/html/changelogs/AutoChangeLog-pr-7267.yml
new file mode 100644
index 0000000000..8777f7780b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7267.yml
@@ -0,0 +1,4 @@
+author: "Denton"
+delete-after: True
+changes:
+ - tweak: "Did you know that honey has antibiotic properties?"
diff --git a/html/changelogs/AutoChangeLog-pr-7273.yml b/html/changelogs/AutoChangeLog-pr-7273.yml
new file mode 100644
index 0000000000..1535cbe95d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7273.yml
@@ -0,0 +1,4 @@
+author: "Thunder12345"
+delete-after: True
+changes:
+ - rscadd: "Added a colour picker component for use with circuits."
diff --git a/html/changelogs/AutoChangeLog-pr-7277.yml b/html/changelogs/AutoChangeLog-pr-7277.yml
new file mode 100644
index 0000000000..b9ff0d8680
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7277.yml
@@ -0,0 +1,7 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Deconstructable TEG now propertly connects to pipes."
+ - bugfix: "Fix of inverted TEG sprite of slow turbine turning.
+add:Now you can flip circulator and make TEG of your dream.
+add:Add TEG and circulator to \"Advanced Power Manipulation\" techweb node."
diff --git a/html/changelogs/AutoChangeLog-pr-7280.yml b/html/changelogs/AutoChangeLog-pr-7280.yml
new file mode 100644
index 0000000000..f5813ae632
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7280.yml
@@ -0,0 +1,5 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - imageadd: "New icon for plastic flaps that actually looks airtight."
+ - code_imp: "Update to plastic flaps code to use tool procs rather than attackby and removed two pointless states."
diff --git a/html/changelogs/AutoChangeLog-pr-7294.yml b/html/changelogs/AutoChangeLog-pr-7294.yml
new file mode 100644
index 0000000000..8ac886a45d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7294.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - bugfix: "Printing the TEG and circulator boards no longer prints the completed machinery instead."
diff --git a/html/changelogs/AutoChangeLog-pr-7327.yml b/html/changelogs/AutoChangeLog-pr-7327.yml
new file mode 100644
index 0000000000..03f67c3307
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7327.yml
@@ -0,0 +1,9 @@
+author: "Naksu"
+delete-after: True
+changes:
+ - tweak: "The ladders in the tear in the fabric of reality no longer spawn their endpoints when the area is loaded, but only when the tear is made accessible via a BoH bomb."
+ - tweak: "CentCom is no longer accessible via the space ladder in the tear."
+ - tweak: "The lavaland endpoint can no longer spawn completely surrounded by lava, unless it spawns on an island"
+ - code_imp: "ChangeTurf can now conditionally inherit the air of the turf it is replacing, via the CHANGETURF_INHERIT_AIR flag."
+ - bugfix: "when ladder endpoints are created, the binary turfs that are created inherit the air of the turfs they are replacing. This means the lavaland ladder endpoint will have the lavaland airmix, instead of a vacuum."
+ - code_imp: "navigation beacons are now properly deregistered from their Z-level list and re-registered on the correct one if moved across Z-levels by an effect such as teleportation or a BoH-induced chasm."
diff --git a/html/changelogs/AutoChangeLog-pr-7340.yml b/html/changelogs/AutoChangeLog-pr-7340.yml
new file mode 100644
index 0000000000..958f97164b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7340.yml
@@ -0,0 +1,4 @@
+author: "Jegub"
+delete-after: True
+changes:
+ - imageadd: "Glowcaps now have their own sprite."
diff --git a/html/changelogs/AutoChangeLog-pr-7342.yml b/html/changelogs/AutoChangeLog-pr-7342.yml
new file mode 100644
index 0000000000..67c44271e7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7342.yml
@@ -0,0 +1,4 @@
+author: "CitadelStationBot"
+delete-after: True
+changes:
+ - imageadd: "Medical HUDs will now show an icon if the body has died recently enough to be defibbed"
diff --git a/html/changelogs/AutoChangeLog-pr-7346.yml b/html/changelogs/AutoChangeLog-pr-7346.yml
new file mode 100644
index 0000000000..6e9bf5a1e3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7346.yml
@@ -0,0 +1,4 @@
+author: "Denton"
+delete-after: True
+changes:
+ - spellcheck: "Improved supply shuttle messages and firefighting foam descs."
diff --git a/html/changelogs/AutoChangeLog-pr-7349.yml b/html/changelogs/AutoChangeLog-pr-7349.yml
new file mode 100644
index 0000000000..317863b6c3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7349.yml
@@ -0,0 +1,4 @@
+author: "Denton"
+delete-after: True
+changes:
+ - bugfix: "Supply shuttles will no longer spill containers on docking."
diff --git a/html/changelogs/AutoChangeLog-pr-7353.yml b/html/changelogs/AutoChangeLog-pr-7353.yml
new file mode 100644
index 0000000000..2041055337
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7353.yml
@@ -0,0 +1,4 @@
+author: "MacHac"
+delete-after: True
+changes:
+ - bugfix: "Bedsheets once again properly influence the dreams of those who sleep under them."
diff --git a/html/changelogs/AutoChangeLog-pr-7355.yml b/html/changelogs/AutoChangeLog-pr-7355.yml
new file mode 100644
index 0000000000..1983db7d0f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7355.yml
@@ -0,0 +1,5 @@
+author: "Naksu"
+delete-after: True
+changes:
+ - bugfix: "constructed directional windows no longer leak atmos across them"
+ - code_imp: "setting the value of anchored for objects should be done via the setAnchored proc to properly handle things like atmos updates in one place"
diff --git a/html/changelogs/AutoChangeLog-pr-7358.yml b/html/changelogs/AutoChangeLog-pr-7358.yml
new file mode 100644
index 0000000000..911196dceb
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-7358.yml
@@ -0,0 +1,4 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - bugfix: "The flag cape donor item should render properly now."
diff --git a/html/create_object.html b/html/create_object.html
index 619da3ec47..3609e46916 100644
--- a/html/create_object.html
+++ b/html/create_object.html
@@ -35,7 +35,7 @@
R
Number:
- Dir:
+ Dir:
Name:
Where: