Merge remote-tracking branch 'upstream/master'

.github/workflows/ci.yml

@@ -58,6 +58,8 @@ jobs:
           tools/bootstrap/python -c ''
       - name: Run Grep Checks
         run: tools/ci/validate_files.sh
+      - name: Run Define Sanity Checks
+        run: tools/bootstrap/python -m define_sanity.check
       - name: Run TGUI Checks
         run: tools/build/build --ci lint tgui-test
 

.gitignore

@@ -41,3 +41,6 @@ tgui/public/tgui.bundle.css
 tgui/public/tgui.bundle.js
 #ignore tracy dll
 prof.dll
+
+# From /tools/define_sanity/check.py - potential output file that we load onto the user's machine that we don't want to have committed.
+define_sanity_output.txt

code/ATMOSPHERICS/components/unary/vent_pump.dm

@@ -313,6 +313,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/proc/set_frequency(new_frequency)
 	radio_connection = register_radio(src, frequency, new_frequency, radio_filter_in)
 	frequency = new_frequency
+	broadcast_status()
 
 /obj/machinery/atmospherics/unary/vent_pump/receive_signal(datum/signal/signal)
 	if(stat & (NOPOWER|BROKEN))

code/__defines/_fruits.dm

@@ -122,7 +122,7 @@ GLOBAL_LIST_INIT(acceptable_fruit_types, list(
 											PLANT_PUMPKIN,
 											PLANT_RICE,
 											PLANT_ROSE,
-											PLANT_ROSE,
+											PLANT_RHUBARB,
 											PLANT_SOYBEAN,
 											PLANT_SPINEAPPLE,
 											PLANT_SUGARCANE,

code/__defines/_planes+layers.dm

@@ -105,6 +105,8 @@ What is the naming convention for planes or layers?
 // Invisible things plane
 #define CLOAKED_PLANE			-15
 
+#define PLANE_CH_STOMACH		-11 //Stomach Plane
+
 // Top plane (in the sense that it's the highest in 'the world' and not a UI element)
 #define ABOVE_PLANE				-10
 
@@ -160,13 +162,22 @@ What is the naming convention for planes or layers?
 #define PLANE_CH_SPECIAL		23 //Special role icon (revhead or w/e)
 #define PLANE_CH_STATUS_OOC		24 //OOC status hud for spooks
 
+// "Character HUDs", aka HUDs, but not the game's UI. Things like medhuds.
+#define PLANE_CH_HEALTH_VR		26 //Hidden healthbar when at full health
+#define PLANE_CH_STATUS_R		27 //Right-side status icon
+#define PLANE_CH_BACKUP			28 //Backup implant
+#define PLANE_CH_VANTAG			29 //Vore Antag hud
+
 #define PLANE_MESONS			30 //Stuff seen with mesons, like open ceilings. This is 30 for downstreams.
 #define PLANE_JANHUD			31 //Stuff seen with janiHUD. Mostly highlight of dirt.
 
 #define PLANE_ADMIN2			33 //Purely for shenanigans (above lighting)
 
 #define PLANE_BUILDMODE			39 //Things that only show up when you have buildmode on
 
+#define PLANE_AUGMENTED			40 //Augmented-reality plane
+#define PLANE_SOULCATCHER		41 //Soulcatcher
+
 //Fullscreen overlays under inventory
 #define PLANE_FULLSCREEN		90 //Blindness, mesons, druggy, etc
 	#define OBFUSCATION_LAYER	5 //Where images covering the view for eyes are put

code/__defines/belly_modes_vr.dm

@@ -43,3 +43,9 @@
 #define DR_SLEEP 								"Sleep"
 #define DR_FAKE									"False Sleep"
 #define DR_WEIGHT								"Weight Drain"
+
+//Vore Sprite Flags
+#define DM_FLAG_VORESPRITE_BELLY    0x1
+#define DM_FLAG_VORESPRITE_TAIL     0x2
+#define DM_FLAG_VORESPRITE_MARKING  0x4
+#define DM_FLAG_VORESPRITE_ARTICLE	0x8

code/__defines/dna.dm

@@ -154,3 +154,9 @@ var/SMALLSIZEBLOCK     = 0
 #define DNA2_BUF_UI 1
 #define DNA2_BUF_UE 2
 #define DNA2_BUF_SE 4
+
+// Mutation flags
+#define MUTCHK_FORCED        1
+
+// Gene flags
+#define GENE_ALWAYS_ACTIVATE 1

code/__defines/misc.dm

@@ -44,7 +44,11 @@
 #define SPECIALROLE_HUD 8 // AntagHUD image.
 #define  STATUS_HUD_OOC 9 // STATUS_HUD without virus DB check for someone being ill.
 #define 	  LIFE_HUD 10 // STATUS_HUD that only reports dead or alive
-#define     TOTAL_HUDS 10 // Total number of HUDs. Like body layers, and other things, it comes up sometimes.
+#define     BACKUP_HUD 11 // HUD for showing whether or not they have a backup implant.
+#define   STATUS_R_HUD 12 // HUD for showing the same STATUS_HUD info on the right side, but not for 'boring' statuses (transparent icons)
+#define  HEALTH_VR_HUD 13 // HUD with blank 100% bar so it's hidden most of the time.
+#define     VANTAG_HUD 14 // HUD for showing being-an-antag-target prefs
+#define     TOTAL_HUDS 14 // Total number of HUDs. Like body layers, and other things, it comes up sometimes.
 
 #define CLIENT_FROM_VAR(I) (ismob(I) ? I:client : (isclient(I) ? I : null))
 
@@ -108,6 +112,7 @@
 #define AREA_ALLOW_LARGE_SIZE		0x400	// If mob size is limited in the area.
 #define AREA_BLOCK_SUIT_SENSORS		0x800	// If suit sensors are blocked in the area.
 #define AREA_BLOCK_TRACKING			0x1000	// If camera tracking is blocked in the area.
+#define AREA_BLOCK_GHOST_SIGHT		0x2000	// If an area blocks sight for ghosts
 
 // OnTopic return values
 #define TOPIC_NOACTION 0
@@ -483,3 +488,79 @@ GLOBAL_LIST_INIT(all_volume_channels, list(
 // Vote Types
 #define VOTE_RESULT_TYPE_MAJORITY	"Majority"
 #define VOTE_RESULT_TYPE_SKEWED		"Seventy"
+
+#define ECO_MODIFIER 10
+
+#define VANTAG_NONE    "hudblank"
+#define VANTAG_VORE    "vantag_vore"
+#define VANTAG_KIDNAP  "vantag_kidnap"
+#define VANTAG_KILL    "vantag_kill"
+
+// ColorMate states
+#define COLORMATE_TINT 1
+#define COLORMATE_HSV 2
+#define COLORMATE_MATRIX 3
+
+#define DEPARTMENT_OFFDUTY			"Off-Duty"
+
+#define ANNOUNCER_NAME "Facility PA"
+
+//For custom species
+#define STARTING_SPECIES_POINTS 2
+#define MAX_SPECIES_TRAITS 5
+
+// Xenochimera thing mostly
+#define REVIVING_NOW		-1
+#define REVIVING_DONE		0
+#define REVIVING_READY		1
+
+// Resleeving Mind Record Status
+#define MR_NORMAL 0
+#define MR_UNSURE 1
+#define MR_DEAD 2
+
+//Shuttle madness!
+#define SHUTTLE_CRASHED 3 // Yup that can happen now
+
+//Herm Gender
+#define HERM "herm"
+
+// Bluespace shelter deploy checks
+#define SHELTER_DEPLOY_ALLOWED "allowed"
+#define SHELTER_DEPLOY_BAD_TURFS "bad turfs"
+#define SHELTER_DEPLOY_BAD_AREA "bad area"
+#define SHELTER_DEPLOY_ANCHORED_OBJECTS "anchored objects"
+#define SHELTER_DEPLOY_SHIP_SPACE "ship not in space"
+
+#define PTO_SECURITY		"Security"
+#define PTO_MEDICAL			"Medical"
+#define PTO_ENGINEERING 	"Engineering"
+#define PTO_SCIENCE			"Science"
+#define PTO_EXPLORATION 	"Exploration"
+#define PTO_CARGO			"Cargo"
+#define PTO_CIVILIAN		"Civilian"
+#define PTO_CYBORG			"Cyborg"
+#define PTO_TALON			"Talon Contractor"
+
+#define DEPARTMENT_TALON	"ITV Talon"
+
+#define MAT_TITANIUMGLASS		"ti-glass"
+#define MAT_PLASTITANIUM		"plastitanium"
+#define MAT_PLASTITANIUMHULL		"plastitanium hull"
+#define MAT_PLASTITANIUMGLASS	"plastitanium glass"
+#define MAT_GOLDHULL	"gold hull"
+
+#define RESIZE_MINIMUM 0.25
+#define RESIZE_MAXIMUM 2
+#define RESIZE_MINIMUM_DORMS 0.01
+#define RESIZE_MAXIMUM_DORMS 6
+
+#define RESIZE_HUGE 2
+#define RESIZE_BIG 1.5
+#define RESIZE_NORMAL 1
+#define RESIZE_SMALL 0.5
+#define RESIZE_TINY 0.25
+#define RESIZE_A_HUGEBIG (RESIZE_HUGE + RESIZE_BIG) / 2
+#define RESIZE_A_BIGNORMAL (RESIZE_BIG + RESIZE_NORMAL) / 2
+#define RESIZE_A_NORMALSMALL (RESIZE_NORMAL + RESIZE_SMALL) / 2
+#define RESIZE_A_SMALLTINY (RESIZE_SMALL + RESIZE_TINY) / 2

code/__defines/phobias.dm

@@ -0,0 +1,9 @@
+//Handling and defining of phobias and fears
+#define NYCTOPHOBIA 1
+#define ARACHNOPHOBIA 2
+#define HEMOPHOBIA 4
+#define THALASSOPHOBIA 8
+#define CLAUSTROPHOBIA_MINOR 16
+#define CLAUSTROPHOBIA_MAJOR 32
+#define ANATIDAEPHOBIA 64
+#define AGRAVIAPHOBIA 128

code/_helpers/global_lists.dm

@@ -62,6 +62,7 @@ var/global/list/exclude_jobs = list(/datum/job/ai,/datum/job/cyborg)
 var/list/datum/visualnet/visual_nets = list()
 var/datum/visualnet/camera/cameranet = new()
 var/datum/visualnet/cult/cultnet = new()
+var/datum/visualnet/ghost/ghostnet = new()
 
 // Runes
 var/global/list/rune_list = new()

code/_helpers/unsorted.dm

@@ -1565,6 +1565,7 @@ GLOBAL_REAL_VAR(list/stack_trace_storage)
 
 	. += new /obj/screen/plane_master{plane = PLANE_MESONS} 			//Meson-specific things like open ceilings.
 	. += new /obj/screen/plane_master{plane = PLANE_BUILDMODE}			//Things that only show up while in build mode
+	. += new /obj/screen/plane_master{plane = PLANE_JANHUD}
 
 	// Real tangible stuff planes
 	. += new /obj/screen/plane_master/main{plane = TURF_PLANE}

code/datums/diseases/_disease.dm

@@ -73,12 +73,19 @@ GLOBAL_LIST_INIT(diseases, subtypesof(/datum/disease))
 		stage = min(stage + 1, max_stages)
 		if(!discovered && stage >= CEILING(max_stages * discovery_threshold, 1))
 			discovered = TRUE
-			BITSET(affected_mob.hud_updateflag, STATUS_HUD)
 
 /datum/disease/proc/handle_cure_testing(has_cure = FALSE)
 	if(has_cure && prob(cure_chance))
 		stage = max(stage -1, 1)
 
+	for(var/organ in required_organs)
+		if(locate(organ) in affected_mob.internal_organs)
+			continue
+		if(locate(organ) in affected_mob.organs)
+			continue
+		cure()
+		return FALSE
+
 	if(disease_flags & CURABLE)
 		if(has_cure && prob(cure_chance))
 			cure()
@@ -165,7 +172,6 @@ GLOBAL_LIST_INIT(diseases, subtypesof(/datum/disease))
 
 /datum/disease/proc/remove_virus()
 	affected_mob.viruses -= src
-	BITSET(affected_mob.hud_updateflag, STATUS_HUD)
 
 /datum/disease/proc/Start()
 	return

code/datums/diseases/advance/symptoms/confusion.dm

@@ -16,7 +16,6 @@ Bonus
 */
 
 /datum/symptom/confusion
-
 	name = "Confusion"
 	stealth = 1
 	resistance = -1
@@ -25,7 +24,6 @@ Bonus
 	level = 4
 	severity = 2
 
-
 /datum/symptom/confusion/Activate(datum/disease/advance/A)
 	..()
 	if(prob(SYMPTOM_ACTIVATION_PROB))

code/datums/diseases/advance/symptoms/cough.dm

@@ -10,8 +10,7 @@ Coughing
 	Low Level.
 
 BONUS
-	Will force the affected mob to drop small items.
-	Small spread if not wearing a mask
+	Will force the affected mob to drop small items. Small spread if not wearing a mask.
 
 //////////////////////////////////////
 */

code/datums/diseases/advance/symptoms/damage_converter.dm

@@ -22,6 +22,7 @@ Bonus
 	stage_speed = -4
 	transmittable = -2
 	level = 4
+	severity = 0
 
 /datum/symptom/damage_converter/Activate(datum/disease/advance/A)
 	..()

code/datums/diseases/advance/symptoms/dizzy.dm

@@ -15,7 +15,6 @@ Bonus
 //////////////////////////////////////
 */
 
-/// Not the egg
 /datum/symptom/dizzy
 	name = "Dizziness"
 	stealth = 2

code/datums/diseases/advance/symptoms/flip.dm

@@ -11,7 +11,6 @@ Flippinov
 
 BONUS
 	Makes the host FLIP.
-	Should be used for buffing your disease.
 
 //////////////////////////////////////
 */
@@ -23,7 +22,7 @@ BONUS
 	stage_speed = 3
 	transmittable = 1
 	level = 1
-	severity = 1
+	severity = 0
 
 /datum/symptom/spyndrome/Activate(datum/disease/advance/A)
 	..()