Commit Graph
29691 Commits
Author SHA1 Message Date
GhomandGitHub e14d2caacc Update shuttle.dm 2020-02-05 21:20:49 +01:00
CitadelStationBot 3b30990e22 Automatic changelog generation for PR #10898 [ci skip] 2020-02-05 13:47:58 -06:00
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub 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
CitadelStationBot 192bae76fd Automatic changelog generation for PR #10894 [ci skip] 2020-02-05 11:32:21 -06:00
GhomandGitHub 7e8bc10b8e Merge pull request #10894 from Trilbyspaceclone/carps
Buffs carps again
2020-02-05 18:32:18 +01:00
kevinz000andGitHub 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
kevinz000andGitHub 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
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub 402283e86a Merge pull request #10791 from Arturlang/more_bloodsucker_tweaks
[READY] Further tweaks to bloodsuckers
2020-02-05 07:23:36 +01:00
GhomandGitHub 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
GhomandGitHub 4b1e3d216f Merge pull request #10583 from Putnam3145/arousal-tweaks
Consent logging
2020-02-05 07:19:37 +01:00
GhomandGitHub 68cbc3487a Update species.dm 2020-02-05 07:09:55 +01:00
CitadelStationBot 09e9ca9633 Automatic changelog generation for PR #10812 [ci skip] 2020-02-05 00:02:14 -06:00
GhomandGitHub 77eb7b8a96 Merge pull request #10812 from Tupinambis/StunbatonFUNCTIONAL
Stunbaton Balance Adjustments 2.0 (Unfucked Edition)
2020-02-05 07:02:11 +01:00
TrilbyspacecloneandGitHub 1547f99ddb Update carp.dm 2020-02-05 00:59:16 -05:00
CitadelStationBot 420a8a8643 Automatic changelog generation for PR #10869 [ci skip] 2020-02-04 23:52:23 -06:00
GhomandGitHub 472bddb5be Merge pull request #10869 from kevinz000/WHY
can we talk about how admin attack logs being viewable in game is not a good thing, alternatively "i want a word with whoever coded mech logging"
2020-02-05 06:52:20 +01:00
CitadelStationBot 6961e9cd2a Automatic changelog generation for PR #10875 [ci skip] 2020-02-04 23:50:13 -06:00
GhomandGitHub aaa45f102e Merge pull request #10875 from ancientpower/m-bunny-ears
Adds bunny ear style for humans and anthromorphs
2020-02-05 06:50:10 +01:00
GhomandGitHub 57ac5c3d66 Update carp.dm 2020-02-05 06:12:57 +01:00
TrilbyspacecloneandGitHub 4ecbd1e407 Update carp.dm 2020-02-04 22:00:33 -05:00
TrilbyspacecloneandGitHub fb2498781c Update carp.dm 2020-02-04 20:29:50 -05:00
CitadelStationBot e501271d87 Automatic changelog generation for PR #10739 [ci skip] 2020-02-04 19:03:45 -06:00
GhomandGitHub b4ba381b59 Merge pull request #10739 from r4d6/Dwarven_Language
Add a Dwarf Language
2020-02-05 02:03:42 +01:00
Hatterhat fe717597da fuck fermichem 2020-02-04 18:35:26 -06:00
r4d6 f42ef66846 Move the lockers and the beacon 2020-02-04 19:25:10 -05:00
r4d6 60163330f7 closets 2020-02-04 19:07:01 -05:00
r4d6 32f3eec050 Real 2020-02-04 19:03:45 -05:00
CitadelStationBot 038f78bbcd Automatic changelog generation for PR #10893 [ci skip] 2020-02-04 17:04:24 -06:00
GhomandGitHub 642a8c4217 Merge pull request #10893 from Arturlang/TGUI_Next_Crafting
[READY]TGUI Next Crafting
2020-02-05 00:04:21 +01:00
LinandGitHub 66638a39b7 Merge pull request #10851 from Citadel-Station-13/Ghommie-patch-3
Fixing little blood bank gnerator examine runtime error.
2020-02-04 20:36:28 +00:00
CitadelStationBot dbe144f961 Automatic changelog generation for PR #10874 [ci skip] 2020-02-04 14:35:02 -06:00
LinandGitHub e8ea16c3f2 Merge pull request #10874 from Citadel-Station-13/Ghommie-patch-6
Fixes the petting element.
2020-02-04 20:34:59 +00:00
EmeraldSundiskandGitHub 8c25277913 Add files via upload 2020-02-04 12:17:28 -08:00
CitadelStationBot 5e1cbd7174 Automatic changelog generation for PR #10840 [ci skip] 2020-02-04 14:15:40 -06:00
GhomandGitHub c24ffa8f1c Merge pull request #10840 from Putnam3145/easier_bunker
Save panic bunker between rounds
2020-02-04 21:15:37 +01:00
EmeraldSundiskandGitHub c503208081 Merge pull request #18 from EmeraldSundisk/EmeraldSundisk-patch-2
Add files via upload
2020-02-04 11:39:02 -08:00
EmeraldSundiskandGitHub ab1730ad1f Add files via upload 2020-02-04 11:38:36 -08:00