Chinsky
fe403d013b
Merge pull request #7583 from atlantiscze/cellrate-hardsuit-stuff
...
Hardsuit Powersink Adjustments
2014-12-31 08:17:20 +03:00
Zuhayr
a5b937c1e8
Readded null check.
2014-12-31 14:12:10 +10:30
Ccomp5950
e0047c5830
Merge pull request #7545 from atlantiscze/blast-door-refactor
...
Blast Door refactor
2014-12-30 21:15:47 -05:00
Atlantiscze
3c41d77b1a
Optimalisations
2014-12-31 01:53:53 +01:00
Zuhayr
111b32016f
Merge pull request #7581 from Baystation12/dev-freeze
...
Dev-freeze into dev
2014-12-30 18:53:20 +10:30
Chinsky
70344c275f
Merge pull request #7580 from Zuhayr/fixes
...
Fixes
2014-12-30 09:41:25 +03:00
Zuhayr
eb6fc63a7b
Fixes #7564 and buffs the dead man's switch explosion radius ( #7567 ).
2014-12-30 16:11:25 +10:30
Zuhayr
842fe11c59
Fixes a runtime with embedding a deleted weapon.
2014-12-30 16:10:37 +10:30
Zuhayr
d1a98cf844
Fixes #7574
2014-12-30 15:56:34 +10:30
Zuhayr
09ba7a67f8
Fixes #7563
2014-12-30 15:56:14 +10:30
LightningIron
3af9b075af
Makes shotguns not break on point-blank fire.
2014-12-29 21:03:55 -06:00
Atlantiscze
7ceade9320
Typo Fix
2014-12-29 20:47:20 +01:00
Atlantiscze
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
Zuhayr
c7f0d7cfc7
Merge resolution.
2014-12-30 05:52:59 +10:30
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
68be4d10a2
Merge pull request #7569 from Baystation12/dev-freeze
...
Dev freeze
2014-12-29 22:20:37 +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
a7b02a0d05
Merge pull request #7561 from Baystation12/dev-freeze
...
Dev freeze
2014-12-29 02:47:31 +10:30
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
d24e1debc8
Merge pull request #7537 from mwerezak/sol-common
...
Sol common syllable list
2014-12-28 13:15:52 +10:30
Zuhayr
dfb6390cad
Merge pull request #7536 from mwerezak/disposal
...
Adjusts disposal pressure
2014-12-28 13:14:01 +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
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
