From 2bfc7872faef501985bfb3b62b7a2f66312e657c Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 2 Sep 2017 07:06:37 -0500 Subject: [PATCH] cleanup --- code/game/objects/items/storage/boxes.dm.rej | 9 --------- code/modules/admin/verbs/randomverbs.dm.rej | 10 ---------- config/custom_roundstart_items.txt | 1 + tgstation.dme.rej | 13 ------------- 4 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 code/game/objects/items/storage/boxes.dm.rej delete mode 100644 code/modules/admin/verbs/randomverbs.dm.rej delete mode 100644 tgstation.dme.rej diff --git a/code/game/objects/items/storage/boxes.dm.rej b/code/game/objects/items/storage/boxes.dm.rej deleted file mode 100644 index c7e13676db..0000000000 --- a/code/game/objects/items/storage/boxes.dm.rej +++ /dev/null @@ -1,9 +0,0 @@ -diff a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm (rejected hunks) -@@ -732,7 +732,6 @@ - /obj/item/storage/box/ingredients //This box is for the randomely chosen version the chef spawns with, it shouldn't actually exist. - name = "ingredients box" - illustration = "donk_kit" -- icon_state = null - - /obj/item/storage/box/ingredients/Initialize() - ..() diff --git a/code/modules/admin/verbs/randomverbs.dm.rej b/code/modules/admin/verbs/randomverbs.dm.rej deleted file mode 100644 index 24b4116032..0000000000 --- a/code/modules/admin/verbs/randomverbs.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm (rejected hunks) -@@ -1214,7 +1214,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits - - /client/proc/cmd_admin_check_player_exp() //Allows admins to determine who the newer players are. - set category = "Admin" -- set name = "Check Player Playtime" -+ set name = "Player Playtime" - if(!check_rights(R_ADMIN)) - return - diff --git a/config/custom_roundstart_items.txt b/config/custom_roundstart_items.txt index dd3ed5f2c3..1b2952615f 100644 --- a/config/custom_roundstart_items.txt +++ b/config/custom_roundstart_items.txt @@ -7,3 +7,4 @@ //test1|Memename Lastname|testjob1|/obj/item/device/aicard=3;/obj/item/device/flightpack=1;/obj/item/gun/energy=3 //kevinz000|Skylar Lineman|ALL|/obj/item/bikehorn/airhorn=1 //kevinz000|ALL|Clown|/obj/item/bikehorn=1 +JayEhh|ALL|ALL|/obj/item/bikehorn=1 diff --git a/tgstation.dme.rej b/tgstation.dme.rej deleted file mode 100644 index a5ff4dc3cb..0000000000 --- a/tgstation.dme.rej +++ /dev/null @@ -1,13 +0,0 @@ -diff a/tgstation.dme b/tgstation.dme (rejected hunks) -@@ -1746,6 +1745,11 @@ - #include "code\modules\mob\living\simple_animal\hostile\gorilla\emotes.dm" - #include "code\modules\mob\living\simple_animal\hostile\gorilla\gorilla.dm" - #include "code\modules\mob\living\simple_animal\hostile\gorilla\visuals_icons.dm" -+#include "code\modules\mob\living\simple_animal\hostile\jungle\_jungle_mobs.dm" -+#include "code\modules\mob\living\simple_animal\hostile\jungle\leaper.dm" -+#include "code\modules\mob\living\simple_animal\hostile\jungle\mega_arachnid.dm" -+#include "code\modules\mob\living\simple_animal\hostile\jungle\mook.dm" -+#include "code\modules\mob\living\simple_animal\hostile\jungle\seedling.dm" - #include "code\modules\mob\living\simple_animal\hostile\megafauna\blood_drunk_miner.dm" - #include "code\modules\mob\living\simple_animal\hostile\megafauna\bubblegum.dm" - #include "code\modules\mob\living\simple_animal\hostile\megafauna\colossus.dm"