Merge branch 'Monkestation:master' into maps

code/game/gamemodes/dynamic/dynamic.dm

@@ -308,26 +308,26 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 				show_core_territory = !show_core_territory
 
 			if (show_core_territory)
-				. += "Advisory Level: <b>Chimpcon 1</b></center><BR>"
-				. += "Your sector's advisory level is Chimpcon 1. At this threat advisory, the risk of attacks on Nanotrasen assets within the sector is minor, but cannot be ruled out entirely. Remain vigilant."
+				. += "Advisory Level: <b>Blue Star</b></center><BR>"
+				. += "Your sector's advisory level is Blue Star. At this threat advisory, the risk of attacks on Nanotrasen assets within the sector is minor, but cannot be ruled out entirely. Remain vigilant."
 			else
-				. += "Advisory Level: <b>Chimpcon 0</b></center><BR>"
-				. += "Your sector's advisory level is Chimpcon 0. Surveillance information shows no credible threats to Nanotrasen assets within the Spinward Sector at this time. As always, the Department advises maintaining vigilance against potential threats, regardless of a lack of known threats."
+				. += "Advisory Level: <b>Green Star</b></center><BR>"
+				. += "Your sector's advisory level is Green Star. Surveillance information shows no credible threats to Nanotrasen assets within the Spinward Sector at this time. As always, the Department advises maintaining vigilance against potential threats, regardless of a lack of known threats."
 		if(20 to 39)
-			. += "Advisory Level: <b>Chimpcon 2</b></center><BR>"
-			. += "Your sector's advisory level is Chimpcon 2. Surveillance shows a credible risk of enemy attack against our assets in the Spinward Sector. We advise a heightened level of security, alongside maintaining vigilance against potential threats."
+			. += "Advisory Level: <b>Yellow Star</b></center><BR>"
+			. += "Your sector's advisory level is Yellow Star. Surveillance shows a credible risk of enemy attack against our assets in the Spinward Sector. We advise a heightened level of security, alongside maintaining vigilance against potential threats."
 		if(40 to 65)
-			. += "Advisory Level: <b>Chimpcon 3</b></center><BR>"
-			. += "Your sector's advisory level is Chimpcon 3. Upon reviewing your sector's intelligence, the Department has determined that the risk of enemy activity is moderate to severe. At this advisory, we recommend maintaining a higher degree of security and alertness, and vigilance against threats that may (or will) arise."
+			. += "Advisory Level: <b>Orange Star</b></center><BR>"
+			. += "Your sector's advisory level is Orange Star. Upon reviewing your sector's intelligence, the Department has determined that the risk of enemy activity is moderate to severe. At this advisory, we recommend maintaining a higher degree of security and alertness, and vigilance against threats that may (or will) arise."
 		if(66 to 79)
-			. += "Advisory Level: <b>Chimpcon 4</b></center><BR>"
-			. += "Your sector's advisory level is Chimpcon 4. The Department of Intelligence has decrypted Cybersun communications suggesting a high likelihood of attacks on Nanotrasen assets within the Spinward Sector. Stations in the region are advised to remain highly vigilant for signs of enemy activity and to be on high alert."
+			. += "Advisory Level: <b>Red Star</b></center><BR>"
+			. += "Your sector's advisory level is Red Star. The Department of Intelligence has decrypted Cybersun communications suggesting a high likelihood of attacks on Nanotrasen assets within the Spinward Sector. Stations in the region are advised to remain highly vigilant for signs of enemy activity and to be on high alert."
 		if(80 to 99)
-			. += "Advisory Level: <b>Chimpcon 5</b></center><BR>"
-			. += "Your sector's advisory level is Chimpcon 5. Your sector's local comms network is currently undergoing a blackout, and we are therefore unable to accurately judge enemy movements within the region. However, information passed to us by GDI suggests a high amount of enemy activity in the sector, indicative of an impending attack. Remain on high alert, and as always, we advise remaining vigilant against any other potential threats."
+			. += "Advisory Level: <b>Black Orbit</b></center><BR>"
+			. += "Your sector's advisory level is Black Orbit. Your sector's local comms network is currently undergoing a blackout, and we are therefore unable to accurately judge enemy movements within the region. However, information passed to us by GDI suggests a high amount of enemy activity in the sector, indicative of an impending attack. Remain on high alert, and as always, we advise remaining vigilant against any other potential threats."
 		if(100)
-			. += "Advisory Level: <b>Chimpcon 6</b></center><BR>"
-			. += "Your sector's advisory level is Chimpcon 6. Credible information passed to us by GDI suggests that the Syndicate is preparing to mount a major concerted offensive on Nanotrasen assets in the Spinward Sector to cripple our foothold there. All stations should remain on high alert and prepared to defend themselves."
+			. += "Advisory Level: <b>Midnight Sun</b></center><BR>"
+			. += "Your sector's advisory level is Midnight Sun. Credible information passed to us by GDI suggests that the Syndicate is preparing to mount a major concerted offensive on Nanotrasen assets in the Spinward Sector to cripple our foothold there. All stations should remain on high alert and prepared to defend themselves."
 
 	var/min_threat = 100
 	for(var/datum/dynamic_ruleset/ruleset as anything in init_rulesets(/datum/dynamic_ruleset))

code/modules/clothing/suits/wiz_robe.dm

@@ -223,7 +223,7 @@
 	var/mob/living/M = new /mob/living/basic/stickman(get_turf(usr))
 	M.faction += list("[REF(usr)]")
 	robe_charge = FALSE
-	sleep(3 SECONDS)
+	sleep(30 SECONDS)
 	robe_charge = TRUE
 	to_chat(usr, span_notice("The robe hums, its internal magic supply restored."))
 

code/modules/security_levels/security_level_datums.dm

@@ -41,7 +41,7 @@
  * No threats
  */
 /datum/security_level/green
-	name = "chimpcon 1"
+	name = "green"
 	sound = 'sound/misc/notice2.ogg' // Friendly beep
 	number_level = SEC_LEVEL_GREEN
 	lowering_to_configuration_key = /datum/config_entry/string/alert_green
@@ -53,7 +53,7 @@
  * Caution advised
  */
 /datum/security_level/blue
-	name = "chimpcon 2"
+	name = "blue"
 	sound = 'sound/misc/notice1.ogg' // Angry alarm
 	number_level = SEC_LEVEL_BLUE
 	lowering_to_configuration_key = /datum/config_entry/string/alert_blue_downto
@@ -66,7 +66,7 @@
  * Hostile threats
  */
 /datum/security_level/red
-	name = "chimpcon 4"
+	name = "red"
 	sound = 'sound/misc/notice1.ogg' // The same angry alarm
 	number_level = SEC_LEVEL_RED
 	lowering_to_configuration_key = /datum/config_entry/string/alert_red_downto
@@ -79,7 +79,7 @@
  * Station destruction is imminent
  */
 /datum/security_level/delta
-	name = "chimpcon 5"
+	name = "delta"
 	sound = 'sound/misc/notice1.ogg' // The same angry alarm, again
 	number_level = SEC_LEVEL_DELTA
 	elevating_to_configuration_key = /datum/config_entry/string/alert_delta

html/changelogs/AutoChangeLog-pr-439.yml

@@ -0,0 +1,4 @@
+author: "Tractor Mann"
+delete-after: True
+changes:
+  - rscadd: "Cargo may now order jukeboxes!"

html/changelogs/AutoChangeLog-pr-658.yml

@@ -0,0 +1,4 @@
+author: "DexeeXI"
+delete-after: True
+changes:
+  - balance: "Paper Wizard Robes' magic spell on a longer cooldown."

html/changelogs/archive/2023-12.yml

@@ -5,3 +5,33 @@
       now properly run.'
   - bugfix: Revenant harvesting should now let you actually pass the final do_after
       so you can harvest that sweet essence.
+2023-12-05:
+  FeudeyTF nikothedude zxaber:
+  - code_imp: Updated the UI of the console for viewing message logs and console for
+      view server communications
+  - rscadd: 'New malf ability: Remote safety overrides. Allows the AI to remotely
+      emag things it has access to.'
+  - code_imp: emag_act() now returns a boolean designating it's success in emagging
+  - code_imp: All instances of emag_act() now have the proper arguments
+  - qol: Most usecases of emagging now have some kind of feedback, and existing feedback
+      has been sanity checked and converted to balloon alerts.
+  - rscadd: 'New malf module: Remote vendor tipping. Allows you to remotely tip a
+      vendor in any of the 8 directions. Goofy and okay for assassinations on unaware
+      enemies!'
+  - rscadd: 'New malf module: Core rolling. Allows you to roll around, crushing anything
+      you fall on with a satisfying splat.'
+  - code_imp: Vendor tipping is now a /atom/movable proc, allowing anything to fall
+      over and crush you.
+  - code_imp: All take_damage() overrides now use the correct arguments
+  - image: turf_analysis.dmi's red_arrow now has orthogonal directions
+  - balance: Vendors now are far less likely to gib your head or make you parapalegic
+  - balance: Vendors now respect armor when they crush you
+  - bugfix: You can no longer break the game by AI rolling in a card or APC
+  - qol: AI Roll now doesnt require you to click the exact turf to move you
+  - qol: AI roll cooldown and roll time is now a variable, making it possible for
+      AIs to become terrifying catamari damacy balls
+  - balance: Malf Ability "Robotics Factory" can now be purchased multiple times.
+  dwasint:
+  - bugfix: bone fracture surgery works again
+  wraith-54321:
+  - bugfix: no more fun for you

monkestation/code/modules/cargo/crates/service.dm

@@ -28,3 +28,10 @@
 					/obj/item/plate/small = 5,
 					/obj/item/a_gift/anything)
 	crate_name = "Birthday Crate"
+
+/datum/supply_pack/service/jukebox
+	name = "Jukebox Beacon Crate"
+	desc = "Last one stolen? Broken? Burnt down in an insurance scam? then this crate is for you. Contains one Jukebox Beacon."
+	cost = CARGO_CRATE_VALUE * 20 //the crew shouldnt be able to just buy 15 jukeboxes all playing among us at the same time
+	contains = list(/obj/item/choice_beacon/jukebox)
+	crate_name = "jukebox beacon crate"