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

code/modules/admin/view_variables/debug_variable_appearance.dm

@@ -59,25 +59,23 @@ GLOBAL_DATUM_INIT(pluto, /atom/movable, new /atom/movable(null))
 	if(beloved.vars.Find(var_name)) // If datums have it, get out
 		return FALSE
 	// If it is one of the two args on /image, yeet (I am sorry)
-	if(var_name == NAMEOF(src, realized_overlays))
+	if(var_name == "realized_overlays")
 		return FALSE
-	if(var_name == NAMEOF(src, realized_underlays))
+	if(var_name == "realized_underlays")
 		return FALSE
 	// Filtering out the stuff I know we don't care about
-	if(var_name == NAMEOF(src, x))
+	if(var_name == "x")
 		return FALSE
-	if(var_name == NAMEOF(src, y))
+	if(var_name == "y")
 		return FALSE
-	if(var_name == NAMEOF(src, z))
+	if(var_name == "z")
 		return FALSE
 	// Could make an argument for these but I think they will just confuse people, so yeeet
-#ifndef SPACEMAN_DMM // Spaceman doesn't believe in contents on appearances, sorry lads
-	if(var_name == NAMEOF(src, contents))
+	if(var_name == "contents")
 		return FALSE
-#endif
-	if(var_name == NAMEOF(src, loc))
+	if(var_name == "loc")
 		return FALSE
-	if(var_name == NAMEOF(src, vis_contents))
+	if(var_name == "vis_contents")
 		return FALSE
 	return ..()
 

code/modules/mob/living/carbon/human/species_types/ipc.dm

@@ -7,9 +7,9 @@
 	sexes = 0
 	inherent_traits = list(TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT,TRAIT_NO_PROCESS_FOOD, TRAIT_ROBOTIC_ORGANISM, TRAIT_RESISTLOWPRESSURE, TRAIT_NOBREATH, TRAIT_AUXILIARY_LUNGS)
 	species_traits = list(MUTCOLORS,NOEYES,NOTRANSSTING,HAS_FLESH,HAS_BONE,HAIR,ROBOTIC_LIMBS)
-	hair_alpha = 210
+	hair_alpha = 255
 	inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID
-	mutant_bodyparts = list("ipc_screen" = "Blank", "deco_wings" = "None", "ipc_antenna" = "None")
+	mutant_bodyparts = list("ipc_screen" = "Blank", "deco_wings" = "None", "ipc_antenna" = "None", "mam_tail" = "None", "mam_ears" = "None", "horns" = "None")
 	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
 	gib_types = list(/obj/effect/gibspawner/ipc, /obj/effect/gibspawner/ipc/bodypartless)
 

html/changelogs/archive/2024-10.yml

@@ -28,3 +28,33 @@
 2024-10-25:
   SaraSayomi:
   - bugfix: 4nal tubes
+2024-10-30:
+  LeDrascol:
+  - tweak: Storage Concealment implant uses new SFX
+  - tweak: Storage Concealment implant now has a one-second cooldown
+  - tweak: Storage Concealment implant chat messages now display what you're wearing
+  - tweak: Storage Concealment implant will not produce SFX without a back item
+  SaraSayomi:
+  - rscadd: More fire safety in the halls
+  - rscadd: More intercoms
+  - tweak: Hydro is now bigger
+  - bugfix: Maints names now follow department and floor over direction and floor
+  - bugfix: Departments better differ from upper, lower, and mid
+  - rscadd: Certain rooms have names now
+  - rscadd: Service lathe is now easier for hydro and cooks to reach
+  - tweak: Wolf pit is now harder to break out of, indestrucable on directions facing
+      maints, but see through to make up for it- Thanks Takumi
+  - rscadd: Sec gets a very specific warning
+  - rscadd: New area names
+  - tweak: Engineering shower now shows some departmental pride
+  - rscadd: Departures now has tiny fans at the airlock
+  - tweak: HoP bully hole is now slightly easier to notice
+  - tweak: APCs are standardized
+  - bugfix: Fixed the kitchen wheelies
+  - rscadd: Engi stuff, (please leave me alone, it's 2 am and I work at 7)
+  - bugfix: Cargo door access bullshit
+  - bugfix: Some firelock direction stuff
+  - rscadd: Clown and mime office is now above the department known to explode, enjoy!
+  cyfause:
+  - tweak: enables tail + horns + ears bodyparts for ipc characters
+  - tweak: disables opacity on ipc character hair

html/changelogs/archive/2024-11.yml

@@ -0,0 +1,5 @@
+2024-11-03:
+  Meghan-Rossi:
+  - server: Server can now be compiled on byond 515.1543
+  MosleyTheMalO:
+  - bugfix: Fixes the snap on dominant aura

modular_splurt/code/datums/traits/good.dm

@@ -92,12 +92,11 @@
 		sub.dir = turn(get_dir(sub, quirk_holder), pick(-90, 90))
 		sub.emote("blush")
 
-/datum/quirk/dominant_aura/proc/handle_snap(datum/source, list/emote_args)
+/datum/quirk/dominant_aura/proc/handle_snap(datum/source, datum/emote/emote)
 	SIGNAL_HANDLER
 
 	. = FALSE
-	var/key = GLOB.emote_list[lowertext(emote_args[EMOTE_ACT])]
-	if(TIMER_COOLDOWN_CHECK(quirk_holder, COOLDOWN_DOMINANT_SNAP) || !findtext(key, "snap"))
+	if(TIMER_COOLDOWN_CHECK(quirk_holder, COOLDOWN_DOMINANT_SNAP) || !findtext(emote.key, "snap"))
 		return
 	for(var/mob/living/carbon/human/sub in hearers(DOMINANT_DETECT_RANGE, quirk_holder))
 		if(!sub.has_quirk(/datum/quirk/well_trained) || (sub == quirk_holder))
@@ -108,7 +107,7 @@
 				good_x = "boy"
 			if(FEMALE)
 				good_x = "girl"
-		switch(key)
+		switch(emote.key)
 			if("snap")
 				sub.dir = get_dir(sub, quirk_holder)
 				sub.emote(pick("blush", "pant"))

modular_splurt/code/game/objects/items/implants/implant_hide_backpack.dm

@@ -39,15 +39,22 @@
 	// Is this being used?
 	var/ability_active = TRUE
 
+	// Cooldown variables
+	var/cooldown = 1 SECONDS
+	var/last_use = 0
+
+	// Effect used when toggling
+	var/obj/effect/temp_visual/effect_toggle = /obj/effect/temp_visual/telekinesis
+
 // Runs on gaining the ability
-/datum/action/item_action/hide_backpack/Grant(mob/user)
+/datum/action/item_action/hide_backpack/Grant(mob/grant_to)
 	. = ..()
 
 	// Add the trait
 	adjust_trait(TRUE)
 
 // Runs on losing the ability
-/datum/action/item_action/hide_backpack/Remove(mob/user)
+/datum/action/item_action/hide_backpack/Remove(mob/remove_from)
 	// Remove the trait (must be done before removal so that owner still exists)
 	adjust_trait(FALSE)
 	return ..()
@@ -67,10 +74,19 @@
 	action_owner.update_inv_back()
 
 // Runs on toggling the ability
-/datum/action/item_action/hide_backpack/Trigger()
+/datum/action/item_action/hide_backpack/Trigger(trigger_flags)
+	// Check for cooldown
+	if(last_use + cooldown > world.time)
+		// Warn user and return
+		to_chat(owner, span_warning("The Storage Concealment implant is still recharging!"))
+		return
+
 	// Set owner
 	var/mob/living/carbon/human/action_owner = owner
 
+	// Set last use time
+	last_use = world.time
+
 	// Update active status
 	ability_active = !ability_active
 
@@ -90,15 +106,37 @@
 	// Update icon state
 	UpdateButtons()
 
+	// Define back item slot
+	var/obj/item/item_backpack = action_owner.get_item_by_slot(ITEM_SLOT_BACK)
+
+	// Check if a back item exists
+	if(!istype(item_backpack))
+		// This is not a valid back item!
+		// Alert user
+		to_chat(action_owner, span_notice("You toggle the Storage Concealment implant, but nothing seems to happen. Try wearing something on your back."))
+
+		// Exit without effect or message
+		return
+
 	// Display fake sparks to match flavor text
-	do_fake_sparks(2,FALSE,action_owner)
+	// Replaced by new temporary effect
+	//do_fake_sparks(2,FALSE,action_owner)
+
+	// Define mob location
+	var/current_turf = get_turf(action_owner)
+
+	// Create particle effect
+	spawn_atom_to_turf(effect_toggle, current_turf, 1, FALSE)
+
+	// Play sound
+	playsound(current_turf, 'sound/effects/chairwhoosh.ogg', 50, 1)
 
 	// Set toggle text based on active state
 	var/implant_toggle_text = (!ability_active ? "discernible" : "imperceptible")
 	var/implant_toggle_text_2 = (!ability_active ? "dis" : "") // Engage or Disengage
 
 	// Display a chat message
-	action_owner.visible_message(span_notice("The equipment worn on [action_owner]'s back-region flickers momentarily, before becoming [implant_toggle_text]."), span_notice("You [implant_toggle_text_2]engage the Storage Concealment Implant, causing your backpack to be [implant_toggle_text]."))
+	action_owner.visible_message(span_notice("[item_backpack] worn by [action_owner] flickers momentarily, before becoming [implant_toggle_text]."), span_notice("You [implant_toggle_text_2]engage the Storage Concealment implant, causing [item_backpack] to be [implant_toggle_text]."))
 
 /*
  * Implant items

tgstation.dme

@@ -4922,7 +4922,6 @@
 #include "modular_splurt\code\modules\mining\equipment\kinetic_crusher.dm"
 #include "modular_splurt\code\modules\mining\equipment\machine_vending.dm"
 #include "modular_splurt\code\modules\mining\lavaland\necropolis_chests.dm"
-#include "modular_splurt\code\modules\mob\emote.dm"
 #include "modular_splurt\code\modules\mob\femclaw.dm"
 #include "modular_splurt\code\modules\mob\inventory.dm"
 #include "modular_splurt\code\modules\mob\mob.dm"