cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-18 02:22:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018

Browse Source 
# Conflicts:
#	code/modules/mob/mob.dm - Whitespace? No real conflict.
#	code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.
This commit is contained in:
Arokha Sieyes
2018-01-22 12:10:19 -05:00
parent 572aac4afb 10490fa5b4
commit 9016ca94c0
19 changed files with 246 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_utility.dm
-1
View File
@@ -13,7 +13,6 @@
path = /obj/item/device/communicator
cost = 0
display_name = "communicator watch"
/datum/gear/utility/communicator/New()
..()
var/list/communicators = list()