cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 07:08:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into w_class

Browse Source 
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
This commit is contained in:
Mervill
2016-12-02 21:44:24 -08:00
parent 19513c398c ca6ffdba40
commit c2e2440953
95 changed files with 272 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/radio/encryptionkey.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/obj/item/device/encryptionkey/
/obj/item/device/encryptionkey
name = "standard encryption key"
desc = "An encryption key for a radio headset. Has no special codes in it. WHY DOES IT EXIST? ASK NANOTRASEN."
icon = 'icons/obj/radio.dmi'