Commit Graph

7234 Commits

Author SHA1 Message Date
CitadelStationBot 1efd6a339e Automatic changelog generation for PR #3395 [ci skip] 2017-10-15 09:20:06 -05: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
LetterJay 243d8759c7 Update gas_mixture.dm 2017-10-15 07:51:48 -05:00
CitadelStationBot a6e413b8ed Automatic changelog generation for PR #3393 [ci skip] 2017-10-15 07:48:58 -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
CitadelStationBot e3adc4cc15 Automatic changelog generation for PR #3392 [ci skip] 2017-10-15 07:48:28 -05: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
CitadelStationBot b0a20f0dce Automatic changelog generation for PR #3391 [ci skip] 2017-10-15 07:48:18 -05: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
CitadelStationBot fdb4406fc8 Automatic changelog generation for PR #3390 [ci skip] 2017-10-15 07:48:05 -05: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
LetterJay 1b14e571a0 Merge pull request #3388 from Citadel-Station-13/upstream-merge-31706
[MIRROR] pride's hammer has a sprite!
2017-10-15 08:47:20 -04:00
CitadelStationBot 5c95c983af [s] Fixes camera mobs becoming contaminated and other tweaks 2017-10-14 17:40:34 -05:00
Emmett Gaines 24b9d4b9f4 Fixes camera mobs becoming contaminated and other tweaks (#31731) 2017-10-14 17:40:34 -05:00
CitadelStationBot 6e70693416 restores safety check in gas mixture temperature_share() 2017-10-14 15:53:33 -05:00
duncathan salt b840605cb6 restores safety check in gas mixture temperature_share() (#31726) 2017-10-14 15:53:33 -05:00
CitadelStationBot b200389630 Automatic changelog generation for PR #3389 [ci skip] 2017-10-14 15:36:35 -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
CitadelStationBot aa8722b6a0 [s] Removes scrubber and filter infinite pressure exploits. 2017-10-14 15:20:49 -05: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
CitadelStationBot 4f6462bad4 Allows mobs to get shocked when they smash things 2017-10-14 15:19:37 -05: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
CitadelStationBot c12a67fe8e Resets client movement delay to its initial value on death 2017-10-14 15:19:28 -05:00
vuonojenmustaturska 4c697df2e9 Resets client movement delay to its initial value on death (#31674) 2017-10-14 15:19:28 -05:00
CitadelStationBot e3463959cc readds guardians to the uplink 2017-10-14 15:19:20 -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
CitadelStationBot 7d5db29a2f Allows simple animals to qdel, generally 2017-10-14 15:18:07 -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
CitadelStationBot 0c663a6a9c Automatic changelog generation for PR #3384 [ci skip] 2017-10-14 15:09:18 -05:00
LetterJay c10ff48ced Merge pull request #3384 from deathride58/noncentcomobjectives
Axes edglines from security objective
2017-10-14 16:09:16 -04:00
LetterJay 0ee34c7b3d Merge pull request #3383 from Citadel-Station-13/upstream-merge-31662
[MIRROR] Removes unused list
2017-10-14 15:41:09 -04:00
LetterJay 581ea5ac48 Merge pull request #3382 from Citadel-Station-13/upstream-merge-31655
[MIRROR] Slight change to the behavior of Assimilate_Air()
2017-10-14 15:38:21 -04: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 1e01c696b4 Merge pull request #3380 from Citadel-Station-13/upstream-merge-31454
[MIRROR] New Chaplain Weapon: Hammer of Pride!
2017-10-14 15:38:01 -04:00
CitadelStationBot 9c4d885710 Automatic changelog generation for PR #3379 [ci skip] 2017-10-14 14:37:18 -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
CitadelStationBot 6f9123b955 Automatic changelog generation for PR #3365 [ci skip] 2017-10-14 14:37:01 -05: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
Armhulen acab543986 pride's hammer has a sprite! 2017-10-14 14:36:11 -05:00
LetterJay c056349055 Update flightsuit.dm 2017-10-14 13:57:22 -05:00
CitadelStationBot cb95086ca5 Fixes the last Href Token issues 2017-10-14 11:46:01 -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 87e8c66d5f Merge pull request #3378 from Citadel-Station-13/upstream-merge-31649
[MIRROR] Fixes invisible wirecutters and made screwdrivers easier to see in DM
2017-10-14 10:21:27 -04:00