MY EYES! - In which I revisit blinds again. (#8268)

This commit is contained in:
Skayven
2020-02-19 23:39:04 +01:00
committed by GitHub
parent a060f5931c
commit a780cf289b
7 changed files with 28 additions and 8 deletions
+2 -1
View File
@@ -20,6 +20,7 @@
C.stuttering = 1
if(is_rune)
C.Weaken(3)
C.confused = 10
C.Stun(3)
C.silent += 15
to_chat(C, span("danger", "The rune explodes in a bright flash!"))
@@ -31,4 +32,4 @@
S.silent += 15
to_chat(S, span("danger", "BZZZT... The rune has exploded in a bright flash!"))
admin_attack_log(user, S, "Used a stun rune.", "Was victim of a stun rune.", "used a stun rune on")
qdel(O)
qdel(O)
@@ -175,6 +175,7 @@
H.Weaken(8)
H.stuttering = 20
H.confused = 10
to_chat(H, "<span class='danger'>You are blinded by [src]'s glare!</span>")
flick("flash", H.flash)
victims += H
+2 -1
View File
@@ -9,7 +9,7 @@
var/range = 2 //this is roughly the size of brig cell
var/disable = 0
var/last_flash = 0 //Don't want it getting spammed like regular flashes
var/strength = 10 //How weakened targets are when flashed.
var/strength = 20 //How weakened targets are when flashed.
var/base_state = "mflash"
anchored = 1
use_power = 1
@@ -98,6 +98,7 @@
if(!O.blinded)
flick("flash", O:flash)
O.Weaken(flash_time)
flick("e_flash", O.flash)
/obj/machinery/flasher/emp_act(severity)
if(stat & (BROKEN|NOPOWER))
+3 -2
View File
@@ -79,6 +79,7 @@
var/safety = M:eyecheck(TRUE)
if(safety <= 0)
flick("e_flash", M.flash)
M.confused = 10
var/mob/living/carbon/human/H = M
var/obj/item/organ/internal/eyes/E = H.get_eyes()
if(!E)
@@ -143,7 +144,7 @@
//It will never break on the first use.
switch(times_used)
if(0 to 5)
if(prob(10*times_used)) //More consequential rolls are made the more you overuse the device.
if(prob(5*times_used)) //More consequential rolls are made the more you overuse the device.
broken = 1
to_chat(user, "<span class='warning'>The bulb has burnt out!</span>")
icon_state = "flashburnt"
@@ -183,7 +184,7 @@
flash_recharge()
switch(times_used)
if(0 to 5)
if(prob(20*times_used))
if(prob(5*times_used))
broken = 1
icon_state = "flashburnt"
return
+3 -3
View File
@@ -269,7 +269,7 @@
//specific vehicle move delays are set in code\modules\vehicles\vehicle.dm
move_delay = world.time
//drunk driving
if(mob.confused && prob(20))
if(mob.confused && prob(25))
direct = pick(cardinal)
return mob.buckled.relaymove(mob,direct)
@@ -285,7 +285,7 @@
return // No hands to drive your chair? Tough luck!
min_move_delay = driver.min_walk_delay
//drunk wheelchair driving
if(mob.confused && prob(20))
if(mob.confused && prob(25))
direct = pick(cardinal)
move_delay += max((mob.movement_delay() + config.walk_speed) * config.walk_delay_multiplier, min_move_delay)
return mob.buckled.relaymove(mob,direct)
@@ -357,7 +357,7 @@
M.animate_movement = 2
return
else if(mob.confused && prob(20))
else if(mob.confused && prob(25))
step(mob, pick(cardinal))
else
. = mob.SelfMove(n, direct)
@@ -23,6 +23,7 @@
//blind adjacent people
for (var/mob/living/carbon/M in viewers(T, flash_range))
if(M.eyecheck() < FLASH_PROTECTION_MODERATE)
M.confused = rand(5,15)
flick("e_flash", M.flash)
//snap pop
@@ -234,4 +235,4 @@
/obj/item/projectile/energy/blaster/incendiary
icon_state = "laser"
damage = 15
incinerate = 2
incinerate = 2
+15
View File
@@ -0,0 +1,15 @@
# Your name.
author: Scheveningen
# 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: "Most forms of flashes/blinds, especially mounted flashers, now confuse organics after blinding."
- tweak: "Confusion has been buffed up a bit to make you move in an unintended direction a bit more often."
- tweak: "Pocket flashes have had their break chance lowered, and unified together and now don't have a ridiculous chance of breaking for manually using them. This mechanic was a problem for too many years, sorry."