diff --git a/tools/merge-upstream-pull-request.sh b/citadel/tools/merge-upstream-pull-request.sh old mode 100755 new mode 100644 similarity index 100% rename from tools/merge-upstream-pull-request.sh rename to citadel/tools/merge-upstream-pull-request.sh diff --git a/config/custom_roundstart_items.txt b/config/custom_roundstart_items.txt index 1b2952615f..8c5a87a676 100644 --- a/config/custom_roundstart_items.txt +++ b/config/custom_roundstart_items.txt @@ -7,4 +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 +JayEhh|ALL|ALL|/obj/item/custom/ceb_soap=1 \ No newline at end of file