cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 04:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Blindness-related bug fixes and code improvements (#6291)

Browse Source 
* Blindness-related bug fix and code improvements (#59616)

TRAIT_BLIND caused by the hypnochair or by being unconscious (eg. sleeping) will no longer prevent you from being flashed.
Moves all raw text strings used in become_blind and cure_blind calls (as well as nanites in general with ADD_TRAIT) into defines.
Code changes not in changelog due to not being even the slightest bit of player facing.

* Blindness-related bug fixes and code improvements

Co-authored-by: RandomGamer123 <31096837+RandomGamer123@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-06-14 08:39:29 +02:00
committed by GitHub
parent 7fff02a21a
commit a9d405cdfb
9 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/nanites/nanite_programs/buffing.dm
+4 -4
View File
@@ -87,11 +87,11 @@
/datum/nanite_program/conductive/enable_passive_effect()
. = ..()
ADD_TRAIT(host_mob, TRAIT_SHOCKIMMUNE, "nanites")
ADD_TRAIT(host_mob, TRAIT_SHOCKIMMUNE, NANITES_TRAIT)
/datum/nanite_program/conductive/disable_passive_effect()
. = ..()
REMOVE_TRAIT(host_mob, TRAIT_SHOCKIMMUNE, "nanites")
REMOVE_TRAIT(host_mob, TRAIT_SHOCKIMMUNE, NANITES_TRAIT)
/datum/nanite_program/mindshield
name = "Mental Barrier"
@@ -102,10 +102,10 @@
/datum/nanite_program/mindshield/enable_passive_effect()
. = ..()
if(!host_mob.mind.has_antag_datum(/datum/antagonist/rev, TRUE)) //won't work if on a rev, to avoid having implanted revs.
ADD_TRAIT(host_mob, TRAIT_MINDSHIELD, "nanites")
ADD_TRAIT(host_mob, TRAIT_MINDSHIELD, NANITES_TRAIT)
host_mob.sec_hud_set_implants()
/datum/nanite_program/mindshield/disable_passive_effect()
. = ..()
REMOVE_TRAIT(host_mob, TRAIT_MINDSHIELD, "nanites")
REMOVE_TRAIT(host_mob, TRAIT_MINDSHIELD, NANITES_TRAIT)
host_mob.sec_hud_set_implants()
code/modules/research/nanites/nanite_programs/suppression.dm
+6 -6
View File
@@ -62,11 +62,11 @@
/datum/nanite_program/pacifying/enable_passive_effect()
. = ..()
ADD_TRAIT(host_mob, TRAIT_PACIFISM, "nanites")
ADD_TRAIT(host_mob, TRAIT_PACIFISM, NANITES_TRAIT)
/datum/nanite_program/pacifying/disable_passive_effect()
. = ..()
REMOVE_TRAIT(host_mob, TRAIT_PACIFISM, "nanites")
REMOVE_TRAIT(host_mob, TRAIT_PACIFISM, NANITES_TRAIT)
/datum/nanite_program/blinding
name = "Blindness"
@@ -76,11 +76,11 @@
/datum/nanite_program/blinding/enable_passive_effect()
. = ..()
host_mob.become_blind("nanites")
host_mob.become_blind(NANITES_TRAIT)
/datum/nanite_program/blinding/disable_passive_effect()
. = ..()
host_mob.cure_blind("nanites")
host_mob.cure_blind(NANITES_TRAIT)
/datum/nanite_program/mute
name = "Mute"
@@ -90,11 +90,11 @@
/datum/nanite_program/mute/enable_passive_effect()
. = ..()
ADD_TRAIT(host_mob, TRAIT_MUTE, "nanites")
ADD_TRAIT(host_mob, TRAIT_MUTE, NANITES_TRAIT)
/datum/nanite_program/mute/disable_passive_effect()
. = ..()
REMOVE_TRAIT(host_mob, TRAIT_MUTE, "nanites")
REMOVE_TRAIT(host_mob, TRAIT_MUTE, NANITES_TRAIT)
/datum/nanite_program/fake_death
name = "Death Simulation"
code/modules/research/nanites/nanite_programs/utility.dm
+1 -1
View File
@@ -33,7 +33,7 @@
/datum/nanite_program/monitoring/enable_passive_effect()
. = ..()
ADD_TRAIT(host_mob, TRAIT_NANITE_MONITORING, "nanites") //Shows up in diagnostic and medical HUDs as a small blinking icon
ADD_TRAIT(host_mob, TRAIT_NANITE_MONITORING, NANITES_TRAIT) //Shows up in diagnostic and medical HUDs as a small blinking icon
if(ishuman(host_mob))
GLOB.nanite_sensors_list |= host_mob
host_mob.hud_set_nanite_indicator()