shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,648 Commits 5 Branches 0 Tags
68813b68469afcdde8a22f4ecbfe9ec3589751ef
Commit Graph

9959 Commits

Author SHA1 Message Date
deathride58
68813b6846 Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer 2019-10-22 19:14:12 -04:00
kevinz000
cbf7509749 Merge pull request #9536 from r4d6/patch-2 
Change the SEVA suit & Exo-suit's descriptions
 2019-10-21 11:16:56 -07:00
nik707
ba90df997f Merge branch 'master' into wingcolors 2019-10-21 10:25:46 -05:00
nik707
671fdf32c9 Merge pull request #9520 from r4d6/master 
Allow Humans, Felinids, Slimepersons and Lizardpeoples to have Decorative Wings just like Mammals
 2019-10-21 10:24:30 -05:00
kevinz000
814f91ee8e Merge pull request #9545 from Ghommie/Ghommie-cit248 
Ports "UTTERLY CATASTROPHIC pumpkin meteors will now only happen when it's catastrophic meteor wave, instead of 100% ending the round every time any kind of dust appears"
 2019-10-21 01:07:00 -07:00
kevinz000
9e63413911 Merge pull request #9466 from deathride58/yawnborgs 
Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert)
 2019-10-21 01:04:34 -07:00
kevinz000
838575da50 Merge pull request #9503 from deathride58/tasernerf 
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
 2019-10-21 00:59:58 -07:00
Ghommie
964372b047 Ports "UTTERLY CATASTROPHIC pumpkin meteors will now only happen when it's catastrophic meteor wave, instead of 100% ending the round every time any kind of dust appears" 2019-10-20 09:34:16 +02:00
kevinz000
659e8edf69 Merge pull request #9522 from Linzolle/tend-wounds 
Tend Wounds + Make Revival more accessible
 2019-10-19 19:52:21 -07:00
r4d6
49afd5261c Change SEVA suit & Exo-suit's descriptions 2019-10-19 20:56:35 -04:00
Linzolle
c0ae39fce1 remove unnecessary things 2019-10-18 12:43:05 -05:00
Linzolle
5ddd0484a8 colourable wings 2019-10-17 22:11:47 -05:00
kevinz000
a6acb212fa Merge pull request #9515 from Ghommie/Ghommie-cit241 
Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer.
 2019-10-17 17:29:18 -07:00
Linzolle
380e5a2be7 Merge remote-tracking branch 'deco-wings/master' into wingcolors 2019-10-17 19:27:34 -05:00
Linzolle
b9572c0fc8 somebody FORGOT 2019-10-17 18:00:08 -05:00
Linzolle
3b1e66ad05 more consistent naming 2019-10-17 17:23:47 -05:00
Linzolle
88814415dc tend wounds 2019-10-17 16:59:33 -05:00
kevinz000
1d0931ede9 Merge pull request #9505 from Thalpy/Smartdart-QoL 
[READY] Tweaks smartdarts with a few quality of life functions, and add a few new things.
 2019-10-17 13:23:33 -07:00
kevinz000
6103ffbafd Merge pull request #9414 from Poojawa/metabolize-lazychem 
nerfs styptic/silversulf/synthflesh to have overdoses
 2019-10-17 13:18:58 -07:00
kevinz000
1cc4ccee0d Merge pull request #9343 from Linzolle/dissection 
port just like a ton of surgery changes from tg also abductor too
 2019-10-17 13:13:51 -07:00
kevinz000
3e1120cd97 Merge pull request #9509 from Ghommie/Ghommie-cit239 
properly blacklists space skeletons kek.
 2019-10-17 13:11:05 -07:00
kevinz000
d2497a8ba1 Merge pull request #9211 from Trilbyspaceclone/Cargo_rebalance 
[Atomic] Cargo rework - Mat selling nerf, addtion of grater gear to sell MK I
 2019-10-17 13:09:55 -07:00
kevinz000
1ff69c23fd Merge pull request #9351 from YakumoChen/holeymelon 
Removes antimagic from holymelon
 2019-10-17 13:07:40 -07:00
kevinz000
805fe2a91a Merge pull request #9496 from Ghommie/Ghommie-cit236 
Removes the need of "_l" suffixes for digitigrade clothing on mob states
 2019-10-17 13:06:17 -07:00
kevinz000
65841a9485 Merge pull request #9507 from Ghommie/Ghommie-cit238 
Ports some in operator misuse bugfixes.
 2019-10-17 12:59:44 -07:00
kevinz000
eef68f43cf Merge pull request #9498 from JTGSZ/october-dwarves 
Halloween Dwarves
 2019-10-17 12:58:28 -07:00
kevinz000
5e049bc64a Merge pull request #9514 from Linzolle/kevin-has-a-foot-fetish 
foot fetish content for kevin (ankle coverings)
 2019-10-17 12:49:08 -07:00
kevinz000
a7a238eafd Merge pull request #9504 from Poojawa/vore-UI-improvements 
Vore fixes and optimizations
 2019-10-17 12:48:01 -07:00
r4d6
c97252eaa6 Give felinids decoratives wings 2019-10-17 12:11:03 -04:00
r4d6
7fbe2abb2c Give Lizardpeoples decorative wings 2019-10-17 12:09:27 -04:00
r4d6
3f20175220 Give slimepersons decoratives wings 2019-10-17 12:08:49 -04:00
r4d6
558a92c519 Give humans decorative wings 2019-10-17 12:08:09 -04:00
Trilbyspaceclone
113f62a705 right 
we removed my tools...
 2019-10-17 01:38:29 -04:00
Trilbyspaceclone
c0034e93a1 readds chose goose 2019-10-16 22:31:34 -04:00
Trilbyspaceclone
c91421984c Merge branch 'master' into Cargo_rebalance 2019-10-16 22:30:12 -04:00
kappa-sama
cbf02e76a4 fixes cringe 
why is this broken and who added this
 2019-10-16 19:47:14 -04:00
Ghommie
f3a9cac11e Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer. 2019-10-16 23:39:21 +02:00
Linzolle
1690596047 you asked for this kevin 2019-10-16 15:53:11 -05:00
kevinz000
994bfddc1b Merge pull request #9477 from Thalpy/tgOrganFixes 
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
 2019-10-16 12:44:34 -07:00
JTGSZ
f1b2eb93d7 Moonshiner doesn't exist here 2019-10-16 13:19:39 -04:00
kevinz000
7187da9e72 Merge pull request #9456 from Thalpy/Spookytime 
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
 2019-10-15 23:11:35 -07:00
kevinz000
e187f806a0 Merge pull request #9479 from lolman360/ltsurge 
fixes bug with new surgerytools examine
 2019-10-15 23:04:15 -07:00
kevinz000
6d1035e995 Merge pull request #9491 from Poojawa/wingfix 
Fixes missing decorative wing states
 2019-10-15 22:59:45 -07:00
kevinz000
3d5facdea5 Merge pull request #9502 from Putnam3145/pandemic-qol2 
Makes beaker spawn on pandemic instead of on user when hands full
 2019-10-15 22:53:44 -07:00
Poojawa
2f9771b1a9 Maybe it's really just as simple as... 2019-10-16 00:48:38 -05:00
Fermi
f587beeef4 2 hats and undoes halloween accidental change 2019-10-15 22:56:42 +01:00
Fermi
00adead300 Fixes syringes too. 2019-10-15 21:43:04 +01:00
Ghommie
fb94e4fef1 properly blacklists space skeletons kek. 2019-10-15 20:45:49 +02:00
Poojawa
d9af826333 whatever 2019-10-15 13:19:56 -05:00
Poojawa
1780f1addd animal nom still don't work but runtimes are fixed 
whatever
 2019-10-15 12:11:46 -05:00