Commit Graph

9865 Commits

Author SHA1 Message Date
Zuhayr
c6d7a94396 Merge pull request #7575 from mwerezak/voxfix
Fixes vox leap special_role check
2014-12-30 05:51:40 +10:30
mwerezak
c4fbe8df34 Fixes vox leap special_role check 2014-12-29 13:04:02 -05:00
Chinsky
d6d1bc15de Merge pull request #7557 from Zuhayr/dev-freeze
Some fixes, siemens coefficient rebalance for species.
2014-12-29 20:56:08 +03:00
Hubblenaut
cfbe4bf8c1 Minor attack message change 2014-12-29 17:04:14 +01:00
Zuhayr
a22f90414b Fixing weird directory structure stuff. 2014-12-30 01:32:56 +10:30
Atlantiscze
84909f2fbd NOCLONE -> HUSK 2014-12-29 15:58:21 +01:00
Zuhayr
0af10fc98e Merge branch 'combat_fixes' of https://github.com/Hubblenaut/Baystation12 into dev-freeze 2014-12-30 01:27:14 +10:30
Zuhayr
1c3e771e07 Merge pull request #7556 from mwerezak/xenobalance
Xeno Balancing
2014-12-29 19:21:21 +10:30
Atlantiscze
301af06033 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into blast-door-refactor 2014-12-28 23:50:15 +01:00
Zuhayr
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
Zuhayr
85643543dc Fixes runtime with bald humans. 2014-12-28 18:58:22 +10:30
Zuhayr
da21480295 Fixes #7546 2014-12-28 17:52:58 +10:30
mwerezak
3bc118b5e6 Weed regeneration heals internal organs 2014-12-28 02:15:37 -05:00
mwerezak
6cf010f737 Converts \green macro to span tag 2014-12-28 02:06:02 -05:00
Zuhayr
b4371916de Replaced some magic numbers. 2014-12-28 17:33:09 +10:30
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
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
Atlantiscze
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
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
PsiOmegaDelta
3e333ee1dc Merge pull request #7541 from GinjaNinja32/posilang
Fix brain/posibrain languages
2014-12-27 11:29:56 +13:00
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
mwerezak
7c65de3e34 Improves power monitor UI
Improves power monitor sensor list UI. Fixes #7449
2014-12-26 16:55:03 -05:00
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
b073c03708 Added xenomorph exclusions to space suits and helmets. 2014-12-27 08:10:55 +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
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
Meyar
116b04dbf5 Fixes Deathsquad suit to be spaceproof again 2014-12-26 01:33:29 -05:00
Meyar
f84759ee5f Fixes DeathSquad helmet to be spaceproof once more. 2014-12-26 01:32:48 -05:00
Ccomp5950
899b415511 Merge pull request #7539 from mwerezak/shock
Fixes traumatic_shock affecting species with NO_PAIN
2014-12-25 23:15:55 -05:00
Ccomp5950
b808c20828 Merge pull request #7535 from mwerezak/disposal-bin
Fixes #7111
2014-12-25 23:14:49 -05:00
mwerezak
f8ec11ddb2 Fixes traumatic_shock affecting species with NO_PAIN 2014-12-25 22:02:56 -05:00
mwerezak
b648c31d83 Fixes #7111 2014-12-25 15:46:48 -05:00
Zuhayr
8978747e53 Moved several globals into the config controller, updated eample config appropriately. 2014-12-25 21:10:30 +10:30