Commit Graph

10 Commits

Author SHA1 Message Date
Ghommie
fac3e65c68 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-07-15 17:42:47 +02:00
Ghommie
7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02:00
Ghommie
5e4bbb0d02 Awaken, code. 2019-05-21 22:45:59 +02:00
Ghommie
a537c12757 Apply some pressure, you lose some pressure 2019-03-19 12:29:26 +01:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
kevinz000
0e4f0c0211 Exploit 2018-03-13 23:04:15 -05:00
kevinz000
0e22fe7660 Chem implants can no longer be activated by action button (#36087) 2018-03-03 06:12:06 -06:00
ACCount
522b8383d8 [READY]Refactors reagent container types 2017-12-18 22:54:51 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
2017-12-11 16:36:38 -08:00
kevinz000
c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
2017-08-24 21:07:58 -07:00