cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-26 13:36:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm
This commit is contained in:
GinjaNinja32
2015-08-11 18:47:05 +01:00
parent a40e84f34a 7b1656f40c
commit 631ff21980
60 changed files with 714 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/spells/aoe_turf/aoe_turf.dm
+24 -24
View File
@@ -1,25 +1,25 @@
/*
Aoe turf spells target a ring of tiles around the user
This ring has an outer radius (range) and an inner radius (inner_radius)
Aoe turf spells have two useful flags: IGNOREDENSE and IGNORESPACE. These are explained in setup.dm
*/
/spell/aoe_turf //affects all turfs in view or range (depends)
spell_flags = IGNOREDENSE
var/inner_radius = -1 //for all your ring spell needs
/spell/aoe_turf/choose_targets(mob/user = usr)
var/list/targets = list()
for(var/turf/target in view_or_range(range,user,selection_type))
if(!(target in view_or_range(inner_radius,user,selection_type)))
if(target.density && (spell_flags & IGNOREDENSE))
continue
if(istype(target, /turf/space) && (spell_flags & IGNORESPACE))
continue
targets += target
if(!targets.len) //doesn't waste the spell
return
/*
Aoe turf spells target a ring of tiles around the user
This ring has an outer radius (range) and an inner radius (inner_radius)
Aoe turf spells have two useful flags: IGNOREDENSE and IGNORESPACE. These are explained in setup.dm
*/
/spell/aoe_turf //affects all turfs in view or range (depends)
spell_flags = IGNOREDENSE
var/inner_radius = -1 //for all your ring spell needs
/spell/aoe_turf/choose_targets(mob/user = usr)
var/list/targets = list()
for(var/turf/target in view_or_range(range, holder, selection_type))
if(!(target in view_or_range(inner_radius, holder, selection_type)))
if(target.density && (spell_flags & IGNOREDENSE))
continue
if(istype(target, /turf/space) && (spell_flags & IGNORESPACE))
continue
targets += target
if(!targets.len) //doesn't waste the spell
return
return targets