LetterJay 0b50addb85 Merge pull request #5169 from improvedname/Kinky ...

Adds shockcollars to the kinkmate for a price of one coin

2018-01-31 03:03:04 -06:00

..

__DATASTRUCTURES

…

__DEFINES

[MIRROR] Makes fire colorful and anime (#5187)

2018-01-30 07:26:04 -06:00

__HELPERS

Merge pull request #5127 from Citadel-Station-13/upstream-merge-34875

2018-01-29 02:29:00 +00:00

_globalvars

Refactor weather to use Z traits, assorted related cleanup (#34633)

2018-01-21 13:34:04 -06:00

_js

…

_onclick

Merge pull request #4998 from Citadel-Station-13/upstream-merge-34606

2018-01-21 22:41:13 +00:00

citadel

Update cit_vendors.dm

2018-01-29 04:01:34 +00:00

controllers

Merge pull request #35125 from Cyberboss/BlameTheBee

2018-01-30 22:44:13 -06:00

datums

Merge pull request #5116 from Citadel-Station-13/upstream-merge-34915

2018-01-26 15:55:10 +00:00

game

Merge pull request #5212 from Citadel-Station-13/upstream-merge-34951

2018-01-31 03:00:38 -06:00

modules

Merge pull request #5164 from Citadel-Station-13/upstream-merge-34950

2018-01-31 03:02:31 -06:00

_compile_options.dm

Low memory mode

2018-01-19 09:12:37 -06:00

world.dm

…