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

Jump to bottom

UPP Command Tablet #6913

Merged
merged 3 commits into from
Aug 14, 2024
Merged

UPP Command Tablet #6913

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e0186e
InitalCommit
Aug 10, 2024
167049c
CorrectAccess
Aug 11, 2024
ef8908b
Update code/game/objects/items/devices/cictablet.dm
Steelpoint Aug 13, 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
12 changes: 12 additions & 0 deletions code/game/objects/items/devices/cictablet.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,3 +177,15 @@
announcement_faction = FACTION_PMC

minimap_type = MINIMAP_FLAG_PMC

/obj/item/device/cotablet/upp

desc = "A special device used by field UPP commanders."

tablet_name = "UPP Field Commanders Tablet"
Steelpoint marked this conversation as resolved.
Show resolved Hide resolved

announcement_title = UPP_COMMAND_ANNOUNCE
announcement_faction = FACTION_UPP
req_access = list(ACCESS_UPP_LEADERSHIP)

minimap_type = MINIMAP_FLAG_UPP
7 changes: 7 additions & 0 deletions code/modules/gear_presets/upp.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1606,6 +1606,8 @@
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/megaphone, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/cotablet/upp, WEAR_IN_BACK)

//face
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR)
//head
Expand Down Expand Up @@ -1766,6 +1768,7 @@
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/megaphone, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/cotablet/upp, WEAR_IN_BACK)
//face
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR)
//head
Expand Down Expand Up @@ -1926,6 +1929,7 @@
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/megaphone, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/cotablet/upp, WEAR_IN_BACK)
//face
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR)
//head
Expand Down Expand Up @@ -2086,6 +2090,7 @@
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/megaphone, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/cotablet/upp, WEAR_IN_BACK)
//face
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR)
//head
Expand Down Expand Up @@ -2246,6 +2251,7 @@
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/megaphone, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/cotablet/upp, WEAR_IN_BACK)
//face
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR)
//head
Expand Down Expand Up @@ -2406,6 +2412,7 @@
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/megaphone, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/cotablet/upp, WEAR_IN_BACK)
//face
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR)
//head
Expand Down
Loading