Commit Graph
1912 Commits
Author SHA1 Message Date
kevinz000andGitHub b062c76ca7 Merge pull request #11485 from Ghommie/Ghommie-cit625
Fixing a little issue with the musician trait etcetera.
2020-03-16 13:23:25 -07:00
Seris02andGitHub ffb2e65c17 why I hate byond (#11496) 2020-03-16 17:20:51 +01:00
Ghommie 5e5bdec85d More runtime errors. 2020-03-16 01:55:02 +01:00
GhomandGitHub 06d641b46a Webedit fixing electrocute_act stuns. 2020-03-14 21:19:09 +01:00
kevinz000andGitHub 0953ec19e5 Merge pull request #11453 from necromanceranne/I_am_at_high_risk_of_stroke
I'm pretty sure this was causing people to bleed out from light hits
2020-03-14 09:11:38 -07:00
necromanceranne 49c0aba205 bleeding out from a toolbox smack is not cool gamers 2020-03-14 04:25:12 +11:00
Ghommie 0876a1eef6 Porting datum components system updates. 2020-03-12 18:22:26 +01:00
kevinz000andGitHub 54713dc1e4 Merge pull request #11408 from necromanceranne/sleeping_carp_port
Refactors Martial Arts code, human_defense, and ports New Sleeping Carp
2020-03-11 17:26:33 -07:00
kevinz000andGitHub 69c21f4b76 Merge pull request #10327 from Seris02/tggenetics
ports tg genetics
2020-03-11 17:01:37 -07:00
Putnam3145andGitHub 480eb32c68 Merge pull request #11418 from Ghommie/Ghommie-cit615
Fix runtimes some more.
2020-03-11 17:01:13 -07:00
GhomandGitHub f7674067d2 Merge pull request #11421 from Citadel-Station-13/kevinz000-patch-2
Fixes the "blind while not unconscious bug", alternatively, "if in doubt, assume something is coded in the worst possible way and is held together by duct tape and prayers"
2020-03-11 13:17:47 +01:00
kevinz000andGitHub 46823a127b Merge pull request #11335 from Ghommie/Ghommie-cit604
Made flavor texts into an element datum, appliable to every atom.
2020-03-10 17:26:20 -07:00
kevinz000andGitHub c4f59b0b83 Update life.dm 2020-03-10 17:18:01 -07:00
kevinz000andGitHub bb1480a369 Update carbon.dm 2020-03-10 17:16:33 -07:00
kevinz000andGitHub f5fd4733e1 Merge pull request #11411 from Citadel-Station-13/Ghommie-patch-1
Webedit touching the MOVESPEED_ID_DAMAGE_SLOWDOWN_FLYING speed modifier: Citadel Edition.
2020-03-10 17:14:51 -07:00
Ghommie 27a7f754c4 Fix runtimes some more. 2020-03-10 22:40:06 +01:00
GhomandGitHub 424a3d9668 Merge pull request #11399 from Seris02/lizardtailfixes
normalising wagging tail names for a very specific bug fix
2020-03-10 16:59:55 +01:00
GhomandGitHub c86124f8ed Update human.dm 2020-03-10 14:34:17 +01:00
kevinz000andGitHub e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612
Porting "Further update_icon splitup"
2020-03-10 05:58:17 -07:00
kevinz000andGitHub bfb75eb26b Merge pull request #11396 from Ghommie/Ghommie-cit613
Ports "Switches out the three billion args of electrocute act for flags"
2020-03-10 05:56:28 -07:00
necromanceranne f41f78b162 Massively refactors martial arts, ports New Sleeping Carp 2020-03-10 20:09:31 +11:00
Ghommie 17007182c9 Merge branch 'Ghommie-cit604' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit604 2020-03-09 22:42:31 +01:00
Ghommie 0587d3482d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit604 2020-03-09 21:53:22 +01:00
Ghommie 4143c1963c Porting more legcuffs / bola fixes etcetera 2020-03-09 16:20:51 +01:00
Seris02 68382d65c8 normalising wagging tail names 2020-03-09 17:48:12 +08:00
Seris02 cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-03-09 16:49:32 +08:00
Ghommie ee1eea8874 Ports "Switches out the three billion args of electrocute act for flags" 2020-03-09 04:01:23 +01:00
GhomandGitHub 8878733fc1 Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI
Ports Skyrat's synths (Plus limb rendering overhaul and more)
2020-03-09 00:26:06 +01:00
Ghommie ad4d290ea7 WIP 2020-03-08 19:26:01 +01:00
kevinz000andGitHub b2235e03a7 Merge pull request #11372 from Ghommie/Ghommie-cit610
Of runtimes and null.
2020-03-08 11:10:02 -07:00
kevinz000andGitHub 2b5f337f06 Merge pull request #11365 from Ghommie/Ghommie-cit607
Makes monkey probability of gorillize from radiation exponential.
2020-03-08 08:15:11 -07:00
GhomandGitHub 4a61dc7b72 tgstation PR #48189 by Yenwodyah 2020-03-08 14:10:34 +01:00
Ghommie 10c8dbbb6e hOLd oN 2020-03-08 02:47:38 +01:00
GhomandGitHub b96475d5aa Merge pull request #11346 from Citadel-Station-13/kevinz000-patch-15
/carbons now null out hand_bodyparts on Destroy()
2020-03-08 01:40:43 +01:00
GhomandGitHub 5f3496e908 Update human.dm 2020-03-08 01:27:35 +01:00
kevinz000andGitHub 02a488f507 Merge pull request #11340 from Ghommie/Ghommie-cit605
Porting movespeed modifiers code updates.
2020-03-07 03:26:48 -07:00
Ghommie 079fd425e5 Makes the monkeys' gorillize chances from radiation exponential. 2020-03-06 19:05:45 +01:00
Kraseo ad20fb1a0e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-06 11:58:11 +01:00
kevinz000andGitHub 87c869a735 Update carbon.dm 2020-03-06 02:00:19 -07:00
deathride58 e08669e8a1 Ports Virgo's synthetic taursprites, adds taur to synthliz mutant bodyparts 2020-03-06 00:15:37 -05:00
Ghommie 0c4af362bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit605 2020-03-06 04:00:36 +01:00
Ghommie e484f72d7b Ports movespeed modifiers code updates. 2020-03-06 03:35:56 +01:00
deathride58andGitHub 2e35c09dec Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
2020-03-05 20:03:56 -05:00
Ghommie 324f75c4db Makes the thing actually work. 2020-03-05 21:41:41 +01:00
Ghommie 6de290758b Oh, yea. 2020-03-05 19:07:24 +01:00
Ghommie 2cbdae2f0a Made flavor texts into an element datum. 2020-03-05 18:46:33 +01:00
GhomandGitHub c373323690 Merge pull request #11318 from Citadel-Station-13/Linzolle-patch-1
fix nose booping
2020-03-04 23:40:54 +01:00
LinandGitHub 1a1e362e80 Merge pull request #11310 from Citadel-Station-13/Ghommie-patch-2
Fixing mob holders inventory slot flags (ergo they are not glasses)
2020-03-04 13:29:13 -06:00
kevinz000 6354b48659 fix 2020-03-03 20:58:06 -07:00
kevinz000 7291417244 fix 2020-03-03 20:57:03 -07:00