cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 06:00:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18840 from sawu-tg/master

Browse Source 
Pope Quick-fix
This commit is contained in:
Joan Lung
2016-06-22 11:23:31 -04:00
committed by GitHub
parent ecc7c5855c 48221bdf2f
commit 220cf636a3
2 changed files with 1050 additions and 756 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/generic/z2.dmm
+1049 -747
View File
File diff suppressed because it is too large Load Diff
code/game/gamemodes/miniantags/hades/hades.dm
+1 -9
View File
@@ -82,14 +82,6 @@
/mob/living/simple_animal/hostile/hades/New()
..()
//helper_datums/map_template.dmm make this a generic function
var/list/bounds = maploader.load_map('_maps/map_files/generic/chapel.dmm')
initTemplateBounds(bounds)
log_game("Chapel of Sin loaded by [src] spawning.")
//
sinLightning = new/obj/effect/proc_holder/spell/targeted/lightning(src)
sinLightning.charge_max = 1
@@ -613,4 +605,4 @@
#undef STATE_JUDGE
#undef STATE_WRATH
#undef STATE_FLEE
#undef STATE_FLEE