CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
AnturK
2ecb4c216c
Datum rev & related upgrades to base datum antag
2017-10-18 02:26:11 -05:00
oranges
5c49bab3c5
Merge pull request #31135 from KorPhaeron/unconvertable
...
Adds a var to minds that makes them immune to conversion
2017-10-03 18:15:20 -05:00
LetterJay
d8de375ada
Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969
...
[MIRROR] DisplayTimeText mk2
2017-09-27 23:39:03 -04:00
ShizCalev
169aa85d9c
DisplayTimeText mk2
2017-09-24 18:59:57 -05:00
pubby
34e186dadb
Datum abductors refactor
2017-09-24 18:00:49 -05:00
MoreRobustThanYou
df607bb24c
Implant Chairs now also support organs ( #30982 )
...
* Implant Chairs now also support organs
* Update implantchair.dm
* Update implantchair.dm
2017-09-24 11:55:22 -05:00
Robustin
894673ef97
Fixes revolutionary deconversion messages and logging
2017-09-23 11:07:05 -05:00
CitadelStationBot
2a860d1954
[MIRROR] More Initialize() fixes, requires someone to test with DB ( #2857 )
...
* More Initialize() fixes, requires someone to test with DB
* fucking mirror failure
2017-09-22 23:35:22 -05:00
LetterJay
a960b63b0a
Merge branch 'master' into upstream-merge-30056
2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51
commit
2017-09-13 06:04:22 -05:00
LetterJay
c42304737a
Update implantchair.dm
2017-09-11 17:47:55 -05:00
LetterJay
c03e216016
Update implantchair.dm
2017-09-11 14:05:58 -05:00
kingofkosmos
cf07ead653
Regularizes resisting out of containers
2017-09-08 09:58:34 -05:00
CitadelStationBot
bdf2fff8d9
Adds logging cause of microbomb activation in admin logs
2017-08-28 02:19:59 -05:00
kevinz000
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07: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
