LetterJay 16eefdd1e6 Merge pull request #7264 from Citadel-Station-13/upstream-merge-38646 ...

[MIRROR] [Ready]Expands the list of borg-wearable hats

2018-07-01 09:32:08 -05:00

..

brain

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

carbon

[MIRROR] RESISTCOLD trait now prevents damage and slowdown from cold, instead of preventing cold itself (#7084)

2018-06-15 02:47:52 -07:00

silicon

Merge pull request #7264 from Citadel-Station-13/upstream-merge-38646

2018-07-01 09:32:08 -05:00

simple_animal

Merge branch 'master' into upstream-merge-38661

2018-06-24 18:13:53 -05:00

blood.dm

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

bloodcrawl.dm

…

damage_procs.dm

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

death.dm

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

emote.dm

[MIRROR] Adds a new drink: Peppermint Patty from Archer! (#7094)

2018-06-15 02:46:40 -07:00

inhand_holder.dm

…

life.dm

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

living_defense.dm

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

living_defines.dm

Removes drone overlays and the associated code (#38175)

2018-05-31 22:41:21 -05:00

living.dm

Merge pull request #38381 from AutomaticFrenzy/patch/orb-of-confusion

2018-06-11 22:30:18 -05:00

login.dm

…

logout.dm

Fix mecha mouse pointer issues (#38213)

2018-06-03 09:03:06 -05:00

say.dm

Merge pull request #38553 from AutomaticFrenzy/patch/aghost-saymode

2018-06-18 13:16:06 -05:00

status_procs.dm

Fixes Adminorazine killing ash lizards (#37872)

2018-05-17 10:24:59 -05:00

taste.dm

Adds minor roundstart traits! (ala CDDA, etc.)

2018-03-02 14:38:18 -06:00

ventcrawling.dm

…