Batch mirroring

Manual merge

_maps/map_files/Birdshot/birdshot.dmm

@@ -25274,7 +25274,7 @@
 	dir = 9
 	},
 /obj/structure/cable,
-/obj/machinery/atmospherics/components/trinary/filter,
+/obj/machinery/atmospherics/components/trinary/filter/critical,
 /turf/open/floor/iron/smooth,
 /area/station/engineering/supermatter/room)
 "jeg" = (

_maps/map_files/NorthStar/north_star.dmm

@@ -20971,20 +20971,6 @@
 	dir = 1
 	},
 /area/station/command/bridge)
-"fBE" = (
-/obj/structure/disposalpipe/segment{
-	dir = 1
-	},
-/obj/structure/cable,
-/obj/machinery/door/airlock/mining/glass{
-	name = "Mail Sorting"
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/any/supply/general,
-/turf/open/floor/iron/smooth,
-/area/station/cargo/storage)
 "fBM" = (
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/iron/dark,
@@ -32703,6 +32689,13 @@
 /obj/machinery/firealarm/directional/east,
 /turf/open/floor/catwalk_floor,
 /area/station/maintenance/floor3/starboard/fore)
+"iDz" = (
+/obj/machinery/atmospherics/components/trinary/filter/critical{
+	dir = 4
+	},
+/obj/machinery/status_display/evac/directional/north,
+/turf/open/floor/engine,
+/area/station/engineering/supermatter/room)
 "iDP" = (
 /obj/structure/cable/multilayer/multiz,
 /turf/open/floor/plating,
@@ -75518,13 +75511,6 @@
 /obj/structure/closet/emcloset/anchored,
 /turf/open/floor/pod/dark,
 /area/station/maintenance/floor3/port)
-"tLH" = (
-/obj/machinery/atmospherics/components/trinary/filter{
-	dir = 4
-	},
-/obj/machinery/status_display/evac/directional/north,
-/turf/open/floor/engine,
-/area/station/engineering/supermatter/room)
 "tMd" = (
 /obj/effect/turf_decal/siding/wood/corner{
 	dir = 1
@@ -86658,6 +86644,20 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/plating,
 /area/station/medical/abandoned)
+"wEN" = (
+/obj/structure/disposalpipe/segment{
+	dir = 1
+	},
+/obj/structure/cable,
+/obj/machinery/door/airlock/mining/glass{
+	name = "Mail Sorting"
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/any/supply/general,
+/turf/open/floor/iron/smooth,
+/area/station/cargo/storage)
 "wEQ" = (
 /obj/structure/stairs/east,
 /turf/open/floor/pod/dark,
@@ -119139,7 +119139,7 @@ cMA
 mnR
 acv
 hNz
-fBE
+wEN
 nlu
 aAZ
 iRK
@@ -140228,7 +140228,7 @@ uyD
 uyD
 uyD
 uyD
-tLH
+iDz
 kfo
 mvg
 dEc

code/__DEFINES/jobs.dm

@@ -236,9 +236,19 @@
 #define JOB_CAN_BE_INTERN (1<<8)
 /// This job cannot have more slots opened by the Head of Personnel (but admins or other random events can still do this).
 #define JOB_CANNOT_OPEN_SLOTS (1<<9)
+/// This job will not display on the job menu when there are no slots available, instead of appearing greyed out
+#define JOB_HIDE_WHEN_EMPTY (1<<10)
+/// This job cannot be signed up for at round start or recorded in your preferences
+#define JOB_LATEJOIN_ONLY (1<<11)
+/// This job is a head of staff.
+#define JOB_HEAD_OF_STAFF (1<<12)
 
 /// Combination flag for jobs which are considered regular crew members of the station.
 #define STATION_JOB_FLAGS (JOB_ANNOUNCE_ARRIVAL|JOB_CREW_MANIFEST|JOB_EQUIP_RANK|JOB_CREW_MEMBER|JOB_NEW_PLAYER_JOINABLE|JOB_REOPEN_ON_ROUNDSTART_LOSS|JOB_ASSIGN_QUIRKS|JOB_CAN_BE_INTERN)
+/// Combination flag for jobs which are considered heads of staff.
+#define HEAD_OF_STAFF_JOB_FLAGS (JOB_BOLD_SELECT_TEXT|JOB_CANNOT_OPEN_SLOTS|JOB_HEAD_OF_STAFF)
+/// Combination flag for jobs which are enabled by station traits.
+#define STATION_TRAIT_JOB_FLAGS (JOB_CANNOT_OPEN_SLOTS|JOB_HIDE_WHEN_EMPTY|JOB_LATEJOIN_ONLY&~JOB_REOPEN_ON_ROUNDSTART_LOSS)
 
 #define FACTION_NONE "None"
 #define FACTION_STATION "Station"
@@ -251,3 +261,6 @@
 #define SUPERVISOR_HOS "the Head of Security"
 #define SUPERVISOR_QM "the Quartermaster"
 #define SUPERVISOR_RD "the Research Director"
+
+/// Mind traits that should be shared by every head of staff. has to be this way cause byond lists lol
+#define HEAD_OF_STAFF_MIND_TRAITS TRAIT_FAST_TYING, TRAIT_HIGH_VALUE_RANSOM

code/__DEFINES/mecha.dm

@@ -6,7 +6,7 @@
 
 #define PANEL_OPEN (1<<0)
 #define ID_LOCK_ON (1<<1)
-#define CANSTRAFE (1<<2)
+#define CAN_STRAFE (1<<2)
 #define LIGHTS_ON (1<<3)
 #define SILICON_PILOT (1<<4)
 #define IS_ENCLOSED (1<<5)

code/__DEFINES/organ_movement.dm

@@ -0,0 +1,4 @@
+/// Delete the organ if replaced
+#define DELETE_IF_REPLACED (1<<0)
+/// When deleting a brain, we don't delete the identity and the player can keep playing
+#define NO_ID_TRANSFER (1<<1)

code/__DEFINES/traits/declarations.dm

@@ -491,6 +491,15 @@
 /// Is the mob standing on an elevated surface? This prevents them from dropping down if not elevated first.
 #define TRAIT_ON_ELEVATED_SURFACE "on_elevated_surface"
 
+/// Prevents you from twohanding weapons.
+#define TRAIT_NO_TWOHANDING "no_twohanding"
+
+/// Halves the time of tying a tie.
+#define TRAIT_FAST_TYING "fast_tying"
+
+/// Sells for more money on the pirate bounty pad.
+#define TRAIT_HIGH_VALUE_RANSOM "high_value_ransom"
+
 // METABOLISMS
 // Various jobs on the station have historically had better reactions
 // to various drinks and foodstuffs. Security liking donuts is a classic

code/__DEFINES/traits/sources.dm

@@ -275,5 +275,7 @@
 
 #define ANALYZER_TRAIT "analyzer_trait"
 
+/// Trait from an organ being inside a bodypart
+#define ORGAN_INSIDE_BODY_TRAIT "organ_inside_body"
 /// Trait when something was labelled by a pen.
 #define PEN_LABEL_TRAIT "pen_label"

code/__DEFINES/~nova_defines/colony_fabricator_misc.dm

@@ -35,4 +35,6 @@ GLOBAL_LIST_INIT(colonist_suit_allowed, list(
 	/obj/item/resonator,
 	/obj/item/t_scanner,
 	/obj/item/analyzer,
+	/obj/item/storage/medkit,
+	/obj/item/fireaxe/metal_h2_axe,
 ))

code/__DEFINES/~nova_defines/manufacturer_strings.dm

@@ -22,5 +22,6 @@
 #define COMPANY_ABDUCTOR "It has <b>[span_abductor("✌︎︎♌︎︎♎︎︎◆︎︎♍︎︎⧫︎︎❄︎♏︎♍︎♒︎")]</b> engraved into it."
 
 #define COMPANY_FRONTIER "It has a small label with <b>[span_engradio("Akhter Company Frontier Equipment")]</b> printed on it, alongside various xerxian proof-marks."
+#define COMPANY_KAHRAMAN "It has a <b>[span_red("red label")] with <b>[span_red("K - A - S")]</b> printed on it, alongside various xerxian proof-marks.</b>"
 
 #define COMPANY_REMOVED "It has had <b>[span_grey("all identifying marks scrubbed off")].</b>"

code/__HELPERS/announcements.dm

@@ -18,7 +18,6 @@
  * * sender_override - optional, modifies the sender of the announcement
  * * encode_title - if TRUE, the title will be HTML encoded
  * * encode_text - if TRUE, the text will be HTML encoded
- * * color_override - optional, set a color for the announcement box
  */
 
 /proc/send_ooc_announcement(
@@ -43,25 +42,25 @@
 			if(!length(text))
 				return
 
-		announcement_strings += span_major_announcement_title(sender_override)
-		announcement_strings += span_subheader_announcement_text(title)
-		announcement_strings += span_ooc_announcement_text(text)
-		var/finalized_announcement = create_ooc_announcement_div(jointext(announcement_strings, ""))
+	announcement_strings += span_major_announcement_title(sender_override)
+	announcement_strings += span_subheader_announcement_text(title)
+	announcement_strings += span_ooc_announcement_text(text)
+	var/finalized_announcement = create_ooc_announcement_div(jointext(announcement_strings, ""))
 
-		if(islist(players))
-			for(var/mob/target in players)
-				to_chat(target, finalized_announcement)
-				if(play_sound && target.client?.prefs.read_preference(/datum/preference/toggle/sound_announcements))
-					SEND_SOUND(target, sound(sound_override))
-		else
-			to_chat(world, finalized_announcement)
+	if(islist(players))
+		for(var/mob/target in players)
+			to_chat(target, finalized_announcement)
+			if(play_sound && target.client?.prefs.read_preference(/datum/preference/toggle/sound_announcements))
+				SEND_SOUND(target, sound(sound_override))
+	else
+		to_chat(world, finalized_announcement)
 
-			if(!play_sound)
-				return
+		if(!play_sound)
+			return
 
-			for(var/mob/player in GLOB.player_list)
-				if(player.client?.prefs.read_preference(/datum/preference/toggle/sound_announcements))
-					SEND_SOUND(player, sound(sound_override))
+		for(var/mob/player in GLOB.player_list)
+			if(player.client?.prefs.read_preference(/datum/preference/toggle/sound_announcements))
+				SEND_SOUND(player, sound(sound_override))
 
 /**
  * Inserts a span styled message into an alert box div
@@ -74,5 +73,12 @@
 /proc/create_announcement_div(message, color = "default")
 	return "<div class='chat_alert_[color]'>[message]</div>"
 
+/**
+ * Inserts a span styled message into an OOC alert style div
+ *
+ *
+ * Arguments
+ * * message - required, the message contents
+ */
 /proc/create_ooc_announcement_div(message)
 	return "<div class='ooc_alert'>[message]</div>"

code/__HELPERS/areas.dm

@@ -1,9 +1,11 @@
 #define BP_MAX_ROOM_SIZE 300
 
-GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/station/engineering/main, \
-															    /area/station/engineering/supermatter, \
-															    /area/station/engineering/atmospherics_engine, \
-															    /area/station/ai_monitored/turret_protected/ai))
+GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(list(
+	/area/station/engineering/main,
+	/area/station/engineering/supermatter,
+	/area/station/engineering/atmospherics_engine,
+	/area/station/ai_monitored/turret_protected/ai,
+)))
 
 // Gets an atmos isolated contained space
 // Returns an associative list of turf|dirs pairs

code/__HELPERS/game.dm

@@ -271,7 +271,7 @@
 		if(!current_apc.cell || !SSmapping.level_trait(current_apc.z, ZTRAIT_STATION))
 			continue
 		var/area/apc_area = current_apc.area
-		if(GLOB.typecache_powerfailure_safe_areas[apc_area.type])
+		if(is_type_in_typecache(apc_area, GLOB.typecache_powerfailure_safe_areas))
 			continue
 
 		var/duration = rand(duration_min,duration_max)

code/__HELPERS/mobs.dm

@@ -707,11 +707,6 @@ GLOBAL_LIST_EMPTY(species_list)
 	if(isliving(occupant))
 		mob_occupant = occupant
 
-	else if(isbodypart(occupant))
-		var/obj/item/bodypart/head/head = occupant
-
-		mob_occupant = head.brainmob
-
 	else if(isorgan(occupant))
 		var/obj/item/organ/internal/brain/brain = occupant
 		mob_occupant = brain.brainmob

code/__HELPERS/type_processing.dm

@@ -4,31 +4,84 @@
 	. = list()
 	for(var/type in types)
 		var/typename = "[type]"
+		// Longest paths comes first
 		var/static/list/TYPES_SHORTCUTS = list(
 			/obj/effect/decal/cleanable = "CLEANABLE",
 			/obj/item/bodypart = "BODYPART",
 			/obj/item/radio/headset = "HEADSET",
-			/obj/item/clothing/head/helmet/space = "SPESSHELMET",
+			/obj/item/clothing/accessory = "ACCESSORY",
+			/obj/item/clothing/mask/gas = "GASMASK",
+			/obj/item/clothing/mask = "MASK",
+			/obj/item/clothing/gloves = "GLOVES",
+			/obj/item/clothing/shoes = "SHOES",
+			/obj/item/clothing/under/plasmaman = "PLASMAMAN_SUIT",
+			/obj/item/clothing/under = "JUMPSUIT",
+			/obj/item/clothing/suit/armor = "ARMOR",
+			/obj/item/clothing/suit = "SUIT",
+			/obj/item/clothing/head/helmet = "HELMET",
+			/obj/item/clothing/head = "HEAD",
+			/obj/item/clothing/neck = "NECK",
+			/obj/item/clothing = "CLOTHING",
+			/obj/item/storage/backpack = "BACKPACK",
+			/obj/item/storage/belt = "BELT",
 			/obj/item/book/manual = "MANUAL",
-			/obj/item/reagent_containers/cup/glass = "DRINK", //longest paths comes first
+			/obj/item/storage/pill_bottle = "PILL_BOTTLE",
+			/obj/item/reagent_containers/pill/patch = "MEDPATCH",
+			/obj/item/reagent_containers/pill = "PILL",
+			/obj/item/reagent_containers/hypospray/medipen = "MEDIPEN",
+			/obj/item/reagent_containers/cup/glass = "DRINK",
 			/obj/item/food = "FOOD",
 			/obj/item/reagent_containers = "REAGENT_CONTAINERS",
 			/obj/machinery/atmospherics = "ATMOS_MECH",
 			/obj/machinery/portable_atmospherics = "PORT_ATMOS",
-			/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack = "MECHA_MISSILE_RACK",
+			/obj/item/mecha_parts/mecha_equipment/weapon = "MECHA_WEAPON",
 			/obj/item/mecha_parts/mecha_equipment = "MECHA_EQUIP",
 			/obj/item/organ = "ORGAN",
+			/obj/item/mod/control = "MODSUIT",
+			/obj/item/mod/module = "MODSUIT_MOD",
+			/obj/item/gun/ballistic/automatic = "GUN_AUTOMATIC",
+			/obj/item/gun/ballistic/revolver = "GUN_REVOLVER",
+			/obj/item/gun/ballistic/rifle = "GUN_RIFLE",
+			/obj/item/gun/ballistic/shotgun = "GUN_SHOTGUN",
+			/obj/item/gun/ballistic = "GUN_BALLISTIC",
+			/obj/item/gun/energy/laser = "GUN_LASER",
+			/obj/item/gun/energy = "GUN_ENERGY",
+			/obj/item/gun/magic = "GUN_MAGIC",
+			/obj/item/gun = "GUN",
+			/obj/item/stack/sheet/mineral = "MINERAL_SHEET",
+			/obj/item/stack/sheet = "SHEET",
+			/obj/item/stack/ore = "ORE",
+			/obj/item/ai_module = "AI_LAW_MODULE",
+			/obj/item/circuitboard/machine = "MACHINE_BOARD",
+			/obj/item/circuitboard/computer = "COMPUTER_BOARD",
+			/obj/item/circuitboard = "CIRCUITBOARD",
 			/obj/item = "ITEM",
+			/obj/structure/closet/crate/secure = "LOCKED_CRATE",
+			/obj/structure/closet/crate = "CRATE",
+			/obj/structure/closet/secure_closet = "LOCKED_CLOSET",
+			/obj/structure/closet = "CLOSET",
+			/obj/structure = "STRUCTURE",
+			/obj/machinery/door/airlock = "AIRLOCK",
+			/obj/machinery/door = "DOOR",
+			/obj/machinery/rnd/production = "RND_FABRICATOR",
+			/obj/machinery/computer/camera_advanced/shuttle_docker = "DOCKING_COMPUTER",
+			/obj/machinery/computer = "COMPUTER",
+			/obj/machinery/vending/wardrobe = "JOBDROBE",
+			/obj/machinery/vending = "VENDING",
 			/obj/machinery = "MACHINERY",
 			/obj/effect = "EFFECT",
+			/obj/projectile = "PROJECTILE",
 			/obj = "O",
 			/datum = "D",
 			/turf/open = "OPEN",
 			/turf/closed = "CLOSED",
 			/turf = "T",
+			/mob/living/carbon/human = "HUMANOID",
 			/mob/living/carbon = "CARBON",
 			/mob/living/simple_animal = "SIMPLE",
 			/mob/living/basic = "BASIC",
+			/mob/living/silicon/robot = "CYBORG",
+			/mob/living/silicon = "SILICON",
 			/mob/living = "LIVING",
 			/mob = "M",
 		)

code/_globalvars/bitfields.dm

@@ -235,7 +235,7 @@ DEFINE_BITFIELD(internal_damage, list(
 
 DEFINE_BITFIELD(mecha_flags, list(
 	"ID_LOCK_ON" = ID_LOCK_ON,
-	"CANSTRAFE" = CANSTRAFE,
+	"CAN_STRAFE" = CAN_STRAFE,
 	"LIGHTS_ON" = LIGHTS_ON,
 	"SILICON_PILOT" = SILICON_PILOT,
 	"IS_ENCLOSED" = IS_ENCLOSED,

code/_globalvars/traits/_traits.dm

@@ -188,6 +188,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_EXPANDED_FOV" = TRAIT_EXPANDED_FOV,
 		"TRAIT_EXTROVERT" = TRAIT_EXTROVERT,
 		"TRAIT_FAKEDEATH" = TRAIT_FAKEDEATH,
+		"TRAIT_FAST_TYING" = TRAIT_FAST_TYING,
 		"TRAIT_FASTMED" = TRAIT_FASTMED,
 		"TRAIT_FAT" = TRAIT_FAT,
 		"TRAIT_FEARLESS" = TRAIT_FEARLESS,
@@ -231,6 +232,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_HEAVY_DRINKER" = TRAIT_HEAVY_DRINKER,
 		"TRAIT_HEAVY_SLEEPER" = TRAIT_HEAVY_SLEEPER,
 		"TRAIT_HIDE_EXTERNAL_ORGANS" = TRAIT_HIDE_EXTERNAL_ORGANS,
+		"TRAIT_HIGH_VALUE_RANSOM" = TRAIT_HIGH_VALUE_RANSOM,
 		"TRAIT_HOLY" = TRAIT_HOLY,
 		"TRAIT_HOPELESSLY_ADDICTED" = TRAIT_HOPELESSLY_ADDICTED,
 		"TRAIT_HOT_SPRING_CURSED" = TRAIT_HOT_SPRING_CURSED,
@@ -307,6 +309,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_NO_SOUL" = TRAIT_NO_SOUL,
 		"TRAIT_NO_STRIP" = TRAIT_NO_STRIP,
 		"TRAIT_NO_TRANSFORM" = TRAIT_NO_TRANSFORM,
+		"TRAIT_NO_TWOHANDING" = TRAIT_NO_TWOHANDING,
 		"TRAIT_NOCRITDAMAGE" = TRAIT_NOCRITDAMAGE,
 		"TRAIT_NO_UNDERWEAR" = TRAIT_NO_UNDERWEAR,
 		"TRAIT_NO_ZOMBIFY" = TRAIT_NO_ZOMBIFY,