cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Polaris Sync Merge

Browse Source 
Fixed Polaris merge conflicts
* Space controller merge conflict
This commit is contained in:
Arokha Sieyes
2017-03-18 00:58:12 -04:00
parent 975cabc128 accf43e644
commit 805b473976
62 changed files with 825 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/spells/aoe_turf/disable_tech.dm
View File

@@ -11,13 +11,15 @@
cooldown_min = 200 //50 deciseconds reduction per rank
var/emp_heavy = 6
var/emp_light = 10
var/emp_heavy = 3
var/emp_med = 5
var/emp_light = 8
var/emp_long = 10
hud_state = "wiz_tech"
/spell/aoe_turf/disable_tech/cast(list/targets)
for(var/turf/target in targets)
empulse(get_turf(target), emp_heavy, emp_light)
empulse(get_turf(target), emp_heavy, emp_med, emp_light, emp_long)
return

2
code/modules/spells/spellbook.dm
View File

@@ -432,4 +432,4 @@
/obj/item/weapon/spellbook/oneuse/charge/recoil(mob/user as mob)
..()
user <<"<span class='warning'>[src] suddenly feels very warm!</span>"
empulse(src, 1, 1)
empulse(src, 1, 1, 1, 1)