Fixes More Devbugs (#4214)

Fixes #4195
Fixes #4199
Fixes #4162
Fixes #4194
This commit is contained in:
LordFowl
2018-01-30 00:50:30 -05:00
committed by Erki
parent fa97ca271e
commit 453b039dfe
7 changed files with 67 additions and 20 deletions
+2
View File
@@ -30,6 +30,8 @@
//Called on life ticks
/datum/brain_trauma/proc/on_life()
if(owner.getBrainLoss() < brain.traumas.len)
owner.setBrainLoss(brain.traumas.len)
return
//Called when given to a mob
+20 -16
View File
@@ -397,8 +397,7 @@ var/global/list/additional_antag_types = list()
/datum/game_mode/proc/send_intercept()
var/intercepttext = "<center><img src = ntlogo.png></center><BR><FONT size = 3><BR><B>Cent. Com. Update</B><BR>FOR YOUR EYES ONLY:</FONT><HR>"
intercepttext += "<B><font face='Courier New'>The personnel listed below have been marked at-risk elements that Cent. Com. has deemed priority handling for the current shift:</B><br>"
var/intercepttext = "<center><img src = ntlogo.png></center><BR><FONT size = 3><BR><B>Cent. Com. Update</B><BR>FOR YOUR EYES ONLY:</FONT><HR><font face='Courier New'>"
var/list/disregard_roles = list()
for(var/antag_type in all_antag_types)
@@ -503,28 +502,33 @@ var/global/list/additional_antag_types = list()
var/business_jargon = list("Collated incident reports","Assembled peer-reviews","Persistently negative staff reviews","Collected shift logs","Accumulated negative reports","Analyzed shift data")
var/mean_words = list("has expressed consistent disapproval with the network", "is no longer working efficiently","has gone on record against NanoTrasen practices","is spreading minor dissent in response to recent NanoTrasen behavior","has expressed subversive intent","is unhappy with their employment package")
for(var/mob/living/carbon/human/M in suspects)
if(player_is_antag(M.mind, only_offstation_roles = 1))
continue
intercepttext += " + [pick(business_jargon)] indicate that [M.mind.assigned_role] [M.name] [pick(mean_words)].<br>"
intercepttext += "Cent. Com recommends coordinating with human resources to resolve any issues with employment.<br>"
if(suspects)
intercepttext += "<B>The personnel listed below have been marked at-risk elements that Cent. Com. has deemed priority handling for the current shift:</B><br>"
for(var/mob/living/carbon/human/M in suspects)
if(player_is_antag(M.mind, only_offstation_roles = 1))
continue
intercepttext += "<br> + [pick(business_jargon)] indicate that [M.mind.assigned_role] [M.name] [pick(mean_words)]."
intercepttext += "Cent. Com recommends coordinating with human resources to resolve any issues with employment.<br>"
intercepttext += "<br><B>The personnel listed below possess three or more offenses listed on record:</B>"
for(var/mob/living/carbon/human/M in repeat_offenders)
intercepttext += " + [M.mind.assigned_role] [M.name], [M.incidents.len] offenses.<br>"
intercepttext += "Cent. Com recommends coordinating with internal security to monitor and rehabilitate these personnel.<br>"
if(repeat_offenders)
intercepttext += "<br><B>The personnel listed below possess three or more offenses listed on record:</B>"
for(var/mob/living/carbon/human/M in repeat_offenders)
intercepttext += "<br> + [M.mind.assigned_role] [M.name], [M.incidents.len] offenses."
intercepttext += "Cent. Com recommends coordinating with internal security to monitor and rehabilitate these personnel.<br>"
intercepttext += "<br><B>The personnel listed below have been indicated as particularly loyal to NanoTrasen:</B>"
for(var/mob/living/carbon/human/M in loyalists)
intercepttext += " + [M.mind.assigned_role] [M.name].<br>"
intercepttext += "Cent. Com recommends coordinating with human resources to reward and further motivate these personnel for their loyalty.<br>"
if(loyalists)
intercepttext += "<br><B>The personnel listed below have been indicated as particularly loyal to NanoTrasen:</B>"
for(var/mob/living/carbon/human/M in loyalists)
intercepttext += "<br> + [M.mind.assigned_role] [M.name]."
intercepttext += "Cent. Com recommends coordinating with human resources to reward and further motivate these personnel for their loyalty.<br>"
if(evil_department)
intercepttext += "<br>[pick(business_jargon)] indicate that a majority of the [evil_department] department [pick(mean_words)]. This department has been marked at-risk and Cent. Com. recommends immediate action before the situation worsens.<br>"
if(total_crew)
intercepttext += "<br>Data collected and analyzed by A.L.I.C.E. indicate that [round((loyal_crew/total_crew)*100)]% of the current crew detail are supportive of NanoTrasen actions. Cent. Com. implores the current Head of Staff detail to increase this percentage.<br>"
intercepttext += "<hr> </font>Respectfully,<br><i>Quix Repi'Weish</i>, Chief Personnel Director"
intercepttext += "<hr> </font>Respectfully,<br><i>Quix Repi'Weish</i>, Chief Personnel Director<br>"
intercepttext += "<center><img src = barcode[rand(0, 3)].png></center>"
//New message handling
post_comm_message("Cent. Com. Status Summary", intercepttext)
+1 -1
View File
@@ -151,7 +151,7 @@
return
for(var/mob/player in player_list)
if(istype(player,/mob/abstract) || ((src in player.languages && !within_jamming_range(player)) || check_special_condition(player)))
if(istype(player,/mob/abstract/observer) || ((src in player.languages && !within_jamming_range(player)) || check_special_condition(player)))
player << msg
/datum/language/bug/check_special_condition(var/mob/other)
+3
View File
@@ -57,6 +57,9 @@
handle_regular_hud_updates()
if(languages.len == 1 && default_language != languages[1])
default_language = languages[1]
/mob/living/proc/handle_breathing()
return
+1
View File
@@ -37,6 +37,7 @@
disconnect_time = null
next_move = 1
sight |= SEE_SELF
disconnect_time = null
..()
if(loc && !isturf(loc))
@@ -56,7 +56,7 @@
malus = abs(base_malus*2)
/obj/item/laser_components/modifier/repair_module(var/obj/item/weapon/weldingtool/W)
if(istype(W))
if(!istype(W))
return
if(W.remove_fuel(5))
malus = max(malus - 5, base_malus)
@@ -73,7 +73,7 @@
repair_item = /obj/item/stack/cable_coil
/obj/item/laser_components/capacitor/repair_module(var/obj/item/stack/cable_coil/C)
if(istype(C))
if(!istype(C))
return
if(C.use(5))
return 1
@@ -104,7 +104,7 @@
repair_item = /obj/item/stack/nanopaste
/obj/item/laser_components/focusing_lens/repair_module(var/obj/item/stack/nanopaste/N)
if(istype(N))
if(!istype(N))
return
if(N.use(5))
return 1
+37
View File
@@ -0,0 +1,37 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: LordFowl
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Added SSD timers for when examining inactive/disconnected mobs."