shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,689 Commits 5 Branches 0 Tags
08d042901c2a07f7ecfb9cdcbbf08ff568b60228
Commit Graph

762 Commits

Author SHA1 Message Date
BlackMajor
08d042901c thank you github 2020-01-02 22:16:47 +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
Ghom
5873ee8ea8 Merge pull request #10264 from Seris02/wintercoatsagain 
Makes cultist coats hold respective items, can actually make them and adds cosmetic versions to the loadout
 2019-12-27 13:27:04 +01:00
Seris02
8ed4fe9c05 changes 2019-12-27 18:09:30 +08:00
Lin
5670276c70 Merge pull request #10237 from Ghommie/Ghommie-cit479 
Stops humanoids whose skin_tone variable is set to "albino" from showing up as pale when examined should their species not use skintones anyway.
 2019-12-25 19:06:46 +00:00
Seris02
d6727bce64 woops 2019-12-22 12:26:42 +08:00
Seris02
18481ec253 more coat stuff yes yes 2019-12-22 12:19:58 +08:00
Lin
37a0f0d7e6 Merge pull request #10241 from Ghommie/Ghommie-cit482 
Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly
 2019-12-21 22:44:09 +00:00
Ghom
6b2fe333f4 Merge pull request #9830 from DeltaFire15/cbt-clockvsbloodtorture 
Stun warfare rebalance - CBT edition
 2019-12-21 19:02:00 +01:00
Ghom
2b2a3c2721 Merge pull request #9950 from Citadel-Station-13/marauder-nerf-1 
Nerfs the Clockwork Marauder meta
 2019-12-21 17:26:04 +01:00
Ghom
2a76743747 I'm playing dirty because we have too many PRs to merge anyway. 2019-12-21 16:42:27 +01:00
Ghom
daf099388e Unnecessary OOC note. 2019-12-21 16:37:28 +01:00
Ghom
a384b1782b Merge pull request #10164 from kappa-sama/martialartist 
What ho, Muscle Wizard! Might you cast us a spell?
 2019-12-21 15:24:06 +01:00
Ghom
19fc981cc1 Merge pull request #9596 from Linzolle/abductor-update 
Bring abductors up-to-date with /tg/.
 2019-12-21 11:15:29 +01:00
Lin
3dc00519fc Merge pull request #9910 from Ghommie/Ghommie-cit390 
Unmodularize gamemodes folder.
 2019-12-19 23:23:20 +00:00
Linzolle
f3aa363a2e drop 2019-12-19 17:19:07 -06:00
Lin
66c6659681 Merge pull request #10160 from Ghommie/Ghommie-cit453 
Ports improved and simplier fire alarms.
 2019-12-19 23:00:52 +00:00
Ghommie
f1154bf840 wew 2019-12-19 16:45:08 +01:00
Ghommie
88978209fa Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly" 2019-12-19 16:42:25 +01:00
Ghommie
b56d2ff276 Stops humanoids whose skin_tone variable is set to "albino" from showing up as pale when examined should their species not use skintones anyway. 2019-12-19 11:19:00 +01:00
Linzolle
70e50e57cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-17 20:21:49 -06:00
kappa-sama
8da0ddda1b oops 2019-12-17 16:40:06 -05:00
Putnam3145
37cfec22aa Merge pull request #10066 from Sishen1542/aaaaaaaa 
neovgre qol changes
 2019-12-17 11:40:43 -08:00
Ghommie
3f06661de5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit453 2019-12-17 03:34:11 +01:00
kappa-sama
9f71900052 oop 2019-12-15 23:29:01 -05:00
kappa-sama
b6c9c73372 this cannot go wrong 2019-12-15 23:28:17 -05:00
BlackMajor
74cc1ec547 Merge pull request #10177 from BlackMajor/FIST 
NUCLEAR FIST. A new wizard spell involving punching people so hard they explode.
 2019-12-16 14:14:35 +13:00
Putnam3145
c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers 
Bloodsuckers, or, yknow, vampires.
 2019-12-15 14:41:36 -08:00
Artur
58f4f58cd2 Slaughter demons shouldnt bleed 2019-12-16 00:05:51 +02:00
BlackMajor
4b177c4956 Adjusted NF balance 2019-12-16 01:20:14 +13:00
Artur
6124fbf316 Hopefully this fixes the linter errors 2019-12-14 19:04:36 +02:00
Artur
d0493ac471 Reviewer and linter fixes, and veil tweak 2019-12-14 17:09:39 +02:00
Artur
9faf3d1dac Mooaar fixeees 2019-12-14 01:01:38 +02:00
BlackMajor
2bf35ec81c Nuclear fist 2019-12-14 02:15:09 +13:00
kappa-sama
93c4d3c1af martial artists 2019-12-12 23:27:12 -05:00
Ghommie
563a0fef3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit390 2019-12-13 02:45:53 +01:00
Ghommie
4502d7b795 Ports improved and simplier fire alarms. 2019-12-12 22:44:20 +01:00
Putnam3145
71b2754aa6 Merge pull request #10121 from kappa-sama/patch-12 
plasmafist wizard plasmafist wizard
 2019-12-12 12:28:49 -08:00
Lin
9ec8458803 Merge pull request #9983 from Ghommie/Ghommie-cit408 
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
 2019-12-10 23:52:31 +00:00
BlackMajor
8817f04e19 Merge pull request #9747 from Ghommie/Ghommie-cit329 
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
 2019-12-10 11:18:55 +13:00
Putnam3145
beddaa1a99 Merge pull request #10053 from Ghommie/Ghommie-cit429 
Fixes some means of eyes blindness not working, removes legacy code.
 2019-12-09 12:40:37 -08:00
Artur
488c0f1833 Mindshield fix and thrall buff 2019-12-09 19:08:42 +02:00
kappa-sama
f790d675d9 flavor text 2019-12-09 09:06:11 -05:00
kappa-sama
e111429a30 the hippie thing 2019-12-08 23:37:33 -05:00
Ghommie
414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
Artur
d184bdd77a Whoops 2019-12-08 22:22:30 +02:00
Linzolle
1e2a4f606c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-08 14:17:00 -06:00
Artur
9773b530f8 More fixes. Urgh 2019-12-08 21:47:25 +02:00
Lin
24e4673c2b Merge pull request #10057 from Ghommie/Ghommie-cit431 
fixes on_mob eyes overlays not updating properly in certain cases.
 2019-12-07 21:49:18 +00:00