CitadelStationBot 2c93091caf [MIRROR] fixes "Drinking glass not updating when used in crafting" (#6058) ...

* fix (#36580)

* fixes "Drinking glass not updating when used in crafting"

2018-03-22 06:06:44 -05:00

..

__DEFINES

Merge pull request #5994 from Poojawa/beepboop

2018-03-21 19:20:43 +00:00

__HELPERS

Merge remote-tracking branch 'refs/remotes/origin/master' into beepboop

2018-03-20 23:00:12 -05:00

_globalvars

Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)

2018-03-14 16:49:40 -05:00

_js

syncs defines

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

_onclick

[MIRROR] Replaced body zone magic strings with defines (#6004)

2018-03-19 21:18:57 -05:00

controllers

[MIRROR] April Fools Day replaces the overflow role with Clowns (#6041)

2018-03-21 12:57:30 -05:00

datums

Being happy no longer makes you obese. (#36565)

2018-03-21 15:35:33 -05:00

game

[MIRROR] fixes breaking SSUs (#6057)

2018-03-22 06:06:21 -05:00

modules

[MIRROR] fixes "Drinking glass not updating when used in crafting" (#6058)

2018-03-22 06:06:44 -05:00

_compile_options.dm

[MIRROR] Sets the default preload_rsc to 2 (#6051)

2018-03-21 15:55:47 -05:00

world.dm

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

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