Merge branch 'master' into Command-Area-Remake

code/__DEFINES/conflict.dm

@@ -220,6 +220,7 @@
 #define UNIFORM_HAS_SENSORS 1
 #define UNIFORM_FORCED_SENSORS 2
 
+#define EYE_PROTECTION_NEGATIVE -1
 #define EYE_PROTECTION_NONE 0
 #define EYE_PROTECTION_FLAVOR 1
 #define EYE_PROTECTION_FLASH 2

code/game/objects/items/tools/maintenance_tools.dm

@@ -380,22 +380,27 @@
 		if(E.robotic == ORGAN_ROBOT)
 			return
 		switch(safety)
-			if(1)
+			if(EYE_PROTECTION_FLASH)
+				to_chat(user, SPAN_DANGER("You see a bright light in the corner of your vision."))
+				E.take_damage(rand(0, 1), TRUE)
+				if(E.damage > 10)
+					E.take_damage(rand(3, 5), TRUE)
+			if(EYE_PROTECTION_FLAVOR)
 				to_chat(user, SPAN_DANGER("Your eyes sting a little."))
 				E.take_damage(rand(1, 2), TRUE)
-				if(E.damage > 12)
-					H.AdjustEyeBlur(3,6)
-			if(0)
+				if(E.damage > 8) // dont abuse your funny flavor glasses
+					E.take_damage(2, TRUE)
+			if(EYE_PROTECTION_NONE)
 				to_chat(user, SPAN_WARNING("Your eyes burn."))
-				E.take_damage(rand(2, 4), TRUE)
+				E.take_damage(rand(3, 4), TRUE)
 				if(E.damage > 10)
 					E.take_damage(rand(4, 10), TRUE)
-			if(-1)
+			if(EYE_PROTECTION_NEGATIVE)
 				to_chat(user, SPAN_WARNING("Your thermals intensify [src]'s glow. Your eyes itch and burn severely."))
 				H.AdjustEyeBlur(12,20)
 				E.take_damage(rand(12, 16), TRUE)
 
-		if(safety < 2)
+		if(safety < EYE_PROTECTION_WELDING)
 			if (E.damage >= E.min_broken_damage)
 				to_chat(H, SPAN_WARNING("You go blind! Maybe welding without protection wasn't such a great idea..."))
 				return FALSE

code/modules/clothing/glasses/night.dm

@@ -15,6 +15,7 @@
 	vision_flags = SEE_TURFS
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	fullscreen_vision = null
+	eye_protection = EYE_PROTECTION_NEGATIVE
 
 /obj/item/clothing/glasses/night/helmet //for the integrated NVGs that are in helmetgarb code
 	name = "\improper M2 night vision goggles"

code/modules/clothing/glasses/thermal.dm

@@ -12,7 +12,7 @@
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	darkness_view = 12
 	invisa_view = 2
-	eye_protection = -1
+	eye_protection = EYE_PROTECTION_NEGATIVE
 	deactive_state = "goggles_off"
 	fullscreen_vision = /atom/movable/screen/fullscreen/thermal
 	var/blinds_on_emp = TRUE

code/modules/gear_presets/upp.dm

@@ -804,7 +804,14 @@
 /datum/equipment_preset/upp/leader/load_gear(mob/living/carbon/human/new_human)
 	var/UPPleadsidearm = rand(1,4)
 	//back
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/jima, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK) //0.66
+	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_BACK) //1.33
+	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_BACK) //2
+	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/phosphorus/upp, WEAR_IN_BACK) //2.66
+	new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //3.33
+	new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //4
+	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71/ap, WEAR_IN_BACK) //5
 	//face
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR)
 	//head

code/modules/mob/dead/observer/observer.dm

@@ -558,7 +558,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 	var/mob/living/carbon/human/original_human = mind.original
 
-	if(!original_human.check_tod() || !original_human.is_revivable() || !can_reenter_corpse)
+	if((original_human.stat == DEAD && !original_human.check_tod() || !original_human.is_revivable()) || !can_reenter_corpse)
 		view_health_scan(target)
 		return
 

html/changelogs/AutoChangeLog-pr-4127.yml

@@ -0,0 +1,4 @@
+author: "cuberound"
+delete-after: True
+changes:
+  - rscadd: "UPP SL gets proper bag with mini fire extinguisher three WP grenades , two snacks and an AP mag"

html/changelogs/AutoChangeLog-pr-4212.yml

@@ -0,0 +1,5 @@
+author: "Diegoflores31"
+delete-after: True
+changes:
+  - bugfix: "Glasses with flash protection can no longer be used for welding."
+  - refactor: "Adds defines for negative welding protection."

html/changelogs/AutoChangeLog-pr-4240.yml

@@ -0,0 +1,4 @@
+author: "AnuvKH"
+delete-after: True
+changes:
+  - maptweak: "Fixed deep ocean around NV monsoon, removed incend ammo."

html/changelogs/AutoChangeLog-pr-4256.yml

@@ -0,0 +1,4 @@
+author: "Morrow"
+delete-after: True
+changes:
+  - bugfix: "fixed a bypass to allow ghost scan health when it should not be allowed"

html/changelogs/archive/2023-08.yml

@@ -344,3 +344,69 @@
   realforest2001:
   - rscadd: Added a new lockdown system to research.
   - rscadd: Added an admin button to interact with above.
+2023-08-26:
+  CapCamIII:
+  - rscadd: Adds 6(8 if you're pedantic) new guns for the UPP, details for each in
+      following lines.
+  - rscadd: Type 19, Replacement for PPsh on colonies and black market.
+  - rscadd: Type 64, replacement for scorpion, full sized SMG, 2 versions, 1 for upp,
+      1 for not upp
+  - rscadd: HJRA-12, RPG for UPP.
+  - rscadd: Type 73, pistol for higher ranked UPP troops, UPP COs get a Type 74 which
+      has high-impact rounds, replaces PK9 in non-UPP use.
+  - rscadd: NP92, pistol, replaces PK9 in UPP use(mostly), integrally suppressed version
+      called NPZ92 for UPP Commandos.
+  - rscadd: QYJ-72, UPP GPMG, replaces minigun with UPP Minigunners
+  - rscadd: Technically resprites but due to changes closer to replaces N-Y revolver
+      with ZHNK-72
+  - rscadd: Adds a character custom loadout Type 73, 2 mags spare.
+  - rscadd: UPP helmets now work as ear protection, intended use with HJRA-12 RPG
+  - rscadd: UPP officers now have regular UM4 helmets instead of UH7 helmets in their
+      vendors as UH7 looked ugly with their combat gear
+  - rscdel: Removes the PK9 entirely
+  - rscdel: Removes tranqs from UPP Commando loadout
+  - rscdel: Removes HEAP ammo from UPP officers and commandos, replaced with normal
+      and AP mags when applicable
+  - balance: UPP jackets no longer have massive armor, in exchange they no longer
+      slow and in clothing vendors a light version of UPP armor is vendable
+  - balance: UPP MPs are now armed with a ZHNK-72 belt on their jacket, with an additional
+      shrapnelshot loader in their belt.
+  - balance: Rebalances Type 71 damage/firerate/AP to be a sidegrade of M41A, about
+      equal DPS, higher damage per shot and AP, lower fire rate, carbine is round-about
+      the exact same as M41A however.
+  - balance: Fixes UPP support armor, given to medics on their person and officers
+      in their vendor, lighter version of UPP armor, exchanges protection for speed.
+  - balance: Seperates SVD bullet damage from crude rifle bullet and buffs it as a
+      hard-hitting AP bullet.
+  - balance: Rebalances UPP revolver(now ZHNK-72), much harder hitting and has higher
+      AP, but rarer, shrapnelshot extremely rare and good.
+  - balance: Due to ammo changes, SVD no longer has burst.
+  - balance: Removes ceramic plates from UPP loadouts
+  - bugfix: UPP Major now has the correct UPP Commander skillset
+  - bugfix: UPP Commander skillset can BE
+  - bugfix: Fixes typepath for UPP support/light armor, actually works now.
+  - spellcheck: Renames SVD to Type 88
+  - spellcheck: Renames UPP Minigunner to UPP Machinegunner
+  - spellcheck: Renames UPP jackets to UL4 all around
+  - soundadd: Adds firing sounds for Type 73 and SVD/UPP MG
+  - imageadd: Resprites the SVD, Type 71, and Type 23, all sprites by wei/esselnek
+  - imageadd: Adds sprites for all above guns, all sprites by wei/esselnek
+  - maptweak: Changes instances of skorpion to non-upp type 64, also changes instances
+      of ppsh to type 19
+  Diegoflores31:
+  - balance: Masterkey and underbarrel extinguisher now must be wielded in order to
+      be used.
+  - bugfix: Underbarrel extinguisher no longer bypass wielding restrictions on flamers.
+  Morrow:
+  - balance: You now lose nutrition when gaining blood rather than losing a ton of
+      nutrition when you have low effective blood
+  Morrow, Frans_Feiffer (beautiful sprites):
+  - rscadd: Added in built HUDs to various helmets
+  - rscadd: Sensormates used by squads without medical skills have been converted
+      to buyable helmet optics
+  realforest2001:
+  - code_imp: Changed backend for the message of walking into an invisible wall to
+      reduce duplication.
+  - rscadd: Telephones can now receive calls from multiple networks.
+  - rscadd: Adds UPP, CLF and WY prefab phones.
+  - bugfix: UPP RTO pack is now titled UPP rather than USCM