cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updating the conjure spell to just use paths instead of strings.

Browse Source 
Removed the needless Del() from event.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5512 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2013-01-11 00:08:17 +00:00
parent f27399bcd5
commit 1aaee90154
3 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/datums/spells/conjure.dm
View File

@@ -25,7 +25,7 @@
for(var/i=0,i<summon_amt,i++) for(var/i=0,i<summon_amt,i++)
if(!targets.len) if(!targets.len)
break break
var/summoned_object_type = text2path(pick(summon_type)) var/summoned_object_type = pick(summon_type)
var/spawn_place = pick(targets) var/spawn_place = pick(targets)
if(summon_ignore_prev_spawn_points) if(summon_ignore_prev_spawn_points)
targets -= spawn_place targets -= spawn_place
@@ -58,7 +58,7 @@
name = "Dispense Wizard Justice" name = "Dispense Wizard Justice"
desc = "This spell dispenses wizard justice." desc = "This spell dispenses wizard justice."
summon_type = list("/obj/machinery/bot/ed209") summon_type = list(/obj/machinery/bot/ed209)
summon_amt = 10 summon_amt = 10
range = 3 range = 3
newVars = list("emagged" = 1,"name" = "Wizard's Justicebot") newVars = list("emagged" = 1,"name" = "Wizard's Justicebot")

16
code/datums/spells/wizard.dm
View File

@@ -148,7 +148,7 @@
invocation_type = "shout" invocation_type = "shout"
range = 1 range = 1
summon_type = list("/mob/living/simple_animal/hostile/carp") summon_type = list(/mob/living/simple_animal/hostile/carp)
/obj/effect/proc_holder/spell/aoe_turf/conjure/construct /obj/effect/proc_holder/spell/aoe_turf/conjure/construct
@@ -162,7 +162,7 @@
invocation_type = "none" invocation_type = "none"
range = 0 range = 0
summon_type = list("/obj/structure/constructshell") summon_type = list(/obj/structure/constructshell)
/obj/effect/proc_holder/spell/aoe_turf/conjure/creature /obj/effect/proc_holder/spell/aoe_turf/conjure/creature
@@ -177,7 +177,7 @@
summon_amt = 10 summon_amt = 10
range = 3 range = 3
summon_type = list("/mob/living/simple_animal/hostile/creature") summon_type = list(/mob/living/simple_animal/hostile/creature)
/obj/effect/proc_holder/spell/targeted/trigger/blind /obj/effect/proc_holder/spell/targeted/trigger/blind
name = "Blind" name = "Blind"
@@ -252,7 +252,7 @@
invocation = "none" invocation = "none"
invocation_type = "none" invocation_type = "none"
range = 0 range = 0
summon_type = list("/turf/simulated/floor/engine/cult") summon_type = list(/turf/simulated/floor/engine/cult)
centcomm_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles centcomm_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
/obj/effect/proc_holder/spell/aoe_turf/conjure/wall /obj/effect/proc_holder/spell/aoe_turf/conjure/wall
@@ -265,7 +265,7 @@
invocation = "none" invocation = "none"
invocation_type = "none" invocation_type = "none"
range = 0 range = 0
summon_type = list("/turf/simulated/wall/cult") summon_type = list(/turf/simulated/wall/cult)
centcomm_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles centcomm_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
/obj/effect/proc_holder/spell/aoe_turf/conjure/wall/reinforced /obj/effect/proc_holder/spell/aoe_turf/conjure/wall/reinforced
@@ -281,7 +281,7 @@
centcomm_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles centcomm_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
delay = 50 delay = 50
summon_type = list("/turf/simulated/wall/r_wall") summon_type = list(/turf/simulated/wall/r_wall)
/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone /obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone
name = "Summon Soulstone" name = "Summon Soulstone"
@@ -294,7 +294,7 @@
invocation_type = "none" invocation_type = "none"
range = 0 range = 0
summon_type = list("/obj/item/device/soulstone") summon_type = list(/obj/item/device/soulstone)
/obj/effect/proc_holder/spell/aoe_turf/conjure/lesserforcewall /obj/effect/proc_holder/spell/aoe_turf/conjure/lesserforcewall
@@ -307,7 +307,7 @@
invocation = "none" invocation = "none"
invocation_type = "none" invocation_type = "none"
range = 0 range = 0
summon_type = list("/obj/effect/forcefield") summon_type = list(/obj/effect/forcefield)
summon_lifespan = 50 summon_lifespan = 50

10
code/modules/events/event.dm
View File

@@ -71,12 +71,4 @@
events.Add(src) events.Add(src)
if(oneShot) if(oneShot)
potentialRandomEvents.Remove(type) potentialRandomEvents.Remove(type)
//This shouldn't be called, but it ensures that the event doesn't persist in
//the events list if it'd deleted instead of garbage collected with kill().
//The master controller will also remove it from the events list if it
//doesn't exist, so there's redundancy here.
/datum/event/Del()
events.Remove(src)