Merge branch 'dev-sierra' into Sierra_Mapping

.github/workflows/generate_documentation.yml

@@ -19,7 +19,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: paths-filter
-        uses: dorny/paths-filter@0bc4621a3135347011ad047f9ecf449bf72ce2bd
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
         id: filter
         with:
           filters: .github/workflow-config/preflight-filters.yml
@@ -39,7 +39,7 @@ jobs:
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: Setup Cache
-        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2
+        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
         with:
           path: ~/spaceman_dmm/${{ env.SPACEMAN_DMM_VERSION }}
           key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }}

.github/workflows/test.yml

@@ -21,7 +21,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: paths-filter
-        uses: dorny/paths-filter@0bc4621a3135347011ad047f9ecf449bf72ce2bd
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
         id: filter
         with:
           filters: .github/workflow-config/preflight-filters.yml
@@ -34,7 +34,7 @@ jobs:
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: Setup Cache
-        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2
+        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
         with:
           path: ~/spaceman_dmm/${{ env.SPACEMAN_DMM_VERSION }}
           key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }}
@@ -62,7 +62,7 @@ jobs:
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: Setup Cache
-        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2
+        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
         with:
           path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
@@ -92,14 +92,14 @@ jobs:
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: Setup Cache
-        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2
+        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
         with:
           path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
       - name: Install rust_g dependencies
         run: ./scripts/install-rust_g-dependencies.sh
       - name: Setup rust_g cache
-        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2
+        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
         with:
           path: ~/.byond/bin/librust_g.so
           key: "rust_g-${{ env.RUST_G_REPO }}-${{ env.RUST_G_VERSION }}"
@@ -130,14 +130,14 @@ jobs:
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: Setup Cache
-        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2
+        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
         with:
           path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
       - name: Install rust_g dependencies
         run: ./scripts/install-rust_g-dependencies.sh
       - name: Setup rust_g cache
-        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2
+        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
         with:
           path: ~/.byond/bin/librust_g.so
           key: "rust_g-${{ env.RUST_G_REPO }}-${{ env.RUST_G_VERSION }}"
@@ -168,14 +168,14 @@ jobs:
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: Setup Cache
-        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2
+        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
         with:
           path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
       - name: Install rust_g dependencies
         run: ./scripts/install-rust_g-dependencies.sh
       - name: Setup rust_g cache
-        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2
+        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
         with:
           path: ~/.byond/bin/librust_g.so
           key: "rust_g-${{ env.RUST_G_REPO }}-${{ env.RUST_G_VERSION }}"

baystation12.dme

@@ -991,6 +991,7 @@
 #include "code\game\objects\items\devices\paint_sprayer.dm"
 #include "code\game\objects\items\devices\personal_shield.dm"
 #include "code\game\objects\items\devices\powersink.dm"
+#include "code\game\objects\items\devices\radio_jammer.dm"
 #include "code\game\objects\items\devices\slide_projector.dm"
 #include "code\game\objects\items\devices\spy_bug.dm"
 #include "code\game\objects\items\devices\suit_cooling.dm"
@@ -1666,7 +1667,6 @@
 #include "code\modules\clothing\under\color.dm"
 #include "code\modules\clothing\under\corporate.dm"
 #include "code\modules\clothing\under\formal_pants.dm"
-#include "code\modules\clothing\under\frontier.dm"
 #include "code\modules\clothing\under\miscellaneous.dm"
 #include "code\modules\clothing\under\shorts.dm"
 #include "code\modules\clothing\under\skirts.dm"
@@ -1685,7 +1685,6 @@
 #include "code\modules\clothing\under\accessories\dashiki.dm"
 #include "code\modules\clothing\under\accessories\fire_overpants.dm"
 #include "code\modules\clothing\under\accessories\flannel_shirt.dm"
-#include "code\modules\clothing\under\accessories\frontier.dm"
 #include "code\modules\clothing\under\accessories\ftu_pin.dm"
 #include "code\modules\clothing\under\accessories\hawaii.dm"
 #include "code\modules\clothing\under\accessories\helmcover.dm"
@@ -3328,6 +3327,7 @@
 #include "maps\_maps.dm"
 #include "mods\_modpack.dm"
 #include "mods\global_modpacks.dm"
+#include "mods\_master_files\code\_onclick\click.dm"
 #include "mods\_master_files\code\game\world.dm"
 #include "mods\_master_files\code\game\gamemodes\ert.dm"
 #include "mods\_master_files\code\game\objects\effects\decals\contraband.dm"
@@ -3366,6 +3366,7 @@
 #include "mods\_master_files\code\modules\mob\new_player\new_player.dm"
 #include "mods\_master_files\code\modules\power\gravitygenerator.dm"
 #include "mods\_master_files\code\modules\projectiles\projectile\bullets.dm"
+#include "mods\_master_files\code\modules\species\station\adherent.dm"
 #include "mods\_master_files\maps\mapsystem\maps.dm"
 #include "mods\_master_files\maps\sierra\sierra_ranks.dm"
 #include "mods\_master_files\maps\sierra\items\rigs.dm"

code/__defines/admin.dm

@@ -31,7 +31,11 @@
 #define R_SOUNDS         FLAG(11)
 #define R_SPAWN          FLAG(12)
 #define R_MOD            FLAG(13)
-#define R_HOST           FLAG(14)
+// [SIERRA-EDIT] - XENO WHITELIST
+//#define R_HOST           FLAG(14) // SIERRA-EDIT - ORIGINAL
+#define R_XENO           FLAG(14)
+#define R_HOST           FLAG(15)
+// [SIERRA-EDIT]
 #define R_INVESTIGATE    (R_ADMIN | R_MOD)
 #define R_MAXPERMISSION  R_HOST
 
@@ -44,4 +48,4 @@
 #define TICKET_ASSIGNED 2 // An admin has assigned themself to the ticket and will respond
 
 #define LAST_CKEY(M) (M.ckey || M.last_ckey)
-#define LAST_KEY(M)  (M.key || M.last_ckey)
+#define LAST_KEY(M)  (M.key || M.last_ckey)

code/__defines/mobs.dm

@@ -365,6 +365,8 @@
 #define SPECIES_NEAERA      "Neaera"
 #define SPECIES_STOK        "Stok"
 
+#define SPECIES_FBP	"Full Body Prosthesis" //SIERRA-ADD XENO WHITELIST
+
 #define UNRESTRICTED_SPECIES list(SPECIES_HUMAN, SPECIES_DIONA, SPECIES_IPC, SPECIES_UNATHI, SPECIES_YEOSA, SPECIES_SKRELL, SPECIES_TRITONIAN, SPECIES_SPACER, SPECIES_VATGROWN, SPECIES_GRAVWORLDER, SPECIES_MULE)
 #define RESTRICTED_SPECIES   list(SPECIES_VOX, SPECIES_ALIEN, SPECIES_GOLEM)
 #define HUMAN_SPECIES        list(SPECIES_HUMAN, SPECIES_VATGROWN, SPECIES_SPACER, SPECIES_GRAVWORLDER, SPECIES_MULE)

code/__defines/~mods/~master_defines.dm

@@ -53,3 +53,7 @@
 // LOADOUT_ITEMS - Start
 #define ACCESSORY_SLOT_OVER     "Over"
 // LOADOUT_ITEMS - End
+
+// IPC_COOLING_UNIT - Start
+#define BP_COOLING "cooling system"
+// IPC_COOLING_UNIT - End

code/_helpers/type2type.dm

@@ -109,6 +109,7 @@
 	if (rights & R_SOUNDS)      . += "[seperator]+SOUND"
 	if (rights & R_SPAWN)       . += "[seperator]+SPAWN"
 	if (rights & R_MOD)         . += "[seperator]+MODERATOR"
+	if (rights & R_XENO)        . += "[seperator]+XENOMODERATOR" //SIERRA-ADD XENO WHITELIST
 	return .
 
 // heat2color functions. Adapted from: http://www.tannerhelland.com/4435/convert-temperature-rgb-algorithm-code

code/datums/outfits/misc.dm

@@ -69,6 +69,4 @@
 	id_slot = slot_wear_id
 	id_types = list(/obj/item/card/id/syndicate)
 	id_pda_assignment = "Scavenger"
-
-
 	flags = OUTFIT_HAS_BACKPACK|OUTFIT_RESET_EQUIPMENT

code/datums/supplypacks/flooring.dm

@@ -55,6 +55,12 @@
 	cost = 15
 	containername = "red carpet crate"
 
+/singleton/hierarchy/supply_pack/flooring/carpetblack
+	name = "Black carpet"
+	contains = list(/obj/item/stack/tile/carpetblack/fifty)
+	cost = 15
+	containername = "black carpet crate"
+
 /singleton/hierarchy/supply_pack/flooring/linoleum
 	name = "Linoleum"
 	contains = list(/obj/item/stack/tile/linoleum/fifty)

code/datums/uplink/devices and tools.dm

@@ -115,6 +115,13 @@
 			While in hacking mode, this device will grant full access to any airlock in 20 to 40 seconds. \
 			This device will be able to continuously reaccess the last 6 to 8  airlocks it was used on."
 
+/datum/uplink_item/item/tools/radio_jammer
+	name = "Portable Radio Jammer"
+	item_cost = 24
+	path = /obj/item/device/radio_jammer
+	desc = "A pocket sized portable radio jammer that can intercept outgoing radio signals in a given distance. \
+			However, radios attempting to send outgoing transmissions will emit a faint buzzing noise. \
+			The jammer can be signaled remotely using assembly signalers."
 
 /datum/uplink_item/item/tools/space_suit
 	name = "Voidsuit and Tactical Mask"

code/game/gamemodes/cult/talisman.dm

@@ -71,7 +71,7 @@
 		)
 		admin_attack_log(user, target, "Used a talisman ([type]).", "Was victim of a talisman ([type]).", "used a talisman ([type]) on")
 		invoke(target, user)
-	user.say("Talisman {talisman_name}!", all_languages[LANGUAGE_CULT])
+	user.say("Talisman [talisman_name]!", all_languages[LANGUAGE_CULT])
 	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 	user.do_attack_animation(target)
 	if (talisman_sound)

code/game/machinery/_machines_base/machinery.dm

@@ -94,11 +94,11 @@
 		var/initial_damage_percentage = Percent(get_max_health() - prior_health, get_max_health(), 0)
 		var/damage_percentage = get_damage_percentage()
 		if (damage_percentage >= 75 && initial_damage_percentage < 75)
-			visible_message("\The [src] looks like it's about to break!" )
+			visible_message(SPAN_DANGER("\The [src] looks like it's about to break!"))
 		else if (damage_percentage >= 50 && initial_damage_percentage < 50)
-			visible_message("\The [src] looks seriously damaged!" )
+			visible_message(SPAN_DANGER("\The [src] looks seriously damaged!" ))
 		else if (damage_percentage >= 25 && initial_damage_percentage < 25)
-			visible_message("\The [src] shows signs of damage!" )
+			visible_message(SPAN_DANGER("\The [src] shows signs of damage!" ))
 
 /obj/machinery/Destroy()
 	if(istype(wires))

code/game/machinery/newscaster.dm

@@ -117,8 +117,8 @@ var/global/list/obj/machinery/newscaster/allCasters = list() //Global list that
 	desc = "A standard newsfeed handler. All the news you absolutely have no use for, in one place!"
 	icon = 'icons/obj/machines/terminals.dmi'
 	icon_state = "newscaster_normal"
-	health_max = 50
-	health_min_damage = 10
+	health_max = 80
+	health_min_damage = 5
 	use_weapon_hitsound = FALSE
 	damage_hitsound = 'sound/effects/Glassbr3.ogg'
 	//var/list/datum/feed_channel/channel_list = list() //This list will contain the names of the feed channels. Each name will refer to a data region where the messages of the feed channels are stored.

code/game/machinery/vending/_vending.dm

@@ -17,7 +17,7 @@
 	machine_desc = "Holds an internal stock of items that can be dispensed on-demand or when a charged ID card is swiped, depending on the brand."
 	idle_power_usage = 10
 	wires = /datum/wires/vending
-	health_max = 80
+	health_max = 100
 
 	/// The machine's wires, but typed.
 	var/datum/wires/vending/vendor_wires

code/game/objects/items/devices/radio/radio.dm

@@ -329,13 +329,35 @@
 	return null
 
 /obj/item/device/radio/talk_into(mob/living/M, message, channel, verb = "says", datum/language/speaking = null)
-	if(!on) return 0 // the device has to be on
+	// the device has to be on
+	if (!on)
+		return FALSE
 	//  Fix for permacell radios, but kinda eh about actually fixing them.
-	if(!M || !message) return 0
+	if (!M || !message)
+		return FALSE
 
-	if(speaking && (speaking.flags & (NONVERBAL|SIGNLANG))) return 0
+	if (speaking && (speaking.flags & (NONVERBAL|SIGNLANG)))
+		return FALSE
 
 	if (!broadcasting)
+		var/list/headset_z_group = GetConnectedZlevels(get_z(src))
+		//needs to account for turfs
+		var/turf/self_turf = get_turf(src)
+		if (!self_turf)
+			return FALSE
+		var/self_x = self_turf.x
+		var/self_y = self_turf.y
+		for (var/obj/item/device/radio_jammer/jammer as anything in GLOB.radio_jammers)
+			var/turf/jammer_turf = get_turf(jammer)
+			if (!jammer_turf)
+				continue
+			var/dx = self_x - jammer_turf.x
+			var/dy = self_y - jammer_turf.y
+			if (dx*dx + dy*dy <= jammer.square_radius && (jammer_turf.z in headset_z_group))
+				to_chat(M,SPAN_WARNING("Instead of the familiar radio crackle, \the [src] emits a faint buzzing sound."))
+				playsound(loc, 'sound/effects/zzzt.ogg', 20, 0, -1)
+				return FALSE
+
 		// Sedation chemical effect should prevent radio use (Chloral and Soporific)
 		var/mob/living/carbon/C = M
 		if (istype(C))
@@ -559,7 +581,6 @@
 
 
 /obj/item/device/radio/hear_talk(mob/M as mob, msg, verb = "says", datum/language/speaking = null)
-
 	if (broadcasting)
 		if(get_dist(src, M) <= canhear_range)
 			talk_into(M, msg,null,verb,speaking)