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

1648 Commits

Author SHA1 Message Date
kevinz000
d110d7bae9 Merge pull request #10347 from deathride58/stambufferbuff 
[experimental] Buffs the stamina buffer by making it recharge for free.
 2020-01-16 14:51:38 -07: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
deathride58
bbdedd20b6 Merge branch 'master' into stambufferbuff 2020-01-12 20:35:31 -05:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
kevinz000
6396c95bec Merge pull request #10480 from Putnam3145/more_flavor 
Added second flavor text, not copied anywhere.
 2020-01-12 00:41:47 -08:00
Seris02
29b66db9e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into explosionport 2020-01-11 11:29:30 +08:00
Seris02
0b0b80f174 explosions 2020-01-11 11:22:59 +08: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
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
Putnam
244d46ee41 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-08 17:08:01 -08:00
Putnam
12a04da2d2 Added second flavor text, not copied on save. 2020-01-08 00:57:42 -08:00
Putnam
cd35e516ac back by popular demand: maso/nympho 2020-01-07 17:01:14 -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
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
Putnam
fba7a8abb0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-05 19:12:28 -08:00
Putnam
d75a525b3c let's fix arousal huh 2020-01-05 19:10:48 -08: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
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
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
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
3239acf74d Sync 2020-01-02 22:02:55 +13:00
Ghommie
37ce6e9336 honk 2020-01-01 20:47:36 +01: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
Ghommie
99c3358d61 Fixing a whacky female clothing caching related issue. 2019-12-31 17:13:01 +01:00
nik707
70d03a7870 Merge pull request #10344 from Ghommie/Ghommie-cit495 
chestbursters deleting brains fix.
 2019-12-30 18:31:34 -06:00
nik707
8a4e44758f Merge pull request #10165 from Ghommie/Ghommie-cit456 
Minor underwear fixes and tweaks.
 2019-12-30 18:28:48 -06:00
nik707
23f79ffed8 Merge pull request #10123 from Citadel-Station-13/throwing_disarm_stuff 
throwing now only randomly turns things if you are on harm intent
 2019-12-30 18:28:16 -06:00
Ghommie
80e716eeaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-30 18:14:47 +01:00
Ghommie
49f1176170 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-30 16:06:16 +01:00
kevinz000
24e3b88a34 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-30 00:32:25 -08:00
kevinz000
ae77577ed3 Merge pull request #10239 from Ghommie/Ghommie-cit480 
Fixing a few consistency issues with Nightmares.
 2019-12-30 00:15:03 -08:00
kevinz000
74edd7b13f Merge pull request #10243 from Putnam3145/lewdchem-better-options 
Lewd chem sanity pass/"ERP preferences"
 2019-12-30 00:09:18 -08:00
kevinz000
47c92e380c Merge branch 'master' into throwing_disarm_stuff 2019-12-30 00:05:17 -08:00