Commit Graph

5587 Commits

Author SHA1 Message Date
Zuhayr
8d7b68d1f5 Fixes double space issue with pain emotes. 2014-12-28 17:19:30 +10:30
mwerezak
f3d7e0853c Replaces a few old for loops with visible_message() 2014-12-28 01:22:49 -05:00
mwerezak
fe348726f2 Alien weed regeneration now mends broken bones
Also, weed regeneration is reduced unless xenos are resting.
2014-12-28 01:22:26 -05:00
mwerezak
6f5f92247a Xeno balancing
Makes xenos slightly faster across the board, so that sentinels are now
on par with humans in terms of base speed. Makes facehuggers become
stunned when thrown, removes helmet protection.
2014-12-28 01:22:01 -05:00
Ccomp5950
5e7b95ad14 Merge pull request #7543 from Zuhayr/xenofixes
Xeno fixes.
2014-12-27 22:03:38 -05:00
Zuhayr
d24e1debc8 Merge pull request #7537 from mwerezak/sol-common
Sol common syllable list
2014-12-28 13:15:52 +10:30
Zuhayr
85fe8b293b Merge pull request #7544 from Zuhayr/dev-freeze
Several fixes.
2014-12-28 13:10:02 +10:30
Hubblenaut
534befe753 Merge remote-tracking branch 'upstream/dev-freeze' into dev-freeze
Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/human/unarmed_attack.dm
2014-12-28 00:04:53 +01:00
Ravensdale
358e6c0d70 Wording tweak1 2014-12-27 14:23:59 -08:00
Hubblenaut
88b967f58c Fixes merge conflict, uses force 2014-12-27 22:51:27 +01:00
Ravensdale
1e90bf460c Fixes a comment, bleh. 2014-12-27 10:57:13 -08:00
Ravensdale
da6a6961ce Corrected oversight 2014-12-27 10:45:55 -08:00
Ravensdale
93db93cd51 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into essEssDee 2014-12-27 10:26:24 -08:00
Ravensdale
393593046e Overhauls SSD mechanic. 2014-12-27 09:16:50 -08:00
Atlantiscze
5c60361f24 Changeling Fix
- Fixes #7550 and one other bug which is not on issue tracker
- Uncomments one line of code which caused #7550, considering reasons for this being commented out no longer apply. (parasting is no longer cheap OP ability you have from start) Changeling rewrite is probably going to occur soon anyway.
- Removes one line which caused bug with "Absorb" ability - victim was immediately absorbed after the "You stab the X with proboscis" part, instead of waiting few seconds as it should.
2014-12-27 15:16:40 +01:00
Zuhayr
c513051d8d Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2014-12-27 17:39:39 +10:30
Zuhayr
011b9a6c1f Amending stun commit.
Stun will properly be set to 0 if the species has NO_PAIN.
2014-12-27 09:20:12 +10:30
Zuhayr
36d5525437 Extremely minor runtime fix. 2014-12-27 08:45:30 +10:30
Zuhayr
49ca5ee0ca NO_PAIN will now properly stop hard stun from taking effect. 2014-12-27 08:29:58 +10:30
Zuhayr
8acb3b6402 Typo from robotslash commit. 2014-12-27 08:19:16 +10:30
Zuhayr
4a9a6636a0 Fixed incorrect cuff resist time when species with can_shred() resisted. 2014-12-27 08:11:35 +10:30
Zuhayr
e3cec50583 Fixed incorrect role check on leap(). 2014-12-27 08:11:18 +10:30
Zuhayr
86cd10057d Fixed brain transplant issue. 2014-12-27 08:10:21 +10:30
Zuhayr
0511ea9567 Added proc for can_shred() on robots. 2014-12-27 08:10:05 +10:30
Zuhayr
34a73a4cb1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into limbs 2014-12-27 02:02:43 +10:30
GinjaNinja32
ccaf9a4edf Change fleshbrains in MMIs to not be able to use :b 2014-12-26 14:18:01 +00:00
GinjaNinja32
ccece63d0b Fix brain languages 2014-12-26 11:26:07 +00:00
mwerezak
f8ec11ddb2 Fixes traumatic_shock affecting species with NO_PAIN 2014-12-25 22:02:56 -05:00
mwerezak
207ce65bd6 Adds sol common syllables, fixes #7527
Humans get default random names 80% of the time, and get sol-common
syllable names the other 20%.

Also replaces the sol common syllable list with a bunch of mandarin and
english syllables.
2014-12-25 20:11:52 -05:00
Zuhayr
8978747e53 Moved several globals into the config controller, updated eample config appropriately. 2014-12-25 21:10:30 +10:30
Zuhayr
3997129390 Tidies up setup.dm, moves a bunch of vars to global.dm, changes the case of a couple. 2014-12-25 20:26:22 +10:30
Zuhayr
930e8c6e5d Removes an unused debug var. 2014-12-25 20:09:45 +10:30
PsiOmegaDelta
3427787359 Merge pull request #7524 from Zuhayr/mutantrace
Species and organ fixes.
2014-12-25 10:56:17 +13:00
Zuhayr
31ba0d12e0 Fixes #6676 and #7375 2014-12-24 23:32:10 +10:30
Zuhayr
0263bc9c84 merge 2014-12-24 22:50:13 +10:30
Zuhayr
c49cb0c645 Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze 2014-12-24 22:43:10 +10:30
Zuhayr
e74c0c38e4 Fixes #5801 2014-12-24 22:00:31 +10:30
Zuhayr
4b030f30cd Refactors and fixes a fair bit of organ transplanting/reattachment/gibbing code. Also fixes an issue with species HUDs. 2014-12-24 16:06:00 +10:30
PsiOmegaDelta
d1758a7162 Merge pull request #7510 from Zuhayr/mutantrace
Gibber fixes/refactor, mutantrace refactor, couple of small fixes.
2014-12-24 17:29:39 +13:00
Zuhayr
01f2d28187 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into mutantrace 2014-12-24 12:47:56 +10:30
Zuhayr
591fc164de Updating rack paths to match previous commit. 2014-12-24 12:26:43 +10:30
Hubblenaut
7988b78f69 No stomping when grabbing 2014-12-23 14:46:59 +01:00
Hubblenaut
d2a31eb024 Changes on kicks and stomps 2014-12-23 14:46:58 +01:00
Zuhayr
cc00fa3d52 Fixes and tweaks to the previous. 2014-12-23 22:03:02 +10:30
Zuhayr
bbfc6db0a3 Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right) 2014-12-23 17:38:05 +10:30
ccomp5950
0a63932d48 Simple Animals now no longer move while facing south all the time.
Fucking weirdo's

resolves #7396 for simple animals.
2014-12-22 21:44:48 -05:00
ccomp5950
66ac2d6e05 Added "give them their breath back" to admin_revive.
Prevents perpetual oxyloss after a revive.
2014-12-22 21:44:38 -05:00
ccomp5950
b446ccb2ab Remove Borg nightvision when special views aren't selected.
Resolves #7452
2014-12-22 21:44:11 -05:00
Zuhayr
360775b96f Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2014-12-23 00:01:09 +10:30
Zuhayr
3de0562dbe Merge resolution. 2014-12-22 23:28:27 +10:30