Merge pull request #1 from SPLURT-Station/master

Update
SPLURT-Station · Feb 7, 2023 · e5f15e0 · e5f15e0
2 parents 1f38bab + 3ec53fc
commit e5f15e0
Show file tree

Hide file tree

Showing 54 changed files with 875 additions and 258 deletions.
diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm
@@ -5133,7 +5133,7 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
-/obj/structure/sign/poster/official/duelshotgun{
+/obj/structure/sign/poster/official/bless_this_spess{
 	pixel_y = -32
 	},
 /turf/open/floor/plasteel,

diff --git a/_maps/map_files/FestiveBall/FestiveStation.dmm b/_maps/map_files/FestiveBall/FestiveStation.dmm
@@ -20381,7 +20381,7 @@
 /area/edina/street/secondary/command)
 "baX" = (
 /obj/machinery/computer/prisoner/management,
-/obj/structure/sign/poster/official/duelshotgun{
+/obj/structure/sign/poster/official/bless_this_spess{
 	pixel_y = 32
 	},
 /turf/open/floor/wood,

diff --git a/code/__SANDCODE/DEFINES/traits.dm b/code/__SANDCODE/DEFINES/traits.dm
@@ -8,3 +8,6 @@
 #define TRAIT_INFERTILE			"infertile"
 /// DNC trait, used to prevent cloning
 #define TRAIT_DNC_ORDER			"dnc_order"
+/// Estrous traits, used for mammalian seasonal arousal systems
+#define TRAIT_ESTROUS_ACTIVE	"estrous_active"
+#define TRAIT_ESTROUS_DETECT	"estrous_detect"
diff --git a/code/__SPLURTCODE/DEFINES/zeros/traits.dm b/code/__SPLURTCODE/DEFINES/zeros/traits.dm
@@ -3,8 +3,6 @@
 #define TRAIT_CURSED_BLOOD "cursed_blood" //Yo dawg I heard you like bloodborne references so I put a
 #define TRAIT_HEADPAT_SLUT "headpat_slut"
 #define TRAIT_DISTANT "headpat_hater"
-#define TRAIT_IN_HEAT "in_heat"
-#define TRAIT_HEAT_DETECT "heat_detect"
 #define TRAIT_ILLITERATE "illiterate"
 #define TRAIT_HIDE_BACKPACK "hide_backpack"
 

diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
@@ -31,6 +31,11 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
 		/obj/item/toy/toy_xeno = ARCADE_WEIGHT_TRICK,
 		/obj/item/toy/windupToolbox = ARCADE_WEIGHT_TRICK,
 
+		// SPLURT EDIT
+		/obj/item/handmirror/split_personality = ARCADE_WEIGHT_TRICK,
+		/obj/item/toy/figure/assistant/imaginary_friend = ARCADE_WEIGHT_TRICK,
+		// END SPLURT EDIT
+
 		/mob/living/simple_animal/bot/secbot/grievous/toy = ARCADE_WEIGHT_RARE,
 		/obj/item/clothing/mask/facehugger/toy = ARCADE_WEIGHT_RARE,
 		/obj/item/gun/ballistic/automatic/toy/pistol/unrestricted = ARCADE_WEIGHT_TRICK,