From 201883c06a99f977c7ef8c5e5589fe39c929d0a6 Mon Sep 17 00:00:00 2001 From: private-tristan <54422837+private-tristan@users.noreply.github.com> Date: Tue, 28 Nov 2023 01:56:13 -0500 Subject: [PATCH 01/14] Surgeon Buff (#78) --- code/modules/gear_presets/uscm_medical.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/gear_presets/uscm_medical.dm b/code/modules/gear_presets/uscm_medical.dm index 47d5ee19c9..b255874829 100644 --- 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) From 6ea8a1f0d0e69bf33d46c3df44e49f0e3cb5b85f Mon Sep 17 00:00:00 2001 From: private-tristan <54422837+private-tristan@users.noreply.github.com> Date: Tue, 28 Nov 2023 01:56:30 -0500 Subject: [PATCH 02/14] Researchers no longer know how to do surgery (#80) --- code/datums/skills/uscm.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/datums/skills/uscm.dm b/code/datums/skills/uscm.dm index f9b6d1df2b..d3f4823286 100644 --- 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, ) From 34518e75884fafb4637b184f3444cf4126c2283b Mon Sep 17 00:00:00 2001 From: AndroBetel <44546836+AndroBetel@users.noreply.github.com> Date: Tue, 28 Nov 2023 09:59:17 +0300 Subject: [PATCH 03/14] upp spec skill no longer required to fire upp machinegun (#71) --- code/modules/projectiles/guns/misc.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/projectiles/guns/misc.dm b/code/modules/projectiles/guns/misc.dm index 5503ab03a1..078b75ecd1 100644 --- 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 = "" From d57a33b027b5496e47e61aea0a91900a8cf715f3 Mon Sep 17 00:00:00 2001 From: Doubleumc Date: Tue, 28 Nov 2023 02:03:08 -0500 Subject: [PATCH 04/14] GM button: delete nearby xenos (#74) --- code/modules/admin/game_master/game_master.dm | 9 +++++++ tgui/packages/tgui/interfaces/GameMaster.js | 24 ++++++++++++++----- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/code/modules/admin/game_master/game_master.dm b/code/modules/admin/game_master/game_master.dm index 6472563af5..1e2cbd3cc2 100644 --- 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/tgui/packages/tgui/interfaces/GameMaster.js b/tgui/packages/tgui/interfaces/GameMaster.js index b3a4dce486..6814a89394 100644 --- a/tgui/packages/tgui/interfaces/GameMaster.js +++ b/tgui/packages/tgui/interfaces/GameMaster.js @@ -76,12 +76,24 @@ export const GameMasterSpawningPanel = (props, context) => { -