cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 04:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
393dcaade76e600b98fcd43314019ffd969c507f
Bubberstation/code/modules/client
History
GunHog 20bd9976b7 Merge remote-tracking branch 'remotes/upstream/master' into Botcall_TG_Edition 
Conflicts:
	code/game/machinery/bots/bots.dm
	code/game/machinery/bots/cleanbot.dm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/floorbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/bots/mulebot.dm
	code/game/machinery/bots/secbot.dm
	code/game/objects/items/devices/PDA/cart.dm
2014-10-21 18:06:04 -05:00
..
client defines.dm
Initial pass to convert LF to CRLF
2014-03-24 08:53:40 +00:00
client procs.dm
Merge remote-tracking branch 'remotes/upstream/master' into Botcall_TG_Edition
2014-10-21 18:06:04 -05:00
preferences_savefile.dm
Merge branch 'undershirts' of https://github.com/paprka/-tg-station into undershirtstake2
2014-10-08 09:48:49 -07:00
preferences_toggles.dm
Adds a separate preference for whispers. Fixed #4658 Fixed #4712
2014-09-07 14:29:58 +02:00
preferences.dm
Merge branch 'undershirts' of https://github.com/paprka/-tg-station into undershirtstake2
2014-10-08 09:48:49 -07:00