Skip to content

Commit

Permalink
Fixing UPP loudout oversights (#7540)
Browse files Browse the repository at this point in the history
# About the pull request

there were dupe objects left in code that messed up spawns and wrong UPP
spec was being chosen with minigun rather then pkp

# Explain why it's good for the game

fixes good


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
fix: removes dupe definitions and corrects items i UPP Loudouts
/:cl:

Co-authored-by: vincibrv <[email protected]>
  • Loading branch information
cuberound and uuuuhuuuu authored Nov 12, 2024
1 parent aeeed6d commit cbb785c
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 16 deletions.
7 changes: 0 additions & 7 deletions code/game/machinery/vending/vendor_types/antag/antag_gear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,6 @@
/obj/structure/bed/medevac_stretcher/upp,
)

/obj/effect/essentials_set/upp_heavy
spawned_gear_list = list(
/obj/item/weapon/gun/pkp,
/obj/item/ammo_magazine/pkp,
/obj/item/ammo_magazine/pkp,
)

/obj/effect/essentials_set/leader/upp
spawned_gear_list = list(
/obj/item/explosive/plastic,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,6 @@

//--------------ESSENTIALS------------------------

/obj/effect/essentials_set/medic/upp
spawned_gear_list = list(
/obj/item/bodybag/cryobag,
/obj/item/device/defibrillator,
/obj/item/storage/firstaid/adv,
/obj/item/device/healthanalyzer,
/obj/item/roller,
)

/obj/effect/essentials_set/upp_heavy
spawned_gear_list = list(
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/upp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@
flags_startup_parameters = ROLE_ADD_TO_SQUAD

/datum/equipment_preset/upp/specialist
name = "UPP Specialist (Cryo)"
name = "UPP Specialist minigun (Cryo)"

skills = /datum/skills/upp/specialist
assignment = JOB_UPP_SPECIALIST
Expand Down

0 comments on commit cbb785c

Please sign in to comment.