From dd9b6ebd4f0498e9394649360077693c4181d6c7 Mon Sep 17 00:00:00 2001 From: IAmBigCoat Date: Mon, 11 May 2015 01:09:00 -0400 Subject: [PATCH] Scrub/Supply caps and a small schema fix --- SQL/paradise_schema.sql | 1 + code/ATMOSPHERICS/pipes.dm | 6 +-- icons/atmos/pipes.dmi | Bin 3657 -> 3818 bytes paradise.dme | 75 +++++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+), 3 deletions(-) diff --git a/SQL/paradise_schema.sql b/SQL/paradise_schema.sql index 7cf71cdd074..f22f746fa48 100644 --- a/SQL/paradise_schema.sql +++ b/SQL/paradise_schema.sql @@ -75,6 +75,7 @@ CREATE TABLE `characters` ( `disabilities` mediumint(8) NOT NULL, `player_alt_titles` mediumtext NOT NULL, `organ_data` mediumtext NOT NULL, + `rlimb_data` mediumtext NOT NULL, `nanotrasen_relation` varchar(45) NOT NULL, `speciesprefs` int(1) NOT NULL, `slime_color` mediumtext NOT NULL, diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm index bded06b1947..e13a5627236 100644 --- a/code/ATMOSPHERICS/pipes.dm +++ b/code/ATMOSPHERICS/pipes.dm @@ -1092,7 +1092,7 @@ alpha = 255 overlays.Cut() - overlays += icon_manager.get_atmos_icon("pipe", , pipe_color, "cap") + overlays += icon_manager.get_atmos_icon("pipe", , pipe_color, "cap" + icon_connect_type) /obj/machinery/atmospherics/pipe/cap/initialize() for(var/obj/machinery/atmospherics/target in get_step(src, dir)) @@ -1138,7 +1138,7 @@ /obj/machinery/atmospherics/pipe/cap/hidden/scrubbers name = "scrubbers pipe endcap" desc = "An endcap for scrubbers pipes" - icon_state = "cap-f-scrubbers" + icon_state = "cap-scrubbers" connect_types = list(3) layer = 2.38 icon_connect_type = "-scrubbers" @@ -1147,7 +1147,7 @@ /obj/machinery/atmospherics/pipe/cap/hidden/supply name = "supply pipe endcap" desc = "An endcap for supply pipes" - icon_state = "cap-f-supply" + icon_state = "cap-supply" connect_types = list(2) layer = 2.39 icon_connect_type = "-supply" diff --git a/icons/atmos/pipes.dmi b/icons/atmos/pipes.dmi index 6bd0b15f618d614aee81dd2187f761c3b8db011f..a84bbb789da15c8ecc3190900e4ee9519027ee64 100644 GIT binary patch delta 3507 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 delta 3329 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 diff --git a/paradise.dme b/paradise.dme index 26da97bd657..7ccf790f0eb 100644 --- a/paradise.dme +++ b/paradise.dme @@ -5,6 +5,81 @@ // END_INTERNALS // BEGIN_FILE_DIR #define FILE_DIR . +#define FILE_DIR "code" +#define FILE_DIR "code/modules" +#define FILE_DIR "code/modules/jungle" +#define FILE_DIR "code/modules/shieldgen" +#define FILE_DIR "html" +#define FILE_DIR "html/images" +#define FILE_DIR "icons" +#define FILE_DIR "icons/48x48" +#define FILE_DIR "icons/ass" +#define FILE_DIR "icons/atmos" +#define FILE_DIR "icons/effects" +#define FILE_DIR "icons/mecha" +#define FILE_DIR "icons/misc" +#define FILE_DIR "icons/mob" +#define FILE_DIR "icons/mob/human_races" +#define FILE_DIR "icons/mob/human_races/cyberlimbs" +#define FILE_DIR "icons/mob/in-hand" +#define FILE_DIR "icons/mob/in-hand/left" +#define FILE_DIR "icons/mob/in-hand/right" +#define FILE_DIR "icons/mob/otherHuman" +#define FILE_DIR "icons/mob/species" +#define FILE_DIR "icons/mob/species/armalis" +#define FILE_DIR "icons/mob/species/skrell" +#define FILE_DIR "icons/mob/species/tajaran" +#define FILE_DIR "icons/mob/species/unathi" +#define FILE_DIR "icons/mob/species/vox" +#define FILE_DIR "icons/mob/spirits" +#define FILE_DIR "icons/NTOS" +#define FILE_DIR "icons/NTOS/battery_icons" +#define FILE_DIR "icons/obj" +#define FILE_DIR "icons/obj/assemblies" +#define FILE_DIR "icons/obj/atmospherics" +#define FILE_DIR "icons/obj/clothing" +#define FILE_DIR "icons/obj/clothing/species" +#define FILE_DIR "icons/obj/clothing/species/skrell" +#define FILE_DIR "icons/obj/clothing/species/tajaran" +#define FILE_DIR "icons/obj/clothing/species/unathi" +#define FILE_DIR "icons/obj/clothing/species/vox" +#define FILE_DIR "icons/obj/doors" +#define FILE_DIR "icons/obj/flora" +#define FILE_DIR "icons/obj/machines" +#define FILE_DIR "icons/obj/pipes" +#define FILE_DIR "icons/obj/power_cond" +#define FILE_DIR "icons/pda_icons" +#define FILE_DIR "icons/pods" +#define FILE_DIR "icons/spideros_icons" +#define FILE_DIR "icons/stamp_icons" +#define FILE_DIR "icons/Testing" +#define FILE_DIR "icons/turf" +#define FILE_DIR "icons/vehicles" +#define FILE_DIR "icons/vending_icons" +#define FILE_DIR "nano" +#define FILE_DIR "nano/images" +#define FILE_DIR "sound" +#define FILE_DIR "sound/AI" +#define FILE_DIR "sound/ambience" +#define FILE_DIR "sound/effects" +#define FILE_DIR "sound/effects/turret" +#define FILE_DIR "sound/effects/wind" +#define FILE_DIR "sound/guitar" +#define FILE_DIR "sound/hallucinations" +#define FILE_DIR "sound/items" +#define FILE_DIR "sound/machines" +#define FILE_DIR "sound/mecha" +#define FILE_DIR "sound/misc" +#define FILE_DIR "sound/music" +#define FILE_DIR "sound/piano" +#define FILE_DIR "sound/turntable" +#define FILE_DIR "sound/violin" +#define FILE_DIR "sound/voice" +#define FILE_DIR "sound/voice/complionator" +#define FILE_DIR "sound/voice/Serithi" +#define FILE_DIR "sound/vox" +#define FILE_DIR "sound/vox_fem" +#define FILE_DIR "sound/weapons" // END_FILE_DIR // BEGIN_PREFERENCES #define DEBUG