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
@@ -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"
@@ -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'