skull132 205ed7ed42 Merge remote-tracking branch 'origin/just-in-case' ...

# Conflicts:
#	code/game/objects/items/weapons/weaponry.dm

Conflict clearance for vampire.

2016-01-28 01:32:20 +02:00

..

client defines.dm

Staff now have a "re-admin self" button after de-admining themselves.

2015-03-05 11:05:58 -05:00

client procs.dm

add a sleep inbetween disabling and enabling hardware mode

2015-11-18 14:38:46 +00:00

preferences_ambience.dm

Footstep Sounds + ASFX Tab

2016-01-14 18:28:09 -05:00

preferences_factions.dm

Fix Dionea home system

2015-11-22 20:34:29 -06:00

preferences_gear.dm

Gear loadout sanity checking.

2015-12-09 12:27:41 +01:00

preferences_savefile.dm

Footstep Sounds + ASFX Tab

2016-01-14 18:28:09 -05:00

preferences_spawnpoints.dm

Adds cyborg-only latejoin spawnpoint

2014-11-14 23:38:09 +00:00

preferences_toggles.dm

Mob refactoring.

2015-03-29 10:44:31 +02:00

preferences.dm

Merge remote-tracking branch 'origin/just-in-case'

2016-01-28 01:32:20 +02:00