shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,371 Commits 5 Branches 0 Tags
512d046f189ef5e2dfebfb5590e264eceb4de249
Commit Graph

17462 Commits

Author SHA1 Message Date
Ghom
512d046f18 Merge pull request #10128 from Seris02/clownheadset 
gives the clown a headset with a clown megaphone loudmode
 2019-12-26 13:58:45 +01:00
Seris02
e125dae871 yee 2019-12-26 16:36:01 +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
Lin
1931a2f715 Merge pull request #10242 from Ghommie/Ghommie-cit483 
Ports "Refactors can_see_reagents"
 2019-12-25 19:03:42 +00:00
Ghom
e7cf680ca7 Merge pull request #10266 from shellspeed1/master 
New insect marking customization option and three new wings.
 2019-12-25 03:43:29 +01:00
Seris02
a106fde6cc a few fixes here and there and updating it 2019-12-24 23:38:27 +08:00
Seris02
85c5a5dfa1 Merge branch 'rising_bass' of https://github.com/Seris02/Citadel-Station-13 into rising_bass 2019-12-24 22:29:46 +08:00
Seris02
9e6f0762b7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into rising_bass 2019-12-24 22:27:41 +08:00
Lin
a0b90158c4 Merge pull request #10269 from Ghommie/Ghommie-cit488 
Fix goose meat.
 2019-12-24 00:56:07 +00:00
Ghom
9a022f21eb Merge pull request #10245 from r4d6/substationV2 
Make Box's Engine be randomised between SM, Tesla and Singulo V2 [TEST-MERGE]
 2019-12-23 18:58:26 +01:00
r4d6
0a3e370a93 Move the config up to avoid conflict 2019-12-23 12:45:40 -05:00
r4d6
01a8fe1cd6 Add config options 2019-12-23 12:41:52 -05:00
r4d6
b909f54ba5 Revert "Revert "Add the option to restrict the Engine that spawn"" 
This reverts commit d851beea16.
 2019-12-23 10:25:37 -05:00
r4d6
d851beea16 Revert "Add the option to restrict the Engine that spawn" 
This reverts commit e3e1f91635.
 2019-12-23 10:23:55 -05:00
r4d6
e3e1f91635 Add the option to restrict the Engine that spawn 2019-12-23 10:06:35 -05:00
Ghom
37a6abd889 Merge pull request #10274 from kappa-sama/kappa-sama-patch-1 
no more 40% time dilation from broodmother
 2019-12-23 13:41:10 +01:00
kevinz000
1b9b54b33d Merge pull request #10267 from Ghommie/Ghommie-cit486 
Fills white first aid kits to the brim. Ergo how I was fooled into believing it was a tweak and not a nerf.
 2019-12-23 00:44:42 -08:00
Ghommie
187b9bb13a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit483 2019-12-23 05:10:38 +01:00
Ghom
db2a108b4a Merge pull request #10246 from Citadel-Station-13/kevinz000-patch-129 
Makes mob/Stat on a 1 second timer rather than fast-as-possible to tone down highpop lag
 2019-12-23 03:25:27 +01:00
Ghom
3635525c56 Merge pull request #10210 from Citadel-Station-13/kevinz000-patch-127 
Cargo shuttle now silently leaves behind slaughter demons + revenants
 2019-12-23 03:13:31 +01:00
Ghom
f3936f2c81 Merge pull request #10093 from Trilbyspaceclone/donut 
[Ready] Hey why dont I port that one donut pr? Ye just the one food related pr... Just the one... Oh no
 2019-12-23 02:31:50 +01:00
kevinz000
fcfdf5e253 Merge pull request #10240 from Ghommie/Ghommie-cit481 
Converts the main timsorts file from relative pathing to absolute pathing.
 2019-12-22 14:04:53 -08:00
kevinz000
6157cb0042 Merge pull request #10254 from r4d6/patch-1 
Fix the nose boop
 2019-12-22 14:03:02 -08:00
kappa-sama
994cd753d5 no more 40% time dilation 2019-12-22 14:39:36 -05:00
Ghommie
757af250cf Fix goose meat. 2019-12-22 12:21:11 +01:00
Ghommie
8bc277d38d Fills white first aid kits to the brim. Ergo how I was fooled into believing it was a tweak and not a nerf. 2019-12-22 11:40:25 +01:00
kevinz000
f39d12527d Update supply.dm 2019-12-21 23:50:59 -08:00
shellspeed1
1875ea3f58 new wings and fluff 2019-12-21 23:47:41 -08:00
TrilbySpaceClone
c7dbdd73df Merge branch 'master' into donut 2019-12-22 02:36:57 -05:00
Trilbyspaceclone
f5a55aaecf Nerfs fun 2019-12-21 21:09:22 -05: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
kevinz000
86074ae6b1 lowered to 10 after i struggled to open tickets panel 2019-12-21 14:33:02 -08:00
r4d6
84d99c8fe8 Fix indentation 2019-12-21 15:00:53 -05:00
r4d6
383e09651f Suggestions 2019-12-21 14:55:37 -05: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
a33065a728 Merge pull request #10190 from Trilbyspaceclone/honeysoda 
The new buzz around the new soft drink
 2019-12-21 18:34:35 +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
2bc401e2d2 Merge pull request #10096 from Citadel-Station-13/kevinz000-patch-123 
nanites can no longer spread through atmospherics-blocking objects
 2019-12-21 16:48:56 +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
5c3d3f4cc5 Is merging someone else's PR you personally fixed considerable as self-merging? 2019-12-21 16:40:32 +01:00
Ghom
daf099388e Unnecessary OOC note. 2019-12-21 16:37:28 +01:00
Ghom
4624a1739a typo 2019-12-21 16:30:02 +01:00
Ghom
9d00072072 Merge pull request #10257 from DeltaFire15/communication-magicnumbad 
Removes a magicnumber
 2019-12-21 15:33:27 +01:00
Ghom
aea2b8865e Merge pull request #10120 from Citadel-Station-13/night_vision 
Night vision trait but it just boosts barely-lit visibility
 2019-12-21 15:30:32 +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
06cbb381d3 Better safe than sorry. 2019-12-21 15:17:29 +01:00
r4d6
c5aef98252 Make things even more organized 2019-12-21 09:17:15 -05:00
DeltaFire
3738156340 Magic number baaad 2019-12-21 15:16:28 +01:00
r4d6
fb078e18f9 QoL Update 
Move the Engines to a subfolder to be cleaner when there will be 20 submaps on different maps and change the Tesla Submap to incorporate a few changes I did for the Singulo submap.
 2019-12-21 09:12:04 -05:00
Ghom
ce34bcf2e4 Merge pull request #10012 from Commandersand/INEEDAMEDICBAG 
Rebalance/port: refactor ported, ointment/brute pack healing nerf but max stack doubled. gauze heals a bit now
 2019-12-21 14:34:43 +01:00