PsiOmega 59ec34e410 Merge remote-tracking branch 'upstream/dev' into PCAILaws

2015-03-22 17:26:09 +01:00

..

devices

Gamemode refactor, lots of code shuffles, PR will have details.

2015-03-21 11:08:17 +10:30

robot

Gamemode refactor, lots of code shuffles, PR will have details.

2015-03-21 11:08:17 +10:30

stacks

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-03-20 08:44:52 +01:00

weapons

Merge remote-tracking branch 'upstream/dev' into PCAILaws

2015-03-22 17:26:09 +01:00

apc_frame.dm

…

ashtray.dm

Conflict fix

2015-02-03 20:57:16 +03:00

blueprints.dm

…

bodybag.dm

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

contraband.dm

Now possible to order a kit with a random toxin and syringe - 4TC

2015-02-20 21:13:34 +01:00

crayons.dm

…

latexballoon.dm

…

shooting_range.dm

…

toys.dm

Dev merge.

2015-02-21 19:49:47 +10:30

trash.dm

…