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

Merge remote-tracking branch 'upstream/master' into hiasl

Browse Source 
Conflicts:
	code/modules/client/client procs.dm
This commit is contained in:
tkdrg
2014-10-29 01:27:08 -03:00
parent 3a862deb6b 1aef19c835
commit 90d9dddf39
115 changed files with 3166 additions and 2609 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/client procs.dm
+4 -1
View File
@@ -259,6 +259,9 @@ var/next_external_rsc = 0
'icons/pda_icons/pda_boom.png',
'icons/pda_icons/pda_bucket.png',
'icons/pda_icons/pda_chatroom.png',
'icons/pda_icons/pda_medbot.png',
'icons/pda_icons/pda_floorbot.png',
'icons/pda_icons/pda_cleanbot.png',
'icons/pda_icons/pda_crate.png',
'icons/pda_icons/pda_cuffs.png',
'icons/pda_icons/pda_eject.png',
@@ -302,4 +305,4 @@ var/next_external_rsc = 0
'icons/stamp_icons/large_stamp-cap.png',
'icons/stamp_icons/large_stamp-qm.png',
'icons/stamp_icons/large_stamp-law.png'
)
)