fe403d013b
Merge pull request #7583 from atlantiscze/cellrate-hardsuit-stuff
...
Hardsuit Powersink Adjustments
2014-12-31 08:17:20 +03:00
842fe11c59
Fixes a runtime with embedding a deleted weapon.
2014-12-30 16:10:37 +10:30
90a83c19cf
Hardsuit powersink module now uses CELLRATE properly
...
- Adds CELLRATE (and SMESRATE for SMESs) into drain_power proc.
- Adds "amount" parameter to drain power proc, sets the powersink module to 40kW draw (80 cell charge/s), which should correspond with normal cell recharger.
- Removes drain_power from all machinery, and adds drain_power to machinery/power. This means you can only drain from machines that have something to do with wiring or electricity.
2014-12-29 20:40:57 +01:00
c7f0d7cfc7
Merge resolution.
2014-12-30 05:52:59 +10:30
c6d7a94396
Merge pull request #7575 from mwerezak/voxfix
...
Fixes vox leap special_role check
2014-12-30 05:51:40 +10:30
c4fbe8df34
Fixes vox leap special_role check
2014-12-29 13:04:02 -05:00
d6d1bc15de
Merge pull request #7557 from Zuhayr/dev-freeze
...
Some fixes, siemens coefficient rebalance for species.
2014-12-29 20:56:08 +03:00
cfbe4bf8c1
Minor attack message change
2014-12-29 17:04:14 +01:00
a22f90414b
Fixing weird directory structure stuff.
2014-12-30 01:32:56 +10:30
84909f2fbd
NOCLONE -> HUSK
2014-12-29 15:58:21 +01:00
0af10fc98e
Merge branch 'combat_fixes' of https://github.com/Hubblenaut/Baystation12 into dev-freeze
2014-12-30 01:27:14 +10:30
1c3e771e07
Merge pull request #7556 from mwerezak/xenobalance
...
Xeno Balancing
2014-12-29 19:21:21 +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
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
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
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
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
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
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
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
f8ec11ddb2
Fixes traumatic_shock affecting species with NO_PAIN
2014-12-25 22:02:56 -05:00
8978747e53
Moved several globals into the config controller, updated eample config appropriately.
2014-12-25 21:10:30 +10:30
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
930e8c6e5d
Removes an unused debug var.
2014-12-25 20:09:45 +10:30
3427787359
Merge pull request #7524 from Zuhayr/mutantrace
...
Species and organ fixes.
2014-12-25 10:56:17 +13:00
31ba0d12e0
Fixes #6676 and #7375
2014-12-24 23:32:10 +10:30
0263bc9c84
merge
2014-12-24 22:50:13 +10:30
c49cb0c645
Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze
2014-12-24 22:43:10 +10:30
e74c0c38e4
Fixes #5801
2014-12-24 22:00:31 +10:30
Chinsky