Merge branch 'SPLURT-Station:master' into 4nal

SPLURT-Station · Oct 18, 2024 · f0b5108 · f0b5108
2 parents 60a3582 + 35474e4
commit f0b5108
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm
@@ -434,7 +434,7 @@
 /obj/structure/sign/poster/contraband/steppy
 	name = "Step On Me"
 	desc = "A phrase associated with a chubby reptile notoriously used in uncivilized Orion space as a deterrent towards would be pirate vessels by instructing them to 'fuck around and find out'."
-	icon_state = "steppy"
+	icon_state = "poster_steppy"
 
 /obj/structure/sign/poster/contraband/scum
 	name = "Security are Scum"

diff --git a/code/modules/mob/living/carbon/human/species_types/anthropomorph.dm b/code/modules/mob/living/carbon/human/species_types/anthropomorph.dm
@@ -2,7 +2,7 @@
 	name = "Anthropomorph"
 	id = SPECIES_MAMMAL
 	default_color = "4B4B4B"
-	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,HORNCOLOR,WINGCOLOR,HAS_FLESH,HAS_BONE)
+	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,FACEHAIR,HORNCOLOR,WINGCOLOR,HAS_FLESH,HAS_BONE)
 	inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BEAST
 	mutant_bodyparts = list("mcolor" = "FFFFFF","mcolor2" = "FFFFFF","mcolor3" = "FFFFFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky", "deco_wings" = "None",
 						 "mam_body_markings" = list(), "taur" = "None", "horns" = "None", "legs" = "Plantigrade", "meat_type" = "Mammalian")

diff --git a/html/changelogs/archive/2024-10.yml b/html/changelogs/archive/2024-10.yml
@@ -3,3 +3,9 @@
   - bugfix: Crop top
   - bugfix: HOP parade
   - bugfix: explorer suit (fukin spaget code)
+2024-10-14:
+  SaraSayomi:
+  - bugfix: Fixed the susplush and steppy poster
+2024-10-16:
+  cyfause:
+  - bugfix: allow facial hair on anthromorph species
diff --git a/modular_sand/code/game/objects/items/plushes.dm b/modular_sand/code/game/objects/items/plushes.dm
@@ -30,19 +30,19 @@
 /obj/item/toy/plush/nukeplushie/susplushie
 	name = "Suspect Plushie"
 	desc = "A stuffed toy that resembles a red space station employee. The tag claims red employee to be purely fictitious."
-	icon = 'modular_sand/icons/obj/plushes.dmi'
+	icon = 'icons/obj/plushes.dmi'
 	icon_state = "plushie_sus"
-	lefthand_file = 'modular_sand/icons/mob/inhands/misc/plushes_lefthand.dmi'
-	righthand_file = 'modular_sand/icons/mob/inhands/misc/plushes_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/misc/plushes_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/misc/plushes_righthand.dmi'
 	attack_verb = list("shot", "eat", "killed")
 
 /obj/item/toy/plush/nukeplushie/minisusplushie
 	name = "Mini Suspect Plushie"
 	desc = "A stuffed toy that resembles a red space station mini employee. The tag claims red employee to be purely fictitious."
-	icon = 'modular_sand/icons/obj/plushes.dmi'
+	icon = 'icons/obj/plushes.dmi'
 	icon_state = "plushie_minisus"
-	lefthand_file = 'modular_sand/icons/mob/inhands/misc/plushes_lefthand.dmi'
-	righthand_file = 'modular_sand/icons/mob/inhands/misc/plushes_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/misc/plushes_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/misc/plushes_righthand.dmi'
 	attack_verb = list("mini-shot", "mini-eat", "mini-killed")
 
 /obj/item/toy/plush/shark