vuonojenmustaturska
4c697df2e9
Resets client movement delay to its initial value on death ( #31674 )
2017-10-14 15:19:28 -05:00
LetterJay
2d32e5f782
Merge pull request #3381 from Citadel-Station-13/upstream-merge-31693
...
[MIRROR] FIXES the NOT FIXED donk pocket issue by FIXING in some omnizine on grind
2017-10-14 15:38:10 -04: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
c056349055
Update flightsuit.dm
2017-10-14 13:57:22 -05: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
49ffb814d5
Update flightsuit.dm
2017-10-14 09:23:01 -05:00
LetterJay
dce56e3951
Merge pull request #3376 from Citadel-Station-13/upstream-merge-31598
...
[MIRROR] Smoke Machine Updates & Fixes
2017-10-14 10:21:09 -04:00
LetterJay
27bd0ffebb
Merge pull request #3374 from Citadel-Station-13/upstream-merge-31635
...
[MIRROR] Small lighting perf tweak
2017-10-14 10:20:36 -04: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
5bbf3b9735
Merge pull request #3370 from Citadel-Station-13/upstream-merge-31620
...
[MIRROR] Fixes various Nanotrasen capitalizations
2017-10-14 10:19:15 -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
2e61af534e
Merge pull request #3366 from Citadel-Station-13/upstream-merge-31420
...
[MIRROR] Bullet decals tweak
2017-10-14 10:17:18 -04:00
LetterJay
d6903bcf3c
Merge branch 'master' into upstream-merge-31601
2017-10-14 10:17:16 -04:00
oranges
5fdaba2b0e
Merge pull request #31693 from Armhulen/patch-12
...
FIXES the NOT FIXED donk pocket issue by FIXING in some omnizine on grind
2017-10-13 23:49:54 -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
LetterJay
aed26b120c
Merge pull request #3350 from Citadel-Station-13/upstream-merge-31584
...
[MIRROR] Fixes ruins spawning over shuttle docks
2017-10-13 23:36:10 -04:00
LetterJay
66585f242c
Merge pull request #3345 from Citadel-Station-13/upstream-merge-31512
...
[MIRROR] Refactors away mission & space ruin area code.
2017-10-13 23:36:01 -04:00
LetterJay
8360e8afd1
Merge pull request #3339 from Citadel-Station-13/upstream-merge-31557
...
[MIRROR] Cleans up some direct loc setting-s in single tank bombs
2017-10-13 23:35:52 -04:00
LetterJay
80eefdd6a0
Update collector.dm
2017-10-13 22:32:45 -05: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
Robustin
4100473aba
Smoke Machine Updates & Fixes ( #31598 )
...
* Smoke Machine Update
* Update smoke_machine.dm
* Compiling again
2017-10-13 16:50:32 -05:00
vuonojenmustaturska
af1aea7e71
Small lighting perf tweak ( #31635 )
...
* lightshit
* Revert "lightshit"
This reverts commit 25a1b6e4a104546c6393d3c472c0412f7580fe96.
* bfghsfg
* kreegah
* honk
2017-10-13 16:30:47 -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
francinum
f63adc1931
Fixes various Nanotrasen capitalizations ( #31620 )
...
* Fixes capitalization of Nanotrasen for secsuits
gimme the GBP
* Fixes this one too
2017-10-13 12:13:26 -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
nicbn
921b65ced0
Bullet decals tweak ( #31420 )
...
* wee
* screen clock update
* resist and stop pulling
* Whoop, Joan messed up on the selection border so here's some fixed icons for that
* there we go
* Update walls.dm
* Update walls.dm
* Update walls.dm
2017-10-13 09:47:10 -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
cd562a3c87
Update centcomAway.dm
2017-10-13 07:30:23 -05:00
LetterJay
09d929e9ca
Merge branch 'master' into upstream-merge-31643
2017-10-13 07:59:09 -04:00
LetterJay
58b8a02802
Update gas_mixture.dm
2017-10-13 02:59:04 -05:00
LetterJay
1e5a6234aa
Update ruins.dm
2017-10-13 02:58:26 -05:00
LetterJay
b08f278127
Merge pull request #3320 from Citadel-Station-13/upstream-merge-31580
...
[MIRROR] Fixes init times
2017-10-13 02:02:16 -04:00
LetterJay
6f9d1893ca
Merge pull request #3342 from Citadel-Station-13/upstream-merge-31396
...
[MIRROR] Adds tick check to ore boxes
2017-10-13 02:01:52 -04:00
LetterJay
fb444f173a
Merge pull request #3351 from Citadel-Station-13/upstream-merge-31582
...
[MIRROR] Notify admins when someone activates a smoke machine
2017-10-13 02:00:46 -04:00
LetterJay
51f5d5423c
Merge pull request #3358 from Citadel-Station-13/upstream-merge-31502
...
[MIRROR] Adds a fireball from the heavens as an admin smite
2017-10-13 00:21:01 -04:00
LetterJay
f4852314dd
Merge pull request #3353 from Citadel-Station-13/upstream-merge-31588
...
[MIRROR] Fixes stationary mob parallax
2017-10-13 00:20:46 -04:00
LetterJay
b43a207390
Merge pull request #3349 from Citadel-Station-13/upstream-merge-31586
...
[MIRROR] Fixes canisters breaking multiple times
2017-10-13 00:20:38 -04:00
LetterJay
ea7b3d101d
Merge pull request #3347 from Citadel-Station-13/upstream-merge-31585
...
[MIRROR] Fixes empty light fixtures showing as working lights in DM
2017-10-13 00:06:06 -04:00
LetterJay
b0f1ecda37
Merge pull request #3336 from Citadel-Station-13/upstream-merge-31569
...
[MIRROR] Fixes conveyor belt layering
2017-10-12 23:55:05 -04:00
LetterJay
25396db2df
Merge pull request #3332 from Citadel-Station-13/upstream-merge-31605
...
[MIRROR] Fixes cryo
2017-10-12 23:45:42 -04:00
