Commit Graph

22352 Commits

Author SHA1 Message Date
kevinz000 4dcdf7ac4d Merge pull request #9044 from Sishen1542/rock-lock
Adds the ability to construct and deconstruct locker locks
2019-08-04 19:07:35 -07:00
CitadelStationBot afd2ea7db6 Automatic changelog generation for PR #9018 [ci skip] 2019-08-04 21:05:02 -05:00
kevinz000 27b3cb6656 Merge pull request #9018 from Ghommie/Ghommie-cit171
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-08-04 19:04:59 -07:00
Sishen 1f100f1f3b crush my lock with a rock i must 2019-08-03 18:48:14 -04:00
CitadelStationBot 08c74d772a Automatic changelog generation for PR #8942 [ci skip] 2019-08-03 02:49:01 -05:00
kevinz000 f59abbf073 Merge pull request #8942 from jakeramsay007/WardenShotgun
Changes the Warden's shotgun to instead be foldable, with greatly increased penalties for being folded.
2019-08-03 00:48:59 -07:00
CitadelStationBot 753548946d Automatic changelog generation for PR #8994 [ci skip] 2019-08-02 03:43:48 -05:00
kevinz000 eca34a6552 Merge pull request #8994 from Ghommie/Ghommie-cit164
Makes staminaloss also apply the oxyloss fullscreen overlay.
2019-08-02 01:43:46 -07:00
kevinz000 a82f9c011b Merge pull request #9004 from Trilbyspaceclone/Crafting
Ports "Adds helpers for finding martial arts types #42045" as well as "Adds simple framework for learnable crafting recipes #43296"
2019-08-02 00:57:05 -07:00
CitadelStationBot 0b97f3f99d Automatic changelog generation for PR #9005 [ci skip] 2019-08-02 02:56:01 -05:00
kevinz000 e1187036e2 Merge pull request #9005 from Trilbyspaceclone/ID_Swipers
Adds Key Aunths to each QM room on each map
2019-08-02 00:55:59 -07:00
CitadelStationBot 17342614eb Automatic changelog generation for PR #9008 [ci skip] 2019-08-02 02:55:36 -05:00
kevinz000 5fdd0b82dd Merge pull request #9008 from Linzolle/kravmaga
fix krav maga leg sweep
2019-08-02 00:55:34 -07:00
CitadelStationBot 30b5104e63 Automatic changelog generation for PR #9026 [ci skip] 2019-08-02 02:55:20 -05:00
kevinz000 eef733da3d Merge pull request #9026 from BurgerLUA/Alert-Level-Indicator
Alert Level is now displayed at the job selection screen.
2019-08-02 00:55:18 -07:00
kevinz000 dba6a25b15 Merge pull request #9011 from Trilbyspaceclone/patch-201
Ports "Gauze can now be applied to corpses #44199"
2019-08-02 00:54:57 -07:00
kevinz000 caa0579fca Merge pull request #9016 from Trilbyspaceclone/patch-204
Fixes Pound and hardware cake
2019-08-01 23:29:27 -07:00
CitadelStationBot f8d7185ec1 Automatic changelog generation for PR #8958 [ci skip] 2019-08-02 01:29:12 -05:00
kevinz000 b52462de0d Merge pull request #8958 from Trilbyspaceclone/emitter_gun
Makes a new traitor Emitter gun for Engi memes
2019-08-01 23:29:10 -07:00
CitadelStationBot fc61eb84fd Automatic changelog generation for PR #8953 [ci skip] 2019-08-02 01:28:24 -05:00
kevinz000 20f912df49 Merge pull request #8953 from Michiyamenotehifunana/Rapid-Resprite-Service
Resprites RCDs and RPDs
2019-08-01 23:28:21 -07:00
CitadelStationBot 3848d97572 Automatic changelog generation for PR #8988 [ci skip] 2019-08-02 01:26:39 -05:00
kevinz000 84a5c8fe5f Merge pull request #8988 from kiwedespars/hallucination-sting
Hallucination Sting Buffs
2019-08-01 23:26:37 -07:00
CitadelStationBot e458eb1f9f Automatic changelog generation for PR #9001 [ci skip] 2019-08-02 01:26:09 -05:00
kevinz000 64267c7ce2 Merge pull request #9001 from Linzolle/skirtfix
fix sec and hos skirts
2019-08-01 23:26:07 -07:00
CitadelStationBot 11764c0434 Automatic changelog generation for PR #9000 [ci skip] 2019-08-02 01:25:54 -05:00
kevinz000 0a83649f28 Merge pull request #9000 from EgoSumStultus/shielf
REMOVES SHIELF
2019-08-01 23:25:52 -07:00
BurgerLua c0698bd220 whitespace 2019-07-31 16:40:49 -07:00
BurgerLua 3baac83021 Added 2019-07-31 16:40:35 -07:00
Ghommie d9a09d7211 Undoes a few things. 2019-07-31 21:23:20 +02:00
Ghommie ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Trilbyspaceclone c68fb90955 Update snacks_cake.dm 2019-07-31 12:03:56 -04:00
Trilbyspaceclone bbb380e043 Update medical.dm 2019-07-31 09:03:27 -04:00
Linzolle db198ba217 fix leg sweep 2019-07-31 01:17:12 -05:00
Chayse Ramsay 085251f5f7 update_icon 2019-07-30 04:35:54 +01:00
TrilbySpaceClone 54f3934f55 step to pixel 2019-07-29 12:50:13 -04:00
TrilbySpaceClone d610d9e4eb green man told me to 2019-07-29 12:16:58 -04:00
Michiyamenotehifunana 94fa4aa6d5 Merge branch 'master' into Rapid-Resprite-Service 2019-07-29 21:15:46 +08:00
CitadelStationBot 3d597ea508 Automatic changelog generation for PR #8921 [ci skip] 2019-07-29 07:46:09 -05:00
kevinz000 823b14e1e4 Merge pull request #8921 from Trilbyspaceclone/Runtimestation_update
Updates RuntimeStation bugtesting map to be more usefull
2019-07-29 05:46:07 -07:00
CitadelStationBot fadb81042c Automatic changelog generation for PR #8945 [ci skip] 2019-07-29 07:05:25 -05:00
kevinz000 c1c30c0f93 Merge pull request #8945 from Ghommie/Ghommie-cit155
Pubby disposal and lawyer spawner fixes.
2019-07-29 05:05:23 -07:00
CitadelStationBot 261b0d3c25 Automatic changelog generation for PR #8956 [ci skip] 2019-07-29 07:02:36 -05:00
kevinz000 7ab0b28c2c Merge pull request #8956 from CameronWoof/backpack-icons
Updates inventory plates
2019-07-29 05:02:34 -07:00
Trilbyspaceclone 57b6294310 Update uplink_items.dm 2019-07-29 07:54:17 -04:00
Trilbyspaceclone 969b928642 Update special.dm 2019-07-29 07:53:41 -04:00
Trilbyspaceclone f9dfe5ae97 Update special.dm 2019-07-29 07:53:11 -04:00
CitadelStationBot a83aa9da7b Automatic changelog generation for PR #8950 [ci skip] 2019-07-29 06:50:52 -05:00
kevinz000 e6fc288076 Merge pull request #8950 from Trilbyspaceclone/patch-195
Ports "Fixes slime lungs runtime. #45057"
2019-07-29 04:50:49 -07:00
kevinz000 e55563d058 Merge pull request #8990 from EgoSumStultus/his-grace-mindless-mob-fix
Mobs eaten by His Grace now require a mind attached to count for ascension
2019-07-29 04:47:44 -07:00