multi level

_maps/basemap.dm

@@ -1,7 +1,7 @@
 #ifndef ALL_MAPS
 
-#include "map_files\generic\SpaceStation.dmm"
 #include "map_files\generic\Centcomm.dmm"
+#include "map_files\generic\SpaceStation.dmm"
 #include "map_files\generic\Space.dmm"
 #include "map_files\generic\SpaceDock.dmm"
 #include "map_files\Mining\lavaland.dmm"

_maps/basemap.dm.rej

@@ -1,10 +0,0 @@
-diff a/_maps/basemap.dm b/_maps/basemap.dm	(rejected hunks)
-@@ -1,7 +1,7 @@
- #ifndef ALL_MAPS
- 
--#include "map_files\generic\SpaceStation.dmm"
- #include "map_files\generic\Centcomm.dmm"
-+#include "map_files\generic\SpaceStation.dmm"
- #include "map_files\generic\Space.dmm"
- #include "map_files\generic\SpaceDock.dmm"
- #include "map_files\Mining\Lavaland.dmm"

code/game/gamemodes/gang/gang_items.dm

@@ -326,6 +326,7 @@
 	if(spawn_msg)
 		to_chat(user, spawn_msg)
 
+
 /datum/gang_item/equipment/wetwork_boots
 	name = "Wetwork boots"
 	id = "wetwork"

code/game/gamemodes/gang/gang_items.dm.rej

@@ -1,17 +0,0 @@
-diff a/code/game/gamemodes/gang/gang_items.dm b/code/game/gamemodes/gang/gang_items.dm	(rejected hunks)
-@@ -325,13 +325,13 @@
- 		user.put_in_hands(O)
- 	if(spawn_msg)
- 		to_chat(user, spawn_msg)
--		
-+
- /datum/gang_item/equipment/wetwork_boots
- 	name = "Wetwork boots"
- 	id = "wetwork"
- 	cost = 20
- 	item_path = /obj/item/clothing/shoes/combat/gang
--	
-+
- /obj/item/clothing/shoes/combat/gang
- 	name = "Wetwork boots"
- 	desc = "A gang's best hitmen are prepared for anything."

code/modules/surgery/organs/tongue.dm.rej

@@ -1,9 +0,0 @@
-diff a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm	(rejected hunks)
-@@ -17,6 +17,7 @@
- 		/datum/language/codespeak,
- 		/datum/language/monkey,
- 		/datum/language/narsie,
-+		/datum/language/beachbum,
- 		/datum/language/ratvar
- 	))
- 

tgstation.dme.rej

@@ -1,9 +0,0 @@
-diff a/tgstation.dme b/tgstation.dme	(rejected hunks)
-@@ -1390,6 +1390,7 @@
- #include "code\modules\jobs\job_types\security.dm"
- #include "code\modules\jobs\job_types\silicon.dm"
- #include "code\modules\jobs\map_changes\map_changes.dm"
-+#include "code\modules\language\beachbum.dm"
- #include "code\modules\language\codespeak.dm"
- #include "code\modules\language\common.dm"
- #include "code\modules\language\draconic.dm"