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

3592 Commits

Author SHA1 Message Date
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
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
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
Putnam3145 b09ef97ae3 Merge pull request #10305 from BlackMajor/Yeehaw 
Various Mining borg changes. And some extras.
 2020-01-07 16:50:21 -08:00
BlackMajor 05a644cc41 Revert "Merge branch 'master' into Yeehaw" 
This reverts commit 972c03f79f, reversing
changes made to 8ebd698763.
 2020-01-08 12:26:45 +13:00
BlackMajor 972c03f79f Merge branch 'master' into Yeehaw 2020-01-08 12:25:50 +13:00
BlackMajor b41c9cd844 Sync with master 2020-01-08 12:25:22 +13:00
deathride58 6f2cf0b636 [s] adds a cooldown to area creation attempts 2020-01-07 10:04:09 -05:00
BlackMajor 5a97259ba9 Fix a couple of bugs, add wrapping paper and destination tagger 2020-01-07 15:33:16 +13:00
Lin 2ce3b7fbf5 Merge pull request #10455 from Ghommie/Ghommie-cit501 
Porting some runtime fixes.
 2020-01-07 01:00:25 +00:00
Lin 46420a693d Merge branch 'master' into Ghommie-cit425 2020-01-07 00:28:37 +00:00
Lin 7ad6021472 Merge pull request #10437 from Ghommie/Ghommie-cit497 
Fixes roundstart mushpeople being unable to MUSH PUUUUUUUUUUUUNCH!!
 2020-01-06 03:49:52 +00:00
Ghommie dcb2ae77fa Porting some runtime fixes. 2020-01-06 02:14:25 +01:00
Ghom e18244671f Merge pull request #10350 from Putnam3145/dojo-ghostrole 
Ghost cafe quality-of-life, plus making ghost role eligibility an element
 2020-01-05 23:05:13 +01:00
Ghommie 592422ee70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-05 22:53:00 +01:00
kevinz000 6e50bb9c03 Revert "Makes mob/Stat on a 1 second timer rather than fast-as-possible to tone down highpop lag" 2020-01-05 12:47:24 -08:00
Ghommie 8c7b648a4f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit425 2020-01-05 17:42:54 +01:00
Ghom 59279a7cd4 Merge pull request #10433 from Citadel-Station-13/kevinz000-patch-7 
nerfs pogscarabs
 2020-01-05 16:23:37 +01:00
Ghom 0646a8557b Merge pull request #10428 from Putnam3145/bomb_fix 
Made dev bombs kill through bomb armor again
 2020-01-05 15:33:54 +01:00
Ghommie 356304f68f Fixes roundstart mushpeople not having MUSH PUUUUUUUUUUUUNCH!! 2020-01-04 20:34:31 +01:00
Ghom 499907f9b7 Merge pull request #10191 from Citadel-Station-13/michael_labs 
Custom Holoforms for pAIs and AIs oh and adds certain cyborg pai holograms. also mild pai nerf.
 2020-01-04 14:07:25 +01:00
kevinz000 a930464f57 Update extra_drone_types.dm 2020-01-04 00:54:06 -08:00
Putnam b1b1d7171e hard crit actually 2020-01-03 23:07:34 -08:00
Putnam e54ec9ec09 shh 2020-01-03 23:03:45 -08:00
Ghommie f5b251db66 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-03 18:24:39 +01:00
Putnam adf87c7595 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2020-01-02 22:52:24 -08:00
Lin b1ccd512db Merge pull request #10215 from Ghommie/Ghommie-cit473 
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
 2020-01-03 00:00:51 +00:00
Lin 5d667a3540 Merge pull request #10388 from CameronWoof/ez-valids 
Adds the "View Crew Manifest" verb to Robots
 2020-01-02 23:54:14 +00:00
Ghommie 4d06d231f8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-02 17:49:01 +01:00
BlackMajor dd68be6d31 IM NOT TRYING TO EDIT CARBON.DM GITHUB, PLEASE. 2020-01-02 22:20:54 +13:00
BlackMajor 8e5b7c1cba Get outta here 2020-01-02 22:17:56 +13:00
BlackMajor 08d042901c thank you github 2020-01-02 22:16:47 +13:00
BlackMajor da3ab71222 Revert "Revert "Revert "Revert "Merge branch 'master' into Yeehaw"""" 
This reverts commit 74a646490f.
 2020-01-02 22:16:09 +13:00
BlackMajor 74a646490f Revert "Revert "Revert "Merge branch 'master' into Yeehaw""" 
This reverts commit 189e1af175.
 2020-01-02 22:15:40 +13:00
BlackMajor 189e1af175 Revert "Revert "Merge branch 'master' into Yeehaw"" 
This reverts commit 1b25996e55.
 2020-01-02 22:15:36 +13:00
BlackMajor 1b25996e55 Revert "Merge branch 'master' into Yeehaw" 
This reverts commit 490fb3ab61, reversing
changes made to aabb39a364.
 2020-01-02 22:15:31 +13:00
BlackMajor 490fb3ab61 Merge branch 'master' into Yeehaw 2020-01-02 22:13:52 +13:00
BlackMajor aabb39a364 Revert "Merge branch 'master' into Yeehaw" 
This reverts commit 30e3edaac1, reversing
changes made to 62c8fce043.
 2020-01-02 22:06:31 +13:00
BlackMajor 30e3edaac1 Merge branch 'master' into Yeehaw 2020-01-02 22:03:58 +13:00
BlackMajor 3239acf74d Sync 2020-01-02 22:02:55 +13:00
nik707 e232b13119 Merge pull request #10369 from Hatterhat/patch-4 
crusher trophy drop chance increase
 2020-01-01 20:28:35 -06:00
CameronWoof 9a54467064 Robots can now view the crew manifest 2020-01-01 14:38:46 -08:00
Ghommie 37ce6e9336 honk 2020-01-01 20:47:36 +01:00
kevinz000 68bc6dcc2a Update megafauna.dm 2020-01-01 02:43:43 -08:00
kevinz000 094d225874 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-31 19:54:01 -08:00
Lin b651bbcdb3 Merge branch 'master' into Ghommie-cit367 2019-12-31 22:37:59 +00:00
kevinz000 f920e7b73c changes 2019-12-31 10:08:14 -08:00
Ghommie 99c3358d61 Fixing a whacky female clothing caching related issue. 2019-12-31 17:13:01 +01:00
Hatterhat 4c5f6f895b tgstation 42481 2019-12-31 00:07:36 -06:00