Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Fix OPFOR bluescreen #5203

Merged
merged 2 commits into from
Nov 29, 2024
+4 −4
Merged

[MIRROR] Fix OPFOR bluescreen #5203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dfcd17
Fix OPFOR bluescreen (#4640)
FlufflesTheDog Nov 27, 2024
a5fae2a
[MIRROR] Fix OPFOR bluescreen
Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modular_nova/modules/opposing_force/code/opposing_force_datum.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,8 +378,8 @@
user.client?.admin_follow(mind_reference.current)

/datum/opposing_force/proc/set_equipment_count(mob/user, datum/opposing_force_selected_equipment/equipment, new_count)
var/sanitized_newcount = sanitize_integer(new_count, 1, equipment.opposing_force_equipment.max_amount)
equipment.count = new_count
var/sanitized_newcount = sanitize_integer(new_count, 1, equipment.opposing_force_equipment.max_amount, default = 1)
equipment.count = sanitized_newcount
add_log(user.ckey, "Set equipment '[equipment.opposing_force_equipment.name] count to [sanitized_newcount]")

/datum/opposing_force/proc/handle(mob/user)
Expand Down
4 changes: 2 additions & 2 deletions tgui/packages/tgui/interfaces/OpposingForcePanel.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,11 +509,11 @@ export const EquipmentTab = (props) => {
buttons={
<>
<NumberInput
animated
value={equipment.count}
step={1}
minValue={1}
maxValue={5}
onChange={(e, value) =>
onChange={(value) =>
act('set_equipment_count', {
selected_equipment_ref: equipment.ref,
new_equipment_count: value,
Expand Down
Loading