cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 05:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Smoke spells readability (#19387)

Browse Source 
* read the smoke

* oops

* contra

* contra

* more tidying

* last one

* Update code/modules/projectiles/projectile/magic.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
S34N
2022-10-15 18:05:55 +02:00
committed by GitHub
co-authored by Farie82
parent a7179d97bf
commit edeba92326
33 changed files with 68 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/effect_system/effect_system.dm
+4 -9
View File
@@ -34,15 +34,10 @@ would spawn and follow the beaker, even if it is carried or thrown.
location = null
return ..()
/datum/effect_system/proc/set_up(n = 3, c = 0, loca)
if(n > 10)
n = 10
number = n
cardinals = c
if(isturf(loca))
location = loca
else
location = get_turf(loca)
/datum/effect_system/proc/set_up(amount = 3, only_cardinals = FALSE, source)
number = clamp(amount, amount, 10)
cardinals = only_cardinals
location = get_turf(source)
/datum/effect_system/proc/attach(atom/atom)
holder = atom
code/game/objects/effects/effect_system/effects_explosion.dm
+1 -1
View File
@@ -51,7 +51,7 @@
/datum/effect_system/explosion/smoke/proc/create_smoke()
var/datum/effect_system/smoke_spread/S = new
S.set_up(5,0,location,null)
S.set_up(5, FALSE, location, null)
S.start()
/datum/effect_system/explosion/smoke/start()
code/game/objects/effects/effect_system/effects_smoke.dm
+7 -12
View File
@@ -78,17 +78,12 @@
effect_type = /obj/effect/particle_effect/smoke
var/direction
/datum/effect_system/smoke_spread/set_up(n = 5, c = 0, loca, direct)
if(n > 20)
n = 20
number = n
cardinals = c
if(isturf(loca))
location = loca
else
location = get_turf(loca)
if(direct)
direction = direct
/datum/effect_system/smoke_spread/set_up(amount = 5, only_cardinals = FALSE, source, desired_direction)
number = clamp(amount, amount, 20)
cardinals = only_cardinals
location = get_turf(source)
if(desired_direction)
direction = desired_direction
/datum/effect_system/smoke_spread/start()
for(var/i=0, i<number, i++)
@@ -176,7 +171,7 @@
for(var/obj/item/Item in T)
Item.extinguish()
/datum/effect_system/smoke_spread/freezing/set_up(n = 5, c = 0, loca, direct, blasting = 0)
/datum/effect_system/smoke_spread/freezing/set_up(amount = 5, only_cardinals = FALSE, source, desired_direction, blasting = 0)
..()
blast = blasting