cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24521 from Cyberboss/Electrocute

Browse Source 
Fixes prototypes of electocute_act
This commit is contained in:
oranges
2017-03-01 09:13:55 +13:00
committed by GitHub
parent 535cccbc35 782d38d964
commit 6ec969d180
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/gamemodes/clock_cult/clock_mobs.dm
View File

@@ -31,7 +31,7 @@
/mob/living/simple_animal/hostile/clockwork/ratvar_act() /mob/living/simple_animal/hostile/clockwork/ratvar_act()
fully_heal(TRUE) fully_heal(TRUE)
/mob/living/simple_animal/hostile/clockwork/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, tesla_shock = 0, illusion = 0) /mob/living/simple_animal/hostile/clockwork/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, tesla_shock = 0, illusion = 0, stun = TRUE)
return 0 //ouch, my metal-unlikely-to-be-damaged-by-electricity-body return 0 //ouch, my metal-unlikely-to-be-damaged-by-electricity-body
/mob/living/simple_animal/hostile/clockwork/examine(mob/user) /mob/living/simple_animal/hostile/clockwork/examine(mob/user)

4
code/modules/mob/living/silicon/silicon_defense.dm
View File

@@ -77,11 +77,11 @@
"<span class='warning'>[M] punches [src], but doesn't leave a dent.</span>", null, COMBAT_MESSAGE_RANGE) "<span class='warning'>[M] punches [src], but doesn't leave a dent.</span>", null, COMBAT_MESSAGE_RANGE)
return 0 return 0
/mob/living/silicon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, tesla_shock = 0, illusion = 0) /mob/living/silicon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, tesla_shock = 0, illusion = 0, stun = TRUE)
if(buckled_mobs) if(buckled_mobs)
for(var/mob/living/M in buckled_mobs) for(var/mob/living/M in buckled_mobs)
unbuckle_mob(M) unbuckle_mob(M)
M.electrocute_act(shock_damage/100, source, siemens_coeff, safety, tesla_shock, illusion) //Hard metal shell conducts! M.electrocute_act(shock_damage/100, source, siemens_coeff, safety, tesla_shock, illusion, stun) //Hard metal shell conducts!
return 0 //So borgs they don't die trying to fix wiring return 0 //So borgs they don't die trying to fix wiring
/mob/living/silicon/emp_act(severity) /mob/living/silicon/emp_act(severity)

2
code/modules/mob/living/simple_animal/constructs.dm
View File

@@ -82,7 +82,7 @@
/mob/living/simple_animal/hostile/construct/narsie_act() /mob/living/simple_animal/hostile/construct/narsie_act()
return return
/mob/living/simple_animal/hostile/construct/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, tesla_shock = 0, illusion = 0) /mob/living/simple_animal/hostile/construct/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, tesla_shock = 0, illusion = 0, stun = TRUE)
return 0 return 0

2
code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
View File

@@ -268,5 +268,5 @@
// Why would bees pay attention to drones? // Why would bees pay attention to drones?
return 1 return 1
/mob/living/simple_animal/drone/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, tesla_shock = 0, illusion = 0) /mob/living/simple_animal/drone/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, tesla_shock = 0, illusion = 0, stun = TRUE)
return 0 //So they don't die trying to fix wiring return 0 //So they don't die trying to fix wiring