Commit Graph
1768 Commits
Author SHA1 Message Date
deathride58andGitHub be4d694080 Merge pull request #9329 from Citadel-Station-13/kevinz000-patch-87
makes sprinting take more stamina when buffer is empty to compensate for added regen
2019-10-25 23:15:11 -04:00
kevinz000andGitHub 49e52eee05 Merge pull request #9603 from Ghommie/Ghommie-cit267
Unmodularize lavaknights and emags.
2019-10-25 20:12:35 -07:00
kevinz000andGitHub 08d139ee2c Merge pull request #9608 from Ghommie/Ghommie-cit272
Unmodularize Eutactic Blades.
2019-10-25 20:11:01 -07:00
kevinz000andGitHub 275ecbf468 Merge pull request #9604 from Ghommie/Ghommie-cit268
Unmodularize job types
2019-10-25 20:10:39 -07:00
kevinz000andGitHub 4eca1ca5ad Merge pull request #9605 from Ghommie/Ghommie-cit269
Unmodularize vox sounds
2019-10-25 20:09:52 -07:00
kevinz000andGitHub 8b22c95479 Merge pull request #9606 from Ghommie/Ghommie-cit270
Unmodularize research.
2019-10-25 20:09:26 -07:00
kevinz000andGitHub 9b7b2ce0b2 Merge pull request #9607 from Ghommie/Ghommie-cit271
Unmodularize events
2019-10-25 20:07:48 -07:00
Ghommie c1f84da39e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit272 2019-10-25 12:26:17 +02:00
kevinz000andGitHub 02a1aaea34 Merge pull request #9548 from Ghommie/Ghommie-cit251
Fixing radio emotes conflict with drunk memes.
2019-10-24 18:48:33 -07:00
kevinz000andGitHub 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 4b0b130c36 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit272 2019-10-25 00:27:04 +02:00
Ghommie 85b35433b2 Unmodularize Eutactic Blades. 2019-10-25 00:14:38 +02:00
Ghommie 6fbe7f9086 unmodularize events 2019-10-24 23:41:31 +02:00
Ghommie 6f19899dd2 Unmodularize research. 2019-10-24 23:28:15 +02:00
Ghommie 0da6ae549f Unmodularize vox sounds 2019-10-24 23:02:21 +02:00
Ghommie f035d77b53 Slips. 2019-10-24 22:50:53 +02:00
Ghommie 2a07bf95d8 Unmodularize job types 2019-10-24 22:44:40 +02:00
Ghommie f01b5c853f Unmodularize lavaknights. 2019-10-24 22:08:36 +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
deathride58andGitHub f85f110baa Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2019-10-23 20:54:55 -04:00
kevinz000andGitHub 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
Ghommie ba307b01a5 Defib fixes and chem effects stuff 2019-10-23 13:45:57 +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
nik707andGitHub fc56fd9f8b Merge pull request #9565 from Citadel-Station-13/kevinz000-patch-103
Fixes and nerfs VTEC upgrades
2019-10-22 16:48:10 -05:00
PoojawaandGitHub 7463bbc001 Merge branch 'master' into syntheticbloods 2019-10-21 21:06:18 -05:00
deathride58andGitHub 30eafc305c Merge pull request #9246 from Linzolle/taur
[READY] some missing icons + sprite changes for taur suits
2019-10-21 21:19:05 -04:00
Poojawa 6fc750dca0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-21 19:13:19 -05:00
kevinz000andGitHub 1d649c27de Update robot_movement.dm 2019-10-21 14:38:38 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub c59f15a8bc Merge pull request #9529 from BlackMajor/Yeet
Syndicate paper masks no longer work in pockets
2019-10-19 19:53:40 -07:00
Poojawa ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
BlackMajor d39897b9ad Update phantomthief.dm 2019-10-18 23:34:31 +13:00
kevinz000andGitHub 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
kevinz000andGitHub 9c21659afc Merge pull request #9483 from ZeroNetAlpha/toylathe-fix
Update toylathe.dm
2019-10-17 12:55:43 -07:00
kevinz000andGitHub 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
kevinz000andGitHub a7a238eafd Merge pull request #9504 from Poojawa/vore-UI-improvements
Vore fixes and optimizations
2019-10-17 12:48:01 -07:00
Poojawa 66c8c17bbd Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-17 05:45:06 -05:00
Linzolle 1690596047 you asked for this kevin 2019-10-16 15:53:11 -05:00
kevinz000andGitHub 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
BlackMajorandGitHub e8649e5c3c Merge pull request #9506 from izzyinbox/bark
Adds *bark emote
2019-10-16 21:00:15 +13:00
Poojawa 184e81eec0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-16 01:51:51 -05:00
Zna12 64819066c6 Update toylathe.dm
Think I fixed it.
2019-10-16 01:15:35 -05:00
kevinz000andGitHub 11a93d41de Merge pull request #9499 from r4d6/patch-1
Add a Blindfold to the loadout list
2019-10-15 22:57:02 -07:00
izzyinbox 7a91bb4cd3 Adds *bark emote 2019-10-15 10:24:08 -05:00
deathride58andGitHub 9fd4e7f673 Merge pull request #9472 from Thalpy/Quickfixforfood
[speedmerge] Quickfixforfood and fixes the chem hindenburg
2019-10-15 06:32:59 -04:00