Merge remote-tracking branch 'upstream/master' into GM-toggle-vehicle…

…-blockers
cmss13-devs · Nov 28, 2023 · d0545f4 · d0545f4
2 parents 5462ce4 + d57a33b
commit d0545f4
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 11 deletions.
diff --git a/code/datums/skills/uscm.dm b/code/datums/skills/uscm.dm
@@ -117,7 +117,6 @@ MILITARY NONCOMBATANT
 	skills = list(
 		SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN,
 		SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
-		SKILL_SURGERY = SKILL_SURGERY_TRAINED,
 		SKILL_RESEARCH = SKILL_RESEARCH_TRAINED,
 		SKILL_INTEL = SKILL_INTEL_TRAINED,
 	)

diff --git a/code/modules/admin/game_master/game_master.dm b/code/modules/admin/game_master/game_master.dm
@@ -209,6 +209,15 @@ GLOBAL_VAR_INIT(radio_communication_clarity, 100)
 
 			return
 
+		if("delete_xenos_in_view")
+			if(tgui_alert(ui.user, "Do you want to delete all xenos within your view range?", "Confirmation", list("Yes", "No")) != "Yes")
+				return
+
+			for(var/mob/living/carbon/xenomorph/viewed_xeno in view(ui.user.client))
+				qdel(viewed_xeno)
+
+			return
+
 		//Behavior Section
 		if("set_selected_behavior")
 			selected_behavior = params["new_behavior"]

diff --git a/code/modules/gear_presets/uscm_medical.dm b/code/modules/gear_presets/uscm_medical.dm
@@ -95,6 +95,9 @@
 	new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/green(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full, WEAR_WAIST)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_BACK)
 
 	if(new_human.disabilities & NEARSIGHTED)
 		new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_EYES)

diff --git a/code/modules/projectiles/guns/misc.dm b/code/modules/projectiles/guns/misc.dm
@@ -273,10 +273,6 @@
 	if(!skillcheck(user, SKILL_FIREARMS, SKILL_FIREARMS_TRAINED))
 		to_chat(user, SPAN_WARNING("You don't seem to know how to use [src]..."))
 		return 0
-	if(!skillcheck(user, SKILL_SPEC_WEAPONS, SKILL_SPEC_ALL) && user.skills.get_skill_level(SKILL_SPEC_WEAPONS) != SKILL_SPEC_UPP)
-		to_chat(user, SPAN_WARNING("You don't seem to know how to use [src]..."))
-		return 0
-
 
 /obj/effect/syringe_gun_dummy
 	name = ""

diff --git a/tgui/packages/tgui/interfaces/GameMaster.js b/tgui/packages/tgui/interfaces/GameMaster.js
@@ -76,12 +76,24 @@ export const GameMasterSpawningPanel = (props, context) => {
           </Stack>
         </Stack.Item>
         <Stack.Item>
-          <Button
-            content="Delete all xenos"
-            onClick={() => {
-              act('delete_all_xenos');
-            }}
-          />
+          <Stack>
+            <Stack.Item>
+              <Button
+                content="Delete all xenos"
+                onClick={() => {
+                  act('delete_all_xenos');
+                }}
+              />
+            </Stack.Item>
+            <Stack.Item>
+              <Button
+                content="Delete viewed xenos"
+                onClick={() => {
+                  act('delete_xenos_in_view');
+                }}
+              />
+            </Stack.Item>
+          </Stack>
         </Stack.Item>
       </Stack>
     </Section>