cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into content-stuff

Browse Source
This commit is contained in:
Mosley
2024-10-16 18:37:02 -05:00
parent f9c16b467d 35474e4310
commit 7c8cbd3481
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/effects/contraband.dm
View File

@@ -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"

6
html/changelogs/archive/2024-10.yml
View File

@@ -11,3 +11,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

12
modular_sand/code/game/objects/items/plushes.dm
View File

@@ -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