Merge branch 'Bubberstation:master' into master

code/__DEFINES/~~bubber_defines/experisci.dm

@@ -0,0 +1,2 @@
+/// Experiment handlers with this flag will bypass the proximity flag check when trying to scan something
+#define EXPERIMENT_CONFIG_WORKS_FROM_RANGE (1 << 4)

code/__DEFINES/~~bubber_defines/traits.dm

@@ -6,3 +6,9 @@
 //Cyborg traits
 
 #define TRAIT_RESEARCH_CYBORG "research_cyborg"
+
+/// Cyborgs with unique sprites
+/// 32x32 quadruped skins with resting, sitting, and belly up sprites
+#define TRAIT_R_SQUADRUPED "squadruped_borg"
+// For light weight borgs
+#define TRAIT_R_LIGHT_WEIGHT "lightweight_borg"

code/_globalvars/traits/_traits.dm

@@ -678,6 +678,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_R_TALL" = TRAIT_R_TALL,
 		"TRAIT_R_SMALL" = TRAIT_R_SMALL,
 		"TRAIT_R_UNIQUEPANEL" = TRAIT_R_UNIQUEPANEL,
+		"TRAIT_R_SQUADRUPED" = TRAIT_R_SQUADRUPED, //BUBBER addition - for small quadruped 32x32 cyborgs
+		"TRAIT_R_LIGHT_WEIGHT" = TRAIT_R_LIGHT_WEIGHT, //BUBBER addition for small light weighted cyborgs
 		"TRAIT_REAGENT" = TRAIT_REAGENT,
 		"TRAIT_REVIVES_BY_HEALING" = TRAIT_REVIVES_BY_HEALING,
 		"TRAIT_RIGGER" = TRAIT_RIGGER,

code/_globalvars/traits/admin_tooling.dm

@@ -332,6 +332,8 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_R_TALL" = TRAIT_R_TALL,
 		"TRAIT_R_SMALL" = TRAIT_R_SMALL,
 		"TRAIT_R_UNIQUEPANEL" = TRAIT_R_UNIQUEPANEL,
+		"TRAIT_R_SQUADRUPED" = TRAIT_R_SQUADRUPED, //BUBBER addition - for small quadruped 32x32 cyborgs
+		"TRAIT_R_LIGHT_WEIGHT" = TRAIT_R_LIGHT_WEIGHT, //BUBBER addition for small light weighted cyborgs
 		"TRAIT_REAGENT" = TRAIT_REAGENT,
 		"TRAIT_REVIVES_BY_HEALING" = TRAIT_REVIVES_BY_HEALING,
 		"TRAIT_RIGGER" = TRAIT_RIGGER,

code/_onclick/cyborg.dm

@@ -14,7 +14,7 @@
 	if(check_click_intercept(params,A))
 		return
 
-	if(stat || (lockcharge) || IsParalyzed() || IsStun())
+	if(stat || (lockcharge) || IsParalyzed() || IsStun() || istype(loc, /obj/item/clothing/head/mob_holder)) //BUBBER EDIT - makes it so cyborgs that are holdable can not interact wile being held
 		return
 
 	var/list/modifiers = params2list(params)

code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm

@@ -572,7 +572,6 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
 		alarm_manager.send_alarm(ALARM_ATMOS)
 		if(pressure <= WARNING_LOW_PRESSURE && temp <= BODYTEMP_COLD_WARNING_1+10)
 			warning_message = "Danger! Low pressure and temperature detected."
-			heat_environment(environment) //BUBBERSTATION CHANGE: ADDS HEATING
 			return
 		if(pressure <= WARNING_LOW_PRESSURE && temp >= BODYTEMP_HEAT_WARNING_1-27)
 			warning_message = "Danger! Low pressure and high temperature detected."
@@ -582,7 +581,6 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
 			return
 		if(pressure >= WARNING_HIGH_PRESSURE && temp <= BODYTEMP_COLD_WARNING_1+10)
 			warning_message = "Danger! High pressure and low temperature detected."
-			heat_environment(environment) //BUBBERSTATION CHANGE: ADDS HEATING
 			return
 		if(pressure <= WARNING_LOW_PRESSURE)
 			warning_message = "Danger! Low pressure detected."
@@ -592,7 +590,6 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
 			return
 		if(temp <= BODYTEMP_COLD_WARNING_1+10)
 			warning_message = "Danger! Low temperature detected."
-			heat_environment(environment) //BUBBERSTATION CHANGE: ADDS HEATING
 			return
 		if(temp >= BODYTEMP_HEAT_WARNING_1-27)
 			warning_message = "Danger! High temperature detected."

code/modules/events/_event.dm

@@ -104,17 +104,12 @@
 	triggering = TRUE
 
 	// We sleep HERE, in pre-event setup (because there's no sense doing it in run_event() since the event is already running!) for the given amount of time to make an admin has enough time to cancel an event un-fitting of the present round.
-	if(alert_observers)
-				// message_admins("Random Event triggering in [DisplayTimeText(RANDOM_EVENT_ADMIN_INTERVENTION_TIME)]: [name]. (<a href='?src=[REF(src)];cancel=1'>CANCEL</a>) (<a href='?src=[REF(src)];different_event=1'>SOMETHING ELSE</a>)") // SKYRAT EDIT REMOVAL
-		sleep(RANDOM_EVENT_ADMIN_INTERVENTION_TIME)
-		var/players_amt = get_active_player_count(alive_check = TRUE, afk_check = TRUE, human_check = TRUE)
-		if(!can_spawn_event(players_amt))
-			message_admins("Second pre-condition check for [name] failed, rerolling...")
-			SSevents.spawnEvent(excluded_event = src)
-			return EVENT_INTERRUPTED
+	// if(alert_observers)
+	// 	message_admins("Random Event triggering in [DisplayTimeText(RANDOM_EVENT_ADMIN_INTERVENTION_TIME)]: [name]. (<a href='?src=[REF(src)];cancel=1'>CANCEL</a>) (<a href='?src=[REF(src)];different_event=1'>SOMETHING ELSE</a>)") // SKYRAT EDIT REMOVAL
+	// 	sleep(RANDOM_EVENT_ADMIN_INTERVENTION_TIME) // SKYRAT EDIT REMOVAL
 
-	// SKYRAT EDIT ADDITION BEGIN - Event notification
-	// BUBBER EDIT START - Only delay on roundstart
+		// SKYRAT EDIT ADDITION BEGIN - Event notification Makes an attention-grabbing sound, gives admins two notifications spread over RANDOM_EVENT_ADMIN_INTERVENTION_TIME instead of just the one.
+		// BUBBER EDIT START - Only delay on roundstart
 	if(SSticker.HasRoundStarted())
 		message_admins("<font color='[COLOR_ADMIN_PINK]'>Random Event triggering in [DisplayTimeText(RANDOM_EVENT_ADMIN_INTERVENTION_TIME)]: [name]. (\
 			<a href='?src=[REF(src)];cancel=1'>CANCEL</a> | \
@@ -129,7 +124,17 @@
 			<a href='?src=[REF(src)];cancel=1'>CANCEL</a> | \
 			<a href='?src=[REF(src)];different_event=1'>SOMETHING ELSE</a></font>")
 			sleep(RANDOM_EVENT_ADMIN_INTERVENTION_TIME * 0.5)
-	// SKYRAT EDIT ADDITION END - Event notification
+		// SKYRAT EDIT ADDITION END - Event notification
+		var/players_amt = get_active_player_count(alive_check = TRUE, afk_check = TRUE, human_check = TRUE)
+		if(!can_spawn_event(players_amt))
+			message_admins("Second pre-condition check for [name] failed, rerolling...")
+			SSevents.spawnEvent(excluded_event = src)
+			return EVENT_INTERRUPTED
+	if(!triggering)
+		return EVENT_CANCELLED //admin cancelled
+	triggering = FALSE
+	return EVENT_READY
+
 
 /datum/round_event_control/Topic(href, href_list)
 	..()

code/modules/experisci/experiment/handlers/experiment_handler.dm

@@ -132,6 +132,10 @@
 	if(!(config_flags & EXPERIMENT_CONFIG_IMMEDIATE_ACTION) && !do_after(user, 1 SECONDS * skill_modifier, target = target)) //SKYRAT EDIT: Research Skill (simple research)
 		return
 	if(action_experiment(source, target))
+		// BUBBERSTATION EDIT START
+		if (config_flags && EXPERIMENT_CONFIG_WORKS_FROM_RANGE)
+			user.Beam(target, icon_state = "rped_upgrade", time = 0.5 SECONDS)
+		// BUBBERSTATION EDIT END
 		playsound(user, 'sound/machines/ping.ogg', 25)
 		to_chat(user, span_notice("You scan [target]."))
 		user.mind.adjust_experience(/datum/skill/research, 5) //SKYRAT EDIT: Research Skill (simple research)

code/modules/mob/living/silicon/robot/robot.dm

@@ -477,7 +477,8 @@
  */
 /mob/living/silicon/robot/proc/toggle_headlamp(turn_off = FALSE, update_color = FALSE)
 	//if both lamp is enabled AND the update_color flag is on, keep the lamp on. Otherwise, if anything listed is true, disable the lamp.
-	if(!(update_color && lamp_enabled) && (turn_off || lamp_enabled || update_color || !lamp_functional || stat || low_power_mode))
+	//BUBBER EDIT - Disables flashlight when held
+	if(!(update_color && lamp_enabled) && (turn_off || lamp_enabled || update_color || !lamp_functional || stat || low_power_mode || istype(loc, /obj/item/clothing/head/mob_holder)))
 		set_light_on(lamp_functional && stat != DEAD && lamp_doom) //If the lamp isn't broken and borg isn't dead, doomsday borgs cannot disable their light fully.
 		set_light_color(COLOR_RED) //This should only matter for doomsday borgs, as any other time the lamp will be off and the color not seen
 		set_light_range(1) //Again, like above, this only takes effect when the light is forced on by doomsday mode.

code/modules/mob/living/silicon/robot/robot_model.dm

@@ -250,6 +250,10 @@
 	new_model.update_dogborg()
 	new_model.update_tallborg()
 	//SKYRAT EDIT ADDITION END
+	//BUBBER EDIT ADDTION BEGIN
+	new_model.update_squadruped()
+	new_model.update_lightweight()
+	//BUBBER EDIT ADDTION END
 
 	INVOKE_ASYNC(new_model, PROC_REF(do_transform_animation))
 	qdel(src)

html/changelogs/AutoChangeLog-pr-1502.yml

@@ -0,0 +1,4 @@
+author: "Majkl-J"
+delete-after: True
+changes:
+  - bugfix: "Fixes atmos dying"

html/changelogs/AutoChangeLog-pr-1525.yml

@@ -0,0 +1,5 @@
+author: "codehonky"
+delete-after: True
+changes:
+  - rscadd: "Added new bluespace experi-scanner."
+  - image: "Added a simple reskin of the experi-scanner for the bluespace variant."

html/changelogs/AutoChangeLog-pr-1639.yml

@@ -0,0 +1,6 @@
+author: "ChromeFoxxity"
+delete-after: True
+changes:
+  - rscadd: "Adds Security High-Vis Jacket Red and Blue variant."
+  - image: "Added icons of both variants."
+  - code_imp: "Added code for both variants."

html/changelogs/AutoChangeLog-pr-1641.yml

@@ -0,0 +1,8 @@
+author: "pixelkitty286"
+delete-after: True
+changes:
+  - rscadd: "holding code for cyborgs"
+  - rscdel: "Old 32x32 F3-LINE sprites"
+  - image: "32x32 F3-LINE sprites and a cargo variant"
+  - code_imp: "preventive flags to indicate when held"
+  - admin: "Two robot traits added to the trait list"

html/changelogs/AutoChangeLog-pr-1644.yml

@@ -0,0 +1,4 @@
+author: "theselfish"
+delete-after: True
+changes:
+  - rscadd: "Crewimov related modules are printable now."

html/changelogs/AutoChangeLog-pr-1648.yml

@@ -0,0 +1,4 @@
+author: "Sprites: axietheaxolotl Code: VioletN"
+delete-after: True
+changes:
+  - image: "Added three new selectable \"rat queen\" skins to the royal rat."

html/changelogs/AutoChangeLog-pr-1665.yml

@@ -0,0 +1,4 @@
+author: "theselfish"
+delete-after: True
+changes:
+  - bugfix: "Sex Barrier is now back. Scene? Scene? Scene? Scene? Scene?"

html/changelogs/AutoChangeLog-pr-1667.yml

@@ -0,0 +1,4 @@
+author: "nevimer"
+delete-after: True
+changes:
+  - qol: "allows the ghost to be voted for at any pop"

html/changelogs/AutoChangeLog-pr-1670.yml

@@ -0,0 +1,6 @@
+author: "theselfish"
+delete-after: True
+changes:
+  - rscadd: "Added some unused clothing items to the MultiSec Vendor. Perhaps you can find them if you're savvy enough with a Multitool."
+  - bugfix: "Fixed a few missing items not being in the MultiSec Vendor. Also removed a duplicate item."
+  - image: "New Multisec Vendor sprite. Two-Face edition."

html/changelogs/AutoChangeLog-pr-1673.yml

@@ -0,0 +1,4 @@
+author: "theselfish"
+delete-after: True
+changes:
+  - rscadd: "The Outlast items are no longer stuck in Loadout hell, yay!"

html/changelogs/AutoChangeLog-pr-1674.yml

@@ -0,0 +1,4 @@
+author: "Icarus-The-Sun"
+delete-after: True
+changes:
+  - bugfix: "Prevents Departmental Guards from rolling antagonist roles."

html/changelogs/AutoChangeLog-pr-1676.yml

@@ -0,0 +1,4 @@
+author: "Rathen Ivanov"
+delete-after: True
+changes:
+  - rscadd: "Added Employee Of The Month Special \"Chief Screws Plush\" for your use and carrying!"

html/changelogs/AutoChangeLog-pr-1680.yml

@@ -0,0 +1,4 @@
+author: "Shroopy"
+delete-after: True
+changes:
+  - bugfix: "fixed a copy-paste error in character_directory.dm"

html/changelogs/AutoChangeLog-pr-1682.yml

@@ -0,0 +1,4 @@
+author: "theselfish"
+delete-after: True
+changes:
+  - rscadd: "The Rat Monarch gender reveal party has been cancelled."

modular_skyrat/modules/borgs/code/robot.dm

@@ -103,7 +103,7 @@
  * model_features is defined in modular_skyrat\modules\altborgs\code\modules\mob\living\silicon\robot\robot_model.dm.
  */
 /mob/living/silicon/robot/proc/can_rest()
-	if(model && model.model_features && ((TRAIT_R_WIDE in model.model_features) || (TRAIT_R_TALL in model.model_features)))
+	if(model && model.model_features && ((TRAIT_R_WIDE in model.model_features) || (TRAIT_R_TALL in model.model_features) || (TRAIT_R_SQUADRUPED in model.model_features)))// BUBBER EDIT - added small quadrupeds
 		if(TRAIT_IMMOBILIZED in _status_traits)
 			return FALSE
 		return TRUE

modular_skyrat/modules/borgs/code/robot_items.dm

@@ -731,6 +731,7 @@
 	user.update_icons()
 	user.model.update_dogborg()
 	user.model.update_tallborg()
+	user.model.update_squadruped() //BUBBER ADDITION
 
 	if(listeningTo == user)
 		return

modular_skyrat/modules/borgs/code/robot_upgrade.dm

@@ -418,7 +418,7 @@
 	if(borg.hasAffection)
 		to_chat(usr, span_warning("This unit already has a affection module installed!"))
 		return FALSE
-	if(!(TRAIT_R_WIDE in borg.model.model_features))
+	if(!((TRAIT_R_SQUADRUPED in borg.model.model_features) || (TRAIT_R_WIDE in borg.model.model_features)))//BUBBER EDIT - added small quadruped borgs
 		to_chat(usr, span_warning("This unit's chassis does not support this module."))
 		return FALSE
 

modular_zubbers/code/game/machinery/vending/multisec.dm

@@ -1,7 +1,7 @@
 /obj/machinery/vending/wardrobe/sec_wardrobe
 	name = "\improper MultiSec Outfitting Station"
 	desc = "A vending machine stocked with a multitude of security outfits, including standardized uniforms in multiple colors and general equipment. Now with more Multi!"
-	icon = 'modular_zubbers/code/game/machinery/vending/multisec.dmi'
+	icon = 'modular_zubbers/icons/obj/machines/multisec.dmi'
 	icon_state = "multisec"
 	light_mask = null
 	products = list() // Overriding this to the default to prevent any issues when building the product menu
@@ -12,6 +12,7 @@
 			"products" = list(
 					/obj/item/clothing/suit/hooded/wintercoat/security = 6,
 					/obj/item/clothing/suit/toggle/jacket/sec = 6,
+					/obj/item/clothing/suit/armor/vest/secjacket/blue = 6,
 					/obj/item/clothing/suit/armor/vest/peacekeeper/brit = 6,
 					/obj/item/clothing/neck/security_cape = 6,
 					/obj/item/clothing/neck/security_cape/armplate = 6,
@@ -22,6 +23,11 @@
 					/obj/item/clothing/under/rank/security/officer = 10,
 					/obj/item/clothing/under/rank/security/officer/skirt/blue = 10,
 					/obj/item/clothing/under/rank/security/peacekeeper = 10,
+					/obj/item/clothing/under/rank/security/peacekeeper/skirt = 10,
+					/obj/item/clothing/under/rank/security/peacekeeper/shortskirt = 10,
+					/obj/item/clothing/under/rank/security/peacekeeper/miniskirt = 10,
+					/obj/item/clothing/under/rank/security/peacekeeper/trousers = 5,
+					/obj/item/clothing/under/rank/security/peacekeeper/trousers/shorts = 5,
 					/obj/item/clothing/under/rank/security/skyrat/utility = 6,
 					/obj/item/clothing/shoes/jackboots/sec = 10,
 					/obj/item/clothing/head/security_garrison = 10,
@@ -42,15 +48,23 @@
 					/obj/item/storage/backpack/satchel/sec/redsec = 6,
 					/obj/item/storage/backpack/duffelbag/sec/redsec = 6,
 					/obj/item/clothing/under/rank/security/officer/redsec = 6,
+					/obj/item/clothing/under/rank/security/peacekeeper/armadyne = 6,
+					/obj/item/clothing/under/rank/security/peacekeeper/armadyne/tactical = 6,
 					/obj/item/clothing/shoes/jackboots = 6,
+					/obj/item/clothing/shoes/jackboots/peacekeeper/armadyne = 6,
 					/obj/item/clothing/head/beret/sec = 6,
+					/obj/item/clothing/head/beret/sec/peacekeeper/armadyne = 6,
 					/obj/item/clothing/head/soft/sec = 6,
 					/obj/item/clothing/head/beaniesec = 6,
 					/obj/item/clothing/mask/bandana/red = 6,
 					/obj/item/clothing/gloves/color/black = 6,
+					/obj/item/clothing/gloves/combat/peacekeeper/armadyne = 6,
 					/obj/item/clothing/under/rank/security/officer/skirt = 6,
 					/obj/item/clothing/under/rank/security/skyrat/utility/redsec = 6,
 					/obj/item/clothing/suit/toggle/jacket/sec/old = 6,
+					/obj/item/clothing/suit/armor/vest/secjacket = 6,
+					/obj/item/clothing/suit/armor/vest/peacekeeper/armadyne = 6,
+					/obj/item/clothing/suit/armor/vest/peacekeeper/armadyne/armor = 6,
 				),
 			),
 		list(
@@ -75,12 +89,45 @@
 					/obj/item/clothing/head/beret/sec/navyofficer = 6,
 					/obj/item/clothing/under/rank/security/officer/formal = 6,
 					/obj/item/clothing/suit/jacket/officer/tan = 6,
-					/obj/item/clothing/head/beret/sec/navyofficer = 6,
 					/obj/item/clothing/head/helmet/metrocophelmet = 6,
 					/obj/item/clothing/suit/armor/metrocop = 6,
 					/obj/item/clothing/suit/armor/metrocopriot = 6,
+					/obj/item/clothing/accessory/badge/holo = 10, //I know there's a box of them but, why not have more, eh?
+					/obj/item/clothing/accessory/badge/holo/cord = 10,
+					/obj/item/clothing/head/helmet/blueshirt = 3,
+					/obj/item/clothing/suit/armor/vest/blueshirt = 3,
 	)
+
+//CONTRABAND: Basically for less serious/hard to cat stuff like the Cowboy and Bluecoat stuff. And for stuff that shouldn't be easy to get like HUD varients.
+
+
+	contraband = list(
+					/obj/item/clothing/under/colonial/nri_police = 3,
+					/obj/item/clothing/suit/british_officer = 3,
+					/obj/item/clothing/head/cowboy/skyrat/cattleman/sec = 3,
+					/obj/item/clothing/head/cowboy/skyrat/cattleman/wide/sec = 3,
+					/obj/item/clothing/head/fedora/det_hat/cybergoggles = 3,
+					/obj/item/clothing/glasses/hud/eyepatch/sec = 3, //No flash protection on the eyepatches, so they're worse than the sunnies.
+					/obj/item/clothing/glasses/hud/eyepatch/sec/blindfold = 3, //Ditto
+					/obj/item/clothing/glasses/hud/ar/aviator/security = 3, //Printable, but you have to choose between HUD and flash protection.
+					/obj/item/clothing/glasses/hud/ar/projector/security = 3,
+					/obj/item/clothing/mask/gas/sechailer/half_mask = 3,
+					/obj/item/clothing/under/rank/prisoner/classic = 6, //To be given to Prisoners.
+					/obj/item/clothing/head/hats/caphat/parade/fedcap/sec = 3,
+					/obj/item/clothing/suit/fedcoat/modern/sec = 3,
+					/obj/item/clothing/mask/gas/soviet = 3,
+					/obj/item/clothing/mask/gas/german = 3, //As far as I can tell, this is nowhere else in the game.
+					/obj/item/clothing/under/rank/security/corrections_officer = 2, //If, or more likely when the Brig Officers abandon them, you can now get 'em here! Yay! Wahoo!
+					/obj/item/clothing/under/rank/security/corrections_officer/skirt = 2,
+					/obj/item/clothing/under/rank/security/corrections_officer/sweater = 2,
+					/obj/item/clothing/under/rank/security/corrections_officer/sweater/skirt = 2,
+					/obj/item/clothing/suit/toggle/jacket/corrections_officer = 2,
+					/obj/item/clothing/head/soft/veteran = 1,
+					/obj/item/clothing/head/helmet/toggleable/justice = 1, //More than one of these in the Vendor and they'll get annoying fast. Hence why Justice2 isn't here.
+	)
+
 	payment_department = ACCOUNT_SEC
 
+
 /obj/item/vending_refill/wardrobe/sec_wardrobe
 	machine_name = "MultiSec Outfitting Station"

modular_zubbers/code/game/objects/items/plushes.dm

@@ -143,3 +143,13 @@
 	attack_verb_continuous = list("shoots (and misses)", "batongs", "annoys", "harmbatons", "magdumps")
 	attack_verb_simple = list("shot (and missed)", "batong", "annoy", "harmbaton", "magdump")
 	squeak_override = list('sound/weapons/gun/general/bolt_rack.ogg' = 1)
+
+/obj/item/toy/plush/cescrewsplush
+	name = "Chief Screws Plush" //Plush for Steals The Screwdriver/SteamStucKobold, sprited by stickygoat. and Amorbis
+	desc = "An adorable blue Lizard plushie wearing a Chief Engineer's Uniform, Rocket Boots, and Meson Goggles. It has a strange, silicone pocket on its underside..."
+	icon = 'modular_zubbers/icons/obj/toys/plushes.dmi'
+	icon_state = "cescrewsplush"
+	attack_verb_continuous = list("slaps", "plaps", "smears")
+	attack_verb_simple = list("slap", "plap", "smear")
+	gender = FEMALE
+	squeak_override = list('sound/misc/soggy.ogg'=1)