Merge pull request #21 from ReoDaProtovali/Fixing-the-fixes

Plentitide of small fixes part 2: electric boogaloo
2024-11-17 20:35:18 +01:00
parent 5b8db19c80 0d3e6e9a31
commit 10a07b2b0d
77 changed files with 2858 additions and 356 deletions
@@ -0,0 +1,18 @@
+
+//GS13 glitters. Making the subtle variants their own subtypes, as some use the fake gas effects to make a room look like it's full of gas, when it isnt.
+/obj/effect/decal/cleanable/glitter/pink_subtle
+	name = "faint pink glitter"
+	icon = 'GainStation13/icons/effects/atmospherics.dmi'
+	icon_state = "glitter"
+	color = "#9e0089"
+
+/obj/effect/decal/cleanable/glitter/white_subtle
+	name = "faint white glitter"
+	icon = 'GainStation13/icons/effects/atmospherics.dmi'
+	icon_state = "glitter"
+
+/obj/effect/decal/cleanable/glitter/blue_subtle
+	name = "faint blue glitter"
+	icon = 'GainStation13/icons/effects/atmospherics.dmi'
+	icon_state = "glitter"
+	color = "#2dd6ff"
@@ -0,0 +1,7 @@
+////////////// GS13 BARSIGNS ///////////////
+// Because modularity, yo
+
+/datum/barsign/the_busted_belt //gs13
+	name = "The Busted Belt"
+	icon = "thebustedbelt"  //...I dont think this survived the rebase, oops.
+	desc = "GATO is not liable for any pieces of broken wardrobe."
@@ -0,0 +1,17 @@
+//Roses dont exist here... Sad
+
+// /datum/gear/head/rose
+// 	name = "Rose"
+// 	path = /obj/item/grown/rose
+
+/datum/gear/head/sunflower
+	name = "Sunflower"
+	path = /obj/item/grown/sunflower
+
+/datum/gear/head/poppy
+	name = "Poppy"
+	path = /obj/item/reagent_containers/food/snacks/grown/poppy
+
+/datum/gear/head/harebell
+	name = "Harebell"
+	path = /obj/item/reagent_containers/food/snacks/grown/harebell
@@ -0,0 +1,3 @@
+/datum/gear/uniform/modularjumpsuit
+	name = "Modular Jumpsuit (gray)"
+	path = /obj/item/clothing/under/color/grey/modular
@@ -0,0 +1,17 @@
+// GS13 subtle glitters
+/datum/reagent/glitter/pink_subtle
+	name = "lesser pink glitter"
+	description = "pink sparkles that get everywhere. these ones seem lower density than normal."
+	color = "#ff8080" //A light pink color
+	glitter_type = /obj/effect/decal/cleanable/glitter/pink_subtle
+
+/datum/reagent/glitter/white_subtle
+	name = "lesser white glitter"
+	description = "white sparkles that get everywhere. these ones seem lower density than normal."
+	glitter_type = /obj/effect/decal/cleanable/glitter/white_subtle
+
+/datum/reagent/glitter/blue_subtle
+	name = "lesser blue glitter"
+	description = "blue sparkles that get everywhere. these ones seem lower density than normal."
+	color = "#4040FF" //A blueish color
+	glitter_type = /obj/effect/decal/cleanable/glitter/blue_subtle
@@ -0,0 +1,20 @@
+///////////////////////////////// SUBTLE GLITTERS ////////////////////////////
+
+/datum/chemical_reaction/lesser_pink
+	name = "pink glitter dilution"
+	id = "lesser_pink_glitter"
+	results = list(/datum/reagent/glitter/pink_subtle = 2)
+	required_reagents = list(/datum/reagent/glitter/pink = 1, /datum/reagent/space_cleaner = 1) //You clean some of it away, I guess?
+
+/datum/chemical_reaction/lesser_white
+	name = "white glitter dilution"
+	id = "lesser_white_glitter"
+	results = list(/datum/reagent/glitter/white_subtle = 2)
+	required_reagents = list(/datum/reagent/glitter/white = 1, /datum/reagent/space_cleaner = 1)
+
+/datum/chemical_reaction/lesser_blue
+	name = "pink glitter dilution"
+	id = "lesser_blue_glitter"
+	results = list(/datum/reagent/glitter/blue_subtle = 2)
+	required_reagents = list(/datum/reagent/glitter/blue = 1, /datum/reagent/space_cleaner = 1)
+//Im not going to do the recolor recipes for the subtle glitters. Unless that's really wanted (except you cant even make glitter to start with so the recipes are already super niche to begin with.)