CitadelStationBot faf8829d30 [MIRROR] Adamantine golem leadership (#785) ...

* Adamantine golem leadership

* Update stylesheet.dm

* Delete golems.dm.rej

* Delete stylesheet.dm.rej

* Update golems.dm

* fuck line endings

2017-05-08 22:16:09 -07:00

..

admin

Merge pull request #772 from Citadel-Station-13/upstream-merge-26874

2017-05-07 23:16:33 -07:00

assembly

…

atmospherics

…

awaymissions

Fixes away gateway

2017-05-07 08:52:57 -05:00

cargo

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813

2017-05-07 22:28:00 -07:00

chatter

…

client

Delete suicide.dm.rej

2017-05-06 11:49:26 -07:00

clothing

Fixes clothing damage message (#831)

2017-05-08 16:44:38 -07:00

crafting

…

detectivework

Fixes detective scanner not being able to ranged scan, adds range/viewcheck vars

2017-05-04 17:54:47 -05:00

emoji

…

error_handler

…

events

woo

2017-05-02 11:19:14 -05:00

flufftext

…

food_and_drinks

Merge pull request #728 from Citadel-Station-13/upstream-merge-26823

2017-05-05 09:43:17 -05:00

games

…

holiday

…

holodeck

rej cleanup

2017-05-02 04:56:46 -05:00

html_interface

…

hydroponics

Merge pull request #708 from Citadel-Station-13/upstream-merge-26752

2017-05-05 09:39:17 -05:00

jobs

[MIRROR] Curator starts with the key to the display cases instead of being the key (#763)

2017-05-08 00:25:59 -07:00

language

…

library

Curator Update

2017-05-03 22:22:12 -05:00

lighting

…

mapping

…

mentor

…

mining

Merge pull request #684 from Citadel-Station-13/upstream-merge-26728

2017-05-07 22:41:24 -07:00

mob

[MIRROR] Adamantine golem leadership (#785)

2017-05-08 22:16:09 -07:00

modular_computers

…

ninja

…

orbit

…

paperwork

…

power

Merge pull request #684 from Citadel-Station-13/upstream-merge-26728

2017-05-07 22:41:24 -07:00

procedural_mapping

…

projectiles

Merge pull request #755 from Citadel-Station-13/upstream-merge-26809

2017-05-06 21:59:40 -07:00

reagents

[MIRROR] Adamantine golem leadership (#785)

2017-05-08 22:16:09 -07:00

recycling

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

2017-05-02 05:13:49 -05:00

research

Merge pull request #705 from Citadel-Station-13/upstream-merge-26743

2017-05-02 18:47:23 -05:00

ruins

[MIRROR] Adamantine golem leadership (#785)

2017-05-08 22:16:09 -07:00

security_levels

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

2017-05-02 05:13:49 -05:00

shuttle

Elevators

2017-05-06 16:29:50 -05:00

space_transition

…

spells

Nerfs Chaplain smoke book. (#758)

2017-05-08 16:45:59 -07:00

station_goals

rej cleanup

2017-05-02 04:56:46 -05:00

stock_market

…

surgery

[MIRROR] Adamantine golem leadership (#785)

2017-05-08 22:16:09 -07:00

telesci

…

tgui

…

tooltip

…

uplink

Curator Update

2017-05-03 22:22:12 -05:00

vehicles

rej cleanup

2017-05-02 04:56:46 -05:00

vore

…

VR

…

zombie

…