diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index c2d52638..7878771b 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -8650,6 +8650,18 @@ name = "Station Intercom (General)"; pixel_y = 26 }, +/obj/item/instrument/trombone, +/obj/item/clothing/glasses/monocle, +/obj/item/instrument/recorder, +/obj/item/clothing/head/that{ + throwforce = 1 + }, +/obj/item/cane, +/obj/item/clothing/under/waiter, +/obj/item/clothing/under/blacktango, +/obj/item/clothing/under/sundress, +/obj/item/clothing/shoes/sandal, +/obj/structure/closet, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "arf" = ( @@ -12847,7 +12859,7 @@ /area/hallway/primary/central) "azr" = ( /obj/structure/table/wood, -/obj/item/storage/book/bible, +/obj/item/toy/plush, /turf/open/floor/carpet, /area/crew_quarters/dorms) "azs" = ( @@ -24986,6 +24998,9 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "aYf" = ( @@ -25035,6 +25050,10 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/machinery/light{ + dir = 4; + light_color = "#c1caff" + }, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "aYj" = ( @@ -26045,27 +26064,21 @@ name = "Station Intercom (General)"; pixel_y = 26 }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/royalblack, /area/crew_quarters/bar) "bap" = ( /obj/machinery/computer/slot_machine, /obj/machinery/airalarm{ pixel_y = 24 }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/royalblack, /area/crew_quarters/bar) "baq" = ( /obj/machinery/computer/arcade, /obj/structure/noticeboard{ pixel_y = 32 }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/royalblack, /area/crew_quarters/bar) "bar" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -26495,19 +26508,20 @@ /turf/open/floor/plating, /area/asteroid/nearstation) "bbo" = ( -/obj/item/clothing/head/hardhat/cakehat, -/obj/structure/table/wood/fancy, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" +/obj/structure/table/wood, +/obj/item/ashtray{ + pixel_y = -16 }, +/obj/item/clothing/mask/cigarette/cigar{ + pixel_x = 6 + }, +/turf/open/floor/carpet/royalblack, /area/crew_quarters/bar) "bbp" = ( /obj/structure/chair/wood/normal{ dir = 8 }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/royalblack, /area/crew_quarters/bar) "bbq" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -26527,26 +26541,21 @@ /obj/structure/chair/wood/normal{ dir = 4 }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/royalblack, /area/crew_quarters/bar) "bbs" = ( -/obj/item/cane, -/obj/item/clothing/head/that{ - throwforce = 1 +/obj/structure/table/wood, +/obj/item/gun/ballistic/revolver/russian{ + pixel_y = 8 }, -/obj/structure/table/wood/fancy, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" +/obj/item/ashtray{ + pixel_y = -16 }, +/turf/open/floor/carpet/royalblack, /area/crew_quarters/bar) "bbt" = ( /obj/structure/disposalpipe/segment, /obj/structure/table/wood, -/obj/item/clothing/under/sundress, -/obj/item/clothing/under/waiter, -/obj/item/clothing/under/blacktango, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "bbu" = ( @@ -26557,22 +26566,16 @@ "bbv" = ( /obj/structure/chair/stool, /obj/item/trash/can, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/royalblack, /area/crew_quarters/bar) "bbw" = ( /obj/effect/landmark/start/assistant, /obj/structure/chair/stool, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/royalblack, /area/crew_quarters/bar) "bbx" = ( /obj/structure/chair/stool, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/turf/open/floor/carpet/royalblack, /area/crew_quarters/bar) "bby" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -26914,17 +26917,12 @@ /turf/open/floor/plating/asteroid/airless, /area/asteroid/nearstation) "bco" = ( -/obj/structure/table/wood/fancy, -/obj/item/gun/ballistic/revolver/russian{ - pixel_y = 16 - }, /obj/item/storage/box/matches{ pixel_x = -3; pixel_y = 5 }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, +/obj/structure/table/wood, +/turf/open/floor/carpet/royalblack, /area/crew_quarters/bar) "bcp" = ( /obj/machinery/door/airlock{ @@ -26934,12 +26932,11 @@ /turf/open/floor/plasteel/grimy, /area/chapel/main/monastery) "bcq" = ( -/obj/item/clothing/glasses/monocle, -/obj/item/instrument/recorder, -/obj/structure/table/wood/fancy, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" +/obj/structure/table/wood, +/obj/item/toy/cards/deck{ + pixel_y = 4 }, +/turf/open/floor/carpet/royalblack, /area/crew_quarters/bar) "bcr" = ( /obj/structure/disposalpipe/segment, @@ -26958,10 +26955,6 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) -"bcs" = ( -/obj/item/clothing/shoes/sandal, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/bar) "bct" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -27946,7 +27939,6 @@ /area/crew_quarters/bar) "bez" = ( /obj/structure/table/wood, -/obj/item/instrument/trombone, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -27957,6 +27949,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/clothing/head/hardhat/cakehat, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "beA" = ( @@ -28966,10 +28959,10 @@ /area/hallway/primary/central) "bgs" = ( /obj/structure/table, -/obj/item/reagent_containers/food/snacks/donut, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/item/reagent_containers/food/snacks/donut/apple, /turf/open/floor/plasteel, /area/hallway/primary/central) "bgt" = ( @@ -99484,7 +99477,7 @@ aUf aUf aPE bbu -bcs +bah bag beG aPE diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index 46bb9206..5b5cb2b5 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -320,7 +320,7 @@ description = "The wooden cabin of a wizard in space, it smells like mana in there." /datum/map_template/ruin/space/feeders_den //GS13 - id = "feedersden" + id = "feeders_den" suffix = "feeders_den.dmm" name = "Feeder Den" description = "What used to be a small Syndicate prison and interrogration facility has been taken over by a degenerate madman and turned into a den fit for one purpose - to fatten up its captives." diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index d371db96..76b9fcf9 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -177,6 +177,11 @@ turf_type = /turf/open/floor/carpet/monochrome tableVariant = /obj/structure/table/wood/fancy/monochrome +/obj/item/stack/tile/carpet/gato //GS13 + name = "gato-themed carpet" + icon_state = "tile-carpet-gato" + turf_type = /turf/open/floor/carpet/gato + /obj/item/stack/tile/carpet/fifty amount = 50 @@ -213,6 +218,9 @@ /obj/item/stack/tile/carpet/royalblue/fifty amount = 50 +/obj/item/stack/tile/carpet/gato/fifty + amount = 50 + /obj/item/stack/tile/fakespace name = "astral carpet" singular_name = "astral carpet" diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index 2c7c6a3f..4376ff97 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -302,6 +302,11 @@ floor_tile = /obj/item/stack/tile/carpet/royalblue canSmoothWith = list(/turf/open/floor/carpet/royalblue) +/turf/open/floor/carpet/gato //GS13 + icon = 'icons/turf/floors/carpet_gato.dmi' + floor_tile = /obj/item/stack/tile/carpet/gato + canSmoothWith = list(/turf/open/floor/carpet/gato) + /turf/open/floor/carpet/narsie_act(force, ignore_mobs, probability = 20) . = (prob(probability) || force) for(var/I in src) diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm index 7f712203..556efad3 100644 --- a/code/modules/cargo/packs/misc.dm +++ b/code/modules/cargo/packs/misc.dm @@ -398,6 +398,8 @@ /obj/item/stack/tile/carpet/red/fifty, /obj/item/stack/tile/carpet/royalblue/fifty, /obj/item/stack/tile/carpet/royalblue/fifty, + /obj/item/stack/tile/carpet/gato/fifty, + /obj/item/stack/tile/carpet/gato/fifty, /obj/item/stack/tile/carpet/royalblack/fifty, /obj/item/stack/tile/carpet/royalblack/fifty, /obj/item/stack/tile/carpet/blackred/fifty, diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index b6094aae..2d6ff776 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1895,6 +1895,18 @@ F.PlaceOnTop(/turf/open/floor/carpet/purple) ..() +/datum/reagent/carpet/purple //GS13 + name = "Liquid GATO-style Carpet" + color = "#6d3392" + +/datum/reagent/carpet/gato/reaction_turf(turf/T, reac_volume) + if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel)) + var/turf/open/floor/F = T + F.PlaceOnTop(/turf/open/floor/carpet/gato) + ..() + + + /datum/reagent/carpet/red name = "Liquid Red Carpet" color = "#871515" diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index 261ae89f..388d1c13 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -696,6 +696,13 @@ results = list(/datum/reagent/carpet/purple = 2) required_reagents = list(/datum/reagent/carpet = 1, /datum/reagent/stable_plasma = 1) +/datum/chemical_reaction/carpet/purple //GS13 + name = "liquid gato carpet" + id = /datum/reagent/carpet/gato + results = list(/datum/reagent/carpet/gato = 2) + required_reagents = list(/datum/reagent/carpet = 1, /datum/reagent/consumable/sugar = 1) + + /datum/chemical_reaction/carpet/red name = "liquid red carpet" id = /datum/reagent/carpet/red @@ -728,4 +735,4 @@ results = list(/datum/reagent/hellwater = 1) required_reagents = list(/datum/reagent/water/holywater = 1) required_temp = 666 - mob_react = FALSE \ No newline at end of file + mob_react = FALSE diff --git a/icons/turf/floors/carpet_gato.dmi b/icons/turf/floors/carpet_gato.dmi new file mode 100644 index 00000000..52d856be Binary files /dev/null and b/icons/turf/floors/carpet_gato.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 969bb881..84d77e38 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3097,7 +3097,7 @@ #include "code\modules\ruins\spaceruin_code\crashedship.dm" #include "code\modules\ruins\spaceruin_code\deepstorage.dm" #include "code\modules\ruins\spaceruin_code\DJstation.dm" -#include "code\modules\ruins\spaceruin_code\feeders_den.dm" //GS13 +#include "code\modules\ruins\spaceruin_code\feeders_den.dm" #include "code\modules\ruins\spaceruin_code\hilbertshotel.dm" #include "code\modules\ruins\spaceruin_code\listeningstation.dm" #include "code\modules\ruins\spaceruin_code\miracle.dm"