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

Update newscaster.dm

Browse Source
This commit is contained in:
cadyn
2021-02-27 14:51:35 -08:00
committed by GitHub
parent ad57e1ad13
commit 8b10504a5c
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/machinery/newscaster.dm
View File

@@ -164,16 +164,8 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster)
securityCaster = 1 securityCaster = 1
/obj/machinery/newscaster/Initialize() /obj/machinery/newscaster/Initialize()
<<<<<<< HEAD
..() //Not returning . because lateload below
GLOB.allCasters += src
||||||| parent of a55ce9bf09... Merge pull request #9772 from VOREStation/upstream-merge-7893
..() //Not returning . because lateload below
allCasters += src
=======
..() ..()
allCasters += src GLOB.allCasters += src
>>>>>>> a55ce9bf09... Merge pull request #9772 from VOREStation/upstream-merge-7893
unit_no = ++unit_no_cur unit_no = ++unit_no_cur
paper_remaining = 15 paper_remaining = 15
update_icon() update_icon()