shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,970 Commits 5 Branches 0 Tags
2a57a7c8a60dbf3abd1b6b279d2f39251e09e5d2
Commit Graph

3046 Commits

Author SHA1 Message Date
kevinz000
236cf328d1 Merge pull request #9567 from BlackMajor/Yote 
Clockwork golems can now use guns
 2019-10-24 19:03:49 -07:00
kevinz000
02a1aaea34 Merge pull request #9548 from Ghommie/Ghommie-cit251 
Fixing radio emotes conflict with drunk memes.
 2019-10-24 18:48:33 -07:00
kevinz000
969bc83179 Merge pull request #9586 from BlackMajor/Yeehaw 
Adds posibrains to the spawners menu for ghosts.
 2019-10-24 18:45:57 -07:00
kevinz000
2ae111eaf0 Merge pull request #9587 from Ghommie/Ghommie-cit258 
Porting components updates and fixing phantom thief component.
 2019-10-24 18:38:39 -07:00
Ghommie
a50606bb67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259 2019-10-24 10:10:07 +02:00
Ghommie
4c8d7023c5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258 2019-10-24 09:50:20 +02:00
deathride58
f85f110baa Merge pull request #9047 from Poojawa/syntheticbloods 
RGB Blood Reworks + Blood generator
 2019-10-23 20:54:55 -04:00
kevinz000
ab02626ef7 Merge pull request #9588 from ItzGabby/Gabby-bat_species_parts 
Anthromorph Bat Parts for character customization
 2019-10-23 17:00:08 -07:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
ItzGabby
25e426ddd0 Adds new parts for anthromorphs 
Adds bat ears, bat marking, bat tails (Two variants and animation included), and new alternative snouts. Also cleans up the wing selection menu to be alphabetic, because, it was horrific to look at.
 2019-10-23 07:26:01 -04:00
Ghommie
fc1f10c97f Porting components updates and fixing phantom thief component. 2019-10-23 13:01:31 +02:00
BlackMajor
8b61fe3d72 posibrains on spawn list 2019-10-23 22:46:10 +13:00
nik707
9a598a92cb Merge pull request #9561 from Ghommie/Ghommie-cit256 
Fixing some ayy overlays and client images oddities.
 2019-10-22 16:49:07 -05:00
kevinz000
684658b34f Merge pull request #9559 from Ghommie/Ghommie-cit255 
fixes invisible men.
 2019-10-22 02:26:34 -07:00
Poojawa
6fc750dca0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-21 19:13:19 -05:00
BlackMajor
1a722a7b52 Update golems.dm 2019-10-22 11:28:07 +13:00
BlackMajor
c901f796f8 Merge pull request #8963 from Citadel-Station-13/kevinz000-patch-61 
healing holoparasites now heals toxlovers
 2019-10-22 10:50:04 +13: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
Ghommie
760522cf6a Fixing some ayy overlays and client images oddities. 2019-10-21 11:29:43 +02:00
Ghommie
015789ac45 fixes invisible men. 2019-10-21 10:08:48 +02: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
7e9298d5ac Fixing radio emotes conflict with drunk memes. 2019-10-20 12:21:21 +02:00
Linzolle
c0ae39fce1 remove unnecessary things 2019-10-18 12:43:05 -05:00
Poojawa
ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
Linzolle
5ddd0484a8 colourable wings 2019-10-17 22:11:47 -05:00
Linzolle
380e5a2be7 Merge remote-tracking branch 'deco-wings/master' into wingcolors 2019-10-17 19:27:34 -05: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
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
eef68f43cf Merge pull request #9498 from JTGSZ/october-dwarves 
Halloween Dwarves
 2019-10-17 12:58:28 -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
Poojawa
66c8c17bbd Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-17 05:45:06 -05:00
Poojawa
4fdddc7b4d clears a merge conflict 2019-10-17 05:37:44 -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
Poojawa
184e81eec0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-16 01:51:51 -05: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
6d1035e995 Merge pull request #9491 from Poojawa/wingfix 
Fixes missing decorative wing states
 2019-10-15 22:59:45 -07:00
Poojawa
2f9771b1a9 Maybe it's really just as simple as... 2019-10-16 00:48:38 -05:00
Ghommie
fb94e4fef1 properly blacklists space skeletons kek. 2019-10-15 20:45:49 +02:00
Poojawa
1780f1addd animal nom still don't work but runtimes are fixed 
whatever
 2019-10-15 12:11:46 -05:00
Poojawa
4396bd4280 runtime fixings I guess 2019-10-15 07:08:00 -05:00
Poojawa
9308ee517f fixing some belly mode quirks 2019-10-15 06:49:31 -05:00
deathride58
df17f34eb6 Merge pull request #9488 from Ghommie/Ghommie-cit231 
Adds some missing species_traits for cloth, clockwork and cult golems.
 2019-10-15 06:20:43 -04:00