LetterJay
8aebc3b15a
Merge pull request #3364 from Citadel-Station-13/upstream-merge-30909
...
[MIRROR] Radiation rework and subsystem
2017-10-13 23:58:04 -04:00
LetterJay
e18e99f56f
Merge pull request #3361 from Citadel-Station-13/upstream-merge-31614
...
[MIRROR] Fixes electrocution animation
2017-10-13 23:37:46 -04:00
LetterJay
14dc8a5a35
Update life.dm
2017-10-13 12:30:35 -05:00
LetterJay
2d66ab4171
Update life.dm
2017-10-13 10:26:25 -05:00
Emmett Gaines
55e8f6526c
Radiation rework and subsystem
2017-10-13 09:22:23 -05:00
kevinz000
c84a270403
Fixes preferences generation ( #31607 )
2017-10-13 09:16:03 -05:00
Jordan Brown
1941a8fcfa
Merge pull request #31614 from AnturK/zap
...
Fixes electrocution animation
2017-10-13 09:14:45 -05:00
LetterJay
0263f44791
Merge pull request #3330 from Citadel-Station-13/upstream-merge-31554
...
[MIRROR] Fix lavaland turfs looking awkward to AIs
2017-10-12 23:38:00 -04:00
LetterJay
06061f0870
Merge pull request #3301 from Citadel-Station-13/upstream-merge-31530
...
[MIRROR] Allows snoring while unconscious
2017-10-12 12:37:03 -04:00
Tad Hardesty
00606b9303
Fix lavaland turfs looking awkward to AIs ( #31554 )
2017-10-12 10:40:38 -05:00
LetterJay
f93733576e
Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528
...
[MIRROR] Minor refactor of how gas IDs are handled
2017-10-12 07:19:30 -04:00
LetterJay
07f0a5f503
Merge pull request #3318 from Citadel-Station-13/upstream-merge-31365
...
[MIRROR] Mega Carp Re-Carpening: Carpatastrophe!
2017-10-12 07:18:35 -04:00
LetterJay
d82459ae45
Merge pull request #3316 from Citadel-Station-13/upstream-merge-31548
...
[MIRROR] Shameless Cleanbot Buff
2017-10-12 07:18:18 -04:00
LetterJay
9af6ffa946
Merge pull request #3311 from Citadel-Station-13/upstream-merge-31543
...
[MIRROR] Datumizes world/Topic
2017-10-12 07:16:44 -04:00
LetterJay
f19437bae9
Merge pull request #3307 from deathride58/crewobjtweaksgalore
...
Crew Obj & Miscreant system optimizations and tweaks
2017-10-12 07:16:13 -04:00
LetterJay
301dbad665
Update life.dm
2017-10-12 02:58:02 -05:00
LetterJay
992416a9b4
Update carp.dm
2017-10-12 02:56:03 -05:00
duncathan salt
c0e9cde5c2
Minor refactor of how gas IDs are handled
2017-10-12 00:30:09 -05:00
Armhulen
c269b062b9
Mega Carp Re-Carpening: Carpatastrophe!
2017-10-12 00:29:21 -05:00
Incoming5643
5711f562f0
when cleanbot cleans a tile, it will now fully cleans the tile ( #31548 )
...
As opposed to taking out one stain at a time
2017-10-12 00:29:07 -05:00
Jordan Brown
1604f8b1d3
Datumizes world/Topic ( #31543 )
...
* Datumizes world/Topic
* active_players requires comms_key
2017-10-12 00:28:27 -05:00
deathride58
bd18903e13
eh it works
2017-10-11 18:03:58 -04:00
AnturK
5be4669924
Datum antag wizard.
2017-10-11 05:24:17 -05:00
kingofkosmos
abcc74b327
Allows the snore-emote while unconscious. ( #31530 )
2017-10-10 22:15:33 -05:00
LetterJay
3f6596dc17
Merge pull request #3300 from Citadel-Station-13/upstream-merge-31406
...
[MIRROR] Adds Slappers
2017-10-10 22:34:28 -04:00
LetterJay
822f15f4ae
Merge pull request #3292 from Citadel-Station-13/upstream-merge-31494
...
[MIRROR] In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 22:32:52 -04:00
LetterJay
74fbde6801
Merge pull request #3284 from Citadel-Station-13/upstream-merge-31495
...
[MIRROR] Diseases will now cure if species is changed
2017-10-10 22:29:58 -04:00
deathride58
c163176e5d
Adds Slappers ( #31406 )
...
* ADDS SLAPPERS
* fixes everything, just need sprites
* nerfs criticism
2017-10-10 19:54:30 -05:00
Jordan Brown
7b30be0058
Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war
...
In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 13:28:38 -05:00
MoreRobustThanYou
bc318af840
Diseases will now cure if species is changed ( #31495 )
...
* Diseases will now cure if species is changed
* Update _disease.dm
* Update _disease.dm
* Update species.dm
2017-10-10 12:41:42 -05:00
AnturK
e880545425
Fixes emote runtimes ( #31498 )
...
* Emote runtime
* Bleh didn't add all
2017-10-10 08:42:30 -05:00
LetterJay
b7c65c7482
Merge pull request #3274 from Citadel-Station-13/upstream-merge-31492
...
[MIRROR] Fixes xeno mass confusion
2017-10-10 05:55:38 -04:00
LetterJay
c3533fee76
Merge pull request #3269 from Citadel-Station-13/upstream-merge-31408
...
[MIRROR] Makes cameras work on shuttles
2017-10-10 05:54:33 -04:00
LetterJay
0331110388
Merge pull request #3268 from Citadel-Station-13/upstream-merge-31416
...
[MIRROR] Clockwork Golems will not slip on glass
2017-10-10 05:54:18 -04:00
LetterJay
b0c833059e
Update chunk.dm
2017-10-10 04:40:26 -05:00
oranges
429543f4ae
Merge pull request #31492 from ShizCalev/sometimes-i-drink-a-glass-of-water-just-to-suprise-my-liver
...
Fixes xeno mass confusion
2017-10-10 03:22:03 -05:00
oranges
494bb0222c
Makes cameras work on shuttles
2017-10-10 03:15:13 -05:00
oranges
5d3a805d30
Merge pull request #31416 from Armhulen/patch-2
...
Clockwork Golems will not slip on glass
2017-10-10 03:14:01 -05:00
Tad Hardesty
01ecdff51a
Improve extended examination text for many objects ( #31381 )
...
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 03:07:38 -05:00
XDTM
7a0ce217db
Refactors virus spreading
2017-10-09 08:55:57 -05:00
LetterJay
4f033a7137
Merge pull request #3244 from Citadel-Station-13/upstream-merge-31422
...
[MIRROR] Internals set to 0 pressure will properly prevent breathing environment air
2017-10-08 23:35:56 -04:00
LetterJay
7d4b0961f0
Merge pull request #3243 from Citadel-Station-13/upstream-merge-31358
...
[MIRROR] Basilisks are now gold core spawnable: Cyberboss likes me this time edition
2017-10-08 23:35:43 -04:00
XDTM
a49441b1e2
Internals set to 0 pressure will prevent breathing environment air ( #31422 )
2017-10-08 19:09:34 -05:00
Armhulen
62a6867f2e
Makes Basilisks gold slime spawnable. ( #31358 )
2017-10-08 18:30:45 -05:00
kevinz000
687b329b7b
Update pai.dm ( #31379 )
2017-10-08 15:47:32 -05:00
LetterJay
5e2deeff84
Merge pull request #3232 from Citadel-Station-13/upstream-merge-31411
...
[MIRROR] Dedicated equipment removal proc
2017-10-08 16:24:20 -04:00
LetterJay
56f05a8476
Merge pull request #3230 from Citadel-Station-13/upstream-merge-31414
...
[MIRROR] Fixes mob swap on tables.
2017-10-08 16:23:43 -04:00
LetterJay
f046f4f15b
Merge pull request #3225 from Citadel-Station-13/upstream-merge-31413
...
[MIRROR] Removes useless commented-out what-if code from the 1970s
2017-10-08 16:22:10 -04:00
LetterJay
a35b84cc2e
Merge pull request #3208 from Citadel-Station-13/upstream-merge-31386
...
[MIRROR] Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-08 16:18:18 -04:00
LetterJay
4c408f4541
Update give.dm
2017-10-08 14:55:37 -05:00
