From 0e0186e04dec442cbc0321e4b7b657d78d3dd216 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Sun, 11 Aug 2024 00:00:06 +0800 Subject: [PATCH 1/3] InitalCommit --- code/game/objects/items/devices/cictablet.dm | 12 ++++++++++++ code/modules/gear_presets/upp.dm | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/code/game/objects/items/devices/cictablet.dm b/code/game/objects/items/devices/cictablet.dm index c53301295fe3..10c7f0009ad2 100644 --- a/code/game/objects/items/devices/cictablet.dm +++ b/code/game/objects/items/devices/cictablet.dm @@ -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" + + announcement_title = UPP_COMMAND_ANNOUNCE + announcement_faction = FACTION_UPP + req_access = list(ACCESS_UPP_COMMANDO) + + minimap_type = MINIMAP_FLAG_UPP diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index ad7b1523d279..8ac573b5beae 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 From 167049c1ae2c54a406437029be154afe25174cc6 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Sun, 11 Aug 2024 21:06:14 +0800 Subject: [PATCH 2/3] CorrectAccess --- code/game/objects/items/devices/cictablet.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/cictablet.dm b/code/game/objects/items/devices/cictablet.dm index 10c7f0009ad2..66d5c26bd34b 100644 --- a/code/game/objects/items/devices/cictablet.dm +++ b/code/game/objects/items/devices/cictablet.dm @@ -186,6 +186,6 @@ announcement_title = UPP_COMMAND_ANNOUNCE announcement_faction = FACTION_UPP - req_access = list(ACCESS_UPP_COMMANDO) + req_access = list(ACCESS_UPP_LEADERSHIP) minimap_type = MINIMAP_FLAG_UPP From ef8908b5cc4d1f0eb20734f5af0e2a2795cddc73 Mon Sep 17 00:00:00 2001 From: Steelpoint <6595389+Steelpoint@users.noreply.github.com> Date: Tue, 13 Aug 2024 11:52:09 +0800 Subject: [PATCH 3/3] Update code/game/objects/items/devices/cictablet.dm Co-authored-by: forest2001 <41653574+realforest2001@users.noreply.github.com> --- code/game/objects/items/devices/cictablet.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/cictablet.dm b/code/game/objects/items/devices/cictablet.dm index 66d5c26bd34b..8c07c71a2112 100644 --- a/code/game/objects/items/devices/cictablet.dm +++ b/code/game/objects/items/devices/cictablet.dm @@ -182,7 +182,7 @@ desc = "A special device used by field UPP commanders." - tablet_name = "UPP Field Commanders Tablet" + tablet_name = "UPP Field Commander's Tablet" announcement_title = UPP_COMMAND_ANNOUNCE announcement_faction = FACTION_UPP