From 13f5adcfb8a5cc6ecaafd67c04377b8aff55850e Mon Sep 17 00:00:00 2001 From: Foler <48944552+polerno@users.noreply.github.com> Date: Wed, 12 Jul 2023 19:16:18 +0500 Subject: [PATCH] tele-pda and tele-wrist --- .../preference_setup/loadout/lists/misc.dm | 5 ++ maps/torch/torch6_bridge.dmm | 20 +++---- .../code/game/items/devices/holopad_hand.dm | 55 +++--------------- proxima/icons/obj/Telewatch.dmi | Bin 0 -> 1110 bytes proxima/icons/obj/holopad.dmi | Bin 736 -> 0 bytes 5 files changed, 24 insertions(+), 56 deletions(-) create mode 100644 proxima/icons/obj/Telewatch.dmi delete mode 100644 proxima/icons/obj/holopad.dmi diff --git a/code/modules/client/preference_setup/loadout/lists/misc.dm b/code/modules/client/preference_setup/loadout/lists/misc.dm index bef665a916adc..5bb67c2ad614a 100644 --- a/code/modules/client/preference_setup/loadout/lists/misc.dm +++ b/code/modules/client/preference_setup/loadout/lists/misc.dm @@ -283,3 +283,8 @@ cointype["coin, phoron"] = /obj/item/material/coin/phoron cointype["coin, platinum"] = /obj/item/material/coin/platinum gear_tweaks += new/datum/gear_tweak/path(cointype) + +/datum/gear/telepda + display_name = "tele-pda" + path = /obj/item/device/holopad + cost = 3 diff --git a/maps/torch/torch6_bridge.dmm b/maps/torch/torch6_bridge.dmm index a4343c45cbd30..d6b0af16930d2 100644 --- a/maps/torch/torch6_bridge.dmm +++ b/maps/torch/torch6_bridge.dmm @@ -1150,7 +1150,7 @@ pixel_x = 8; pixel_y = -3 }, -/obj/item/device/holopad, +/obj/item/device/holopad/wrist, /turf/simulated/floor/carpet, /area/crew_quarters/heads/office/xo) "cq" = ( @@ -2324,6 +2324,7 @@ /obj/item/device/flashlight/lamp{ pixel_y = 3 }, +/obj/item/device/holopad/wrist, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/office/cos) "en" = ( @@ -2429,7 +2430,6 @@ desc = "A 'Space Life' brand Security Officer action figure. This one seems rather old. A small heart is sewn into the armor vest." }, /obj/item/sticky_pad/random, -/obj/item/device/holopad, /turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/heads/office/cos) "ev" = ( @@ -4407,7 +4407,6 @@ }, /obj/random_multi/single_item/memo_engineering, /obj/item/storage/box/encryptionkey/engineering, -/obj/item/device/holopad, /turf/simulated/floor/tiled, /area/crew_quarters/heads/office/ce) "iU" = ( @@ -5015,6 +5014,7 @@ name = "plastic table frame" }, /obj/item/toy/desk/newtoncradle, +/obj/item/device/holopad/wrist, /turf/simulated/floor/tiled, /area/crew_quarters/heads/office/ce) "kJ" = ( @@ -5618,7 +5618,7 @@ pixel_x = 9; pixel_y = -24 }, -/obj/item/device/holopad, +/obj/item/device/holopad/wrist, /turf/simulated/floor/tiled/dark/monotile, /area/crew_quarters/heads/office/sea) "mA" = ( @@ -5749,7 +5749,7 @@ /area/hallway/primary/bridge/aft) "mT" = ( /obj/structure/table/woodentable/walnut, -/obj/item/device/holopad, +/obj/item/device/holopad/wrist, /turf/simulated/floor/wood/walnut, /area/crew_quarters/heads/cobed) "mU" = ( @@ -9572,7 +9572,7 @@ /obj/effect/floor_decal/corner/brown/mono, /obj/structure/closet/secure_closet/deckofficer, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/holopad, +/obj/item/device/holopad/wrist, /turf/simulated/floor/tiled/dark/monotile, /area/quartermaster/deckchief) "wP" = ( @@ -10258,6 +10258,7 @@ /obj/structure/table/woodentable_reinforced/walnut, /obj/item/sticky_pad/random, /obj/item/book/manual/nt_regs, +/obj/item/device/holopad/wrist, /turf/simulated/floor/carpet/green, /area/crew_quarters/heads/office/cl) "yV" = ( @@ -11757,7 +11758,7 @@ dir = 4; pixel_x = 21 }, -/obj/item/device/holopad, +/obj/item/device/holopad/wrist, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/office/cmo) "EV" = ( @@ -13030,7 +13031,7 @@ /obj/effect/floor_decal/corner/research/half{ dir = 1 }, -/obj/item/device/holopad, +/obj/item/device/holopad/wrist, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/heads/office/rd) "IW" = ( @@ -14363,7 +14364,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/device/holopad, /turf/simulated/floor/carpet/green, /area/crew_quarters/heads/office/cl) "OD" = ( @@ -15812,7 +15812,7 @@ pixel_y = -4 }, /obj/item/hand_labeler, -/obj/item/device/holopad, +/obj/item/device/holopad/wrist, /turf/simulated/floor/wood/walnut, /area/crew_quarters/heads/office/sgr) "Ug" = ( diff --git a/proxima/code/game/items/devices/holopad_hand.dm b/proxima/code/game/items/devices/holopad_hand.dm index e887c5401468e..4758e80209e55 100644 --- a/proxima/code/game/items/devices/holopad_hand.dm +++ b/proxima/code/game/items/devices/holopad_hand.dm @@ -4,9 +4,9 @@ #define CALL_IN_CALL 3 /obj/item/device/holopad - name = "Holopad" - desc = "Small handheld disk with controls." - icon = 'proxima/icons/obj/holopad.dmi' + name = "Tele-pda" + desc = "Tele-pda is a convenient device that allows you to talk over a closed third-party connection that will protect you from sudden wiretapping or intrusion into your conversations. Rejoice in such a useful thing." + icon = 'proxima/icons/obj/holopda.dmi' icon_state = "holopad" item_state = "card-id" w_class = ITEM_SIZE_TINY @@ -15,8 +15,6 @@ var/uniq_id var/obj/item/device/holopad/abonent = null var/call_state = CALL_NONE - var/obj/effect/hologram = null - var/updatingPos = 0 origin_tech = list(TECH_DATA = 4, TECH_BLUESPACE = 2, TECH_MAGNET = 4) /obj/item/device/holopad/Initialize() @@ -90,7 +88,6 @@ abonent.acceptCall() call_state = CALL_IN_CALL icon_state = "holopad_in_call" - addtimer(CALLBACK(src, .proc/update_holo), 1) audible_message("[voice] transmits, \"Connection established\"", hearing_distance = 1) else @@ -102,7 +99,6 @@ else if(call_state == CALL_CALLING) call_state = CALL_IN_CALL icon_state = "holopad_in_call" - addtimer(CALLBACK(src, .proc/update_holo), 1) audible_message("[voice] transmits, \"Connection established\"", hearing_distance = 1) @@ -118,45 +114,7 @@ icon_state = initial(icon_state) desc = initial(desc) abonent = null - qdel(hologram) -/obj/item/device/holopad/dropped() - update_holo() - -/obj/item/device/holopad/proc/update_holo() - if(call_state == CALL_IN_CALL) - if(!abonent) - return - if(!abonent.hologram) - abonent.hologram = new() - abonent.hologram.name = "Hologram [sanitize(id)]" - abonent.hologram.layer = 5 - if(isliving(loc)) - abonent.hologram.icon = getHologramIcon(build_composite_icon_omnidir(loc)) - else - abonent.hologram.icon = icon('icons/effects/effects.dmi', "icon_state"="nothing") - if(!abonent.updatingPos) - abonent.update_holo_pos() - -/obj/item/device/holopad/proc/update_holo_pos() - if(call_state != CALL_IN_CALL) - updatingPos = 0 - return - updatingPos = 1 - if(isliving(loc)) - var/mob/living/L = loc - hologram.dir = turn(L.dir,180) - hologram.loc = L.loc - hologram.pixel_x = ((L.dir&4)?32:((L.dir&8)?-32:0)) - hologram.pixel_y = ((L.dir&1)?32:((L.dir&2)?-32:0)) - else if(isturf(loc)) - hologram.dir = 2 - hologram.loc = loc - hologram.pixel_x = 0 - hologram.pixel_y = 0 - else - hangUp() - addtimer(CALLBACK(src, .proc/update_holo_pos), 2) /obj/item/device/holopad/attack_self(mob/user) @@ -183,10 +141,15 @@ listening |= G if(!user) - voice = "Holopad Background Voice" + voice = "Tele-link Background Voice" for(var/mob/M in listening) to_chat(M, "[voice] transmits, \"[speaking]\" ") +/obj/item/device/holopad/wrist + name = "Tele-wrist" + desc = "The tele-wrist is a useful device if it is inconvenient for you to hold your tele-pda to your ear, now you can hook it on your hand and chat while jogging or working." + icon = 'proxima/icons/obj/telewatch.dmi' + slot_flags = SLOT_GLOVES #undef CALL_NONE #undef CALL_CALLING diff --git a/proxima/icons/obj/Telewatch.dmi b/proxima/icons/obj/Telewatch.dmi new file mode 100644 index 0000000000000000000000000000000000000000..db63de2f5b3eb4e1fac22f3543f41b0f2c7face1 GIT binary patch literal 1110 zcmV-c1gZOpP)005u}0{{R3yb+fl0000#P)t-sz`(#C z3<5V51xOnPva+&3KtNz%Uc|7J5Y%>MuY zW;160z`(#%OpU1k0004WQchCV=-0C=2JR&a84 z_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DI-58 zzaTM1iHkEOv#1y-V#vjrR+N~V3SwITMN@MUD?xe;bPT}|#=tNlz9=&<9f+_SWr8ru z5SIbTi8(nq4KPC(V59?wn1*ELfz2Uk2-FooXk@^ptl;YB0uDa_g#=n_`Ucot0009K zNkl(J5Jd&0;C-p^|NraFV@PPpn8Xl<)^obre%Q0%B(g;I@^nHFBr%Oj zdp@_#QF+_8dVrgd=4wFwJefEI*Z-IaX@0u2=k`Jap$TcO2Abu-YC@X(6?7(n1IThU zaM1%@_hHg?2jeuLaj&9Bj>XN}WYbw}N4i6CeRZ~Kpm+It0AX$h^a2LT*Ch}q*k7+K z*YL`5g4fj+&3wk|Ej9yv&n-cky8*X@!2=9_2d^AAun+UzLh~og9p(xieg}W4{8r%( zAjQpuzDWP5{8b5Eq@sMa$4BGl6XUZtN^x#J(muJ>h;uX1@HcCDZU)r-komYH&+QHS zZ1OMsSRl+11VNBvN8JCx55f<^55f<^55fk@r_Ma7thdN>n&AAP z)nDr^@O*Z7ujsYW7aa3=b-%Y+LGB{jhHp@??)L`^3Rd@fmfHrw_n8Q004jl0{{R3eocQU0000jP)t-sz`(#} zYHYK!vnjUre%Jry<>fRuJ$!$GW@a=0Gnr=pnZUrn{{S-p0RI60Gp%7eFaQ7m0d!JM zQvg8b*k%9#0H%6WSad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1%*ny7-U29^nv+-wWE$w1>fphc1{Y=Kr2`RmgUt{I8|vVJn8tz} zi_=(Rgt10CAc$$8vVyCh3piu}hU{KxRRe=X00056Nklb;z6o#E8Gcj?Q z?G~v;NhErM^adbhhb7D`c<&K70!QHp93dyEyZQa8>{`jxzHj@`^TXpOM+k;tm;l9M zW;c2+S{!YC`C-XvTt&R5=^0_RDzl?kta-rM}*WM3Gw{4_u>8t~Zi%*mp{A+pyC$&V+*#CP1+-zx@Wm8Jxfa*q7Pf z`3^1=n!p3tm$};Cx+i~OWC9OhU*>1k6&HVDWC9Oh9_IF3Sh6rOfd@u?*;{+@Jvsq8 zelF~LvM)XX8qY%xNQPk;<{y#zei+@C_