Tigercat2000 356835aa99 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT ...

Conflicts:
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/malfunction/malfunction.dm
	code/game/gamemodes/revolution/revolution.dm
	code/modules/admin/verbs/randomverbs.dm

2015-12-03 11:03:01 -08:00

..

computers

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

2015-12-03 11:03:01 -08:00

upload

Unused/WorkInProgress folder cleanup

2015-01-31 16:40:29 +01:00

bios.dm

Unused/WorkInProgress folder cleanup

2015-01-31 16:40:29 +01:00

buildandrepair.dm

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

component.dm

Removes Space Ninjas

2015-03-02 19:05:44 -05:00

computer3_notes.dm

Unused/WorkInProgress folder cleanup

2015-01-31 16:40:29 +01:00

computer.dm

Bay/-tg- Meteor port

2015-06-21 18:39:39 -07:00

file.dm

Removing all mutantrace crap except for slimepeople

2015-04-13 06:20:17 -04:00

laptop.dm

Last Few Destroy Fixes

2015-10-10 00:16:31 -04:00

lapvend.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

networking.dm

Lighting overhaul.

2015-05-10 12:03:27 -07:00

NTOS.dm

Unused/WorkInProgress folder cleanup

2015-01-31 16:40:29 +01:00

program_disks.dm

Unused/WorkInProgress folder cleanup

2015-01-31 16:40:29 +01:00

program.dm

Pass II

2015-07-09 19:51:40 -04:00

server.dm

Unused/WorkInProgress folder cleanup

2015-01-31 16:40:29 +01:00

storage.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

test_machines.dm

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00