shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,147 Commits 5 Branches 0 Tags
3c877c96f51301cd8317f7ccaf98c3aba157a736
Commit Graph

28147 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trilbyspaceclone 3c877c96f5 Update sheet_types.dm 2020-01-09 20:42:56 -05:00
Trilbyspaceclone 530d710f57 Update mineral.dm 2020-01-09 20:42:07 -05:00
Trilbyspaceclone 7df495f4ba Merge branch 'master' into plastic__world 2020-01-09 20:41:33 -05:00
CitadelStationBot b522cfafb8 Automatic changelog generation for PR #10329 [ci skip] 2020-01-09 19:34:42 -06:00
Lin e5e2e4f012 Merge pull request #10329 from Ghommie/Ghommie-cit490 
Ports reagents id removal and typepath usage.
 2020-01-10 01:34:39 +00:00
CitadelStationBot 4887510573 Automatic changelog generation for PR #10112 [ci skip] 2020-01-09 19:31:23 -06:00
Lin c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447 
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
 2020-01-10 01:31:20 +00:00
Ghommie 825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00
Lin ee5d6a3d4a Merge pull request #10449 from Ghommie/Ghommie-cit498 
Improves the set_APTFT verb into a proc.
 2020-01-10 00:38:06 +00:00
CitadelStationBot 42b7255a40 Automatic changelog generation for PR #10463 [ci skip] 2020-01-09 16:08:57 -06:00
Ghom 959e87185a Merge pull request #10463 from Putnam3145/random-engine 
Allowed random engines to be weighted
 2020-01-09 23:08:54 +01:00
Trilbyspaceclone 17afb84f94 I didnt even touch any maps 2020-01-09 05:53:23 -05:00
TrilbySpaceClone 34c6288d22 so fantastic! 2020-01-09 05:46:30 -05:00
Putnam3145 3d4e68cf26 Merge branch 'master' into random-engine 2020-01-08 21:08:20 -08:00
deathride58 0b9d566076 Merge pull request #10469 from kevinz000/fail2topic 
Ports fail2topic from Aurora
 2020-01-08 22:19:22 -05:00
CitadelStationBot f4e508615d Automatic changelog generation for PR #10473 [ci skip] 2020-01-08 21:16:06 -06:00
kevinz000 356286f0e5 Merge pull request #10473 from deathride58/serverhopsanity 
[s] adds a basic sanity check to server_hop
 2020-01-08 19:16:03 -08:00
CitadelStationBot 5dd58950ab Automatic changelog generation for PR #10483 [ci skip] 2020-01-08 20:04:47 -06:00
Ghom dd6e85ddac Merge pull request #10483 from Putnam3145/fix_limbs 
Fix limb damage
 2020-01-09 03:04:44 +01:00
Putnam df572996b3 fix limb damage 2020-01-08 15:40:35 -08:00
CitadelStationBot d9783d2bba Automatic changelog generation for PR #10440 [ci skip] 2020-01-08 15:41:28 -06:00
kevinz000 652cf6e60c Merge pull request #10440 from Putnam3145/weird-secret 
Allows users to vote their least favorite game modes in secret/extended vote
 2020-01-08 13:41:26 -08:00
CitadelStationBot ebf87a173b Automatic changelog generation for PR #10442 [ci skip] 2020-01-08 15:40:42 -06:00
kevinz000 6a350d5d58 Merge pull request #10442 from Trilbyspaceclone/patch-264 
Halfs the nutriments in sugar
 2020-01-08 13:40:39 -08:00
kevinz000 2944a902c6 Merge pull request #10447 from Arturlang/Bloodsucker_tweaks 
[READY] Bloodsucker tweaks
 2020-01-08 13:36:24 -08:00
CitadelStationBot 9ed90235ab Automatic changelog generation for PR #10472 [ci skip] 2020-01-08 15:34:45 -06:00
kevinz000 e6a061ee8f Merge pull request #10472 from keronshb/DermalFix 
Dermal Button nanite icon fix
 2020-01-08 13:34:42 -08:00
CitadelStationBot 3894d85c30 Automatic changelog generation for PR #10459 [ci skip] 2020-01-08 15:34:30 -06:00
kevinz000 5360f85e21 Merge pull request #10459 from Putnam3145/cold-blooded 
Adds cold-blooded neutral quirk
 2020-01-08 13:34:27 -08:00
CitadelStationBot 146b8f898c Automatic changelog generation for PR #10457 [ci skip] 2020-01-08 15:33:56 -06:00
kevinz000 5f03f5e3d8 Merge pull request #10457 from r4d6/Voice-Copy 
Add a playback device and make the Voice Analyzer actually care about languages.
 2020-01-08 13:33:54 -08:00
CitadelStationBot 4a5a89ffdc Automatic changelog generation for PR #10467 [ci skip] 2020-01-08 15:31:58 -06:00
kevinz000 dbd2cb6195 Merge pull request #10467 from Seris02/boxfix 
stops lightspeed spessmen in boxes
 2020-01-08 13:31:55 -08:00
CitadelStationBot 465145a0a3 Automatic changelog generation for PR #10285 [ci skip] 2020-01-08 15:31:33 -06:00
kevinz000 68a0eddeaf Merge pull request #10285 from Ghommie/Ghommie-cit491 
[s] Fixes singularity pulls duping rods out of engine floors.
 2020-01-08 13:31:31 -08:00
CitadelStationBot 65d9f13abe Automatic changelog generation for PR #10452 [ci skip] 2020-01-08 15:30:39 -06:00
kevinz000 b68f81f4e6 Merge pull request #10452 from Ghommie/Ghommie-cit499 
Fixes lattice's examine.
 2020-01-08 13:30:37 -08:00
kevinz000 1e6d05dc59 Merge pull request #10470 from deathride58/deletesminers 
[s] adds a cooldown to area creation attempts
 2020-01-08 13:29:36 -08:00
Arturlang cc174d91ec Reviewer suggestion 
Co-Authored-By: Lin <linzolle@gmail.com>
 2020-01-08 22:02:50 +02:00
Artur e16f1d2f21 Makes regen coles not heal instead of affecting aheal 2020-01-08 21:01:37 +01:00
Artur 039248dac7 Kills legion core healing 2020-01-08 20:29:30 +01:00
CitadelStationBot e5220dbd29 Automatic changelog generation for PR #10474 [ci skip] 2020-01-08 06:48:15 -06:00
Ghom f263a3ea31 Merge pull request #10474 from Putnam3145/fix-traitor-again 
[s] Fixes traitors
 2020-01-08 13:48:12 +01:00
Putnam fdce8e2b69 dang 2020-01-08 03:55:23 -08:00
Putnam a97fa8f81a also made objectives deletable 2020-01-07 18:01:24 -08:00
Putnam 26064e0992 crap 2020-01-07 17:37:57 -08:00
deathride58 89fcde9927 im like 3 iq dont bulli 2020-01-07 20:24:08 -05:00
deathride58 f0af57d7d6 wrong question mark place aaa 2020-01-07 20:22:06 -05:00
deathride58 633294c590 adds a basic sanity check to server_hop 2020-01-07 20:03:44 -05:00
Putnam3145 b09ef97ae3 Merge pull request #10305 from BlackMajor/Yeehaw 
Various Mining borg changes. And some extras.
 2020-01-07 16:50:21 -08:00