cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-26 22:56:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Alternative communicator and cane sprites (#8864)

Browse Source 
* items

* adjustments
This commit is contained in:
Greenjoe12345
2023-01-02 18:19:43 -08:00
committed by GitHub
parent 0c23067efa
commit 2903c367bd
8 changed files with 88 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/communicator/communicator.dm
+16 -39
View File
@@ -18,8 +18,7 @@ var/global/list/obj/item/communicator/all_communicators = list()
/obj/item/communicator
name = "communicator"
desc = "A personal device used to enable long range dialog between two people, utilizing existing telecommunications infrastructure to allow \
communications across different stations, planets, or even star systems."
desc = "A T-14.2 communicator, popular across the galaxy for it's simplicity to use."
icon = 'icons/obj/device.dmi'
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
@@ -315,15 +314,15 @@ var/global/list/obj/item/communicator/all_communicators = list()
// Description: Self explanatory
/obj/item/communicator/update_icon()
if(video_source)
icon_state = "communicator-video"
icon_state = "[initial(icon_state)]-video"
return
if(voice_mobs.len || communicating.len)
icon_state = "communicator-active"
icon_state = "[initial(icon_state)]-active"
return
if(alert_called)
icon_state = "communicator-called"
icon_state = "[initial(icon_state)]-called"
return
icon_state = initial(icon_state)
@@ -340,50 +339,28 @@ var/global/list/obj/item/communicator/all_communicators = list()
//It's the 26th century. We should have smart watches by now.
/obj/item/communicator/watch
name = "communicator watch"
desc = "A personal device used to enable long range dialog between two people, utilizing existing telecommunications infrastructure to allow \
communications across different stations, planets, or even star systems. You can wear this one on your wrist!"
desc = "A T-14.2-W wristbound communicator, all the function of the T-14.2, now in a hands-free format!"
icon = 'icons/obj/device.dmi'
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
icon_state = "commwatch"
slot_flags = SLOT_GLOVES
/obj/item/communicator/watch/update_icon()
if(video_source)
icon_state = "commwatch-video"
return
if(voice_mobs.len || communicating.len)
icon_state = "commwatch-active"
return
if(alert_called)
icon_state = "commwatch-called"
return
icon_state = initial(icon_state)
note = "Thank you for choosing the T-14.2-W Communicator, this is your notepad!"
/obj/item/communicator/sleek
desc = "A personal device used to enable long range dialog between two people, utilizing existing telecommunications infrastructure to allow \
communications across different stations, planets, or even star systems. This one has a large, sleek touch screen."
desc = "A sleek, high-end communicator, featuring a large touchscreen."
icon = 'icons/obj/device.dmi'
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
icon_state = "commsleek"
note = "Thank you for choosing the T-17.4 Communicator, this is your notepad!" //Current note in the notepad function
note = "Thank you for choosing the T-17.4 Communicator, this is your notepad!"
/obj/item/communicator/flip
desc = "The S-12 Flip, An affordable communicator with a clamshell design."
icon_state = "commflip"
note = "Thank you for choosing the S-12 Flip, this is your notepad!" //Current note in the notepad function
/obj/item/communicator/sleek/update_icon()
if(video_source)
icon_state = "commsleek-video"
return
if(voice_mobs.len || communicating.len)
icon_state = "commsleek-active"
return
if(alert_called)
icon_state = "commsleek-called"
return
icon_state = initial(icon_state)
/obj/item/communicator/rugged
desc = "The RB-65, voted most robust communicator 2566!"
icon_state = "commrugged"
note = "Thank you for choosing the RB-65 Communicator, this is your notepad!" //Current note in the notepad function
code/game/objects/items/weapons/canes.dm
+59 -7
View File
@@ -19,6 +19,45 @@
icon_state = "crutch"
item_state = "crutch"
/obj/item/cane/telescopic
name = "telescopic cane"
desc = "A compact cane which can be collapsed for storage."
icon_state = "telecanein"
force = 3
var/on = 0
//Code for Telescopic Cane writen by Gozulio
/obj/item/cane/telescopic/attack_self(mob/user as mob)
on = !on
if(on)
user.visible_message("<span class='notice'>\The [user] extends the cane.</span>",\
"<span class='warning'>You extend the cane.</span>",\
"You hear an ominous click.")
icon_state = "telecaneout"
item_state_slots = list(slot_r_hand_str = "telecane", slot_l_hand_str = "telecane")
w_class = ITEMSIZE_NORMAL
force = 5
attack_verb = list("smacked", "struck", "cracked", "beaten")
else
user.visible_message("<span class='notice'>\The [user] retracts the cane.</span>",\
"<span class='notice'>You retract the cane.</span>",\
"You hear a click.")
icon_state = "telecanein"
item_state_slots = list(slot_r_hand_str = null, slot_l_hand_str = null)
w_class = ITEMSIZE_SMALL
force = 3
attack_verb = list("hit", "poked", "prodded")
if(istype(user,/mob/living/carbon/human))
var/mob/living/carbon/human/H = user
H.update_inv_l_hand()
H.update_inv_r_hand()
playsound(src, 'sound/weapons/empty.ogg', 50, 1)
add_fingerprint(user)
return TRUE
/obj/item/cane/concealed
var/concealed_blade
@@ -93,23 +132,27 @@
w_class = ITEMSIZE_SMALL
force = 3
var/on = 0
var/unfoldverb = "extend"
var/foldverb = "collapse"
var/unfoldicon = "whitecane1out"
var/foldicon = "whitecane1in"
/obj/item/cane/white/collapsible/attack_self(mob/user as mob)
on = !on
if(on)
user.visible_message("<span class='notice'>\The [user] extends the white cane.</span>",\
"<span class='warning'>You extend the white cane.</span>",\
user.visible_message("<span class='notice'>\The [user] [unfoldverb]s the white cane.</span>",\
"<span class='warning'>You [unfoldverb] the white cane.</span>",\
"You hear an ominous click.")
icon_state = "whitecane1out"
icon_state = "[unfoldicon]"
item_state_slots = list(slot_r_hand_str = "whitecane", slot_l_hand_str = "whitecane")
w_class = ITEMSIZE_NORMAL
force = 5
attack_verb = list("smacked", "struck", "cracked", "beaten")
else
user.visible_message("<span class='notice'>\The [user] collapses the white cane.</span>",\
"<span class='notice'>You collapse the white cane.</span>",\
user.visible_message("<span class='notice'>\The [user] [foldverb]s the white cane.</span>",\
"<span class='notice'>You [foldverb] the white cane.</span>",\
"You hear a click.")
icon_state = "whitecane1in"
icon_state = "[foldicon]"
item_state_slots = list(slot_r_hand_str = null, slot_l_hand_str = null)
w_class = ITEMSIZE_SMALL
force = 3
@@ -122,4 +165,13 @@
playsound(src, 'sound/weapons/empty.ogg', 50, 1)
add_fingerprint(user)
return TRUE
return TRUE
/obj/item/cane/white/collapsible/folding
name = "folding white cane"
desc = "A folding white cane. They are commonly used by the blind or visually impaired as a mobility tool or as a courtesy to others."
icon_state = "whitecane2in"
unfoldverb = "unfold"
foldverb = "fold"
unfoldicon = "whitecane2out"
foldicon = "whitecane2in"