shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul

Browse Source
This commit is contained in:
Putnam
2020-01-19 00:56:17 -08:00
parent 5eba760aa8 0a5e2cf8ff
commit bc5646f8b1
170 changed files with 4841 additions and 2485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/spells/spell_types/ethereal_jaunt.dm
+2 -1
View File
@@ -99,5 +99,6 @@
/obj/effect/dummy/phased_mob/spell_jaunt/ex_act(blah)
return
/obj/effect/dummy/phased_mob/spell_jaunt/bullet_act(blah)
return
return BULLET_ACT_FORCE_PIERCE
code/modules/spells/spell_types/shadow_walk.dm
+1 -1
View File
@@ -91,7 +91,7 @@
return
/obj/effect/dummy/phased_mob/shadow/bullet_act()
return
return BULLET_ACT_FORCE_PIERCE
/obj/effect/dummy/phased_mob/shadow/singularity_act()
return