Commit Graph

1789 Commits

Author SHA1 Message Date
PsiOmega 5dc3e40b34 Restores APC load balancing and the autoflag system. 2014-10-25 15:18:42 +02:00
PsiOmega 8e3861141c Merge branch 'dev' into PowerTwo
Conflicts:
	code/modules/power/solar.dm
2014-10-24 13:32:36 +02:00
Zuhayr 7e4d3f38a2 Merge pull request #6830 from Glloyd/fixes
Two More Little Fixes
2014-10-24 09:16:13 +10:30
Graham Lloyd dfee656826 Fixes turbine computers disappearing when broken/out of power. 2014-10-22 16:57:01 -04:00
Graham Lloyd c764a94073 fixes some annoying punctuation errors. 2014-10-22 15:58:27 -04:00
PsiOmega 3a7066c6c1 Replaces add_load with draw_power. Issue about silly battery handling remains. Fixes the build-error. 2014-10-20 19:18:27 +02:00
PsiOmega 1cabbbf5a6 Master controller no longer annihilate powernets, powernets annihilate themselves.
Some misc. changes.
2014-10-15 09:44:15 +02:00
PsiOmega 9bc9698998 Sets turn-off limits based on a standard cell's max charge 2014-10-15 08:14:10 +02:00
PsiOmega 9bcbdc6dc5 Fixes bad tabbing, only evident when placing Z-crossing cables. 2014-10-14 14:14:46 +02:00
PsiOmega f190acf7c5 /tg/'s solar code with a fix for the solar control computer not refreshing on user input. 2014-10-13 17:37:18 +02:00
PsiOmega a1ee4e766b Basically ripped over /tg/'s powernet and cable code into our own codebase.
Keeps Z-level code as it was.
Modifies/restores powernet procs as necessary to match our own implementation changes.
2014-10-13 17:13:04 +02:00
PsiOmega ef9cc80603 Adds diagonal cable check on breaker box state change. 2014-10-12 12:55:19 +02:00
PsiOmega f6bab1bd08 Cherry picking breaker box fix. 2014-10-12 12:49:56 +02:00
PsiOmega 988d07cefe Hopefully fixes #6674
Breaker boxes would not always place down all the cables necessary to connect power grids on server start.
Moving initialization from the New() to the initialize() appears to have resolved this.
2014-10-12 12:41:38 +02:00
Zuhayr 9b23315359 Fixes #6644 2014-10-11 07:44:48 +10:30
PsiOmega 36c9f65bb1 Ports /tg's cable and powernet code to our code base. 2014-10-10 14:59:44 +02:00
Zuhayr 223bd86f18 Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
First pass on major conversion of xenomorphs to a human subspecies. Additional condensing of various redundant mob verbs.
Converted larva and diona to their own class, collapsed the rest of xenomorphs into a human species, other stuff.
Completely removed attack_alien(). Still have to reimplement some of the lost behavior for human/alien.
Reapplies lost attack_alien() functionality other than tackling/caressing.
Further alien/humanoid cleanup and xenospawn fix-ups. Also uncommented caste verbs.
Removed half-finished abilities system since species.dm handles it.
All xenomorphs functionality should be working now, other than the HUD, tackling and the xenomorph balance issues.
Added icons for xenomorph castes, moved broadcast languages into datums, removed alien_talk and robot_talk vars.
Merged with organ removal code.
Reapplied verbs to simple_animals/slimes. Updated species definitions to have appropriate organs.
Readded tackle as a human verb.
Borer changes regarding brain removal.
Working on moving the human HUD to the species datum a bit. Mixed results.
Moved Cortical Link to a language, added borer husks.
Tidied up the HUD stuff. Still need to make it rebuild properly when species is changed, but this will do for no
Compile fix, forgot the DME.
Fixed up ventcrawl, added new organ mechanics for dionaea.
Fixed up some overlooked sections causing mobs without brains to die immediately.
Fixed up plasma generation for queens, bugs with organs, force_organ issues with set_species().
2014-09-29 06:19:26 +09:30
Chinsky 69ed2317bf Merge pull request #6428 from atlantiscze/cyborg-power
Cyborg power overhaul
2014-09-25 00:19:13 +04:00
Zuhayr 0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
Atlantiscze 5b905ebde1 Cyborg Advanced Charging
- This solves various issues with cyborg charging
- Cyborg chargers have 15k charge capacity themselves. They charge at 2.5kW when no cyborg is inside and 25kW when cyborg is inside.
- Instead of draining power directly to cyborg's cell, they simply transfer power (capped at 250 charge/tick) from charger to cyborg.
- All is checked, which means no excess power is wasted. This means AFK cyborgs parked in rechargers are no longer power sinks

Balance
- Increased cyborg actuator power usage a bit.
2014-09-17 08:59:19 +02:00
PsiOmega 56ee7e00b0 Map changes
Makes APCs with different cells specific types.
Replaces arrival's APC with a higher-capacity cell variant to avoid people being unable to leave due to power failure at 12:15.
The engine core now begins without oxygen but still requires cooling and everything else.
2014-09-15 15:30:27 +02:00
Zuhayr 4e68ab210e May fix the debug verbs showing up for non-debuggers. Probably not. 2014-09-15 01:56:38 +09:30
PsiOmega bd1e55f19f Changes 3 debug verbs to procs and adds them to the debug-verb list. 2014-09-13 15:49:04 +02:00
mwerezak 90af78ac44 Increases SM power output
Should safely run to 700 kW. Returned starting SMES charge back to
original value to compensate. Engine omnifilters now start off on round
start.
2014-09-12 23:01:15 -04:00
Atlantiscze c5e5856e82 Merge branch 'dev' into substation-multifix 2014-09-12 20:11:42 +02:00
Atlantiscze cbeff523ac Attempt to resolve merge conflict. I hope i won't break something. 2014-09-12 20:07:21 +02:00
mwerezak f1bc9367c7 Increased SMES starting charge 2014-09-12 01:16:31 -04:00
mwerezak 1133088b73 Increases max SMES output to 250 kW
Was recently updated to that on dev so it shouldn't hurt on dev-freeze.
2014-09-10 22:15:26 -04:00
mwerezak 716c6ab3ef APC cell_type is now an actual power cell type 2014-09-10 22:12:43 -04:00
mwerezak 709d87d933 Fixes APCs switching between autoflag 1 and 0 when cell.charge > 10 but not enough charge for one tick
Old APC bug.
2014-09-10 18:51:36 -04:00
mwerezak ee56453ca3 Allows heater/freezer construction dir to be set 2014-09-07 17:07:53 -04:00
mwerezak d12a09addb Powernets
Moved powernet datum definition to powernet.dm
Improved APC load balancing.
Updated SMES charging to work better with new APC/powernet code.
2014-09-07 01:10:22 -04:00
mwerezak e045c84f97 Fixes APC load totals periodically doubling
Also fixes areas updating excessively when update_use_power() was
called.
2014-09-06 11:35:58 -04:00
Atlantiscze 03f2be3091 PARTIAL IMPLEMENTATION - Charged SMES deconstruction & SMES code cleanup
- Cleanup of SMES attackby() code
- Buildable SMESs now have option to override safety circuit by using multitool while the hatch is open.
- Disabling safeties lets you disassemble SMES even if it's charged above 1%.
- If charge is above 5% stored energy may discharge violently. This is percentage based (more energy = higher chance of this occuring + more severe consequences)
- Larger discharges affect whole powernet, burning out some lights and even completely destroying APCs!
- Substation PSUs act as surge protection. Thus, if set up properly damage is limited to few areas which are directly on the main grid (= maintenance mostly)
- STILL NEEDS TESTING. Pushing so other people can review the code and give further suggestions. And because i need to access it on second computer.
2014-09-05 01:52:15 +02:00
igalan 0aa6c4f38c Fixes #6121
Moves HE pipes and junction dmi's to where the rest of the icon_manager dmi's are.
2014-09-04 05:02:03 +01:00
Atlantiscze 20d33815ba Breaker Box Fix
- Removes source of runtime errors. From my examination of code, it seems these errors happen when breaker box is turned off for the first time. It should work then.
- Mostly temporary fix, i intend to rework the powernet code over time. I would welcome cooperation with @mwerezak as he is currently doing lots of related things.
2014-09-02 17:09:37 +02:00
Atlantiscze 3ca0d1577f Breaker Box AI interaction fix
- AI can now properly interact with Breaker Box, without interacting BOTH as AI and human.
2014-09-02 17:02:36 +02:00
Atlantiscze 6905a90b9e SMES Construction rework
- Buildable SMES is now subtype of regular SMES.
- Buildable SMES related stuff moved to separate file (smes_construction.dm)

Please note that this commit is one of two commits which have to be applied together. Otherwise, compilation error occurs. (Code + Map. This one is Code)
2014-09-02 15:33:36 +02:00
Zuhayr 67cb6e297e Merge pull request #6254 from Kelenius/OfStacks
Of Stacks
2014-09-02 17:58:28 +09:30
Kelenius 505f857eb8 Stack update 2014-09-02 09:59:32 +04:00
Atlantiscze 975070c1ba ENGINEERING SUBSTATIONS!
- Mapped in engineering substations
- Completely reworked station wiring (Z level 1)
- Wire colours: Yellow - Local Power (engine, solars), Red - Main Grid, Green - Sub Grid (department grid)
- Adds breaker box variant that starts enabled
- Substation PSUs are now not set to charge themselves by default (as this caused quite large loads)
2014-08-31 03:52:38 +02:00
Atlantiscze 228fa21a46 Adds Fractal Energy Reactor
- Fractal energy reactor is infinite power source
- It is NOT mapped in. It is intended for map testing purposes when large amount of power is needed
- It is NOT buildable. Only way to obtain it is by spawning it.
- Outputted power can be varedited to your liking. Defaults to 2MW (should be enough for ... well, everything?)
2014-08-31 03:44:25 +02:00
Atlantiscze 7bb01ca020 Breaker Box update
- Added suggestions by mwerezak and comma
- Directions list is now in variable
- Type changed to /obj/machinery/power/breakerbox
- Instead of using loop visible_message() is used now.
2014-08-30 20:54:41 +02:00
Atlantiscze cb52831268 SMES construction fix:
- You can no longer place coils into PSUs.
- SMES now properly checks max_coils var when installing new coils.
2014-08-30 16:21:03 +02:00
Atlantiscze 845c0a0b17 SMES (de)construction
- Adds Superconducting Magnetic Coils - SMES specific construction item.
- Each SMES can have up to 5 additional coils added , similar to PSUs with cells.
- It is possible to create multi coil SMESs by changing "cur_coils" variable while mapping them in.
- SMES can be deconstructed, salvaging their board and coil(s)
- It is currently not possible to obtain these by any other way than deconstructing existing SMESs. This will be added in another commit.
2014-08-30 15:55:38 +02:00
Atlantiscze e1b38f9d38 Adds Breaker Box
- Basically, reworked powerswitch. Powerswitch was commented out and this commit removes it completely, as Breaker Box is partially using it's code.
- Breaker box is device designed for advanced grid control. Allows you to connect/disconnect wires WITHOUT having to cut them manually.
- This update mostly improves interaction, and adds AI support (as i already saw many AIs which are actually good in balancing things. This will help them a bit. Engineers can do it manually too.)
2014-08-29 20:21:46 +02:00
Zuhayr 772715f2da Merged dev-freeze into master. Two map conflicts, used dev-freeze map. 2014-08-27 20:46:04 +09:30
Zuhayr cf68ad7c87 Master to dev merge. 2014-08-27 20:24:07 +09:30
mwerezak 54d11506d0 Allows power to be read by examining the collectors 2014-08-25 20:57:32 -04:00
GinjaNinja32 778a0fc608 Removed debug statements 2014-08-26 01:43:54 +01:00