From 17dd5eaa5c52d05adfecd78223160929dd7ccd4c Mon Sep 17 00:00:00 2001 From: Erthilo Date: Tue, 8 May 2012 23:43:45 +0100 Subject: [PATCH] Adds brig prison wing, holodeck, and escape pods. Also fixes some derpy boxing glove and emag sprites. --- baystation12.dme | 3 - html/changelog.html | 3 + icons/obj/card.dmi | Bin 5520 -> 5523 bytes icons/obj/clothing/gloves.dmi | Bin 8462 -> 10818 bytes maps/tgstation.2.0.8.dmm | 18502 ++++++++++++++++---------------- 5 files changed, 9346 insertions(+), 9162 deletions(-) diff --git a/baystation12.dme b/baystation12.dme index 2c09c894205..d03a9b4d2d2 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -160,11 +160,9 @@ #define FILE_DIR "code/WorkInProgress" #define FILE_DIR "code/WorkInProgress/Apples" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jumper" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/tajara_sprites" #define FILE_DIR "code/WorkInProgress/Chinsky" #define FILE_DIR "code/WorkInProgress/mapload" #define FILE_DIR "code/WorkInProgress/Mini" @@ -200,7 +198,6 @@ #define FILE_DIR "icons/vending_icons" #define FILE_DIR "interface" #define FILE_DIR "maps" -#define FILE_DIR "maps/backup" #define FILE_DIR "sound" #define FILE_DIR "sound/AI" #define FILE_DIR "sound/ambience" diff --git a/html/changelog.html b/html/changelog.html index 6ccdcf49e5e..ae382aa3807 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -51,6 +51,9 @@ should be listed in the changelog upon commit though. Thanks. -->

07 May 2012

TG updated: