Commit Graph

1098 Commits

Author SHA1 Message Date
LetterJay
74bc1be6c2 Merge pull request #3412 from Citadel-Station-13/upstream-merge-31705
[MIRROR] Fixes tendril possession
2017-10-16 07:08:02 -04:00
LetterJay
d5d0fa919a Merge pull request #3411 from Citadel-Station-13/upstream-merge-31714
[MIRROR] Fixes "permenant" and "permenantly" typos in code/comments.
2017-10-16 07:06:37 -04:00
Armhulen
c516404175 Fixes tendril possession (#31705) 2017-10-15 11:33:24 -05:00
Jordan Brown
3d50fec086 Merge pull request #31714 from DaxDupont/screaminginternally
Fixes "permenant" and "permenantly" typos in code/comments.
2017-10-15 11:32:13 -05:00
Jordan Brown
4e4f2fa19d Merge pull request #31713 from vuonojenmustaturska/initializefixesoct
Fixes a bunch of runtimes involving supermatter suicides, also some initialize fixes
2017-10-15 11:32:05 -05:00
LetterJay
e72d36c381 Merge pull request #3406 from deathride58/heavysechoundnerfs
INTENSE BORGO BALANCE CHANGES
2017-10-15 10:23:37 -04:00
LetterJay
b6f69c88ea Merge pull request #3402 from Citadel-Station-13/upstream-merge-31553
[MIRROR] Removes a bunch of sleeps/spawns and makes a few booleans defines
2017-10-15 10:22:59 -04:00
LetterJay
b02e9c6a90 Merge pull request #3395 from Citadel-Station-13/upstream-merge-31731
[MIRROR] [s] Fixes camera mobs becoming contaminated and other tweaks
2017-10-15 10:20:04 -04:00
LetterJay
2f88a62b26 Merge pull request #3391 from Citadel-Station-13/upstream-merge-31674
[MIRROR] Resets client movement delay to its initial value on death
2017-10-15 08:48:17 -04:00
deathride58
47195cdbf0 INTENSE BORGO BALANCE TWEAKS 2017-10-15 00:30:22 -04:00
kevinz000
b20e5916ea Removes a bunch of sleeps/spawns and makes a few booleans defines 2017-10-14 18:53:48 -05:00
Emmett Gaines
24b9d4b9f4 Fixes camera mobs becoming contaminated and other tweaks (#31731) 2017-10-14 17:40:34 -05:00
kevinz000
80ac0313a7 Merge pull request #3389 2017-10-14 13:36:22 -07:00
LetterJay
21ec35da1c Merge pull request #3385 from Citadel-Station-13/upstream-merge-31668
[MIRROR] Fixes slapping while restrained/etc...
2017-10-14 16:20:13 -04:00
vuonojenmustaturska
4c697df2e9 Resets client movement delay to its initial value on death (#31674) 2017-10-14 15:19:28 -05:00
vuonojenmustaturska
f2413f047f Allows simple animals to qdel, generally (#31680)
* Allows simple animals to qdel, generally

* requested changes
2017-10-14 15:18:07 -05:00
LetterJay
253f1e3f1c Merge pull request #3379 from Citadel-Station-13/upstream-merge-30570
[MIRROR] Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes
2017-10-14 15:37:17 -04:00
LetterJay
45619b0e1b Merge pull request #3365 from Citadel-Station-13/upstream-merge-31601
[MIRROR] Fix many instances of "the the"
2017-10-14 15:37:00 -04:00
LetterJay
47df292c54 Update angel.dm 2017-10-14 09:23:46 -05:00
LetterJay
1fcfa019f3 Update species.dm 2017-10-14 09:23:24 -05:00
LetterJay
fea2807378 Merge pull request #3371 from Citadel-Station-13/upstream-merge-31648
[MIRROR] Medibots will no longer inject people in lockers/sleepers/etc
2017-10-14 10:19:52 -04:00
LetterJay
9aa87f73c8 Merge pull request #3369 from Citadel-Station-13/upstream-merge-31628
[MIRROR] Various examine grammar fixes
2017-10-14 10:19:01 -04:00
LetterJay
f7123f0f4b Merge pull request #3368 from Citadel-Station-13/upstream-merge-31623
[MIRROR] Fixes Shambrero Penguin Names
2017-10-14 10:18:43 -04:00
LetterJay
d6903bcf3c Merge branch 'master' into upstream-merge-31601 2017-10-14 10:17:16 -04:00
Leo
635e430ec6 Merge pull request #31668 from tgstation/Cyberboss-patch-2
Fixes slapping while restrained/etc...
2017-10-14 09:05:49 -05:00
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
kevinz000
77d6420db0 Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes 2017-10-13 19:09:45 -05:00
MoreRobustThanYou
282bc3e5f1 Medibots will no longer inject people in lockers/sleepers/etc (#31648) 2017-10-13 16:26:12 -05:00
LetterJay
14dc8a5a35 Update life.dm 2017-10-13 12:30:35 -05:00
ShizCalev
75bdbccbe7 Various grammar fixes 2017-10-13 11:57:00 -05:00
militaires
7f26d59541 Fixes Shambrero Penguin names 2017-10-13 11:55:48 -05:00
LetterJay
2d66ab4171 Update life.dm 2017-10-13 10:26:25 -05:00
Jordan Brown
bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -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