Commit Graph

7 Commits

Author SHA1 Message Date
deathride58
858da24743 Merge pull request #3977 from Citadel-Station-13/upstream-merge-32790
[MIRROR] Grammar fixes on list circuits
2017-11-17 02:01:15 +00:00
deathride58
8e3bf4d248 Merge pull request #3976 from Citadel-Station-13/upstream-merge-32792
[MIRROR] Grammar fixes on output circuits.
2017-11-17 02:00:26 +00:00
Iamgoofball
3daa75a240 Grammar fixes on list circuits (#32790) 2017-11-16 18:35:17 -06:00
Iamgoofball
6727273613 Grammar fixes on output circuits. (#32792)
* Grammar fixes on outputs

* Update output.dm

* Update output.dm

* Update output.dm

* Update output.dm
2017-11-16 18:34:06 -06:00
Anonmare
d648d971f7 Grammar checks circuit hypospray (#32785) 2017-11-16 17:09:00 -06:00
Jordie
eaa1d752a8 Merge pull request #32753 from optimumtact/wegetityouvape
Smoke circuit only notifies admins on first use and reagent change
2017-11-16 02:11:24 -06:00
arsserpentarium
d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00