deathride58 f92f1f0390 Merge pull request #4839 from Citadel-Station-13/LetterJay-patch-1 ...

Shock collars

2018-01-18 04:56:18 +00:00

..

__DATASTRUCTURES

Add /datum prefix to custom root types (#34294)

2018-01-11 21:28:02 -06:00

__DEFINES

Fixes missing pipe colors in RPD and pipe painter (#34371)

2018-01-15 03:01:36 -06:00

__HELPERS

Cleans up some redundant stripped_input usage

2018-01-16 14:32:25 -06:00

_globalvars

Merge pull request #34470 from Cyberboss/MoveMotd

2018-01-16 14:28:07 -06:00

_js

syncs defines

2018-01-03 23:15:49 -05:00

_onclick

Replaces cached get_area vars for names (#34338)

2018-01-13 20:56:11 -06:00

citadel

donate fix

2018-01-12 20:05:50 -06:00

controllers

Merge pull request #34470 from Cyberboss/MoveMotd

2018-01-16 14:28:07 -06:00

datums

Merge pull request #34477 from tgstation/Cyberboss-patch-2

2018-01-16 14:29:40 -06:00

game

Merge pull request #4901 from Citadel-Station-13/upstream-merge-33916

2018-01-17 20:15:38 +00:00

modules

Merge pull request #4839 from Citadel-Station-13/LetterJay-patch-1

2018-01-18 04:56:18 +00:00

_compile_options.dm

Fixes compiler errors in the preload_rsc external resource thingy (#34061)

2018-01-15 09:33:07 -06:00

world.dm

Merge pull request #4742 from Citadel-Station-13/upstream-merge-34217

2018-01-10 19:59:51 +00:00