Commit Graph

9652 Commits

Author SHA1 Message Date
Zuhayr
014729a001 Addendum to previous commits. 2015-01-03 05:52:29 +10:30
Zuhayr
a34a1f66cf Fixes #7632 2015-01-03 05:23:44 +10:30
Chinsky
5e0676df49 Merge pull request #7631 from Zuhayr/dev-freeze
More fixes.
2015-01-02 20:52:27 +03:00
Chinsky
f30981ab71 Merge pull request #7610 from Loganbacca/trainfixes
Cargo train fixes
2015-01-02 20:51:19 +03:00
Loganbacca
f3b893942f More cargo train fixes
- Fixes #5906
- Fixes #5939
- Fixes #6282
- Fixes #6634 (properly this time)
- Fixed a bug with updating train stats (causing trains to be super slow if hitched while running)
- Updated train verbs (start/stop/remove key) to only show up if you are in the same turf
- Moved all train specific verbs to their own verb category: "Vehicle"
2015-01-03 01:27:10 +13:00
Zuhayr
e63798ea4e Fixes oversight with decompiler. 2015-01-02 20:42:59 +10:30
Zuhayr
261f3f935c Fixes #7627 2015-01-02 19:19:01 +10:30
Zuhayr
89955dbb36 Fixes #7628 2015-01-02 19:02:11 +10:30
Zuhayr
041cd3f3f3 Fixes #7629 2015-01-02 18:58:52 +10:30
Zuhayr
6cae51a945 Fixes #7625 2015-01-02 18:48:06 +10:30
mwerezak
f9344a5a2d Atmos machine update
Takes a pass at updating ATMOSPHERICS to take advantage of the new powernet changes.

Also removes var/on definitions from many atmos machines. Machines generally shouldn't
be doing "on" things if they aren't using power, and most players don't expect a machine
to use power if it isn't "on," so I guess this is fair game.

Also, further refactoring.
2015-01-02 01:46:18 -05:00
Zuhayr
a41364fbd1 Fixes #7595 2015-01-02 00:00:23 +10:30
Zuhayr
5afb55815e Fixes #7601 2015-01-01 23:15:34 +10:30
Loganbacca
dbeec8915e Cargo train fixes
- Partial fix for #6634
- Fixes #7414
- Fixes #7609
2015-01-02 00:05:47 +13:00
Atlantiscze
5a6815b200 Fixes slightly inaccurate comment
- I am detailist, i know.
2015-01-01 08:15:15 +01:00
Atlantiscze
ae4cd4d5b4 SMES Exploit Fix
- RCON consoles ignored SMES I/O limits, meaning you could set SMES to charge/discharge at unlimited values.
- SMESs now properly trim the value when it is above maximal limit (or below 0)
- Also commented the code, while i was in it
2015-01-01 08:09:14 +01:00
Atlantiscze
afe991c1b4 Powernet Sensor System Overhaul
- Completely reworks the powernet sensor system that i created.
- Code mostly refactored to nice properly commented one.
- Sensors now have (currently unused) proc for returning HTML encoded string (it's there if someone needs it) and (newly added) proc that returns assoc list of data.
- Thanks to previous, the console has been fully reworked to utilize NanoUI.
- This addresses most issues with old UI which was harder to use and somewhat buggy at specific situations (such as, showing lower load than suposed)
2015-01-01 07:48:42 +01:00
Atlantiscze
6bd47590cd Warning System Fix
- This fixes bugged powernet warning system. Electrocution now properly triggers warning even when short-circuit is caused by gloved user
- However, there is small difference. Causing sparks but not taking damage triggers only 5 tick warning, instead of 20 tick one. 20 tick warning is triggered when injury is caused.
2015-01-01 06:00:05 +01:00
Atlantiscze
35b42c47c5 APC UI Modification
This modifies the APC NanoUI to show power usage during charging. This is done in form of Total Load: 1234W (+2500W Charging). Charging panel only shows when it's really charging.
APCs now track how much power is actually used for charging. This prevents APC charging from showing up as "Other Load" in power monitoring console.
2015-01-01 05:58:07 +01:00
Zuhayr
cdfa2a5205 Merge pull request #7586 from Zuhayr/dev-freeze
Fixes the remainder of #7567, plus other fixes.
2014-12-31 22:48:39 +10:30
PsiOmegaDelta
d0a8f514b6 Merge pull request #7592 from mwerezak/power-sensor
Fixes power console warning icon not updating
2014-12-31 11:26:41 +01:00
Zuhayr
47a3afb5af Fixes remainder of #7287 2014-12-31 20:15:53 +10:30
Zuhayr
fdc8261f0a Causes spawned alien species to use their default base colour. Adds base colour for Skrell. 2014-12-31 19:34:46 +10:30
mwerezak
e2eb95734c Fixes power console warning icon not updating 2014-12-31 01:43:08 -05:00
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
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
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