cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 11:38:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update newscaster.dm

Browse Source
This commit is contained in:
Novacat
2021-03-09 17:06:56 -05:00
committed by GitHub
parent 6abf14d67d
commit 64a99f4437
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/newscaster.dm
-3
View File
@@ -631,7 +631,6 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster)
photo_data = new(selection, 1)
<<<<<<< HEAD
//########################################################################################################################
//###################################### NEWSPAPER! ######################################################################
//########################################################################################################################
@@ -779,8 +778,6 @@ obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user)
attack_self(user)
return
=======
>>>>>>> d0b71c8... Lobby Improvements (#7856)
////////////////////////////////////helper procs
/obj/machinery/newscaster/proc/tgui_user_name(mob/user)
if(ishuman(user))