rej cleanup

2017-05-02 04:56:46 -05:00
parent 7ab8ee8cae
commit 4a6ffec412
18 changed files with 0 additions and 297 deletions
@@ -1,21 +0,0 @@
-diff a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm	(rejected hunks)
-@@ -31,8 +31,8 @@
- 	. = ..()
- 	deltimer(timerid)
- 
-/obj/effect/overlay/temp/New()
-	..()
-+/obj/effect/overlay/temp/Initialize()
-+	. = ..()
- 	if(randomdir)
- 		setDir(pick(GLOB.cardinal))
- 	flick("[icon_state]", src) //Because we might be pulling it from a pool, flick whatever icon it uses so it starts at the start of the icon's animation.
-@@ -214,7 +221,7 @@
- 	icon = 'icons/effects/fire.dmi'
- 	icon_state = "3"
- 	duration = 20
-	
-+
- /obj/effect/overlay/temp/cult
- 	randomdir = 0
- 	duration = 10
@@ -1,10 +0,0 @@
-diff a/code/game/objects/items.dm b/code/game/objects/items.dm	(rejected hunks)
-@@ -102,7 +102,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
- /obj/item/Initialize()
- 	if (!materials)
- 		materials = list()
-	..()
-+	. = ..()
- 	for(var/path in actions_types)
- 		new path(src)
- 	actions_types = null