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

Unorphans the blackbox

Browse Source
This commit is contained in:
CitadelStationBot
2017-04-26 17:05:23 -05:00
parent e7df2bc14a
commit bde5d6253a
116 changed files with 1980 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/brain/MMI.dm
+1 -1
View File
@@ -73,7 +73,7 @@
name = "Man-Machine Interface: [brainmob.real_name]"
update_icon()
feedback_inc("cyborg_mmis_filled",1)
SSblackbox.inc("cyborg_mmis_filled",1)
else if(brainmob)
O.attack(brainmob, user) //Oh noooeeeee
code/modules/mob/living/carbon/human/death.dm
+1 -1
View File
@@ -33,7 +33,7 @@
dna.species.spec_death(gibbed, src)
if(SSticker && SSticker.mode)
sql_report_death(src)
SSblackbox.ReportDeath(src)
if(mind && mind.devilinfo)
INVOKE_ASYNC(mind.devilinfo, /datum/devilinfo.proc/beginResurrectionCheck, src)
code/modules/mob/living/carbon/human/human_defense.dm
+2 -2
View File
@@ -177,8 +177,8 @@
var/obj/item/bodypart/affecting = get_bodypart(ran_zone(user.zone_selected)) //what we're actually ending up trying to hit.
var/target_area = parse_zone(check_zone(user.zone_selected)) //our intended target
feedback_add_details("item_used_for_combat","[I.type]|[I.force]")
feedback_add_details("zone_targeted","[target_area]")
SSblackbox.add_details("item_used_for_combat","[I.type]|[I.force]")
SSblackbox.add_details("zone_targeted","[target_area]")
// the attacked_by code varies among species
return dna.species.spec_attacked_by(I, user, affecting, a_intent, src)
code/modules/mob/living/silicon/robot/death.dm
+1 -1
View File
@@ -32,4 +32,4 @@
unbuckle_all_mobs(TRUE)
sql_report_death(src)
SSblackbox.ReportDeath(src)
code/modules/mob/living/silicon/robot/robot_modules.dm
+1 -1
View File
@@ -222,7 +222,7 @@
if(R.hud_used)
R.hud_used.update_robot_modules_display()
if(feedback_key && !did_feedback)
feedback_inc(feedback_key, 1)
SSblackbox.inc(feedback_key, 1)
/obj/item/weapon/robot_module/standard
name = "Standard"
code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+1 -1
View File
@@ -53,7 +53,7 @@
return
else
if(!admin_spawned)
feedback_set_details("megafauna_kills","[initial(name)]")
SSblackbox.set_details("megafauna_kills","[initial(name)]")
if(!elimination) //used so the achievment only occurs for the last legion to die.
grant_achievement(medal_type,score_type)
..()
code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+6 -6
View File
@@ -48,7 +48,7 @@
..()
/mob/living/simple_animal/hostile/asteroid/death(gibbed)
feedback_add_details("mobs_killed_mining","[src.type]")
SSblackbox.add_details("mobs_killed_mining","[src.type]")
..(gibbed)
/mob/living/simple_animal/hostile/asteroid/basilisk
@@ -266,15 +266,15 @@
update_icon()
if(implanted)
feedback_add_details("hivelord_core", "[type]|implanted")
SSblackbox.add_details("hivelord_core", "[type]|implanted")
else
feedback_add_details("hivelord_core", "[type]|stabilizer")
SSblackbox.add_details("hivelord_core", "[type]|stabilizer")
/obj/item/organ/hivelord_core/proc/go_inert()
inert = TRUE
desc = "The remains of a hivelord that have become useless, having been left alone too long after being harvested."
feedback_add_details("hivelord_core", "[src.type]|inert")
SSblackbox.add_details("hivelord_core", "[src.type]|inert")
update_icon()
/obj/item/organ/hivelord_core/ui_action_click()
@@ -298,10 +298,10 @@
return
if(H != user)
H.visible_message("[user] forces [H] to apply [src]... [H.p_they()] quickly regenerate all injuries!")
feedback_add_details("hivelord_core","[src.type]|used|other")
SSblackbox.add_details("hivelord_core","[src.type]|used|other")
else
to_chat(user, "<span class='notice'>You start to smear [src] on yourself. It feels and smells disgusting, but you feel amazingly refreshed in mere moments.</span>")
feedback_add_details("hivelord_core","[src.type]|used|self")
SSblackbox.add_details("hivelord_core","[src.type]|used|self")
H.revive(full_heal = 1)
qdel(src)
..()
code/modules/mob/living/simple_animal/slime/powers.dm
+1 -1
View File
@@ -166,7 +166,7 @@
M.Friends = Friends.Copy()
babies += M
M.mutation_chance = Clamp(mutation_chance+(rand(5,-5)),0,100)
feedback_add_details("slime_babies_born","slimebirth_[replacetext(M.colour," ","_")]")
SSblackbox.add_details("slime_babies_born","slimebirth_[replacetext(M.colour," ","_")]")
var/mob/living/simple_animal/slime/new_slime = pick(babies)
new_slime.a_intent = INTENT_HARM