Commit Graph

17479 Commits

Author SHA1 Message Date
mwerezak
d240f6563d Throwing speed defines 2014-12-31 02:02:49 -05:00
mwerezak
e2eb95734c Fixes power console warning icon not updating 2014-12-31 01:43:08 -05:00
mwerezak
3381c615ef Adds blue suit jacket to custom loadout gear
Custom item for Nyarlthotep, implemented as custom loadout gear.
2014-12-31 01:00:49 -05:00
mwerezak
756d79b7f3 Less airlock destruction snowflake
Removed the secured_wires multiplier to emitter_hits because it doesn't
make sense that swapping out a different kind of electronics should
affect the door being destroyed. If certain doors should be resistant
then that can be changed in mapping.
2014-12-31 00:43:58 -05:00
Chinsky
1619c09b66 Merge pull request #7588 from mwerezak/door
Fixes door hitby() ignoring speed parameter, small mult-tile door improvement
2014-12-31 08:33:05 +03:00
mwerezak
f17aa78d5f Less wall damage snowflake, allows obj throwers like crossbows and vox spike throwers to damage walls 2014-12-31 00:28:54 -05:00
Chinsky
fe403d013b Merge pull request #7583 from atlantiscze/cellrate-hardsuit-stuff
Hardsuit Powersink Adjustments
2014-12-31 08:17:20 +03:00
mwerezak
0a78703ee2 Fixes door hitby() ignoring speed parameter 2014-12-31 00:12:22 -05:00
mwerezak
20a5e60b6d Merge remote-tracking branch 'upstream/dev-freeze' into dev-freeze 2014-12-31 00:10:01 -05: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
a76af3c7c5 Fixes #7572 2014-12-30 16:33:34 +10:30
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
c73d3e9e16 Prevents power drain from functioning on atmos canisters. (#7567) 2014-12-30 16:09:50 +10:30
Zuhayr
971336d223 Prevents power drain from functioning on piping (#7567) 2014-12-30 15:57:03 +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
Atlantiscze
a9e1f920fd Powersink Load Fix
- Apparently i forgot to add check for used amount of power when reworking powersink, causing it to drain 2kW from each APC, even above drain cap.
2014-12-29 20:36:50 +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
da41c1980d Slightly better multi_tile airlock handling
No need to mess with lists
2014-12-29 13:32:31 -05:00
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
Chinsky
4011745301 Merge pull request #7568 from Kelenius/ofNukeAndShuttle
Fixes "To shuttle" button in nuke traitor panel
2014-12-29 20:41:44 +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
Kelenius
3a9d802c62 Fixes "To shuttle" button in nuke traitor panel 2014-12-29 13:08:48 +03:00
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
1ea83f4365 Removed the DNA2 debug message in the dream daemon console. 2014-12-28 18:32:38 +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
fabee2fdf8 Stopped glass shards from proning mobs with NO_PAIN. 2014-12-28 17:32:55 +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