cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix cheeky icon port

Browse Source
This commit is contained in:
Aronai Sieyes
2020-05-11 22:08:14 -04:00
parent 29ed593881
commit 4f89fc535f
3 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/game/machinery/pda_multicaster.dm
View File

@@ -1,13 +1,8 @@
/obj/machinery/pda_multicaster
name = "\improper PDA multicaster"
desc = "This machine mirrors messages sent to it to specific departments."
<<<<<<< HEAD
icon = 'icons/obj/stationobjs_vr.dmi' //VOREStation Edit
icon_state = "pdamulti" //VOREStation Edit
=======
icon = 'icons/obj/stationobjs.dmi'
icon_state = "pdamulti"
>>>>>>> 578ba46d... Merge pull request #7125 from Cerebulon/tcommsprites
density = 1
anchored = 1
circuit = /obj/item/weapon/circuitboard/telecomms/pda_multicaster
@@ -41,11 +36,7 @@
if(on)
icon_state = initial(icon_state)
else
<<<<<<< HEAD
icon_state = "[initial(icon_state)]_off" //VOREStation Edit
=======
icon_state = "[initial(icon_state)]_off"
>>>>>>> 578ba46d... Merge pull request #7125 from Cerebulon/tcommsprites
/obj/machinery/pda_multicaster/attackby(obj/item/I, mob/user)
if(I.is_screwdriver())

5
code/game/machinery/telecomms/broadcaster.dm
View File

@@ -132,13 +132,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
/obj/machinery/telecomms/allinone
name = "Telecommunications Mainframe"
<<<<<<< HEAD
//icon = 'icons/obj/stationobjs.dmi' //VOREStation Removal - use parent icon
icon_state = "allinone" //VOREStation Edit
=======
icon = 'icons/obj/stationobjs.dmi'
icon_state = "allinone"
>>>>>>> 578ba46d... Merge pull request #7125 from Cerebulon/tcommsprites
desc = "A compact machine used for portable subspace telecommuniations processing."
density = 1
use_power = USE_POWER_IDLE