Revert "12/21 modernizations from TG live"

2016-12-22 22:35:44 -06:00
parent cf59ac1c3d
commit ae40d4134e
2215 changed files with 86928 additions and 707332 deletions
@@ -1,5 +1,6 @@
 /obj/effect/overlay
 	name = "overlay"
+	unacidable = 1
 	var/i_attached//Added for possible image attachments to objects. For hallucinations and the like.

 /obj/effect/overlay/singularity_act()
@@ -40,26 +41,17 @@

 	timerid = QDEL_IN(src, duration)

-/obj/effect/overlay/temp/dir_setting
-	randomdir = FALSE
-
-/obj/effect/overlay/temp/dir_setting/New(loc, set_dir)
-	if(set_dir)
-		setDir(set_dir)
-	..()
-
-/obj/effect/overlay/temp/dir_setting/bloodsplatter
+/obj/effect/overlay/temp/bloodsplatter
 	icon = 'icons/effects/blood.dmi'
 	duration = 5
 	randomdir = FALSE
 	layer = BELOW_MOB_LAYER
-	var/splatter_type = "splatter"

-/obj/effect/overlay/temp/dir_setting/bloodsplatter/New(loc, set_dir)
+/obj/effect/overlay/temp/bloodsplatter/New(loc, set_dir)
 	if(set_dir in diagonals)
-		icon_state = "[splatter_type][pick(1, 2, 6)]"
+		icon_state = "splatter[pick(1, 2, 6)]"
 	else
-		icon_state = "[splatter_type][pick(3, 4, 5)]"
+		icon_state = "splatter[pick(3, 4, 5)]"
 	..()
 	var/target_pixel_x = 0
 	var/target_pixel_y = 0
@@ -87,88 +79,43 @@
 			target_pixel_x = -16
 			target_pixel_y = -16
 			layer = ABOVE_MOB_LAYER
+	setDir(set_dir)
 	animate(src, pixel_x = target_pixel_x, pixel_y = target_pixel_y, alpha = 0, time = duration)

-/obj/effect/overlay/temp/dir_setting/bloodsplatter/xenosplatter
-	splatter_type = "xsplatter"

-/obj/effect/overlay/temp/dir_setting/firing_effect
-	icon = 'icons/effects/effects.dmi'
-	icon_state = "firing_effect"
-	duration = 2
+/obj/effect/overlay/temp/heal //color is white by default, set to whatever is needed
+	name = "healing glow"
+	icon_state = "heal"
+	duration = 15

-/obj/effect/overlay/temp/dir_setting/firing_effect/setDir(newdir)
-	switch(newdir)
-		if(NORTH)
-			layer = BELOW_MOB_LAYER
-			pixel_x = rand(-3,3)
-			pixel_y = rand(4,6)
-		if(SOUTH)
-			pixel_x = rand(-3,3)
-			pixel_y = rand(-1,1)
-		else
-			pixel_x = rand(-1,1)
-			pixel_y = rand(-1,1)
+/obj/effect/overlay/temp/heal/New(loc, colour)
 	..()
+	pixel_x = rand(-12, 12)
+	pixel_y = rand(-9, 0)
+	if(colour)
+		color = colour

-/obj/effect/overlay/temp/dir_setting/firing_effect/energy
-	icon_state = "firing_effect_energy"
-	duration = 3
+/obj/effect/overlay/temp/kinetic_blast
+	name = "kinetic explosion"
+	icon = 'icons/obj/projectiles.dmi'
+	icon_state = "kinetic_blast"
+	layer = ABOVE_ALL_MOB_LAYER
+	duration = 4

-/obj/effect/overlay/temp/dir_setting/firing_effect/magic
-	icon_state = "shieldsparkles"
-	duration = 3
+/obj/effect/overlay/temp/explosion
+	name = "explosion"
+	icon = 'icons/effects/96x96.dmi'
+	icon_state = "explosion"
+	pixel_x = -32
+	pixel_y = -32
+	duration = 8

-/obj/effect/overlay/temp/dir_setting/ninja
-	name = "ninja shadow"
-	icon = 'icons/mob/mob.dmi'
-	icon_state = "uncloak"
-	duration = 9
-
-/obj/effect/overlay/temp/dir_setting/ninja/cloak
-	icon_state = "cloak"
-
-/obj/effect/overlay/temp/dir_setting/ninja/shadow
-	icon_state = "shadow"
-
-/obj/effect/overlay/temp/dir_setting/ninja/phase
-	name = "ninja energy"
-	icon_state = "phasein"
-
-/obj/effect/overlay/temp/dir_setting/ninja/phase/out
-	icon_state = "phaseout"
-
-/obj/effect/overlay/temp/dir_setting/wraith
-	name = "blood"
-	icon = 'icons/mob/mob.dmi'
-	icon_state = "phase_shift2"
-	duration = 12
-
-/obj/effect/overlay/temp/dir_setting/wraith/out
-	icon_state = "phase_shift"
-
-/obj/effect/overlay/temp/wizard
-	name = "water"
-	icon = 'icons/mob/mob.dmi'
-	icon_state = "reappear"
-	duration = 5
-
-/obj/effect/overlay/temp/wizard/out
-	icon_state = "liquify"
-	duration = 12
-
-/obj/effect/overlay/temp/monkeyify
-	icon = 'icons/mob/mob.dmi'
-	icon_state = "h2monkey"
-	duration = 22
-
-/obj/effect/overlay/temp/monkeyify/humanify
-	icon_state = "monkey2h"
-
-/obj/effect/overlay/temp/borgflash
-	icon = 'icons/mob/mob.dmi'
-	icon_state = "blspell"
-	duration = 5
+/obj/effect/overlay/temp/blob
+	name = "blob"
+	icon_state = "blob_attack"
+	alpha = 140
+	randomdir = 0
+	duration = 6

 /obj/effect/overlay/temp/guardian
 	randomdir = 0
@@ -191,19 +138,8 @@
 		name = mimiced_atom.name
 		appearance = mimiced_atom.appearance
 		setDir(mimiced_atom.dir)
-		mouse_opacity = 0
-
-/obj/effect/overlay/temp/decoy/fading/New(loc, atom/mimiced_atom)
-	..()
 	animate(src, alpha = 0, time = duration)

-/obj/effect/overlay/temp/decoy/fading/fivesecond
-	duration = 50
-
-/obj/effect/overlay/temp/small_smoke
-	icon_state = "smoke"
-	duration = 50
-
 /obj/effect/overlay/temp/cult
 	randomdir = 0
 	duration = 10
@@ -213,12 +149,17 @@
 	name = "blood sparks"
 	icon_state = "bloodsparkles"

-/obj/effect/overlay/temp/dir_setting/cult/phase
+/obj/effect/overlay/temp/cult/phase
 	name = "phase glow"
 	duration = 7
 	icon_state = "cultin"

-/obj/effect/overlay/temp/dir_setting/cult/phase/out
+/obj/effect/overlay/temp/cult/phase/New(loc, set_dir)
+	..()
+	if(set_dir)
+		setDir(set_dir)
+
+/obj/effect/overlay/temp/cult/phase/out
 	icon_state = "cultout"

 /obj/effect/overlay/temp/cult/sac
@@ -238,14 +179,13 @@
 	icon_state = "wallglow"
 	layer = ABOVE_NORMAL_TURF_LAYER

-/obj/effect/overlay/temp/cult/turf/floor
+/obj/effect/overlay/temp/cult/turf/open/floor
 	icon_state = "floorglow"
 	duration = 5


 /obj/effect/overlay/temp/ratvar
 	name = "ratvar's light"
-	icon = 'icons/effects/clockwork_effects.dmi'
 	duration = 8
 	randomdir = 0
 	layer = ABOVE_NORMAL_TURF_LAYER
@@ -261,37 +201,27 @@
 	icon_state = "ratvarbeamglow"

 /obj/effect/overlay/temp/ratvar/beam/door
-	layer = CLOSED_DOOR_LAYER
+	layer = CLOSED_FIREDOOR_LAYER //above closed doors

 /obj/effect/overlay/temp/ratvar/beam/grille
-	layer = BELOW_OBJ_LAYER
+	layer = LOW_ITEM_LAYER //above grilles

 /obj/effect/overlay/temp/ratvar/beam/itemconsume
 	layer = HIGH_OBJ_LAYER

-/obj/effect/overlay/temp/ratvar/beam/falsewall
-	layer = OBJ_LAYER
-
 /obj/effect/overlay/temp/ratvar/wall
 	icon_state = "ratvarwallglow"

-/obj/effect/overlay/temp/ratvar/wall/false
-	layer = OBJ_LAYER
-
 /obj/effect/overlay/temp/ratvar/floor
 	icon_state = "ratvarfloorglow"

 /obj/effect/overlay/temp/ratvar/window
 	icon_state = "ratvarwindowglow"
-	layer = ABOVE_WINDOW_LAYER
-
-/obj/effect/overlay/temp/ratvar/gear
-	icon_state = "ratvargearglow"
-	layer = BELOW_OBJ_LAYER
+	layer = ABOVE_WINDOW_LAYER //above windows

 /obj/effect/overlay/temp/ratvar/grille
 	icon_state = "ratvargrilleglow"
-	layer = BELOW_OBJ_LAYER
+	layer = LOW_ITEM_LAYER //above grilles

 /obj/effect/overlay/temp/ratvar/grille/broken
 	icon_state = "ratvarbrokengrilleglow"
@@ -299,18 +229,6 @@
 /obj/effect/overlay/temp/ratvar/window/single
 	icon_state = "ratvarwindowglow_s"

-/obj/effect/overlay/temp/ratvar/ocular_warden
-	name = "warden's gaze"
-	layer = ABOVE_MOB_LAYER
-	icon_state = "warden_gaze"
-	duration = 3
-
-/obj/effect/overlay/temp/ratvar/ocular_warden/New()
-	..()
-	pixel_x = rand(-8, 8)
-	pixel_y = rand(-10, 10)
-	animate(src, alpha = 0, time = 3, easing = EASE_OUT)
-
 /obj/effect/overlay/temp/ratvar/spearbreak
 	icon = 'icons/effects/64x64.dmi'
 	icon_state = "ratvarspearbreak"
@@ -318,74 +236,31 @@
 	pixel_y = -16
 	pixel_x = -16

-/obj/effect/overlay/temp/ratvar/geis_binding
-	icon_state = "geisbinding"
-
-/obj/effect/overlay/temp/ratvar/geis_binding/top
-	icon_state = "geisbinding_top"
-
-/obj/effect/overlay/temp/ratvar/component
-	icon = 'icons/obj/clockwork_objects.dmi'
-	icon_state = "belligerent_eye"
-	layer = ABOVE_MOB_LAYER
-	duration = 10
-
-/obj/effect/overlay/temp/ratvar/component/New()
-	..()
-	transform = matrix()*0.75
-	pixel_x = rand(-10, 10)
-	pixel_y = rand(-10, -2)
-	animate(src, pixel_y = pixel_y + 10, alpha = 50, time = 10, easing = EASE_OUT)
-
-/obj/effect/overlay/temp/ratvar/component/cogwheel
-	icon_state = "vanguard_cogwheel"
-
-/obj/effect/overlay/temp/ratvar/component/capacitor
-	icon_state = "geis_capacitor"
-
-/obj/effect/overlay/temp/ratvar/component/alloy
-	icon_state = "replicant_alloy"
-
-/obj/effect/overlay/temp/ratvar/component/ansible
-	icon_state = "hierophant_ansible"
-
 /obj/effect/overlay/temp/ratvar/sigil
 	name = "glowing circle"
+	icon = 'icons/effects/clockwork_effects.dmi'
 	icon_state = "sigildull"

 /obj/effect/overlay/temp/ratvar/sigil/transgression
 	color = "#FAE48C"
 	layer = ABOVE_MOB_LAYER
-	duration = 70
-	luminosity = 6
+	duration = 50

 /obj/effect/overlay/temp/ratvar/sigil/transgression/New()
 	..()
 	var/oldtransform = transform
 	animate(src, transform = matrix()*2, time = 5)
-	animate(transform = oldtransform, alpha = 0, time = 65)
-
-/obj/effect/overlay/temp/ratvar/sigil/voltvoid
-	color = "#EC8A2D"
-	layer = ABOVE_MOB_LAYER
-	duration = 10
-	luminosity = 3
-
-/obj/effect/overlay/temp/ratvar/sigil/voltvoid/New()
-	..()
-	var/oldtransform = transform
-	animate(src, transform = matrix()*3, time = 1)
-	animate(transform = oldtransform, alpha = 0, time = 9)
+	animate(transform = oldtransform, alpha = 0, time = 45)

 /obj/effect/overlay/temp/ratvar/sigil/vitality
 	color = "#1E8CE1"
 	icon_state = "sigilactivepulse"
-	layer = ABOVE_MOB_LAYER
+	layer = BELOW_MOB_LAYER

 /obj/effect/overlay/temp/ratvar/sigil/accession
 	color = "#AF0AAF"
 	layer = ABOVE_MOB_LAYER
-	duration = 70
+	duration = 50
 	icon_state = "sigilactiveoverlay"
 	alpha = 0

@@ -406,7 +281,7 @@

 /obj/effect/overlay/temp/emp/pulse
 	name = "emp pulse"
-	icon_state = "emppulse"
+	icon_state = "emp pulse"
 	duration = 8
 	randomdir = 0

@@ -455,80 +330,6 @@
 /obj/effect/overlay/temp/sparkle/tailsweep
 	icon_state = "tailsweep"

-
-/obj/effect/overlay/temp/heal //color is white by default, set to whatever is needed
-	name = "healing glow"
-	icon_state = "heal"
-	duration = 15
-
-/obj/effect/overlay/temp/heal/New(loc, colour)
-	..()
-	pixel_x = rand(-12, 12)
-	pixel_y = rand(-9, 0)
-	if(colour)
-		color = colour
-
-/obj/effect/overlay/temp/kinetic_blast
-	name = "kinetic explosion"
-	icon = 'icons/obj/projectiles.dmi'
-	icon_state = "kinetic_blast"
-	layer = ABOVE_ALL_MOB_LAYER
-	duration = 4
-
-/obj/effect/overlay/temp/explosion
-	name = "explosion"
-	icon = 'icons/effects/96x96.dmi'
-	icon_state = "explosion"
-	pixel_x = -32
-	pixel_y = -32
-	duration = 8
-
-/obj/effect/overlay/temp/explosion/fast
-	icon_state = "explosionfast"
-	duration = 4
-
-/obj/effect/overlay/temp/blob
-	name = "blob"
-	icon_state = "blob_attack"
-	alpha = 140
-	randomdir = 0
-	duration = 6
-
-/obj/effect/overlay/temp/impact_effect
-	icon = 'icons/effects/effects.dmi'
-	icon_state = "impact_bullet"
-	duration = 5
-
-/obj/effect/overlay/temp/impact_effect/New(loc, atom/target, obj/item/projectile/P)
-	if(target == P.original) //the projectile hit the target originally clicked
-		pixel_x = P.p_x + target.pixel_x - 16 + rand(-4,4)
-		pixel_y = P.p_y + target.pixel_y - 16 + rand(-4,4)
-	else
-		pixel_x = target.pixel_x + rand(-4,4)
-		pixel_y = target.pixel_y + rand(-4,4)
-	..()
-
-/obj/effect/overlay/temp/impact_effect/red_laser
-	icon_state = "impact_laser"
-	duration = 4
-
-/obj/effect/overlay/temp/impact_effect/blue_laser
-	icon_state = "impact_laser_blue"
-	duration = 4
-
-/obj/effect/overlay/temp/impact_effect/green_laser
-	icon_state = "impact_laser_green"
-	duration = 4
-
-/obj/effect/overlay/temp/impact_effect/purple_laser
-	icon_state = "impact_laser_purple"
-	duration = 4
-
-/obj/effect/overlay/temp/impact_effect/ion
-	icon_state = "shieldsparkles"
-	duration = 6
-
-
 /obj/effect/overlay/palmtree_r
 	name = "Palm tree"
 	icon = 'icons/misc/beach2.dmi'