diff --git a/GainStation13/icons/obj/bedsheets.dmi b/GainStation13/icons/obj/bedsheets.dmi index e4950e9875..4c3b18e629 100644 Binary files a/GainStation13/icons/obj/bedsheets.dmi and b/GainStation13/icons/obj/bedsheets.dmi differ diff --git a/GainStation13/icons/obj/structure/beds.dm b/GainStation13/icons/obj/structure/beds.dm index a81e234e65..f49c4581b5 100644 --- a/GainStation13/icons/obj/structure/beds.dm +++ b/GainStation13/icons/obj/structure/beds.dm @@ -36,3 +36,165 @@ item_state = "blue" dream_messages = list("blue", "mega",) icon = 'GainStation13/icons/obj/bedsheets.dmi' + +/obj/item/bedsheet/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetwhite" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/blue/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetblue" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/green/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetgreen" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/grey/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetgrey" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/orange/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetorange" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/purple/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetpurple" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/patriot/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetUSA" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/rainbow/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetrainbow" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/red/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetred" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/yellow/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetyellow" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/mime/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetmime" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/clown/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetclown" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/captain/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetcaptain" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/rd/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetrd" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/medical/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetmedical" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/cmo/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetcmo" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/hos/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheethos" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/hop/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheethop" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/ce/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetce" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/qm/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetqm" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/chaplain/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetchap" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/brown/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetbrown" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/black/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetblack" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/centcom/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetcentcom" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/syndie/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetsyndie" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/cult/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetcult" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/wiz/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetwiz" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/nanotrasen/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetNT" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/ian/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetian" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/cosmos/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "double_sheetcosmos" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/random/double + icon = 'GainStation13/icons/obj/bedsheets.dmi' + icon_state = "random_bedsheet" + bedsheet_type = BEDSHEET_DOUBLE + +/obj/item/bedsheet/random/double/Initialize(mapload) + ..() + if(bedsheet_type == BEDSHEET_DOUBLE) + var/type = pick(GLOB.double_bedsheets) + new type(loc) + return INITIALIZE_HINT_QDEL diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_caloritealtar.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_caloritealtar.dmm deleted file mode 100644 index 9da95ae05c..0000000000 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_caloritealtar.dmm +++ /dev/null @@ -1,61 +0,0 @@ -"a" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) -"c" = (/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"d" = (/obj/structure/cursedfatfountain,/turf/open/floor/mineral/calorite/dance,/area/ruin/powered/gluttony) -"i" = (/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/brown,/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"j" = (/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/machinery/light{dir = 4; color = "#ffa500"},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"k" = (/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"l" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/structure/railing{color = FFA500; dir = 8},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"o" = (/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow,/obj/structure/railing{color = FFA500},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"r" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"s" = (/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"v" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/plasteel,/area/ruin/powered/gluttony) -"w" = (/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"y" = (/turf/closed/mineral/volcanic/lava_land_surface,/area/lavaland/surface/outdoors) -"z" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"B" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/yellow,/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"D" = (/obj/machinery/light/small{dir = 1; pixel_x = 16},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"F" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"G" = (/obj/structure/statue/calorite/fatty,/obj/machinery/light{dir = 4; color = "#ffa500"},/turf/open/floor/mineral/calorite/dance,/area/ruin/powered/gluttony) -"H" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/structure/mineral_door/calorite,/obj/structure/fans/tiny/invisible,/turf/open/floor/mineral/calorite/hide,/area/ruin/powered/gluttony) -"I" = (/turf/open/floor/mineral/calorite/dance,/area/ruin/powered/gluttony) -"J" = (/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"K" = (/turf/closed/wall/mineral/calorite,/area/ruin/powered/gluttony) -"M" = (/obj/structure/statue/calorite/fatty,/obj/machinery/light{dir = 8; color = "#ffa500"},/turf/open/floor/mineral/calorite/dance,/area/ruin/powered/gluttony) -"N" = (/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"O" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/mineral/calorite/hide,/area/ruin/powered/gluttony) -"P" = (/turf/open/lava/smooth/lava_land_surface,/area/ruin/powered/gluttony) -"R" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/structure/railing{color = FFA500; dir = 4},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"T" = (/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"U" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/structure/railing{color = FFA500; dir = 1},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"V" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/structure/mineral_door/calorite,/turf/open/floor/mineral/calorite/hide,/area/ruin/powered/gluttony) -"W" = (/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"X" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/machinery/light{dir = 8; color = "#ffa500"},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"Y" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) - -(1,1,1) = {" -yyyyyyyyyyyyy -yyyyyyyyyyyyy -yyyyyyyyyyyyy -yyyPPPPPPPyyy -yyyPKKKKKPyyy -yyyPKrYJKPyyy -yyyPKXdjKPyyy -yyyPKTciKPyyy -yyyPKKVKKPyyy -yyyPPKOKPPyyy -yyyyKKOKKyyyy -yyyKKIOIKKyyy -yyyKoJvWoKyyy -yyyKMlvRGKyyy -yyyKUNvsUKyyy -yyyKKNvsKKyyy -ayyyKkvzKyyyy -ayyyKFOBKyyyy -ayayKIOIKyyyy -aaayKKHKKyyya -aaaaDwwDwyyya -aaaaKwwwKyyaa -ayyaaaaayyyaa -ayyyaaaaaaaaa -aaaaaaaaaaaay -"} diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index a6d3686fa8..730e2dc07e 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -40,25 +40,25 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s #define BODYPARTS_LAYER 31 //Initially "AUGMENTS", this was repurposed to be a catch-all bodyparts flag #define MARKING_LAYER 30 //Matrixed body markings because clashing with snouts? #define BODY_ADJ_LAYER 29 //certain mutantrace features (snout, body markings) that must appear above the body parts -#define GENITALS_FRONT_LAYER 28 //Draws some genitalia above clothes and the TAUR body if need be. -#define BODY_LAYER 27 //underwear, undershirts, socks, eyes, lips(makeup) -#define BODY_ADJ_UPPER_LAYER 26 -#define FRONT_MUTATIONS_LAYER 25 //mutations that should appear above body, body_adj and bodyparts layer (e.g. laser eyes) -#define DAMAGE_LAYER 24 //damage indicators (cuts and burns) -#define UNIFORM_LAYER 23 -#define ID_LAYER 22 -#define HANDS_PART_LAYER 21 -#define SHOES_LAYER 20 -#define GLOVES_LAYER 19 -#define EARS_LAYER 18 -#define GENITALS_UNDER_LAYER 17 -#define SUIT_LAYER 16 -#define GENITALS_EXPOSED_LAYER 15 -#define GLASSES_LAYER 14 -#define BELT_LAYER 13 //Possible make this an overlay of somethign required to wear a belt? -#define SUIT_STORE_LAYER 12 -#define NECK_LAYER 11 -#define BACK_LAYER 10 +#define BODY_LAYER 28 //underwear, undershirts, socks, eyes, lips(makeup) +#define BODY_ADJ_UPPER_LAYER 27 +#define FRONT_MUTATIONS_LAYER 26 //mutations that should appear above body, body_adj and bodyparts layer (e.g. laser eyes) +#define DAMAGE_LAYER 25 //damage indicators (cuts and burns) +#define UNIFORM_LAYER 24 +#define ID_LAYER 23 +#define HANDS_PART_LAYER 22 +#define SHOES_LAYER 21 +#define GLOVES_LAYER 20 +#define EARS_LAYER 19 +#define GENITALS_UNDER_LAYER 18 +#define SUIT_LAYER 17 +#define GLASSES_LAYER 16 +#define BELT_LAYER 15 //Possible make this an overlay of somethign required to wear a belt? +#define SUIT_STORE_LAYER 14 +#define NECK_LAYER 13 +#define BACK_LAYER 12 +#define GENITALS_EXPOSED_LAYER 11 +#define GENITALS_FRONT_LAYER 10 //Draws some genitalia above clothes and the TAUR body if need be. #define HAIR_LAYER 9 //TODO: make part of head layer? #define HORNS_LAYER 8 #define FACEMASK_LAYER 7