Commit Graph

3069 Commits

Author SHA1 Message Date
Ghommie 4aa1d55abb Porting multi-z support updates. 2019-10-27 16:32:32 +01:00
deathride58 8f479492db Merge pull request #9513 from Citadel-Station-13/kevinz000-patch-98
medibots are now TOXINLOVER (so slimes) friendly
2019-10-25 23:17:30 -04:00
nik707 187ea6476b Merge pull request #9572 from Citadel-Station-13/canReachInto_1
Fixes a bunch of CanReach/storage related bugs ("You can no longer stick your hands inside other people and take their things")
2019-10-25 22:16:02 -05:00
kevinz000 4eca1ca5ad Merge pull request #9605 from Ghommie/Ghommie-cit269
Unmodularize vox sounds
2019-10-25 20:09:52 -07:00
kevinz000 bd9443252a Merge pull request #9579 from YakumoChen/shapeshift
Ports #41638 and #43784, "Wizard Shapeshift now converts damage taken while transformed"
2019-10-24 19:13:54 -07:00
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 0da6ae549f Unmodularize vox sounds 2019-10-24 23:02:21 +02: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
YakumoChen 3e9dfd6441 i was suggested to try this 2019-10-24 02:59:15 +00:00
YakumoChen c6939864c1 and this 2019-10-24 02:42:38 +00:00
YakumoChen 5a9f0aa1e4 this too 2019-10-24 02:33:48 +00:00
YakumoChen 3ec63ed12d I think I forgot this 2019-10-24 02:32:21 +00: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
YakumoChen 3d63e9aa20 throwing darts at the wall here 2019-10-23 00:50:05 +00:00
YakumoChen 1e0f31ad4a Update damage_procs.dm 2019-10-23 00:14:52 +00:00
YakumoChen ffd160ebe8 Update pai_defense.dm 2019-10-23 00:13:00 +00:00
YakumoChen 292b997900 Update damage_procs.dm 2019-10-23 00:11:52 +00:00
YakumoChen 6d11e1bd1d Update damage_procs.dm 2019-10-23 00:08:13 +00:00
YakumoChen 13a06aa099 Update damage_procs.dm 2019-10-23 00:05:44 +00:00
YakumoChen 7d9a6d2a34 Update zombies.dm 2019-10-23 00:05:12 +00:00
YakumoChen c5ec76e24d Update species.dm 2019-10-23 00:04:09 +00:00
YakumoChen 5b321fc821 #43784 2019-10-22 23:50:25 +00:00
YakumoChen e76f64ce16 #43784 2019-10-22 23:49:29 +00: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
kevinz000 2426849d4b this is a pretty bad idea 2019-10-22 02:19:33 -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