clean up

2017-08-28 10:34:31 -05:00
parent f3721ff2f0
commit 6c76ae2395
236 changed files with 0 additions and 3648 deletions
@@ -1,10 +0,0 @@
-diff a/code/modules/projectiles/guns/beam_rifle.dm b/code/modules/projectiles/guns/beam_rifle.dm	(rejected hunks)
-@@ -715,7 +715,7 @@
- 	light_range = 2
- 	light_color = "#00ffff"
- 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-	flags = ABSTRACT
-+	flags_1 = ABSTRACT_1
- 	appearance_flags = 0
- 
- /obj/effect/projectile_beam/proc/scale_to(nx,ny,override=TRUE)
@@ -1,10 +0,0 @@
-diff a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm	(rejected hunks)
-@@ -6,7 +6,7 @@
- 	w_class = WEIGHT_CLASS_BULKY
- 	force = 10
- 	modifystate = TRUE
-	flags =  CONDUCT
-+	flags_1 =  CONDUCT_1
- 	slot_flags = SLOT_BACK
- 	ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
- 	cell_type = "/obj/item/stock_parts/cell/pulse"
@@ -1,10 +0,0 @@
-diff a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm	(rejected hunks)
-@@ -4,7 +4,7 @@
- 	icon_state = "bullet"
- 	density = FALSE
- 	anchored = TRUE
-	flags = ABSTRACT
-+	flags_1 = ABSTRACT_1
- 	pass_flags = PASSTABLE
- 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- 	hitsound = 'sound/weapons/pierce.ogg'