Commit Graph

21918 Commits

Author SHA1 Message Date
Zuhayr
014729a001 Addendum to previous commits. 2015-01-03 05:52:29 +10:30
Zuhayr
42f6807cce Added back sprites for ninja, breachers and merc suits. 2015-01-03 05:36:13 +10:30
Zuhayr
f054d56cc8 Adds a more immersion-friendly icon for rig modules. Fixes #7246 for now. 2015-01-03 05:25:37 +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
PsiOmegaDelta
591b5d830f Merge pull request #7630 from mwerezak/atmospherics
Atmos machine update
2015-01-02 13:22:44 +01:00
Zuhayr
e63798ea4e Fixes oversight with decompiler. 2015-01-02 20:42:59 +10:30
Zuhayr
15801e9f50 Fixes #7596 2015-01-02 19:55:50 +10:30
Zuhayr
a255fe48ca Fixes #7619 2015-01-02 19:28:30 +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
PsiOmegaDelta
73f9617cef Merge pull request #7613 from Zuhayr/dev-freeze
Fixes.
2015-01-02 00:09:03 +01:00
Zuhayr
fc75f3bdfc Merge pull request #7620 from mwerezak/poster
Fixes #7598
2015-01-02 09:00:16 +10:30
mwerezak
6eceb15fe6 Merge remote-tracking branch 'upstream/dev-freeze' into poster
Conflicts:
	code/game/turfs/simulated/walls.dm
2015-01-01 15:46:23 -05:00
mwerezak
9485c6410c Fixes #7598 2015-01-01 15:43:28 -05:00
Zuhayr
a41364fbd1 Fixes #7595 2015-01-02 00:00:23 +10:30
Zuhayr
cf6dbcba69 Fixes #7594 2015-01-01 23:36:48 +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
Zuhayr
2f5dff0f46 Merge pull request #7608 from atlantiscze/nano-sensors
Nano Crusade
2015-01-01 20:41:44 +10:30
Atlantiscze
bf74130383 Map Adjustments:
- Fixes #7597 and #7594
- Solars turned from tiled turfs to plating to make wiring easier.
- Atmospherics sensor reconnected to the grid.
- Corrected issue with engine waste handling which caused approximately 50% of waste to remain in pipes, requiring multiple canister swaps to actually empty it.
- Added two bottles of space cleaner. One at security, second at engineering.
- Changed the material crates in engineering workshop to reinforced tables (supplies are now easier to see)
- Changed engineering workshop access to allow both engineers and atmosphere technicians inside.
2015-01-01 09:15:50 +01:00
Atlantiscze
37460b6174 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into nano-sensors 2015-01-01 08:42:05 +01:00
Atlantiscze
1a1963e292 Adjustments to RCON console UI
- Adds buttons to show/hide specific sections of the UI.
2015-01-01 08:40:47 +01: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
Zuhayr
442254c750 Merge pull request #7606 from Loganbacca/freezefix
Genetics/Science map area cleanup
2015-01-01 17:37:11 +10:30
Atlantiscze
2580db82b5 Removes debug statement
- Forgot to add this into my previous commit.
2015-01-01 07:54:04 +01:00
Atlantiscze
a17656086c Fixes #7349
- This fixes missing powernet sensor entries in engineer PDAs.
- This is done by reimplementing old system, that instead connected to consoles. Bleh.
- New system connects directly to sensors, but offers only very limited amount of information (ie. console is 5x better and nicer, this is intentional before someone begins yelling it's a bug!)
2015-01-01 07:52:44 +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
Loganbacca
36f2ce019d Genetics/Science map area cleanup
- Changes small room between R&D and Genetics to be part of R&D hallway area since Genetics doesn't have a working APC
- Changed access door on R&D side to an R&D access door
2015-01-01 16:43:32 +13: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
11d5f7a306 Fixes #7278 2014-12-31 19:53:52 +10:30
Zuhayr
1ea2acc24b Fixes #7392 2014-12-31 19:34: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
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
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