Commit Graph
21904 Commits
Author SHA1 Message Date
kevinz000andGitHub 91f114f717 Merge pull request #8832 from Ghommie/Ghommie-cit116
Fixes new player runtime that makes people unable to join rounds.
2019-07-07 02:33:32 -07:00
CitadelStationBot 5d861581d7 Automatic changelog generation for PR #8826 [ci skip] 2019-07-07 04:32:58 -05:00
kevinz000andGitHub 9d13576cc9 Merge pull request #8826 from Ghommie/Ghommie-cit111
Ports "Adds safer helper for alt-click turf listing"
2019-07-07 02:32:56 -07:00
CitadelStationBot 8e6bb27909 Automatic changelog generation for PR #8824 [ci skip] 2019-07-07 04:31:28 -05:00
kevinz000andGitHub 6944725cfb Merge pull request #8824 from Ghommie/Ghommie-cit109
Ports "Fixes damp rag not smothering people"
2019-07-07 02:31:26 -07:00
CitadelStationBot de310551b6 Automatic changelog generation for PR #8827 [ci skip] 2019-07-07 04:31:12 -05:00
kevinz000andGitHub fd592e5815 Merge pull request #8827 from Ghommie/Ghommie-cit112
Ports "Makes looping sounds use client time"
2019-07-07 02:31:10 -07:00
kevinz000andGitHub d0a74ef331 Revert "Adds a can_inject check to IV Drips" 2019-07-07 02:29:49 -07:00
Linzolle 1731d4a266 normalises hop and cap's berets to not hide hair 2019-07-07 01:44:58 -05:00
Ghommie 3404131f3a don't init yet. 2019-07-07 05:19:13 +02:00
Ghommie 696dd2839b clunky. 2019-07-07 05:13:14 +02:00
Ghommie b2192f0530 Fixes up space ninja's energy net. 2019-07-07 05:06:03 +02:00
kevinz000andGitHub 41c93ee793 Update traumas.json 2019-07-06 03:24:24 -07:00
Ghommie fe2abc990b Fixes new player runtime that makes people unable to join rounds. 2019-07-06 04:51:56 +02:00
Ghommie 00879a6e28 Holographic PDA Quickfix! 2019-07-06 03:46:01 +02:00
deathride58andGitHub bd675d3bae Merge pull request #8808 from Citadel-Station-13/singerydonator
Yellow Outfit - Donator [T2]
2019-07-05 18:00:42 -04:00
LetterJayandGitHub a17b4ff953 Merge branch 'master' into singerydonator 2019-07-05 14:31:31 -05:00
CitadelStationBot 01c2d96e34 Automatic changelog generation for PR #8632 [ci skip] 2019-07-05 08:57:52 -05:00
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
Ghommie eed30d73a9 Ports "Makes ventcrawl much easier on the client" 2019-07-04 23:28:14 +02:00
Ghommie 7be9305b03 Ports "Makes looping sounds use client time" 2019-07-04 22:50:11 +02:00
Ghommie 5ff8be0faa Ports "Adds safer helper for alt-click turf listing" 2019-07-04 22:42:51 +02:00
Ghommie b41e289db3 Ports "Fixes default supplypods exploding their contents" & co. 2019-07-04 22:35:13 +02:00
Ghommie 37cf41a3bb Ports "Fixes damp rag not smothering people" 2019-07-04 22:06:16 +02:00
Ghommie b501edf9cf Ports "fixes spontaneous appendicitis picking incompatible biotypes" 2019-07-04 22:02:20 +02:00
Ghommie 98418c7f87 [s] ports "Fixes infinite brass generation exploit" 2019-07-04 21:54:20 +02:00
Ghommie f134d58464 Flak. 2019-07-04 21:37:06 +02:00
Ghommie 0361a0a863 Ports "Updates corgi & parrot inventory panels to the same formatting as other mobs"
also "Makes Corgi collars removable"
2019-07-04 21:33:56 +02:00
678a08e883 Update modular_citadel/code/modules/client/loadout/__donator.dm
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-07-04 14:23:37 -05:00
Ghommie a2691e8f13 Ports "Add cancel button to assault pod destination selector" 2019-07-04 21:13:03 +02:00
Poojawa 899c5fed7e Oh this should be uncommented too. 2019-07-04 00:56:17 -05:00
Poojawa 43affcb831 properly fixes Quartermaster headrole, mind traits 2019-07-04 00:52:48 -05:00
Poojawa f66ee6f967 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-07-04 00:44:29 -05:00
Sishen e5cd1bd7c2 Update thermomachine.dm 2019-07-03 17:46:05 -04:00
Sishen 4fa244e8e4 Update thermomachine.dm 2019-07-03 17:41:27 -04:00
Sishen 9e514bfab5 Update thermomachine.dm 2019-07-03 17:39:41 -04:00
Sishen df75f9f289 Update thermomachine.dm 2019-07-03 17:38:19 -04:00
Sishen e76954455c fixed lathes 2019-07-03 17:21:05 -04:00
Linzolle 84f0554fc1 ai display was on the ground too 2019-07-03 16:02:53 -05:00
Sishen a9f5b99510 Update thermomachine.dm 2019-07-03 16:55:14 -04:00