Commit Graph

22 Commits

Author SHA1 Message Date
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
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
kevinz000
8ba3609a4d god why fuck 2019-06-10 00:07:04 -07:00
kevinz000
8cd0b69b61 adrenals 2019-05-28 01:00:41 -07:00
Ghommie
20124c24ec Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-05-21 22:48:59 +02:00
Ghommie
5e4bbb0d02 Awaken, code. 2019-05-21 22:45:59 +02:00
Useroth
5d8cf0cabe Let's give adrenals the one more small touch of love. 2019-04-28 16:13:07 +02:00
Useroth
56b2e7150c Back to the point of entry. 2019-04-28 06:21:03 +02:00
Useroth
41a8177f34 Adjustments v2. 2019-04-27 13:53:04 +02:00
Useroth
c1ffffa4f1 Adjustments. 2019-04-27 13:50:23 +02:00
Useroth
9c17845e0f Buffed changeling adrenals too. 2019-04-26 21:34:50 +02:00
Useroth
3563fef4c0 Makes adrenals work pretty much like they used to pre combat rework. 2019-04-26 16:47:31 +02:00
Ghommie
ced2ee0ad0 Painbow extract. Cluwne. 2019-03-19 14:48:35 +01: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
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
KorPhaeron
0ed0abbd4c Slime Radio Potion (#35548)
* Slime Radio Potion

* Deletes inaccurate comment
2018-02-15 10:38:59 -06:00
KorPhaeron
e64a42c248 Mining sentience upgrade grants minebots a radio and ID (#35235)
* Minebots get mining radio+ID card

* Updates radio implant paths
2018-02-11 05:13:46 -06:00
coiax
866318e33e Internal radio implant 2017-12-29 02:52:24 -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
CitadelStationBot
d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165)
* Grammar fixes to atom descriptions

* compile errors
2017-10-21 07:17:03 -05: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