new GATO carpet (thanks Cubic) + minor map fixes

- first variant of GATO carpet (made by CubicP1sa)
- small mapping fixes on Pubby (centered around the bar)
This commit is contained in:
Sonoida
2023-01-12 00:10:03 +01:00
parent ee0b49efed
commit 27b2e2a9e8
9 changed files with 87 additions and 60 deletions
+1 -1
View File
@@ -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."
@@ -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"
@@ -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)
+2
View File
@@ -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,
@@ -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"
@@ -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
mob_react = FALSE