LetterJay 761035b391 Merge pull request #6901 from Citadel-Station-13/upstream-merge-37960 ...

[MIRROR] Fix some inconsistencies relating to resting

2018-05-27 14:39:18 -05:00

..

effects

Disallow effects from being scanned by the chameleon projector (#38017)

2018-05-25 07:38:01 -05:00

items

Capitalizes CentCom (#38086)

2018-05-27 11:40:12 -05:00

structures

Merge pull request #6901 from Citadel-Station-13/upstream-merge-37960

2018-05-27 14:39:18 -05:00

buckling.dm

Merge pull request #37312 from DaxDupont/tendril

2018-04-20 10:47:28 -05:00

empulse.dm

…

items.dm

Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448

2018-05-24 11:58:57 -05:00

obj_defense.dm

Stops qdeleted objects from taking damage. (#37726)

2018-05-10 02:30:01 -05:00

objs.dm

Kills off three more flags from flags_2

2018-04-29 17:30:55 -05:00

structures.dm

things with stuff (#6233)

2018-04-07 23:07:09 -04:00