Commit Graph

29739 Commits

Author SHA1 Message Date
CitadelStationBot 1c82779846 Automatic changelog generation for PR #10881 [ci skip] 2020-02-06 01:41:32 -06:00
kevinz000 18910a23a2 Merge pull request #10881 from Ghommie/Ghommie-cit552
Refactoring mob holders into an element.
2020-02-06 00:41:28 -07:00
CitadelStationBot b3fb11559e Automatic changelog generation for PR #10700 [ci skip] 2020-02-06 01:38:34 -06:00
kevinz000 73aa761c69 Merge pull request #10700 from Ghommie/Ghommie-cit526
Anomalous honking crystal pet peeve & co.
2020-02-06 00:38:31 -07:00
kevinz000 1288a463cf Merge pull request #10772 from Ghommie/Ghommie-cit537
Removing unused vore files and commented out code.
2020-02-06 00:37:52 -07:00
CitadelStationBot 1dd6514bd7 Automatic changelog generation for PR #10919 [ci skip] 2020-02-06 01:37:03 -06:00
kevinz000 ead2be5116 Merge pull request #10919 from Ghommie/Ghommie-cit556
Fixing accidental nerfs to the magpistol.
2020-02-06 00:36:59 -07:00
CitadelStationBot 3a47e49cb3 Automatic changelog generation for PR #10883 [ci skip] 2020-02-06 00:46:07 -06:00
kevinz000 3c5a3cb4d4 Merge pull request #10883 from ancientpower/ghost-newscasters
Allows ghosts to read newscasters and books
2020-02-05 23:46:04 -07:00
CitadelStationBot 109b15ebdd Automatic changelog generation for PR #10902 [ci skip] 2020-02-06 00:45:49 -06:00
kevinz000 e0dd12ecbd Merge pull request #10902 from Citadel-Station-13/Ghommie-patch-1
Fixes some mounted defibrillator issue.
2020-02-05 23:45:45 -07:00
CitadelStationBot 984af3cc9a Automatic changelog generation for PR #10885 [ci skip] 2020-02-06 00:45:33 -06:00
kevinz000 cda01e10f6 Merge pull request #10885 from Ghommie/Ghommie-cit553
Removing a couple troublesome NSFW useless and unused preferences.
2020-02-05 23:45:30 -07:00
kevinz000 50cabc3c64 Merge pull request #10889 from Ghommie/Ghommie-cit555
runtime drifting
2020-02-05 23:44:52 -07:00
CitadelStationBot 0263502a05 Automatic changelog generation for PR #10899 [ci skip] 2020-02-06 00:44:33 -06:00
kevinz000 d0cd33a5ea Merge pull request #10899 from Trilbyspaceclone/vender-hate
Almost all venders now can be restocked
2020-02-05 23:44:30 -07:00
CitadelStationBot cbf1497996 Automatic changelog generation for PR #10900 [ci skip] 2020-02-06 00:44:11 -06:00
kevinz000 27d3fcf5fd Merge pull request #10900 from Putnam3145/port-atmos-fix
Ports atmos priority reaction mix from TG
2020-02-05 23:44:08 -07:00
CitadelStationBot 1c4fb05a98 Automatic changelog generation for PR #10905 [ci skip] 2020-02-06 00:43:56 -06:00
kevinz000 5059c0fa8c Merge pull request #10905 from Hatterhat/engishit
consoleless interfaces default, standard RCD ammo added to industrial engi
2020-02-05 23:43:54 -07:00
CitadelStationBot f6d0c177be Automatic changelog generation for PR #10907 [ci skip] 2020-02-06 00:43:25 -06:00
kevinz000 b17b98ff5f Merge pull request #10907 from Citadel-Station-13/Ghommie-patch-2
Fixes no-grav lavaland labor/mining shuttle areas.
2020-02-05 23:43:21 -07:00
kevinz000 51bc7a5dec Merge pull request #10909 from Citadel-Station-13/Ghommie-patch-3
Fixes the panic bunker persistence.
2020-02-05 23:43:05 -07:00
kevinz000 b8c5f7e319 Merge pull request #10931 from Citadel-Station-13/Ghommie-patch-9
Fixing admin ranks configs loading.
2020-02-05 23:41:21 -07:00
Ghom 181944bb36 Update admin_ranks.dm 2020-02-06 03:07:42 +01:00
Hatterhat f100b6c5e4 multitools in basic tools, dumb headers 2020-02-05 19:47:20 -06:00
CitadelStationBot 3b30990e22 Automatic changelog generation for PR #10898 [ci skip] 2020-02-05 13:47:58 -06:00
Ghom c4e7f2f8cd Merge pull request #10898 from EmeraldSundisk/smalltime
Disposing of a problem on Delta.
2020-02-05 20:47:54 +01:00
CitadelStationBot be3694d858 Automatic changelog generation for PR #10903 [ci skip] 2020-02-05 12:26:43 -06:00
Ghom 6d78d01612 Merge pull request #10903 from Hatterhat/tg-47770
fuck organ decay - tgstation#47770
2020-02-05 19:26:40 +01:00
CitadelStationBot aef2251400 Automatic changelog generation for PR #10915 [ci skip] 2020-02-05 12:22:39 -06:00
Ghom 69c4cde323 Merge pull request #10915 from Citadel-Station-13/kevinz000-patch-5
jackboot magpistols are a thing again
2020-02-05 19:22:36 +01:00
Ghom deb1686ce2 Merge pull request #10911 from Tupinambis/StunbatonFUCK
Addendum to PR #10812. REGEN STAMINA WHATEVER FUCK COMBAT REWORK IS CONFUSING
2020-02-05 19:19:41 +01:00
Ghommie 7e2ad2b71f Fixing accidental nerfs to the magpistol. 2020-02-05 18:45:15 +01:00
CitadelStationBot 192bae76fd Automatic changelog generation for PR #10894 [ci skip] 2020-02-05 11:32:21 -06:00
Ghom 7e8bc10b8e Merge pull request #10894 from Trilbyspaceclone/carps
Buffs carps again
2020-02-05 18:32:18 +01:00
kevinz000 a45038d214 Update pockets.dm 2020-02-05 03:31:55 -07:00
CitadelStationBot af8d6c913d Automatic changelog generation for PR #10855 [ci skip] 2020-02-05 02:10:25 -06:00
kevinz000 f05d37b7fd Merge pull request #10855 from Trilbyspaceclone/patch-274
The Syndicats are run by aliens - Fixes Alien cargo crate to be  correction emag
2020-02-05 01:10:21 -07:00
CitadelStationBot 087ff0cab2 Automatic changelog generation for PR #10747 [ci skip] 2020-02-05 00:38:17 -06:00
Ghom 02d1761c0a Merge pull request #10747 from Citadel-Station-13/kevinz000-patch-11
shoving someone into a wall on the second shove now also disarms their weapon
2020-02-05 07:38:14 +01:00
CitadelStationBot f7d9c2c739 Automatic changelog generation for PR #10788 [ci skip] 2020-02-05 00:36:17 -06:00
Ghom 4cdade4b2d Merge pull request #10788 from Seris02/crushboots
crushing magboots for tators
2020-02-05 07:36:14 +01:00
Tupinambis 3539fa7603 Stunbaton PR had bad math didn't properly reduce effectiveness oops. 2020-02-05 00:31:54 -06:00
CitadelStationBot 575f6e4ebc Automatic changelog generation for PR #10791 [ci skip] 2020-02-05 00:23:39 -06:00
Ghom 402283e86a Merge pull request #10791 from Arturlang/more_bloodsucker_tweaks
[READY] Further tweaks to bloodsuckers
2020-02-05 07:23:36 +01:00
Ghom 20a5f905bc Merge pull request #10832 from r4d6/shitters
Mining Update : Real update
2020-02-05 07:20:02 +01:00
CitadelStationBot 28749a5947 Automatic changelog generation for PR #10583 [ci skip] 2020-02-05 00:19:40 -06:00
Ghom 4b1e3d216f Merge pull request #10583 from Putnam3145/arousal-tweaks
Consent logging
2020-02-05 07:19:37 +01:00
Ghom 68cbc3487a Update species.dm 2020-02-05 07:09:55 +01:00