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

2021 Commits

Author SHA1 Message Date
Artur e360ac1d36 Conflict fix 2020-01-24 23:06:32 +01:00
kevinz000 831ac91917 Merge pull request #10073 from Ghommie/Ghommie-cit435 
Ports timestop and sepia extracts improvements/tweaks.
 2020-01-24 00:25:53 -07:00
kevinz000 f8ec01676a Merge pull request #10609 from Putnam3145/cold-blooded-buff 
Moved cold-blooded to negative, made it cost -2
 2020-01-24 00:22:08 -07:00
Ghommie 78934c52fe A handful of runtime fixes. 2020-01-24 02:27:06 +01:00
Ghom 047059617c Merge pull request #10645 from r4d6/Modular-Lavaland 
Modularize the mining base
 2020-01-23 02:53:34 +01:00
Artur 255f2ce449 Testmerge Conflict fix? 2020-01-22 20:17:42 +01:00
r4d6 e3cb379bde Add the Mining Base as a submap 2020-01-21 20:31:40 -05:00
Artur 8b21a60ac9 MF Line endings 2020-01-20 14:09:22 +02:00
Artur f5ad854c2c Conflict fix 2020-01-20 13:50:52 +02:00
Ghom 77911f9009 Merge pull request #10597 from Putnam3145/player-panel-can-reenter 
Ghost role eligibility activation in player panel
 2020-01-20 03:24:46 +01:00
kevinz000 088e586b47 Merge pull request #9601 from Ghommie/Ghommie-cit265 
Ports move force and move resist, movement/pushing/pulling tweaks & co.
 2020-01-19 16:10:56 -07:00
Ghom 536900a7ac Merge pull request #10520 from Hatterhat/tg-40920 
you like examining things? - port of tgstation 40920
 2020-01-19 16:37:40 +01:00
Ghom 812182230f Merge pull request #10307 from Seris02/stunglasses 
stunglasses
 2020-01-19 16:35:47 +01:00
Putnam cc1fcee4ac Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into one-more-dojo-tweak 2020-01-19 03:56:41 -08:00
Seris02 25d7af31a5 merge fixes 2020-01-19 16:36:04 +08:00
Putnam 3dc3f28748 Moved cold-blooded to negative, made it cost -2 2020-01-18 18:41:04 -08:00
Ghommie 072eca6ec0 fixes and more PRs 2020-01-18 23:01:00 +01:00
Ghommie 3ee855ab77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 22:14:06 +01:00
Ghom d709edb1c2 Merge pull request #10578 from r4d6/Mining 
Port TG's Mining changes
 2020-01-18 20:32:14 +01:00
Putnam 95dc861ad8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into player-panel-can-reenter 2020-01-18 03:39:35 -08:00
Putnam c612462b8c some demodularization + new eligibility stuff 2020-01-18 03:39:27 -08:00
Ghommie 9c0b78bc09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 01:23:08 +01:00
keronshb 69b5164103 Merge branch 'master' into RemoteMoodResearch 2020-01-16 15:50:11 -05:00
r4d6 ce16c91b2f Code changes 2020-01-16 14:08:14 -05:00
Artur 1f718df41a Reverts crafting changes 2020-01-16 14:26:36 +02:00
Artur eb77c6b86b This too 2020-01-16 12:57:11 +02:00
Artur 472d18403c Merge remote-tracking branch 'Upstream/master' into TGUIs_Nexties 2020-01-16 11:38:09 +02:00
Putnam d29603ad77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-15 15:57:32 -08:00
Ghom 31c3b0f7bb Merge pull request #10415 from kevinz000/tg_update_1 
Small controller/backend updates from /tg/
 2020-01-15 15:23:09 +01:00
Artur 8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
Ghommie a0f35f5cfc Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 2020-01-14 00:55:28 +01:00
Ghommie 1d948907f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-13 23:26:21 +01:00
Ghom 3c4d36ddd3 Merge pull request #10478 from Seris02/gorillashuttlesstopping 
Makes the gorilla shuttle emag only
 2020-01-13 16:12:26 +01:00
Ghom 7af8579d17 Merge pull request #10550 from deathride58/fixestopicstatusproper 
fixes status topic having a broken cooldown
 2020-01-13 13:48:04 +01:00
Arturlang f98bc85db0 Merge branch 'master' into mesmerize_quickfiz 2020-01-13 09:44:17 +02:00
Putnam 6197920101 fixed unnecessary typecheck 2020-01-12 23:40:28 -08:00
Artur 1b852b3a03 Fixes mesmerize 2020-01-13 09:34:40 +02:00
deathride58 e3a33ad8c1 fixes status topic having a broken cooldown 2020-01-13 00:56:05 -05:00
Putnam c7e3b167e2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into one-more-dojo-tweak 2020-01-12 17:40:26 -08:00
Putnam bb0d012d7a well that works 2020-01-12 16:08:49 -08:00
Ghommie f45f979c27 Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 2020-01-12 23:21:03 +01:00
Hatterhat 9aedc62ddb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920 2020-01-12 12:39:17 -06:00
Ghommie c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Hatterhat 2842434d00 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920 2020-01-12 02:49:58 -06:00
kevinz000 ce1dabb585 Merge pull request #10513 from r4d6/open-message 
Add a message when pulsing the open wire on airlocks
 2020-01-12 00:37:33 -08:00
Hatterhat 080cb74893 tgstation 40920 tweaked and tested for cit 2020-01-10 22:56:11 -06:00
Putnam 48fadffbfb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-10 17:57:03 -08:00
Lin fb94bf5fa0 Merge pull request #10482 from kappa-sama/modularthing 
modular citadel file destruction but only slightly
 2020-01-11 00:30:58 +00:00
r4d6 96c75eb5ca Add a message when pulsing the open wire on airlocks 2020-01-10 17:01:46 -05:00