0af10fc98e
Merge branch 'combat_fixes' of https://github.com/Hubblenaut/Baystation12 into dev-freeze
2014-12-30 01:27:14 +10:30
68be4d10a2
Merge pull request #7569 from Baystation12/dev-freeze
...
Dev freeze
2014-12-29 22:20:37 +10:30
1c3e771e07
Merge pull request #7556 from mwerezak/xenobalance
...
Xeno Balancing
2014-12-29 19:21:21 +10:30
301af06033
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into blast-door-refactor
2014-12-28 23:50:15 +01:00
a7b02a0d05
Merge pull request #7561 from Baystation12/dev-freeze
...
Dev freeze
2014-12-29 02:47:31 +10:30
505d84049c
Properly implements the species insulated var (renames it to siemens_coefficient), includes it in electrocution, rebalances species values accordingly.
2014-12-28 19:16:07 +10:30
85643543dc
Fixes runtime with bald humans.
2014-12-28 18:58:22 +10:30
da21480295
Fixes #7546
2014-12-28 17:52:58 +10:30
3bc118b5e6
Weed regeneration heals internal organs
2014-12-28 02:15:37 -05:00
6cf010f737
Converts \green macro to span tag
2014-12-28 02:06:02 -05:00
b4371916de
Replaced some magic numbers.
2014-12-28 17:33:09 +10:30
8d7b68d1f5
Fixes double space issue with pain emotes.
2014-12-28 17:19:30 +10:30
f3d7e0853c
Replaces a few old for loops with visible_message()
2014-12-28 01:22:49 -05:00
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
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
5e7b95ad14
Merge pull request #7543 from Zuhayr/xenofixes
...
Xeno fixes.
2014-12-27 22:03:38 -05:00
d24e1debc8
Merge pull request #7537 from mwerezak/sol-common
...
Sol common syllable list
2014-12-28 13:15:52 +10:30
dfb6390cad
Merge pull request #7536 from mwerezak/disposal
...
Adjusts disposal pressure
2014-12-28 13:14:01 +10:30
85fe8b293b
Merge pull request #7544 from Zuhayr/dev-freeze
...
Several fixes.
2014-12-28 13:10:02 +10:30
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
358e6c0d70
Wording tweak1
2014-12-27 14:23:59 -08:00
88b967f58c
Fixes merge conflict, uses force
2014-12-27 22:51:27 +01:00
1e90bf460c
Fixes a comment, bleh.
2014-12-27 10:57:13 -08:00
da6a6961ce
Corrected oversight
2014-12-27 10:45:55 -08:00
93db93cd51
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into essEssDee
2014-12-27 10:26:24 -08:00
393593046e
Overhauls SSD mechanic.
2014-12-27 09:16:50 -08:00
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
c513051d8d
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2014-12-27 17:39:39 +10:30
07b5b7af8b
Updates references
...
- Changed referenced to old blastdoor type to new type, removing compile errors
- Fixes small issue in blast door file which caused compile error
2014-12-27 00:03:20 +01:00
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
3e333ee1dc
Merge pull request #7541 from GinjaNinja32/posilang
...
Fix brain/posibrain languages
2014-12-27 11:29:56 +13:00
36d5525437
Extremely minor runtime fix.
2014-12-27 08:45:30 +10:30
49ca5ee0ca
NO_PAIN will now properly stop hard stun from taking effect.
2014-12-27 08:29:58 +10:30
7c65de3e34
Improves power monitor UI
...
Improves power monitor sensor list UI. Fixes #7449
2014-12-26 16:55:03 -05:00
8acb3b6402
Typo from robotslash commit.
2014-12-27 08:19:16 +10:30
4a9a6636a0
Fixed incorrect cuff resist time when species with can_shred() resisted.
2014-12-27 08:11:35 +10:30
e3cec50583
Fixed incorrect role check on leap().
2014-12-27 08:11:18 +10:30
b073c03708
Added xenomorph exclusions to space suits and helmets.
2014-12-27 08:10:55 +10:30
86cd10057d
Fixed brain transplant issue.
2014-12-27 08:10:21 +10:30
0511ea9567
Added proc for can_shred() on robots.
2014-12-27 08:10:05 +10:30
34a73a4cb1
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into limbs
2014-12-27 02:02:43 +10:30
ccaf9a4edf
Change fleshbrains in MMIs to not be able to use :b
2014-12-26 14:18:01 +00:00
ccece63d0b
Fix brain languages
2014-12-26 11:26:07 +00:00
116b04dbf5
Fixes Deathsquad suit to be spaceproof again
2014-12-26 01:33:29 -05:00
f84759ee5f
Fixes DeathSquad helmet to be spaceproof once more.
2014-12-26 01:32:48 -05:00
899b415511
Merge pull request #7539 from mwerezak/shock
...
Fixes traumatic_shock affecting species with NO_PAIN
2014-12-25 23:15:55 -05:00
b808c20828
Merge pull request #7535 from mwerezak/disposal-bin
...
Fixes #7111
2014-12-25 23:14:49 -05:00
4d7731dca6
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2014-12-26 14:06:22 +10:30
f8ec11ddb2
Fixes traumatic_shock affecting species with NO_PAIN
2014-12-25 22:02:56 -05:00
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