Clean up .rej files

2017-06-28 02:24:03 -05:00
parent a7c18e65bc
commit 789064a3a5
7 changed files with 0 additions and 10063 deletions
--- a/code/modules/modular_computers/computers/item/computer.dm.rej
+++ b/code/modules/modular_computers/computers/item/computer.dm.rej
@@ -1,11 +0,0 @@
-diff a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm	(rejected hunks)
-@@ -49,9 +49,6 @@
- 	var/comp_light_color			//The color of that light
- 
- 
-/obj/item/device/modular_computer/New()
-	all_components = list()
-	
- /obj/item/device/modular_computer/Initialize()
- 	. = ..()
- 	START_PROCESSING(SSobj, src)
--- a/code/modules/projectiles/guns/energy/energy_gun.dm.rej
+++ b/code/modules/projectiles/guns/energy/energy_gun.dm.rej
@@ -1,10 +0,0 @@
-diff a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm	(rejected hunks)
-@@ -48,7 +48,7 @@
- /obj/item/weapon/gun/energy/e_gun/mini/practice_phaser
- 	name = "practice phaser"
- 	desc = "A modified version of the basic phaser gun, this one fires less concentrated energy bolts designed for target practice."
-	ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/electrode/old)
-+	ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser/practice)
- 	icon_state = "decloner"
- 
- /obj/item/weapon/gun/energy/e_gun/hos