Merge branch 'Bubberstation:master' into master

code/__DEFINES/~~bubber_defines/signals.dm

@@ -1,2 +1,4 @@
 // Signal sent when the morgue tray throws its alarm
 #define COMSIG_MORGUE_ALARM "morgue_alarm"
+// Can be sent whenever an object's name is changed so components can be properly updated as well
+#define COMSIG_NAME_CHANGED "name_changed"

code/modules/loadout/loadout_items.dm

@@ -297,6 +297,7 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories())
 			renamed = 1
 		if(renamed)
 			ADD_TRAIT(equipped_item, TRAIT_WAS_RENAMED, "Loadout")
+			SEND_SIGNAL(equipped_item, COMSIG_NAME_CHANGED) // BUBBER EDIT
 	// SKYRAT EDIT END
 
 	if(can_be_reskinned && item_details?[INFO_RESKIN])

html/changelogs/AutoChangeLog-pr-1726.yml

@@ -0,0 +1,4 @@
+author: "Shroopy"
+delete-after: True
+changes:
+  - rscadd: "Added a GPS tracking collar to the LustWish"

html/changelogs/AutoChangeLog-pr-1822.yml

@@ -0,0 +1,4 @@
+author: "LT3"
+delete-after: True
+changes:
+  - qol: "Improved alarm function on medbay's crew monitor console"

html/changelogs/AutoChangeLog-pr-1823.yml

@@ -0,0 +1,4 @@
+author: "StrangeWeirdKitten"
+delete-after: True
+changes:
+  - balance: "Emote delay has been set to 1 second"

html/changelogs/AutoChangeLog-pr-1824.yml

@@ -0,0 +1,4 @@
+author: "Majkl-J"
+delete-after: True
+changes:
+  - bugfix: "Blue 98 UI Style fixes"

modular_skyrat/modules/GAGS/json_configs/collar/gps.json

@@ -0,0 +1,22 @@
+{
+	"gps": [
+
+		{
+			"type": "icon_state",
+			"icon_state": "collar_band_gray",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "collar_tracker_gray",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "collar_screen",
+			"blend_mode": "overlay"
+		}
+	]
+}

modular_skyrat/modules/GAGS/json_configs/collar/gps_lefthand.json

@@ -0,0 +1,16 @@
+{
+	"gps": [
+		{
+			"type": "icon_state",
+			"icon_state": "collar_inhand_tracker_l_gray",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "collar_inhand_band_l_gray",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

modular_skyrat/modules/GAGS/json_configs/collar/gps_righthand.json

@@ -0,0 +1,16 @@
+{
+	"gps": [
+		{
+			"type": "icon_state",
+			"icon_state": "collar_inhand_tracker_r_gray",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "collar_inhand_band_r_gray",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

modular_skyrat/modules/GAGS/json_configs/collar/gps_worn.json

@@ -0,0 +1,16 @@
+{
+	"gps": [
+		{
+			"type": "icon_state",
+			"icon_state": "collar_mob_tracker_gray",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "collar_mob_band_gray",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

modular_skyrat/modules/emotes/code/emotes.dm

@@ -1,11 +1,11 @@
 
-#define EMOTE_DELAY (5 SECONDS) //To prevent spam emotes.
+#define EMOTE_DELAY (1 SECONDS) //To prevent spam emotes. - BUBBER EDIT 5 to 1 SECOND CHANGE IN COOLDOWN
 
 /mob
 	var/nextsoundemote = 1 //Time at which the next emote can be played
 
 /datum/emote
-	// cooldown = EMOTE_DELAY BUBBERSTATION CHANGE: REMOVES ABSURD EMOTE DELAY
+	cooldown = EMOTE_DELAY
 	var/muzzle_ignore = FALSE
 
 //Disables the custom emote blacklist from TG that normally applies to slimes.

modular_zubbers/code/game/machinery/crew_monitor.dm

@@ -1,11 +1,12 @@
 #define SENSORS_UPDATE_PERIOD 15 SECONDS //Why is this not a global define, why do I have to define it again
-
+#define ALARM_PERIOD 45 SECONDS
 
 /obj/machinery/computer/crew
 	luminosity = 1
-	light_power = 3
+	light_power = 1.4
+	light_range = 1.7
 	var/canalarm = FALSE
-
+	COOLDOWN_DECLARE(alarm_cooldown)
 
 /obj/machinery/computer/crew/Initialize(mapload, obj/item/circuitboard/C)
 	. = ..()
@@ -21,20 +22,27 @@
 		if(mob.z != src.z  && !HAS_TRAIT(mob, TRAIT_MULTIZ_SUIT_SENSORS))
 			continue
 		var/obj/item/clothing/under/uniform = mob.w_uniform
-		if(uniform.sensor_mode >= SENSOR_VITALS && (HAS_TRAIT(mob, TRAIT_CRITICAL_CONDITION) || mob.stat == DEAD))
+		if(uniform.sensor_mode == SENSOR_COORDS && (uniform.has_sensor != BROKEN_SENSORS) && (HAS_TRAIT(mob, TRAIT_CRITICAL_CONDITION) || mob.stat == DEAD))
 			if(mob.get_dnr()) // DNR won't beep anymore
 				continue
 			canalarm = TRUE
 			break // Why wasn't this here?
 
 	if(canalarm)
-		playsound(src, 'sound/machines/twobeep.ogg', 50, TRUE)
-		set_light((initial(light_range) + 3), 3, CIRCUIT_COLOR_SECURITY, TRUE)
-		spasm_animation(10)
+		icon_keyboard = "syndie_key"
+		update_appearance()
+		set_light(l_range = 1.9, l_power = 5, l_color = CIRCUIT_COLOR_SECURITY, l_on = TRUE)
+		if(COOLDOWN_FINISHED(src, alarm_cooldown))
+			playsound(source = src, soundin = 'sound/machines/twobeep.ogg', vol = 50, vary = TRUE)
+			spasm_animation(1 SECONDS)
+			COOLDOWN_START(src, alarm_cooldown, ALARM_PERIOD)
 	else
-		set_light((initial(light_range)), initial(light_power), initial(light_color), TRUE)
+		icon_keyboard = "med_key"
+		update_appearance()
+		set_light(l_range = initial(light_range), l_power = initial(light_power), l_color = initial(light_color), l_on = TRUE)
 	addtimer(CALLBACK(src, .proc/alarm), SENSORS_UPDATE_PERIOD) // Fix this for 515
 
 	return canalarm
 
 #undef SENSORS_UPDATE_PERIOD
+#undef ALARM_PERIOD

modular_zubbers/code/modules/GAGS/greyscale_configs.dm

@@ -11,6 +11,24 @@
 	name = "Ring Bell Collar (Worn)"
 	json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/ringbell_worn.json'
 
+
+/datum/greyscale_config/collar/gps
+	name = "GPS Collar"
+	icon_file = 'modular_zubbers/code/modules/GAGS/icons/collar.dmi'
+	json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/gps.json'
+
+/datum/greyscale_config/collar/gps/worn
+	name = "GPS Collar (Worn)"
+	json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/gps_worn.json'
+
+/datum/greyscale_config/collar/gps/lefthand
+	name = "GPS Collar (Left hand)"
+	json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/gps_lefthand.json'
+
+/datum/greyscale_config/collar/gps/righthand
+	name = "GPS Collar (Right hand)"
+	json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/gps_righthand.json'
+
 //Bunny stuff, sprites from MonkieStation
 
 /datum/greyscale_config/bunnysuit
@@ -62,3 +80,4 @@
 	name = "Worn Playbunny Ears"
 	icon_file = 'modular_zubbers/icons/mob/clothing/head/bunnyears.dmi'
 	json_config = 'modular_skyrat/modules/GAGS/json_configs/bunny_stuff/playbunny_ears_worn.json'
+

modular_zubbers/code/modules/clothing/neck/collars.dm

@@ -9,3 +9,71 @@
 /obj/item/clothing/neck/human_petcollar/locked/ringbell/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/squeak, list('modular_zubbers/sound/misc/collarbell1.ogg'=1,'modular_zubbers/sound/misc/collarbell2.ogg'=1), 50, 100, 8)
+
+/obj/item/clothing/neck/kink_collar/locked/gps
+	name = "tracking collar"
+	desc = "A collar that lets you find your pet anywhere with GPS!"
+	var/datum/component/gps/gps
+	icon_state = "gps"
+	greyscale_config = /datum/greyscale_config/collar/gps
+	greyscale_config_worn = /datum/greyscale_config/collar/gps/worn
+	greyscale_config_inhand_left = /datum/greyscale_config/collar/gps/lefthand
+	greyscale_config_inhand_right = /datum/greyscale_config/collar/gps/righthand
+	greyscale_colors = "#8B96B7#505665"
+	flags_1 = IS_PLAYER_COLORABLE_1
+	unique_reskin = null
+	resistance_flags = FIRE_PROOF
+
+/obj/item/clothing/neck/kink_collar/locked/gps/Initialize(mapload)
+	. = ..()
+	atom_storage.click_alt_open = FALSE
+	gps = AddComponent(/datum/component/gps, name)
+	register_context()
+	update_icon(UPDATE_OVERLAYS)
+	RegisterSignal(src, COMSIG_NAME_CHANGED, PROC_REF(on_update_name))
+
+/obj/item/clothing/neck/kink_collar/locked/gps/proc/on_update_name()
+	SIGNAL_HANDLER
+	gps.gpstag = name
+
+/obj/item/clothing/neck/kink_collar/locked/gps/attack_self(mob/user)
+	. = ..()
+	gps.gpstag = tagname
+
+/obj/item/clothing/neck/kink_collar/locked/gps/examine(mob/user)
+	. = ..()
+	. += span_notice("Alt-click to [gps.tracking ? "disable":"enable"] tracking.")
+
+///Calls toggletracking
+/obj/item/clothing/neck/kink_collar/locked/gps/click_alt(mob/user)
+	if(locked)
+		balloon_alert(user, "it's locked!")
+		playsound(src, 'sound/items/click.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+	else
+		toggletracking(user)
+		balloon_alert(user, "tracking [gps.tracking ? "enabled":"disabled"]")
+		playsound(src, 'sound/machines/click.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+	return CLICK_ACTION_SUCCESS
+
+/obj/item/clothing/neck/kink_collar/locked/gps/proc/toggletracking(mob/user)
+	gps.tracking = !gps.tracking
+	update_icon(UPDATE_OVERLAYS)
+	user.update_worn_neck()
+
+/obj/item/clothing/neck/kink_collar/locked/gps/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+	. = ..()
+	if(!locked)
+		context[SCREENTIP_CONTEXT_ALT_LMB] = "[gps.tracking ? "Disable":"Enable"] tracking"
+		return CONTEXTUAL_SCREENTIP_SET
+
+/obj/item/clothing/neck/kink_collar/locked/gps/update_overlays()
+	. = ..()
+	if(gps.tracking)
+		. += mutable_appearance('modular_zubbers/code/modules/GAGS/icons/collar.dmi', "light")
+		. += emissive_appearance('modular_zubbers/code/modules/GAGS/icons/collar.dmi', "light", src, alpha = src.alpha)
+
+/obj/item/clothing/neck/kink_collar/locked/gps/worn_overlays(mutable_appearance/standing, isinhands = FALSE)
+	. = ..()
+	if(gps.tracking && !isinhands)
+		. += mutable_appearance('modular_zubbers/code/modules/GAGS/icons/collar.dmi', "collar_mob_tracker_light")
+		. += emissive_appearance('modular_zubbers/code/modules/GAGS/icons/collar.dmi', "collar_mob_tracker_light", src, alpha = src.alpha)

modular_zubbers/code/modules/loadout/categories/neck.dm

@@ -7,6 +7,10 @@
 	name = "Ringing Bell Collar"
 	item_path = /obj/item/clothing/neck/human_petcollar/locked/ringbell
 
+/datum/loadout_item/neck/gps
+	name = "Tracking Collar"
+	item_path = /obj/item/clothing/neck/kink_collar/locked/gps
+
 /datum/loadout_item/neck/binary
 	name = "Crow Feather Cloak"
 	item_path = /obj/item/clothing/neck/binary

modular_zubbers/code/modules/vending/armadyne.dm

@@ -0,0 +1,4 @@
+/obj/machinery/vending/security
+	zubbers_contraband = list(
+		/obj/item/clothing/neck/kink_collar/locked/gps = 3,
+	)

modular_zubbers/code/modules/vending/lustwish.dm

@@ -23,10 +23,11 @@
 	)
 
 	zubbers_premium = list(
-	/obj/item/holosign_creator/sex = 6,
-	/obj/item/clothing/under/mikubikini = 3,
-	/obj/item/clothing/suit/mikujacket = 3,
-	/obj/item/clothing/head/mikuhair = 3,
-	/obj/item/clothing/gloves/mikugloves = 3,
-	/obj/item/clothing/shoes/sneakers/mikuleggings = 3,
+		/obj/item/clothing/neck/kink_collar/locked/gps = 3,
+		/obj/item/holosign_creator/sex = 6,
+		/obj/item/clothing/under/mikubikini = 3,
+		/obj/item/clothing/suit/mikujacket = 3,
+		/obj/item/clothing/head/mikuhair = 3,
+		/obj/item/clothing/gloves/mikugloves = 3,
+		/obj/item/clothing/shoes/sneakers/mikuleggings = 3,
 	)

tgstation.dme

@@ -9052,6 +9052,7 @@
 #include "modular_zubbers\code\modules\uplink\uplink_items\dangerous.dm"
 #include "modular_zubbers\code\modules\uplink\uplink_items\device_tools.dm"
 #include "modular_zubbers\code\modules\uplink\uplink_items\job.dm"
+#include "modular_zubbers\code\modules\vending\armadyne.dm"
 #include "modular_zubbers\code\modules\vending\clothmate.dm"
 #include "modular_zubbers\code\modules\vending\comdrobe.dm"
 #include "modular_zubbers\code\modules\vending\games.dm"