Merge remote-tracking branch 'upstream/master'

SPLURT-Station · Aug 8, 2024 · 33a7ac4 · 33a7ac4
2 parents 2913dc7 + 67801aa
commit 33a7ac4
Show file tree

Hide file tree

Showing 20 changed files with 3,587 additions and 3,558 deletions.
diff --git a/_maps/map_files/moonstation/moonstation.dmm b/_maps/map_files/moonstation/moonstation.dmm
diff --git a/code/__DEFINES/dcs/signals/signals_object.dm b/code/__DEFINES/dcs/signals/signals_object.dm
@@ -266,7 +266,6 @@
 
 ///from [/mob/living/carbon/human/Move]: ()
 #define COMSIG_SHOES_STEP_ACTION "shoes_step_action"
-#define COMSIG_NECK_STEP_ACTION "neck_step_action"	//Bubbers addition
 
 // /obj/item/implant signals
 ///from base of /obj/item/implant/proc/activate(): ()

diff --git a/code/__DEFINES/~~bubber_defines/signals.dm b/code/__DEFINES/~~bubber_defines/signals.dm
@@ -2,3 +2,5 @@
 #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"
+///from [/mob/living/carbon/human/Move]: ()
+#define COMSIG_NECK_STEP_ACTION "neck_step_action"
diff --git a/code/__DEFINES/~~bubber_defines/traits.dm b/code/__DEFINES/~~bubber_defines/traits.dm
@@ -13,3 +13,6 @@
 
 //For the hemophage quirk that allows hemophages to eat/drink normal food/drink.
 #define TRAIT_MASQUERADE_FOOD "masquerade_food"
+
+//basic security hud
+#define TRAIT_BASIC_SECURITY_HUD "basic_security_hud"
diff --git a/code/datums/components/squeak.dm b/code/datums/components/squeak.dm
@@ -43,8 +43,6 @@
 			RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop))
 			if(istype(parent, /obj/item/clothing/shoes))
 				RegisterSignal(parent, COMSIG_SHOES_STEP_ACTION, PROC_REF(step_squeak))
-			if(istype(parent, /obj/item/clothing/neck))
-				RegisterSignal(parent, COMSIG_NECK_STEP_ACTION, PROC_REF(step_squeak)) //Bubbers addition
 		else if(isstructure(parent))
 			RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(use_squeak))
 

diff --git a/code/datums/hud.dm b/code/datums/hud.dm
@@ -28,6 +28,7 @@ GLOBAL_LIST_INIT(trait_to_hud, list(
 	TRAIT_DIAGNOSTIC_HUD = DATA_HUD_DIAGNOSTIC,
 	TRAIT_BOT_PATH_HUD = DATA_HUD_BOT_PATH, // SKYRAT EDIT CHANGE
 	TRAIT_PERMIT_HUD = DATA_HUD_PERMIT, // SKYRAT EDIT ADDITION
+	TRAIT_BASIC_SECURITY_HUD = DATA_HUD_SECURITY_BASIC // BUBBER EDIT ADDITION
 ))
 
 /datum/atom_hud

diff --git a/code/modules/cargo/packs/organic.dm b/code/modules/cargo/packs/organic.dm
@@ -74,7 +74,6 @@
 		/obj/item/seeds/rainbow_bunch,
 		/obj/item/seeds/seedling,
 		/obj/item/seeds/shrub,
-		/obj/item/seeds/vaporsac, //Bubbers Addition
 		/obj/item/seeds/random = 2,
 	)
 	crate_name = "exotic seeds crate"

diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
@@ -621,7 +621,7 @@
 	name = "blue surgery cap"
 	icon_state = "surgicalcap"
 	desc = "A blue medical surgery cap to prevent the surgeon's hair from entering the insides of the patient!"
-	//flags_inv = HIDEHAIR //Cover your head doctor! (Bubber Edit: Disabled for preview QOL) //BUBBER TODO: Modularise
+	flags_inv = HIDEHAIR //Cover your head doctor!
 	w_class = WEIGHT_CLASS_SMALL //surgery cap can be easily crumpled
 
 /obj/item/clothing/head/utility/surgerycap/attack_self(mob/user)

diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -29,8 +29,6 @@
 	if(shoes && body_position == STANDING_UP && has_gravity(loc))
 		if((. && !moving_diagonally) || (!. && moving_diagonally == SECOND_DIAG_STEP))
 			SEND_SIGNAL(shoes, COMSIG_SHOES_STEP_ACTION)
-	if(wear_neck && body_position == STANDING_UP && loc == NewLoc && has_gravity(loc))
-		SEND_SIGNAL(wear_neck, COMSIG_NECK_STEP_ACTION) //Bubbers addition: Bell collars ring. (#1537) todo: modularize this
 
 /mob/living/carbon/human/Process_Spacemove(movement_dir = 0, continuous_move = FALSE)
 	if(movement_type & FLYING || HAS_TRAIT(src, TRAIT_FREE_FLOAT_MOVEMENT))

diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm
@@ -262,7 +262,11 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
 		if(locked)
 			to_chat(user, span_warning("The cover is locked and cannot be opened!"))
 		else
-			to_chat(user, span_notice("You open the cover."))
+			// BUBBER EDIT START
+			balloon_alert_to_viewers("Cover Opening...", "Opening Cover...", 1)
+			if(!do_after(user, 0.5 SECONDS))
+				return FALSE
+			// BUBBER EDIT START
 			opened = TRUE
 			update_icons()
 
@@ -356,6 +360,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
 		ResetModel()
 		return TRUE
 
+	scrambledcodes = TRUE // BUBBER EDIT START
 	SetEmagged(1)
 	SetStun(60) //Borgs were getting into trouble because they would attack the emagger before the new laws were shown
 	lawupdate = FALSE

diff --git a/html/changelogs/AutoChangeLog-pr-1871.yml b/html/changelogs/AutoChangeLog-pr-1871.yml
@@ -0,0 +1,4 @@
+author: "StrangeWeirdKitten"
+delete-after: True
+changes:
+  - balance: "Emagging a borg will now scramble its codes plus opening the cover has a delay"
diff --git a/html/changelogs/AutoChangeLog-pr-1913.yml b/html/changelogs/AutoChangeLog-pr-1913.yml
@@ -0,0 +1,4 @@
+author: "BurgerBB"
+delete-after: True
+changes:
+  - bugfix: "Fixes even more moonstation issues."
diff --git a/html/changelogs/AutoChangeLog-pr-1914.yml b/html/changelogs/AutoChangeLog-pr-1914.yml
@@ -0,0 +1,4 @@
+author: "Odairu"
+delete-after: True
+changes:
+  - refactor: "modularizes a few things"
diff --git a/html/changelogs/AutoChangeLog-pr-1920.yml b/html/changelogs/AutoChangeLog-pr-1920.yml
@@ -0,0 +1,4 @@
+author: "Odairu"
+delete-after: True
+changes:
+  - code_imp: "changed basic sec hud into a trait"
diff --git a/modular_zubbers/code/datums/components/squeak.dm b/modular_zubbers/code/datums/components/squeak.dm
@@ -0,0 +1,4 @@
+/datum/component/squeak/Initialize(custom_sounds, volume_override, chance_override, step_delay_override, use_delay_override, extrarange, falloff_exponent, fallof_distance)
+	. = ..()
+	if(istype(parent, /obj/item/clothing/neck))
+		RegisterSignal(parent, COMSIG_NECK_STEP_ACTION, PROC_REF(step_squeak))
diff --git a/modular_zubbers/code/modules/cargo/packs/service.dm b/modular_zubbers/code/modules/cargo/packs/service.dm
@@ -5,3 +5,7 @@
 	contains = list(/obj/machinery/jukebox)
 	crate_type = /obj/structure/closet/crate/large
 	access_view = ACCESS_BAR
+
+/datum/supply_pack/organic/exoticseeds/New()
+	. = ..()
+	contains += /obj/item/seeds/vaporsac
diff --git a/modular_zubbers/code/modules/clothing/head/jobs.dm b/modular_zubbers/code/modules/clothing/head/jobs.dm
@@ -46,6 +46,9 @@
 	icon_state = "beanie_sec"
 	armor_type = /datum/armor/beanie_sec
 
+/obj/item/clothing/head/utility/surgerycap
+	flags_inv = null
+
 /datum/armor/beanie_sec
 	melee = 30
 	bullet = 25

diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/human.dm b/modular_zubbers/code/modules/mob/living/carbon/human/human.dm
@@ -5,3 +5,8 @@
 // This is expected to be called or used in situations where you already know the mob is dead
 /mob/living/carbon/human/proc/get_dnr()
 	return stat ? ((HAS_TRAIT(src, TRAIT_DNR) && !((src.mind?.get_ghost(FALSE, TRUE)) ? 1 : 0))) : 0
+
+/mob/living/carbon/human/Move(NewLoc, direct)
+	. = ..()
+	if(wear_neck && body_position == STANDING_UP && loc == NewLoc && has_gravity(loc))
+		SEND_SIGNAL(wear_neck, COMSIG_NECK_STEP_ACTION)
diff --git a/modular_zubbers/code/modules/security/secmed/security_medic.dm b/modular_zubbers/code/modules/security/secmed/security_medic.dm
@@ -100,22 +100,7 @@
 	icon = 'modular_zubbers/code/modules/security/secmed/icons/secmed_equipment.dmi'
 	icon_state = "hud"
 	worn_icon_state = "healthhud"
-	clothing_traits = list(TRAIT_MEDICAL_HUD)
-
-/obj/item/clothing/glasses/hud/secmed/equipped(mob/living/carbon/human/user, slot)
-	. = ..()
-	if(!(slot & ITEM_SLOT_EYES))
-		return
-	// Extra hud because the bloody code doesn't support multihuds yet. I'll probably add multihud support soon enough. If you see this I didn't. ~Waterpig
-	var/datum/atom_hud/extra_hud = GLOB.huds[DATA_HUD_SECURITY_BASIC]
-	extra_hud.show_to(user)
-
-/obj/item/clothing/glasses/hud/secmed/dropped(mob/living/carbon/human/user)
-	. = ..()
-	if(!istype(user) || user.glasses != src)
-		return
-	var/datum/atom_hud/extra_hud = GLOB.huds[DATA_HUD_SECURITY_BASIC]
-	extra_hud.hide_from(user)
+	clothing_traits = list(TRAIT_MEDICAL_HUD, TRAIT_BASIC_SECURITY_HUD)
 
 /obj/item/clothing/glasses/hud/secmed/sunglasses
 	name = "security-medical HUD sunglasses"

diff --git a/tgstation.dme b/tgstation.dme
@@ -8570,6 +8570,7 @@
 #include "modular_zubbers\code\datums\bubber_quirks\hydrophilic.dm"
 #include "modular_zubbers\code\datums\bubber_quirks\neutral.dm"
 #include "modular_zubbers\code\datums\bubber_quirks\petowner.dm"
+#include "modular_zubbers\code\datums\components\squeak.dm"
 #include "modular_zubbers\code\datums\components\crafting\furniture.dm"
 #include "modular_zubbers\code\datums\components\crafting\tailoring.dm"
 #include "modular_zubbers\code\datums\components\crafting\utility.dm"