Commit Graph

10033 Commits

Author SHA1 Message Date
mwerezak c3413bc7d7 Fixes meteor event 2015-01-07 23:29:52 -05:00
Zuhayr 0d56551319 Merge pull request #7729 from Baystation12/dev-freeze
Dev freeze
2015-01-07 18:15:03 +10:30
Tramziller 29a0ae2ad6 Response to #7686 2015-01-06 21:48:56 +01:00
ccomp5950 27765f799f Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
Conflict resolution.

Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm
2015-01-06 12:36:28 -05:00
Zuhayr cb88860f6b Merge resolution. 2015-01-07 03:43:12 +10:30
Zuhayr 66759eff3c Adds Borer bantype, halves borer resist time, comments out Devour Brain verb, expands borer welcome text. 2015-01-06 11:11:34 +10:30
Tramziller 06e6277dc6 Fixed bug of peridaxon healing robotic organs 2015-01-05 22:17:40 +01:00
Zuhayr e07a14c0ea Made bomber jacket/hoodies toggleable, added black hoodie. 2015-01-06 01:35:45 +10:30
Ccomp5950 c78ad9666a Merge pull request #7649 from Kelenius/ofDionaeAndDrugs
Fixes a tiny typo and a comment
2015-01-03 17:43:32 -05:00
Kelenius c1d07cd77b Fixes a tiny typo and a comment
So basically toxins are not processed like all other reagents - instead
that is handled to the liver. Since dionae/dionas have no liver, toxins
would never leave their system. There is a check for aliens to
forcefully call ..(), but due to a typo it was only called if the drug
had any toxpwr. Since mindbreaker (and several others) has toxpwr = 0,
such drugs would never leave a poor diona's... khm, system.

The question to how diona even get affected by those in the first place
stays open.

Fixes #6994.
2015-01-03 23:19:14 +03:00
Kelenius 4c63e6a3ea Restores monkey's ability to ventcrawl
Fixes #7474.
2015-01-03 22:41:57 +03:00
Zuhayr 982998d08d Fixes #7636 2015-01-03 06:53:29 +10:30
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
Fira 81d545d406 Added attack_ghost to APC and SMES to allow observing 2015-01-01 18:26:55 +00:00
Fira d9be074d29 Made Ghosts able to use NanoUI in read-only mode 2015-01-01 18:17:11 +00:00
Atlantiscze 3e1ad4099e Wireless Wires Bug Removal
- This removes the dreaded wireless wires bug, which caused wires disconnected by explosions to actually still conduct power until powernet was manually updated.
- This also adresses issue with (on bay unused) singularity, which exhibits similar behavior when eating wires (wireless wires bug)
2015-01-01 17:20:21 +01: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
Zuhayr 5b578a1668 Merge resolution. 2015-01-01 22:59:54 +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 12053e739c Merge pull request #7590 from mwerezak/walls
Less wall and door destruction snowflake, allows obj to damage walls
2014-12-31 11:29:28 +01:00
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 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
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