Merge pull request #14 from sheepishgoat/fixes-and-maps

plentitude of small fixes
This commit is contained in:
sheepishgoat
2024-10-30 14:15:55 -04:00
committed by GitHub
120 changed files with 377 additions and 404 deletions
@@ -277,25 +277,25 @@
icon_state = "salt_pile"
gender = NEUTER
/obj/effect/decal/cleanable/glitter
/obj/effect/decal/cleanable/glitter //GS13 - changed glitters to more subtle variants
name = "generic glitter pile"
desc = "The herpes of arts and crafts."
icon = 'icons/effects/atmospherics.dmi'
icon = 'GainStation13/icons/effects/atmospherics.dmi'
icon_state = "glitter"
gender = NEUTER
mergeable_decal = TRUE
persistent = FALSE
/obj/effect/decal/cleanable/glitter/pink
name = "pink glitter"
icon_state = "plasma_old"
color = "#9e0089"
/obj/effect/decal/cleanable/glitter/white
name = "white glitter"
icon_state = "nitrous_oxide_old"
/obj/effect/decal/cleanable/glitter/blue
name = "blue glitter"
icon_state = "freon_old"
color = "#2dd6ff"
/obj/effect/decal/cleanable/plasma
name = "stabilized plasma"
+5
View File
@@ -291,6 +291,11 @@
icon = "thehive"
desc = "Comb in for some sweet drinks! Not known for serving any sappy drink."
/datum/barsign/the_busted_belt //gs13
name = "The Busted Belt"
icon = "thebustedbelt"
desc = "GATO is not liable for any pieces of broken wardrobe."
/datum/barsign/hiddensigns
hidden = TRUE
@@ -160,6 +160,7 @@
buildstacktype = null //Custom mats handle this
/obj/structure/chair/wood
icon = 'GainStation13/icons/obj/chairs.dmi'
icon_state = "wooden_chair"
name = "wooden chair"
desc = "Old is never too old to not be in fashion."
@@ -539,6 +540,7 @@
/obj/item/chair/wood
name = "wooden chair"
icon = 'GainStation13/icons/obj/chairs.dmi'
icon_state = "wooden_chair_toppled"
item_state = "woodenchair"
resistance_flags = FLAMMABLE