LetterJay fc07e15f61 Merge pull request #3563 from Citadel-Station-13/upstream-merge-31992 ...

[MIRROR] Fixes being unable to merge full stacks

2017-10-23 14:52:28 -04:00

..

__DATASTRUCTURES

Update globals.dm

2017-10-21 07:24:50 -05:00

__DEFINES

Cleans up datum traitor minimally. (#31978)

2017-10-22 17:44:55 -05:00

__HELPERS

Merge pull request #3547 from Citadel-Station-13/upstream-merge-31989

2017-10-23 03:35:35 -04:00

_globalvars

expand simple_animals/hostile/aistatus into a simple_animals-wide system for putting mobs into idling mode (#31778)

2017-10-19 04:57:49 -05:00

_js

…

_onclick

Removes mob.lastattacked and replaces lastattacker with a string

2017-10-22 11:29:35 -05:00

citadel

Merge pull request #3529 from Michiyamenotehifunana/nerf-nerfs

2017-10-22 12:18:35 -04:00

controllers

Merge pull request #3561 from Citadel-Station-13/upstream-merge-32017

2017-10-23 14:51:06 -04:00

datums

Merge pull request #3558 from Citadel-Station-13/upstream-merge-31978

2017-10-23 14:50:05 -04:00

game

Merge pull request #3563 from Citadel-Station-13/upstream-merge-31992

2017-10-23 14:52:28 -04:00

modules

Merge pull request #3560 from Citadel-Station-13/upstream-merge-31923

2017-10-23 14:50:52 -04:00

_compile_options.dm

Update _compile_options.dm

2017-10-12 02:55:10 -05:00

world.dm

…