Onule
5bdadb7d4e
Sunflower makeover, adds missing inhands sprites. ( #31728 )
...
* New sunflower sprite, added inhand sprites, first time messing with git
* Updates sunflower and variant's sprites, adds new growing stage sprites for sunflower variants, new inhands sprites.
* Made the leaves a bit higher. Das it
2017-10-15 16:34:01 -05:00
LetterJay
be2dc49384
Merge pull request #3408 from Citadel-Station-13/upstream-merge-31694
...
[MIRROR] Prevents the fire reaction from leaving garbage in the gas mixture
2017-10-15 10:24:22 -04:00
LetterJay
e72d36c381
Merge pull request #3406 from deathride58/heavysechoundnerfs
...
INTENSE BORGO BALANCE CHANGES
2017-10-15 10:23:37 -04:00
LetterJay
a1187795dd
Merge pull request #3405 from Citadel-Station-13/upstream-merge-31692
...
[MIRROR] allows vent internal pressure bound to be set by air alarms
2017-10-15 10:23:26 -04:00
LetterJay
6a288fec29
Merge pull request #3403 from Citadel-Station-13/upstream-merge-31661
...
[MIRROR] Fixes custom shuttle docker display
2017-10-15 10:23:07 -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
499254761c
Merge pull request #3399 from Citadel-Station-13/upstream-merge-31671
...
[MIRROR] ID ejecting from computers by alt-clicking
2017-10-15 10:22:04 -04:00
LetterJay
8f97e8c65f
Merge pull request #3398 from Citadel-Station-13/upstream-merge-31688
...
[MIRROR] fixes filter NaN issue
2017-10-15 10:21:46 -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
5b4bb85ca1
Merge pull request #3394 from Citadel-Station-13/upstream-merge-31726
...
[MIRROR] restores safety check in gas mixture temperature_share()
2017-10-15 10:19:33 -04:00
duncathan salt
e2e4d7aa60
Prevents the fire reaction from leaving garbage in the gas mixture ( #31694 )
2017-10-15 08:48:31 -05:00
LetterJay
243d8759c7
Update gas_mixture.dm
2017-10-15 07:51:48 -05:00
LetterJay
a5ee5c76c8
Merge pull request #3393 from Citadel-Station-13/upstream-merge-31684
...
[MIRROR] [s] Removes scrubber and filter infinite pressure exploits.
2017-10-15 08:48:56 -04:00
LetterJay
e2914c5987
Merge pull request #3392 from Citadel-Station-13/upstream-merge-31677
...
[MIRROR] Allows mobs to get shocked when they smash things
2017-10-15 08:48:26 -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
LetterJay
58872d8b02
Merge pull request #3390 from Citadel-Station-13/upstream-merge-31616
...
[MIRROR] readds guardians to the uplink
2017-10-15 08:48:04 -04:00
deathride58
47195cdbf0
INTENSE BORGO BALANCE TWEAKS
2017-10-15 00:30:22 -04:00
oranges
993cf948fb
allows vent internal pressure bound to be set by air alarms
2017-10-14 21:10:47 -05:00
Jordan Brown
4d110d9b70
Merge pull request #31661 from ninjanomnom/custom-docker
...
Fixes custom shuttle docker display
2017-10-14 18:55:03 -05:00
kevinz000
b20e5916ea
Removes a bunch of sleeps/spawns and makes a few booleans defines
2017-10-14 18:53:48 -05:00
Jordan Brown
5bb7618aa9
Merge pull request #31671 from kingofkosmos/altclickejectidfromcomputers
...
ID ejecting from computers by alt-clicking
2017-10-14 18:48:13 -05:00
Jordan Brown
6b7fce369b
Merge pull request #31688 from duncathan/atmos-patch3
...
fixes filter NaN issue
2017-10-14 18:46:01 -05:00
Emmett Gaines
24b9d4b9f4
Fixes camera mobs becoming contaminated and other tweaks ( #31731 )
2017-10-14 17:40:34 -05:00
duncathan salt
b840605cb6
restores safety check in gas mixture temperature_share() ( #31726 )
2017-10-14 15:53:33 -05:00
kevinz000
80ac0313a7
Merge pull request #3389
2017-10-14 13:36:22 -07:00
kevinz000
e8bb77ba2c
Merge pull request #3387
2017-10-14 13:35:04 -07:00
duncathan salt
9a4ee4d5a4
removes filter and scrubber pressure exploits ( #31684 )
2017-10-14 15:20:49 -05:00
LetterJay
dd18caa84e
Merge pull request #3386 from Citadel-Station-13/upstream-merge-31670
...
[MIRROR] IC Issue also tells the ahelper that their ticket has been resolved
2017-10-14 16:20:30 -04: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
1831bc8ea9
Allows mobs to get shocked when they smash things ( #31677 )
...
also fixes an unrelated runtime involving magillitis
2017-10-14 15:19:37 -05:00
vuonojenmustaturska
4c697df2e9
Resets client movement delay to its initial value on death ( #31674 )
2017-10-14 15:19:28 -05:00
Armhulen
c518497e80
readds guardians to the uplink ( #31616 )
...
* LOL! LMAO! ROFLMAO!
* 12 + 18 = ??
* gang in [current_year]
* ok!
2017-10-14 15:19:19 -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
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
Jordan Brown
ccb0674988
Fixes the last Href Token issues ( #31666 )
2017-10-14 11:46:01 -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
Leo
506324fbec
Merge pull request #31670 from tgstation/Cyberboss-patch-3
...
IC Issue also tells the ahelper that their ticket has been resolved
2017-10-14 09:07:03 -05:00
