mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-29 23:17:02 +01:00
emp'd wire interface implants no longer hard stun (#29870)
* emp'd wire interface implants no longer hard stun * Update code/datums/wires/wires.dm Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> --------- Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
This commit is contained in:
co-authored by
PollardTheDragon
parent
85c92cde07
commit
3184299587
@@ -116,7 +116,14 @@
|
||||
var/replaced_color = color
|
||||
var/color_name = color
|
||||
|
||||
if(color in replace_colors) // If this color is one that needs to be replaced using the colorblindness list.
|
||||
if(HAS_TRAIT(user, TRAIT_WIRE_BLIND)) //You are going to be seeing colours, colourblind or not. And it is going to be WRONG
|
||||
replaced_color = rgb(rand(1,255), rand(1,255), rand(1,255))
|
||||
var/list/fake_colour_chars = list("!", "@", "#", "$", "%", "^", "&", "*", "-", "?", "/")
|
||||
color_name = ""
|
||||
for(var/i in 1 to rand(5, 8))
|
||||
color_name += pick(fake_colour_chars)
|
||||
|
||||
else if(color in replace_colors) // If this color is one that needs to be replaced using the colorblindness list.
|
||||
replaced_color = replace_colors[color]
|
||||
if(replaced_color in LIST_COLOR_RENAME) // If its an ugly written color name like "darkolivegreen", rename it to something like "dark green".
|
||||
color_name = LIST_COLOR_RENAME[replaced_color]
|
||||
@@ -131,6 +138,8 @@
|
||||
"cut" = is_color_cut(color), // Whether the wire is cut or not. Used to display "cut" or "mend".
|
||||
"attached" = is_attached(color) // Whether or not a signaler is attached to this wire.
|
||||
))
|
||||
if(HAS_TRAIT(user, TRAIT_WIRE_BLIND)) // If the wires are here and your brain thinks they're there and your computer tells you over here, do you recall which one you pulsed?
|
||||
wires_list = shuffle(wires_list)
|
||||
data["wires"] = wires_list
|
||||
|
||||
// Get the information shown at the bottom of wire TGUI window, such as "The red light is blinking", etc.
|
||||
@@ -297,7 +306,7 @@
|
||||
return null
|
||||
|
||||
// even if you *think* you can see them, it's not guaranteed that you can.
|
||||
if(HAS_TRAIT(holder, TRAIT_OBSCURED_WIRES))
|
||||
if(HAS_TRAIT(holder, TRAIT_OBSCURED_WIRES) || HAS_TRAIT(user, TRAIT_WIRE_BLIND))
|
||||
var/list/fake_wire_chars = list("!", "@", "#", "$", "%", "^", "&", "*", "-", "?", "/")
|
||||
var/fake_wire_name = ""
|
||||
|
||||
|
||||
Reference in New Issue
Block a user