Hornygranny af3f1aa4d8 Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor ...

Conflicts:
	code/game/machinery/deployable.dm
	code/game/objects/items/weapons/storage/lockbox.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/modules/clothing/glasses/hud.dm
	code/modules/mob/living/silicon/robot/robot.dm

2014-12-09 16:03:45 -08:00

..

devices

Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor

2014-12-09 16:03:45 -08:00

robot

Merge pull request #6125 from MrPerson/span_classes_never_heard_of_them

2014-12-02 15:54:17 +03:00

stacks

Merge pull request #6130 from phil235/AttackMsgStandardizedFormat

2014-12-04 12:45:31 -06:00

weapons

Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor

2014-12-09 16:03:45 -08:00

apc_frame.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

blueprints.dm

Fixes blueprint HTML injection exploit

2014-11-22 14:32:10 -03:00

bodybag.dm

Adding bluespace bodybags. Adding changelog.

2014-10-21 17:27:40 +02:00

candle.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

crayons.dm

Prevented from using popups away from crayon, popup now updates properly, mime colours are properly shown.

2014-09-28 14:02:08 +04:00

documents.dm

-Removed some duplicate code

2014-05-04 16:18:48 -06:00

latexballoon.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

shooting_range.dm

Changes many span classes.

2014-10-18 16:00:38 +02:00

toys.dm

Adds a new prize mech based on the mime mech.

2014-10-21 10:26:01 -05:00

trash.dm

…