shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

woo

Browse Source
This commit is contained in:
LetterJay
2017-05-02 11:19:14 -05:00
parent c62fc3886a
commit 6310292531
33 changed files with 0 additions and 1838 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm (rejected hunks)
@@ -419,7 +419,7 @@
return
if(confirm == "Yes")
SSticker.delay_end = 0
- feedback_add_details("admin_verb","Hard Restart") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ SSblackbox.add_details("admin_verb","Hard Restart") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
world.Reboot("Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key].", "end_error", "admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]", 10)
/datum/admins/proc/end_round()
code/modules/admin/secrets.dm.rej
-291
View File
@@ -1,291 +0,0 @@
diff a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm (rejected hunks)
@@ -197,8 +197,8 @@
if("moveminingshuttle")
if(!check_rights(R_ADMIN))
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","ShM")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","ShM")
if(!SSshuttle.toggleShuttle("mining","mining_home","mining_away"))
message_admins("[key_name_admin(usr)] moved mining shuttle")
log_admin("[key_name(usr)] moved the mining shuttle")
@@ -206,8 +206,8 @@
if("movelaborshuttle")
if(!check_rights(R_ADMIN))
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","ShL")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","ShL")
if(!SSshuttle.toggleShuttle("laborcamp","laborcamp_home","laborcamp_away"))
message_admins("[key_name_admin(usr)] moved labor shuttle")
log_admin("[key_name(usr)] moved the labor shuttle")
@@ -215,8 +215,8 @@
if("moveferry")
if(!check_rights(R_ADMIN))
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","ShF")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","ShF")
if(!SSshuttle.toggleShuttle("ferry","ferry_home","ferry_away"))
message_admins("[key_name_admin(usr)] moved the centcom ferry")
log_admin("[key_name(usr)] moved the centcom ferry")
@@ -228,8 +228,8 @@
if(A)
var/new_perma = !A.perma_docked
A.perma_docked = new_perma
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","ShA[new_perma ? "s" : "g"]")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","ShA[new_perma ? "s" : "g"]")
message_admins("[key_name_admin(usr)] [new_perma ? "stopped" : "started"] the arrivals shuttle")
log_admin("[key_name(usr)] [new_perma ? "stopped" : "started"] the arrivals shuttle")
else
@@ -279,8 +279,8 @@
if("monkey")
if(!check_rights(R_FUN))
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","M")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","M")
for(var/mob/living/carbon/human/H in GLOB.mob_list)
spawn(0)
H.monkeyize()
@@ -300,8 +300,8 @@
if("corgi")
if(!check_rights(R_FUN))
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","M")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","M")
for(var/mob/living/carbon/human/H in GLOB.mob_list)
spawn(0)
H.corgize()
@@ -311,14 +311,14 @@
if(!check_rights(R_FUN))
return
usr.client.triple_ai()
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","TriAI")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","TriAI")
if("power")
if(!check_rights(R_FUN))
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","P")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","P")
log_admin("[key_name(usr)] made all areas powered", 1)
message_admins("<span class='adminnotice'>[key_name_admin(usr)] made all areas powered</span>")
power_restore()
@@ -326,8 +326,8 @@
if("unpower")
if(!check_rights(R_FUN))
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","UP")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","UP")
log_admin("[key_name(usr)] made all areas unpowered", 1)
message_admins("<span class='adminnotice'>[key_name_admin(usr)] made all areas unpowered</span>")
power_failure()
@@ -335,8 +335,8 @@
if("quickpower")
if(!check_rights(R_FUN))
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","QP")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","QP")
log_admin("[key_name(usr)] made all SMESs powered", 1)
message_admins("<span class='adminnotice'>[key_name_admin(usr)] made all SMESs powered</span>")
power_restore_quick()
@@ -350,8 +350,8 @@
var/objective = copytext(sanitize(input("Enter an objective")),1,MAX_MESSAGE_LEN)
if(!objective)
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","TA([objective])")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","TA([objective])")
for(var/mob/living/carbon/human/H in GLOB.player_list)
if(H.stat == 2 || !H.client || !H.mind) continue
if(is_special_character(H)) continue
@@ -383,8 +383,8 @@
if("changebombcap")
if(!check_rights(R_FUN))
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","BC")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","BC")
var/newBombCap = input(usr,"What would you like the new bomb cap to be. (entered as the light damage range (the 3rd number in common (1,2,3) notation)) Must be above 4)", "New Bomb Cap", GLOB.MAX_EX_LIGHT_RANGE) as num|null
if (newBombCap < 4)
@@ -404,16 +404,16 @@
if("lightsout")
if(!check_rights(R_FUN))
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","LO")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","LO")
message_admins("[key_name_admin(usr)] has broke a lot of lights")
E = new /datum/round_event/electrical_storm{lightsoutAmount = 2}()
if("blackout")
if(!check_rights(R_FUN))
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","BO")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","BO")
message_admins("[key_name_admin(usr)] broke all lights")
for(var/obj/machinery/light/L in GLOB.machines)
L.break_light_tube()
@@ -429,8 +429,8 @@
if(animetype == "Cancel" || droptype == "Cancel")
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","CC")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","CC")
message_admins("[key_name_admin(usr)] made everything kawaii.")
for(var/mob/living/carbon/human/H in GLOB.mob_list)
H << sound('sound/AI/animes.ogg')
@@ -460,8 +460,8 @@
if("whiteout")
if(!check_rights(R_FUN))
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","WO")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","WO")
message_admins("[key_name_admin(usr)] fixed all lights")
for(var/obj/machinery/light/L in GLOB.machines)
L.fix()
@@ -472,8 +472,8 @@
if("virus")
if(!check_rights(R_FUN))
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","V")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","V")
switch(alert("Do you want this to be a random disease or do you have something in mind?",,"Make Your Own","Random","Choose"))
if("Make Your Own")
AdminCreateVirus(usr.client)
@@ -488,8 +488,8 @@
if("retardify")
if(!check_rights(R_FUN))
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","RET")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","RET")
for(var/mob/living/carbon/human/H in GLOB.player_list)
to_chat(H, "<span class='boldannounce'>You suddenly feel stupid.</span>")
H.setBrainLoss(60)
@@ -498,8 +498,8 @@
if("eagles")//SCRAW
if(!check_rights(R_FUN))
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","EgL")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","EgL")
for(var/obj/machinery/door/airlock/W in GLOB.machines)
if(W.z == ZLEVEL_STATION && !istype(get_area(W), /area/bridge) && !istype(get_area(W), /area/crew_quarters) && !istype(get_area(W), /area/security/prison))
W.req_access = list()
@@ -509,8 +509,8 @@
if("guns")
if(!check_rights(R_FUN))
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","SG")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","SG")
var/survivor_probability = 0
switch(alert("Do you want this to create survivors antagonists?",,"No Antags","Some Antags","All Antags!"))
if("Some Antags")
@@ -523,8 +523,8 @@
if("magic")
if(!check_rights(R_FUN))
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","SM")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","SM")
var/survivor_probability = 0
switch(alert("Do you want this to create survivors antagonists?",,"No Antags","Some Antags","All Antags!"))
if("Some Antags")
@@ -540,15 +540,15 @@
if(!SSevents.wizardmode)
if(alert("Do you want to toggle summon events on?",,"Yes","No") == "Yes")
summonevents()
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","SE")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","SE")
else
switch(alert("What would you like to do?",,"Intensify Summon Events","Turn Off Summon Events","Nothing"))
if("Intensify Summon Events")
summonevents()
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","SE")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","SE")
if("Turn Off Summon Events")
SSevents.toggleWizardmode()
SSevents.resetFrequency()
@@ -556,8 +556,8 @@
if("dorf")
if(!check_rights(R_FUN))
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","DF")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","DF")
for(var/mob/living/carbon/human/B in GLOB.mob_list)
B.facial_hair_style = "Dward Beard"
B.update_hair()
@@ -566,8 +566,8 @@
if("onlyone")
if(!check_rights(R_FUN))
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","OO")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","OO")
usr.client.only_one()
send_to_playing_players('sound/misc/highlander.ogg')
// message_admins("[key_name_admin(usr)] has triggered a battle to the death (only one)")
@@ -575,16 +575,16 @@
if("delayed_onlyone")
if(!check_rights(R_FUN))
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","OO")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","OO")
usr.client.only_one_delayed()
send_to_playing_players('sound/misc/highlander_delayed.ogg')
if("onlyme")
if(!check_rights(R_FUN))
return
- feedback_inc("admin_secrets_fun_used",1)
- feedback_add_details("admin_secrets_fun_used","OM")
+ SSblackbox.inc("admin_secrets_fun_used",1)
+ SSblackbox.add_details("admin_secrets_fun_used","OM")
only_me()
if("maint_access_brig")
code/modules/admin/topic.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm (rejected hunks)
@@ -1175,7 +1175,7 @@
ban_unban_log_save("[key_name(usr)] has permabanned [key_name(M)]. - Reason: [reason] - This is a permanent ban.")
log_admin_private("[key_name(usr)] has banned [key_name_admin(M)].\nReason: [reason]\nThis is a permanent ban.")
message_admins("<span class='adminnotice'>[key_name_admin(usr)] has banned [key_name_admin(M)].\nReason: [reason]\nThis is a permanent ban.</span>")
- feedback_inc("ban_perma",1)
+ SSblackbox.inc("ban_perma",1)
qdel(M.client)
if("Cancel")
return
code/modules/admin/verbs/adminhelp.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm (rejected hunks)
@@ -127,7 +127,7 @@
log_admin_private("HELP: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins who have +BAN.")
if(admin_number_present <= 0)
to_chat(src, "<span class='notice'>No active admins are online, your adminhelp was sent to the admin irc.</span>")
- feedback_add_details("admin_verb","Adminhelp") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ SSblackbox.add_details("admin_verb","Adminhelp") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return
/proc/get_admin_counts(requiredflags = R_BAN)
code/modules/admin/verbs/adminjump.dm.rej
-16
View File
@@ -1,16 +0,0 @@
diff a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm (rejected hunks)
@@ -107,7 +107,7 @@
log_admin("[key_name(usr)] teleported [key_name(M)]")
message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)]")
M.forceMove(get_turf(usr))
- feedback_add_details("admin_verb","Get Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ SSblackbox.add_details("admin_verb","Get Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/Getkey()
set category = "Admin"
@@ -149,4 +149,4 @@
message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)] to [A]")
else
to_chat(src, "Failed to move mob to a valid location.")
- feedback_add_details("admin_verb","Send Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ SSblackbox.add_details("admin_verb","Send Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
code/modules/admin/verbs/debug.dm.rej
-28
View File
@@ -1,28 +0,0 @@
diff a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm (rejected hunks)
@@ -79,7 +79,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
. = get_callproc_returnval(returnval, procname)
if(.)
to_chat(usr, .)
- feedback_add_details("admin_verb","Advanced ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ SSblackbox.add_details("admin_verb","Advanced ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/callproc_datum(datum/A as null|area|mob|obj|turf)
set category = "Debug"
@@ -104,7 +104,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
return
log_admin("[key_name(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].")
message_admins("[key_name(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].")
- feedback_add_details("admin_verb","Atom ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ SSblackbox.add_details("admin_verb","Atom ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
var/returnval = call(A,procname)(arglist(lst)) // Pass the lst as an argument list to the proc
. = get_callproc_returnval(returnval,procname)
@@ -758,7 +758,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
GLOB.medals_enabled = !GLOB.medals_enabled
message_admins("<span class='adminnotice'>[key_name_admin(src)] [GLOB.medals_enabled ? "disabled" : "enabled"] the medal hub lockout.</span>")
- feedback_add_details("admin_verb","Toggle Medal Disable") // If...
+ SSblackbox.add_details("admin_verb","Toggle Medal Disable") // If...
log_admin("[key_name(src)] [GLOB.medals_enabled ? "disabled" : "enabled"] the medal hub lockout.")
/client/proc/view_runtimes()
code/modules/admin/verbs/panicbunker.dm.rej
-8
View File
@@ -1,8 +0,0 @@
diff a/code/modules/admin/verbs/panicbunker.dm b/code/modules/admin/verbs/panicbunker.dm (rejected hunks)
@@ -11,5 +11,5 @@
message_admins("[key_name_admin(usr)] has toggled the Panic Bunker, it is now [(config.panic_bunker?"enabled":"disabled")].")
if (config.panic_bunker && (!GLOB.dbcon || !GLOB.dbcon.IsConnected()))
message_admins("The Database is not connected! Panic bunker will not work until the connection is reestablished.")
- feedback_add_details("admin_toggle","Toggle Panic Bunker|[config.panic_bunker]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ SSblackbox.add_details("admin_toggle","Toggle Panic Bunker|[config.panic_bunker]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
code/modules/admin/verbs/randomverbs.dm.rej
-46
View File
@@ -1,46 +0,0 @@
diff a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm (rejected hunks)
@@ -16,7 +16,7 @@
log_admin("[key_name(usr)] made [key_name(M)] drop everything!")
message_admins("[key_name_admin(usr)] made [key_name_admin(M)] drop everything!")
- feedback_add_details("admin_verb","Drop Everything") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ SSblackbox.add_details("admin_verb","Drop Everything") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_subtle_message(mob/M in GLOB.mob_list)
@@ -42,7 +42,7 @@
log_admin("SubtlePM: [key_name(usr)] -> [key_name(M)] : [msg]")
message_admins("<span class='adminnotice'><b> SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] :</b> [msg]</span>")
- feedback_add_details("admin_verb","Subtle Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ SSblackbox.add_details("admin_verb","Subtle Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_world_narrate()
set category = "Special Verbs"
@@ -83,7 +83,7 @@
to_chat(M, msg)
log_admin("DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]")
message_admins("<span class='adminnotice'><b> DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]):</b> [msg]<BR></span>")
- feedback_add_details("admin_verb","Direct Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ SSblackbox.add_details("admin_verb","Direct Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_local_narrate(atom/A)
set category = "Special Verbs"
@@ -118,7 +118,7 @@
log_admin("[key_name(usr)] has toggled [key_name(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]")
message_admins("[key_name_admin(usr)] has toggled [key_name_admin(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]")
- feedback_add_details("admin_toggle","Godmode|[M.status_flags & GODMODE]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ SSblackbox.add_details("admin_toggle","Godmode|[M.status_flags & GODMODE]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/proc/cmd_admin_mute(whom, mute_type, automute = 0)
@@ -448,7 +448,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
log_admin("[key_name(usr)] healed / revived [key_name(M)]")
message_admins("<span class='danger'>Admin [key_name_admin(usr)] healed / revived [key_name_admin(M)]!</span>")
- feedback_add_details("admin_verb","Rejuvinate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ SSblackbox.add_details("admin_verb","Rejuvinate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_create_centcom_report()
set category = "Special Verbs"
code/modules/admin/verbs/reestablish_db_connection.dm.rej
-15
View File
@@ -1,15 +0,0 @@
diff a/code/modules/admin/verbs/reestablish_db_connection.dm b/code/modules/admin/verbs/reestablish_db_connection.dm (rejected hunks)
@@ -17,11 +17,11 @@
GLOB.dbcon.Disconnect()
log_admin("[key_name(usr)] has forced the database to disconnect")
message_admins("[key_name_admin(usr)] has <b>forced</b> the database to disconnect!")
- feedback_add_details("admin_verb","Force Reestablished Database Connection") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ SSblackbox.add_details("admin_verb","Force Reestablished Database Connection") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] is attempting to re-established the DB Connection")
message_admins("[key_name_admin(usr)] is attempting to re-established the DB Connection")
- feedback_add_details("admin_verb","Reestablished Database Connection") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ SSblackbox.add_details("admin_verb","Reestablished Database Connection") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
GLOB.dbcon.failed_connections = 0
if(!GLOB.dbcon.Connect())
code/modules/clothing/clothing.dm.rej
-29
View File
@@ -1,29 +0,0 @@
diff a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm (rejected hunks)
@@ -545,16 +545,26 @@ BLIND // can't see anything
tI.color = hastie.color
. += tI
+/obj/item/clothing/under/attackby(obj/item/W, mob/user, params)
+ if((has_sensor == BROKEN_SENSORS) && istype(W, /obj/item/stack/cable_coil))
+ var/obj/item/stack/cable_coil/C = W
+ C.use(1)
+ has_sensor = HAS_SENSORS
+ to_chat(user,"<span class='notice'>You repair the suit sensors on [src] with [C].</span>")
+ return 1
+
/obj/item/clothing/under/update_clothes_damaged_state(damaging = TRUE)
..()
if(ismob(loc))
var/mob/M = loc
M.update_inv_w_uniform()
+ if(has_sensor > NO_SENSORS)
+ has_sensor = BROKEN_SENSORS
/obj/item/clothing/under/New()
if(random_sensor)
//make the sensor mode favor higher levels, except coords.
- sensor_mode = pick(0, 1, 1, 2, 2, 2, 3, 3)
+ sensor_mode = pick(SENSOR_OFF, SENSOR_LIVING, SENSOR_LIVING, SENSOR_VITALS, SENSOR_VITALS, SENSOR_VITALS, SENSOR_COORDS, SENSOR_COORDS)
adjusted = NORMAL_STYLE
..()
code/modules/clothing/suits/armor.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm (rejected hunks)
@@ -140,7 +140,7 @@
return 1
/obj/item/clothing/suit/armor/vest/det_suit
- name = "armor"
+ name = "detective's armor vest"
desc = "An armored vest with a detective's badge on it."
icon_state = "detective-armor"
allowed = list(/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/ballistic,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder,/obj/item/weapon/melee/classic_baton/telescopic)
code/modules/events/_event.dm.rej
-17
View File
@@ -1,17 +0,0 @@
diff a/code/modules/events/_event.dm b/code/modules/events/_event.dm (rejected hunks)
@@ -78,13 +78,13 @@
triggering = FALSE
message_admins("[key_name_admin(usr)] cancelled event [name].")
log_admin_private("[key_name(usr)] cancelled event [name].")
- feedback_add_details("admin_verb","Cancel Event: [typepath]")
+ SSblackbox.add_details("admin_verb","Cancel Event: [typepath]")
/datum/round_event_control/proc/runEvent(random)
var/datum/round_event/E = new typepath()
E.current_players = get_active_player_count(alive_check = 1, afk_check = 1, human_check = 1)
E.control = src
- feedback_add_details("event_ran","[E]")
+ SSblackbox.add_details("event_ran","[E]")
occurrences++
testing("[time2text(world.time, "hh:mm:ss")] [E.type]")
code/modules/mining/equipment.dm.rej
-26
View File
@@ -1,26 +0,0 @@
diff a/code/modules/mining/equipment.dm b/code/modules/mining/equipment.dm (rejected hunks)
@@ -68,7 +68,7 @@
/obj/item/device/wormhole_jaunter/attack_self(mob/user)
user.visible_message("<span class='notice'>[user.name] activates the [src.name]!</span>")
- feedback_add_details("jaunter", "U") // user activated
+ SSblackbox.add_details("jaunter", "U") // user activated
activate(user)
/obj/item/device/wormhole_jaunter/proc/turf_check(mob/user)
@@ -124,13 +124,13 @@
if(triggered)
usr.visible_message("<span class='warning'>The [src] overloads and activates!</span>")
- feedback_add_details("jaunter","E") // EMP accidental activation
+ SSblackbox.add_details("jaunter","E") // EMP accidental activation
activate(usr)
/obj/item/device/wormhole_jaunter/proc/chasm_react(mob/user)
if(user.get_item_by_slot(slot_belt) == src)
to_chat(user, "Your [src] activates, saving you from the chasm!</span>")
- feedback_add_details("jaunter","C") // chasm automatic activation
+ SSblackbox.add_details("jaunter","C") // chasm automatic activation
activate(user)
else
to_chat(user, "The [src] is not attached to your belt, preventing it from saving you from the chasm. RIP.</span>")
code/modules/mining/lavaland/necropolis_chests.dm.rej
-28
View File
@@ -1,28 +0,0 @@
diff a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm (rejected hunks)
@@ -87,7 +87,7 @@
user.sight |= SEE_MOBS
icon_state = "lantern"
wisp.orbit(user, 20)
- feedback_add_details("wisp_lantern","F") // freed
+ SSblackbox.add_details("wisp_lantern","F") // freed
else
to_chat(user, "<span class='notice'>You return the wisp to the lantern.</span>")
@@ -102,7 +102,7 @@
wisp.stop_orbit()
wisp.loc = src
icon_state = "lantern-blue"
- feedback_add_details("wisp_lantern","R") // returned
+ SSblackbox.add_details("wisp_lantern","R") // returned
/obj/item/device/wisp_lantern/Initialize()
..()
@@ -229,7 +229,7 @@
/obj/item/device/immortality_talisman/attack_self(mob/user)
if(cooldown < world.time)
- feedback_add_details("immortality_talisman","U") // usage
+ SSblackbox.add_details("immortality_talisman","U") // usage
cooldown = world.time + 600
user.visible_message("<span class='danger'>[user] vanishes from reality, leaving a a hole in [user.p_their()] place!</span>")
var/obj/effect/immortality_talisman/Z = new(get_turf(src.loc))
code/modules/mob/living/simple_animal/constructs.dm.rej
-9
View File
@@ -1,9 +0,0 @@
diff a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm (rejected hunks)
@@ -35,7 +35,6 @@
/mob/living/simple_animal/hostile/construct/Initialize()
. = ..()
- updateglow()
update_health_hud()
for(var/spell in construct_spells)
AddSpell(new spell(null))
code/modules/mob/logout.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm (rejected hunks)
@@ -3,7 +3,7 @@
unset_machine()
GLOB.player_list -= src
if(GLOB.admin_datums[src.ckey])
- if (SSticker && SSticker.current_state == GAME_STATE_PLAYING) //Only report this stuff if we are currently playing.
+ if (SSticker && SSticker.IsRoundInProgress()) //Only report this stuff if we are currently playing.
var/admins_number = GLOB.admins.len
if(admins_number == 0) //Apparently the admin logging out is no longer an admin at this point, so we have to check this towards 0 and not towards 1. Awell.
var/cheesy_message = pick( list( \
code/modules/power/singularity/emitter.dm.rej
-10
View File
@@ -1,10 +0,0 @@
diff a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm (rejected hunks)
@@ -88,7 +88,7 @@
connect_to_network()
/obj/machinery/power/emitter/Destroy()
- if(SSticker && SSticker.current_state == GAME_STATE_PLAYING)
+ if(SSticker && SSticker.IsRoundInProgress())
message_admins("Emitter deleted at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
log_game("Emitter deleted at ([x],[y],[z])")
investigate_log("<font color='red'>deleted</font> at ([x],[y],[z]) at [get_area(src)]","singulo")
code/modules/reagents/chemistry/recipes/slime_extracts.dm.rej
-442
View File
@@ -1,442 +0,0 @@
diff a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm (rejected hunks)
@@ -19,7 +19,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimespawn/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/mob/living/simple_animal/slime/S
S = new(get_turf(holder.my_atom), "grey")
S.visible_message("<span class='danger'>Infused with plasma, the \
@@ -36,7 +36,7 @@
required_container = /obj/item/slime_extract/grey
/datum/chemical_reaction/slime/slimeinaprov/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
..()
/datum/chemical_reaction/slime/slimemonkey
@@ -47,7 +47,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimemonkey/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
for(var/i = 1, i <= 3, i++)
var /obj/item/weapon/reagent_containers/food/snacks/monkeycube/M = new /obj/item/weapon/reagent_containers/food/snacks/monkeycube
M.loc = get_turf(holder.my_atom)
@@ -63,7 +63,7 @@
required_container = /obj/item/slime_extract/green
/datum/chemical_reaction/slime/slimemutate/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
..()
//Mutated Green
@@ -77,7 +77,7 @@
mix_message = "<span class='info'>The mixture rapidly expands and contracts, its appearance shifting into a sickening green.</span>"
/datum/chemical_reaction/slime/slimemutate_unstable/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
..()
//Metal
@@ -89,7 +89,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimemetal/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/turf/location = get_turf(holder.my_atom)
new /obj/item/stack/sheet/plasteel (location, 5)
new /obj/item/stack/sheet/metal (location, 15)
@@ -103,7 +103,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimeglass/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/turf/location = get_turf(holder.my_atom)
new /obj/item/stack/sheet/rglass (location, 5)
new /obj/item/stack/sheet/glass (location, 15)
@@ -118,7 +118,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimecrit/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/turf/T = get_turf(holder.my_atom)
T.visible_message("<span class='danger'>The slime extract begins to vibrate violently !</span>")
addtimer(CALLBACK(src, .proc/chemical_mob_spawn, holder, 5, "Gold Slime"), 50)
@@ -134,7 +134,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimecritlesser/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/turf/T = get_turf(holder.my_atom)
T.visible_message("<span class='danger'>The slime extract begins to vibrate violently !</span>")
addtimer(CALLBACK(src, .proc/chemical_mob_spawn, holder, 3, "Lesser Gold Slime", "neutral"), 50)
@@ -150,7 +150,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimecritfriendly/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/turf/T = get_turf(holder.my_atom)
T.visible_message("<span class='danger'>The slime extract begins to vibrate adorably !</span>")
addtimer(CALLBACK(src, .proc/chemical_mob_spawn, holder, 1, "Friendly Gold Slime", "neutral"), 50)
@@ -168,7 +168,7 @@
/datum/chemical_reaction/slime/slimebork/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/list/blocked = list(/obj/item/weapon/reagent_containers/food/snacks,
/obj/item/weapon/reagent_containers/food/snacks/store/bread,
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
@@ -216,7 +216,7 @@
/datum/chemical_reaction/slime/slimebork2/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/list/borks = subtypesof(/obj/item/weapon/reagent_containers/food/drinks)
// BORK BORK BORK
@@ -246,7 +246,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimefrost/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
..()
@@ -258,7 +258,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimestabilizer/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/obj/item/slimepotion/stabilizer/P = new /obj/item/slimepotion/stabilizer
P.loc = get_turf(holder.my_atom)
..()
@@ -273,7 +273,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimefoam/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
..()
@@ -286,7 +286,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimefreeze/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/turf/T = get_turf(holder.my_atom)
T.visible_message("<span class='danger'>The slime extract begins to vibrate adorably!</span>")
addtimer(CALLBACK(src, .proc/freeze, holder), 50)
@@ -310,7 +310,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimefireproof/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/obj/item/slimepotion/fireproof/P = new /obj/item/slimepotion/fireproof
P.loc = get_turf(holder.my_atom)
..()
@@ -325,7 +325,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimecasp/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
..()
/datum/chemical_reaction/slime/slimefire
@@ -336,7 +336,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimefire/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/turf/TU = get_turf(holder.my_atom)
TU.visible_message("<span class='danger'>The slime extract begins to vibrate adorably!</span>")
addtimer(CALLBACK(src, .proc/slime_burn, holder), 50)
@@ -360,7 +360,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimesmoke/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
..()
//Yellow
@@ -373,7 +373,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimeoverload/on_reaction(datum/reagents/holder, created_volume)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
empulse(get_turf(holder.my_atom), 3, 7)
..()
@@ -386,7 +386,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimecell/on_reaction(datum/reagents/holder, created_volume)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/obj/item/weapon/stock_parts/cell/high/slime/P = new /obj/item/weapon/stock_parts/cell/high/slime
P.loc = get_turf(holder.my_atom)
..()
@@ -399,7 +399,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimeglow/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/turf/T = get_turf(holder.my_atom)
T.visible_message("<span class='danger'>The slime begins to emit a soft light. Squeezing it will cause it to grow brightly.</span>")
var/obj/item/device/flashlight/slime/F = new /obj/item/device/flashlight/slime
@@ -416,7 +416,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimepsteroid/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/obj/item/slimepotion/steroid/P = new /obj/item/slimepotion/steroid
P.loc = get_turf(holder.my_atom)
..()
@@ -430,7 +430,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimejam/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
..()
@@ -443,7 +443,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimeplasma/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/turf/location = get_turf(holder.my_atom)
new /obj/item/stack/sheet/mineral/plasma (location, 3)
..()
@@ -458,7 +458,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimemutator/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/obj/item/slimepotion/mutator/P = new /obj/item/slimepotion/mutator
P.loc = get_turf(holder.my_atom)
..()
@@ -471,7 +471,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimebloodlust/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
for(var/mob/living/simple_animal/slime/slime in viewers(get_turf(holder.my_atom), null))
slime.rabid = 1
slime.visible_message("<span class='danger'>The [slime] is driven into a frenzy!</span>")
@@ -486,7 +486,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimespeed/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/obj/item/slimepotion/speed/P = new /obj/item/slimepotion/speed
P.loc = get_turf(holder.my_atom)
..()
@@ -501,7 +501,7 @@
required_other = 1
/datum/chemical_reaction/slime/docility/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/obj/item/slimepotion/docility/P = new /obj/item/slimepotion/docility
P.loc = get_turf(holder.my_atom)
..()
@@ -514,7 +514,7 @@
required_other = 1
/datum/chemical_reaction/slime/gender/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/obj/item/slimepotion/genderchange/G = new /obj/item/slimepotion/genderchange
G.loc = get_turf(holder.my_atom)
..()
@@ -529,7 +529,7 @@
required_container = /obj/item/slime_extract/black
/datum/chemical_reaction/slime/slimemutate2/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
..()
//Oil
@@ -541,7 +541,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimeexplosion/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/turf/T = get_turf(holder.my_atom)
var/lastkey = holder.my_atom.fingerprintslast
var/touch_msg = "N/A"
@@ -570,7 +570,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimecornoil/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
..()
//Light Pink
@@ -582,7 +582,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimepotion2/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/obj/item/slimepotion/sentience/P = new /obj/item/slimepotion/sentience
P.loc = get_turf(holder.my_atom)
..()
@@ -596,7 +596,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimegolem/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/obj/effect/golemrune/Z = new /obj/effect/golemrune
Z.loc = get_turf(holder.my_atom)
notify_ghosts("Golem rune created in [get_area(Z)].", 'sound/effects/ghost2.ogg', source = Z)
@@ -610,7 +610,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimegolem2/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/obj/item/golem_shell/artificial/Z = new /obj/item/golem_shell/artificial
Z.loc = get_turf(holder.my_atom)
..()
@@ -624,7 +624,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimefloor2/on_reaction(datum/reagents/holder, created_volume)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/obj/item/stack/tile/bluespace/P = new /obj/item/stack/tile/bluespace
P.amount = 25
P.loc = get_turf(holder.my_atom)
@@ -639,7 +639,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimecrystal/on_reaction(datum/reagents/holder, created_volume)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
if(holder.my_atom)
var/obj/item/weapon/ore/bluespace_crystal/BC = new(get_turf(holder.my_atom))
BC.visible_message("<span class='notice'>The [BC.name] appears out of thin air!</span>")
@@ -654,7 +654,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimepsteroid2/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/obj/item/slimepotion/enhancer/P = new /obj/item/slimepotion/enhancer
P.loc = get_turf(holder.my_atom)
..()
@@ -668,7 +668,7 @@
required_other = 1
/datum/chemical_reaction/slime/slime_territory/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/obj/item/areaeditor/blueprints/slime/P = new /obj/item/areaeditor/blueprints/slime
P.loc = get_turf(holder.my_atom)
..()
@@ -682,7 +682,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimestop/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/mob/mob = get_mob_by_key(holder.my_atom.fingerprintslast)
var/obj/effect/timestop/T = new /obj/effect/timestop
T.loc = get_turf(holder.my_atom)
@@ -699,7 +699,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimecamera/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/obj/item/device/camera/P = new /obj/item/device/camera
P.loc = get_turf(holder.my_atom)
var/obj/item/device/camera_film/Z = new /obj/item/device/camera_film
@@ -714,7 +714,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimefloor/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/obj/item/stack/tile/sepia/P = new /obj/item/stack/tile/sepia
P.amount = 25
P.loc = get_turf(holder.my_atom)
@@ -732,7 +732,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimepaint/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/list/paints = subtypesof(/obj/item/weapon/paint)
var/chosen = pick(paints)
var/obj/P = new chosen
@@ -749,7 +749,7 @@
required_other = 1
/datum/chemical_reaction/slime/slimecrayon/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/list/crayons = difflist(subtypesof(/obj/item/toy/crayon),typesof(/obj/item/toy/crayon/spraycan))
var/chosen = pick(crayons)
var/obj/P = new chosen
@@ -766,7 +766,7 @@
required_container = /obj/item/slime_extract/rainbow
/datum/chemical_reaction/slime/slimeRNG/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/mob/living/simple_animal/slime/random/S
S = new(get_turf(holder.my_atom))
S.visible_message("<span class='danger'>Infused with plasma, the \
@@ -782,7 +782,7 @@
required_container = /obj/item/slime_extract/rainbow
/datum/chemical_reaction/slime/slime_transfer/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
var/obj/item/slimepotion/transference/P = new /obj/item/slimepotion/transference
P.loc = get_turf(holder.my_atom)
..()
@@ -795,7 +795,7 @@
required_container = /obj/item/slime_extract/rainbow
/datum/chemical_reaction/slime/flight_potion/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
+ SSblackbox.add_details("slime_cores_used","[type]")
new/obj/item/weapon/reagent_containers/glass/bottle/potion/flight(get_turf(holder.my_atom))
..()
code/modules/uplink/uplink_item.dm.rej
-17
View File
@@ -1,17 +0,0 @@
diff a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm (rejected hunks)
@@ -88,7 +88,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
/datum/uplink_item/proc/spawn_item(turf/loc, obj/item/device/uplink/U)
if(item)
- feedback_add_details("traitor_uplink_items_bought", "[item]")
+ SSblackbox.add_details("traitor_uplink_items_bought", "[item]")
return new item(loc)
/datum/uplink_item/proc/buy(mob/user, obj/item/device/uplink/U)
@@ -1351,5 +1351,5 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
var/datum/uplink_item/I = pick(possible_items)
U.telecrystals -= I.cost
U.spent_telecrystals += I.cost
- feedback_add_details("traitor_uplink_items_bought","RN")
+ SSblackbox.add_details("traitor_uplink_items_bought","RN")
return new I.item(loc)