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] Converts blindness and nearsightedness to status effects, scratches some VERY dumb blindness handling that resulted in mobs becoming "incurably" blind [MDB IGNORE] (#18760)

Browse Source 
* Converts blindness and nearsightedness to status effects, scratches some VERY dumb blindness handling that resulted in mobs becoming "incurably" blind

* Fixes the conflicts and makes shit compile!

* Fixes other things that didn't show up because I hadn't updated

* Fixes the lints.

* Okay NOW it's ready (please don't add anything else that touches blindness I beg you)

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
SkyratBot
2023-02-03 22:08:32 +01:00
committed by GitHub
parent bc6b643082
commit 1fe0d145a3
88 changed files with 850 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/crayons.dm
+3 -3
View File
@@ -437,9 +437,9 @@
if(iscarbon(M))
var/mob/living/carbon/C = M
var/covered = ""
if(C.is_mouth_covered(head_only = 1))
if(C.is_mouth_covered(ITEM_SLOT_HEAD))
covered = "headgear"
else if(C.is_mouth_covered(mask_only = 1))
else if(C.is_mouth_covered(ITEM_SLOT_MASK))
covered = "mask"
if(covered)
to_chat(C, span_warning("You have to remove your [covered] first!"))
@@ -696,7 +696,7 @@
if(C.client)
C.set_eye_blur_if_lower(6 SECONDS)
C.adjust_blindness(1)
C.adjust_temp_blindness(2 SECONDS)
if(C.get_eye_protection() <= 0) // no eye protection? ARGH IT BURNS. Warning: don't add a stun here. It's a roundstart item with some quirks.
C.apply_effects(eyeblur = 5, jitter = 10)
flash_color(C, flash_color=paint_color, flash_time=40)
code/game/objects/items/devices/scanners/health_analyzer.dm
+1 -1
View File
@@ -217,7 +217,7 @@
if(istype(eyes))
if(carbontarget.is_blind())
render_list += "<span class='alert ml-2'>Subject is blind.\n</span>"
else if(HAS_TRAIT(carbontarget, TRAIT_NEARSIGHT))
else if(carbontarget.is_nearsighted())
render_list += "<span class='alert ml-2'>Subject is nearsighted.\n</span>"
// Body part damage report
code/game/objects/items/granters/magic/blind.dm
+1 -2
View File
@@ -16,7 +16,7 @@
/obj/item/book/granter/action/spell/blind/recoil(mob/living/user)
. = ..()
to_chat(user, span_warning("You go blind!"))
user.adjust_blindness(10)
user.adjust_temp_blindness(20 SECONDS)
/obj/item/book/granter/action/spell/blind/wgw
name = "Woody's Got Wood"
@@ -30,4 +30,3 @@
"Please, make it stop...",
"HELP ME SOMEONE, WHY AM I READING THIS...",
)
code/game/objects/items/weaponry.dm
+1 -1
View File
@@ -498,7 +498,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
attack_verb_continuous_on = list("smacks", "strikes", "cracks", "beats"), \
attack_verb_simple_on = list("smack", "strike", "crack", "beat"))
RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform))
ADD_TRAIT(src, TRAIT_BLIND_TOOL, ITEM_BLIND_TRAIT)
ADD_TRAIT(src, TRAIT_BLIND_TOOL, INNATE_TRAIT)
/*
* Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM].
code/game/objects/structures/displaycase.dm
-1
View File
@@ -649,4 +649,3 @@
/obj/structure/displaycase/forsale/kitchen
desc = "A display case with an ID-card swiper. Use your ID to purchase the contents. Meant for the bartender and chef."
req_one_access = list(ACCESS_KITCHEN, ACCESS_BAR)