Commit Graph

21782 Commits

Author SHA1 Message Date
BurgerLua f4307f919b Nerfed changeling transformation string by making it temporary. 2019-07-05 16:49:02 -07:00
CitadelStationBot 01c2d96e34 Automatic changelog generation for PR #8632 [ci skip] 2019-07-05 08:57:52 -05:00
kevinz000 748550895d Merge pull request #8632 from Arturlang/Traitor_Codeword_Highlight
Ports traitor codeword highlighting
2019-07-05 06:57:49 -07:00
CitadelStationBot 7b8a9cdf4c Automatic changelog generation for PR #8805 [ci skip] 2019-07-05 08:56:49 -05:00
kevinz000 757b85b7b0 Merge pull request #8805 from Linzolle/fix-2
fixes some displays being on the ground
2019-07-05 06:56:47 -07:00
CitadelStationBot 8c2d3c3d6d Automatic changelog generation for PR #8794 [ci skip] 2019-07-05 08:56:24 -05:00
kevinz000 77743c9a0f Merge pull request #8794 from Ghommie/Ghommie-cit100
Fixes the uplink category indexing.
2019-07-05 06:56:22 -07:00
CitadelStationBot ec8f9cd186 Automatic changelog generation for PR #8663 [ci skip] 2019-07-05 08:55:51 -05:00
kevinz000 231e0170a9 Merge pull request #8663 from Ghommie/Ghommie-cit58
Peanuts, peanut butter, and PB&J sandwiches.
2019-07-05 06:55:49 -07:00
CitadelStationBot 2af8ce22e3 Automatic changelog generation for PR #8790 [ci skip] 2019-07-05 08:55:20 -05:00
kevinz000 7544748570 Merge pull request #8790 from deathride58/pryablesleepers
Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers via crowbar
2019-07-05 06:55:18 -07:00
kevinz000 7aa6716024 Merge pull request #8815 from Sishen1542/b
adds a 🅱
2019-07-05 06:54:28 -07:00
Ghommie 3c2e03c247 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit58 2019-07-04 23:46:04 +02:00
Linzolle 84f0554fc1 ai display was on the ground too 2019-07-03 16:02:53 -05:00
CitadelStationBot a814442fa5 Automatic changelog generation for PR #8768 [ci skip] 2019-07-03 15:47:55 -05:00
kevinz000 ba74189192 Merge pull request #8768 from Ghommie/Ghommie-cit94
New sprites for the some pda cartridges.
2019-07-03 13:47:53 -07:00
kevinz000 ce2914ab90 Merge pull request #8769 from Arturlang/ALT_Mech_Strafing
Alt now tempoarily disables strafing for mechs.
2019-07-03 13:47:29 -07:00
CitadelStationBot 067dd7084e Automatic changelog generation for PR #8778 [ci skip] 2019-07-03 15:47:06 -05:00
kevinz000 bce4ce31ab Merge pull request #8778 from Ghommie/Ghommie-cit97
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
2019-07-03 13:47:04 -07:00
CitadelStationBot 63804b257c Automatic changelog generation for PR #8773 [ci skip] 2019-07-03 15:46:10 -05:00
kevinz000 75f1dca544 Merge pull request #8773 from Sishen1542/podgang
Podweak now have all customization options.
2019-07-03 13:46:08 -07:00
CitadelStationBot 273f5a2e9c Automatic changelog generation for PR #8775 [ci skip] 2019-07-03 15:45:36 -05:00
kevinz000 e62213a6cd Merge pull request #8775 from Ghommie/Ghommie-cit95
crew monitor indexing pet peeve.
2019-07-03 13:45:34 -07:00
CitadelStationBot 4cdd3c5f5e Automatic changelog generation for PR #8776 [ci skip] 2019-07-03 15:45:05 -05:00
kevinz000 10a584c71f Merge pull request #8776 from Ghommie/Ghommie-cit96
Porting in donut fixes, beepsky smash and Neurotoxin reworks.
2019-07-03 13:45:02 -07:00
CitadelStationBot 9da6687d1b Automatic changelog generation for PR #8798 [ci skip] 2019-07-03 15:44:36 -05:00
kevinz000 d78bd7399b Merge pull request #8798 from Sishen1542/action-button-swaps
Action button swapping
2019-07-03 13:44:34 -07:00
CitadelStationBot f9be8eb33a Automatic changelog generation for PR #8801 [ci skip] 2019-07-03 15:44:08 -05:00
kevinz000 a689f6b6cb Merge pull request #8801 from Sishen1542/brapfactory
Updated miasma canister sprites
2019-07-03 13:44:05 -07:00
CitadelStationBot d31156a503 Automatic changelog generation for PR #8783 [ci skip] 2019-07-03 15:42:52 -05:00
kevinz000 78357018d6 Merge pull request #8783 from Ghommie/Ghommie-cit98
Fixing some emergency pod storage refactor fuck ups.
2019-07-03 13:42:49 -07:00
CitadelStationBot 467b1351a7 Automatic changelog generation for PR #8781 [ci skip] 2019-07-03 15:42:24 -05:00
kevinz000 ab217e81e6 Merge pull request #8781 from Sishen1542/plasteel
Adds plasteel to medical and security techfabs.
2019-07-03 13:42:22 -07:00
kevinz000 9654308a94 Merge pull request #8809 from Ghommie/Ghommie-cit103
Quickfixing latejoin ghost roles, I'm sorry.
2019-07-03 09:52:14 -07:00
CitadelStationBot cf7725233c Automatic changelog generation for PR #8799 [ci skip] 2019-07-03 11:51:49 -05:00
kevinz000 948bba1274 Merge pull request #8799 from Trilbyspaceclone/Cargo_lewds
Adds Promiscuous Organs crate to cargo
2019-07-03 09:51:47 -07:00
CitadelStationBot 670d1f8743 Automatic changelog generation for PR #8797 [ci skip] 2019-07-03 07:20:40 -05:00
kevinz000 0f0d5323a3 Merge pull request #8797 from Sishen1542/rotate-emitters
Emitters can be rotated instead of only flipped
2019-07-03 05:20:37 -07:00
CitadelStationBot 71ef69b76c Automatic changelog generation for PR #8793 [ci skip] 2019-07-03 07:19:15 -05:00
kevinz000 85534fa1ef Merge pull request #8793 from Ghommie/Ghommie-cit99
Fixes PDA skin preference not saving up.
2019-07-03 05:19:13 -07:00
kevinz000 06f1eb6dcd Merge pull request #8810 from Trilbyspaceclone/patch-185
Corrects  Plastitanium total object damage
2019-07-03 05:18:21 -07:00
Ghommie 1fd50cc15a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit96 2019-07-03 04:52:57 +02:00
Ghommie b2c5e002ec Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit94 2019-07-03 02:50:49 +02:00
Sishen 32b5da6af9 b
b
2019-07-02 15:04:15 -04:00
LetterJay d01eb661cd Merge pull request #8813 from Citadel-Station-13/bedsheet
Bedsheet for Donator [T2]
2019-07-02 10:39:15 -05:00
Jay e4ecb2894a bedsheet for donator 2019-07-02 09:41:04 -05:00
Ghommie 33687dc2bc I'm an idiot, I need to pick an element within the list, not the list itself!! 2019-07-01 22:53:42 +02:00
Ghommie d0a001f663 Quickfixing latejoin ghost roles, I'm sorry. 2019-07-01 22:47:51 +02:00
Trilbyspaceclone 88c01dd521 I need to take a brake 2019-07-01 16:47:50 -04:00
Linzolle 52a6201f41 oops 2019-07-01 02:24:12 -05:00