Clean up .rej files

code/controllers/subsystem/shuttle.dm.rej

@@ -1,9 +0,0 @@
-diff a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm	(rejected hunks)
-@@ -536,3 +536,7 @@ SUBSYSTEM_DEF(shuttle)
- 		if(M.is_in_shuttle_bounds(A))
- 			return TRUE
- 
-+/datum/controller/subsystem/shuttle/proc/get_containing_shuttle(atom/A)
-+	for(var/obj/docking_port/mobile/M in mobile)
-+		if(M.is_in_shuttle_bounds(A))
-+			return M

code/game/objects/items/devices/PDA/PDA_types.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm	(rejected hunks)
-@@ -121,7 +121,7 @@
- 	default_cartridge = /obj/item/weapon/cartridge/captain
- 	inserted_item = /obj/item/weapon/pen/fountain/captain
- 	icon_state = "pda-captain"
--	detonatable = 0
-+	detonatable = FALSE
- 
- /obj/item/device/pda/cargo
- 	name = "cargo technician PDA"

code/game/shuttle_engines.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm	(rejected hunks)
-@@ -46,7 +117,7 @@
- 	bound_height = 64
- 	appearance_flags = 0
- 
--obj/structure/shuttle/engine/huge
-+/obj/structure/shuttle/engine/huge
- 	name = "engine"
- 	opacity = 1
- 	icon = 'icons/obj/3x3.dmi'

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)

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