From 750baf3dcafe2e9c5bd2fb22b24e886ad934a1bd Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 29 May 2017 02:15:26 -0500 Subject: [PATCH] multi level --- _maps/basemap.dm | 2 +- _maps/basemap.dm.rej | 10 ---------- code/game/gamemodes/gang/gang_items.dm | 1 + code/game/gamemodes/gang/gang_items.dm.rej | 17 ----------------- code/modules/surgery/organs/tongue.dm.rej | 9 --------- tgstation.dme.rej | 9 --------- 6 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 _maps/basemap.dm.rej delete mode 100644 code/game/gamemodes/gang/gang_items.dm.rej delete mode 100644 code/modules/surgery/organs/tongue.dm.rej delete mode 100644 tgstation.dme.rej diff --git a/_maps/basemap.dm b/_maps/basemap.dm index 6d5747fa5c..198c7e74a2 100644 --- a/_maps/basemap.dm +++ b/_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" diff --git a/_maps/basemap.dm.rej b/_maps/basemap.dm.rej deleted file mode 100644 index 7097141e73..0000000000 --- a/_maps/basemap.dm.rej +++ /dev/null @@ -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" diff --git a/code/game/gamemodes/gang/gang_items.dm b/code/game/gamemodes/gang/gang_items.dm index d9c890cb59..1145bd2a66 100644 --- a/code/game/gamemodes/gang/gang_items.dm +++ b/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" diff --git a/code/game/gamemodes/gang/gang_items.dm.rej b/code/game/gamemodes/gang/gang_items.dm.rej deleted file mode 100644 index cdc0d35918..0000000000 --- a/code/game/gamemodes/gang/gang_items.dm.rej +++ /dev/null @@ -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." diff --git a/code/modules/surgery/organs/tongue.dm.rej b/code/modules/surgery/organs/tongue.dm.rej deleted file mode 100644 index 11c501c6f6..0000000000 --- a/code/modules/surgery/organs/tongue.dm.rej +++ /dev/null @@ -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 - )) - diff --git a/tgstation.dme.rej b/tgstation.dme.rej deleted file mode 100644 index 6f5a5fec15..0000000000 --- a/tgstation.dme.rej +++ /dev/null @@ -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"