Commit Graph

31 Commits

Author SHA1 Message Date
Hubblenaut
3d9a558712 Changes to SMES
- Transition to using kilowatts and kilowatt hours
 - Adds an input load bar with value
 - SMES charge rate and coil capacities slightly adjusted for using
   kilowatt units
2016-04-22 00:58:11 +02:00
SinTwo
b356f5cf21 Construction Update 2016-03-25 16:02:36 -04:00
PsiOmegaDelta
9dd1a54191 Destroy tweaks.
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091.
Adds returns in Destroy()s, to prepare for future return values.
2015-09-25 10:44:23 +02:00
PsiOmegaDelta
307f36e919 Compilation fixes. 2015-06-16 11:03:25 +02:00
PsiOmegaDelta
06a1ece4b8 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/ZAS/Controller.dm
	code/datums/mind.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-06-16 10:52:33 +02:00
Atlantis
8a5a969002 More Destroy()s, better implementation
- Re-implements Destroy() for SMES units. This time moves relevant (de)construction code all the way up to obj/machinery/. This should fix any potential GC issues with deconstruction of component-based machines.
- Implements Destroy() for breaker boxes.
- Fixes SMES units lacking disconnect_terminal(), causing GC errors.
2015-06-06 11:04:41 +02:00
Atlantis
b16bf61d03 Implements Destroy() for buildable SMES units.
- This also means GC errors for SMES coils and probably cable coils are fixed. Both of these things are in used in SMESs' construction components.
2015-06-06 09:43:39 +02:00
Kelenius
35a20002c6 Merge branch 'dev' into ofResearchAndPrototypes
Conflicts:
	baystation12.dme
	code/defines/obj/weapon.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
	code/game/mecha/mecha_parts.dm
	code/game/objects/items/devices/flash.dm
	code/game/objects/items/devices/powersink.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm
	code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
	code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm
	code/game/objects/items/weapons/circuitboards/machinery/pacman.dm
	code/game/objects/items/weapons/circuitboards/machinery/power.dm
	code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm
	code/game/objects/items/weapons/circuitboards/machinery/research.dm
	code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm
	code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm
	code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
	code/game/objects/items/weapons/flamethrower.dm
	code/game/objects/items/weapons/handcuffs.dm
	code/game/objects/items/weapons/kitchen.dm
	code/game/objects/items/weapons/shields.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/teleportation.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/assembly/igniter.dm
	code/modules/assembly/infrared.dm
	code/modules/assembly/mousetrap.dm
	code/modules/assembly/proximity.dm
	code/modules/assembly/signaler.dm
	code/modules/assembly/timer.dm
	code/modules/assembly/voice.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/mining/drilling/scanner.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/ore.dm
	code/modules/mob/living/silicon/robot/analyzer.dm
	code/modules/power/rust/circuits_and_design.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/energy/laser.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/designs.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm
	code/modules/research/research.dm
	code/modules/research/server.dm
	code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
2015-05-20 11:50:28 +03:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
Kelenius
db30c15e4c Updates to science
Protolathe and CI build procs moved to them from RD console.
Protolathe and CI now have a build queue. Designs take varying time to
build.
P and CI material storage is now a list instead of a set of vars.
origin_tech is now a list.
All sheets now contain exactly 2000 units of matter.
In design datum, chemicals and materials are two separate lists.
Designs are now sorted. The method is kinda hacky but flexible. They
have a var, sort_string. Designs are sorted alphabetically using it.
Circuits how show whether they build a machine or a computer in CI menu.
Adds item construction, for now protolathe is used.
2015-04-04 13:38:03 +03:00
Atlantiscze
2d4926f72d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power 2015-02-17 16:05:47 +01:00
PsiOmega
06335b1064 The AI now has a personal power monitor interface. 2015-02-16 15:12:23 +01:00
Atlantiscze
34e116bbb0 Buffs engineering shuttle SMES to store a bit more power. 2015-02-09 18:54:01 +01:00
Atlantiscze
12be20ed73 Mapping changes preparation
- Adds Red and Blue simple pipes for mapping use.
- Adds empty CO2 PH and N2O canisters for mapping use.
- Reworks asteroid outpost areas. Old areas kept in separate file for downstream compatibility
- Modifies engineering shuttle to work with next commit.
- SMESs no longer have to be charged above certain level (~5%?) to actually begin outputting power.
- Fixes SMES related bug caused by previous commit
2015-02-09 18:53:02 +01:00
Atlantiscze
8eb08c2457 Adds more types of magnetic coils
- Adds high capacity, high IO and basic coil types.
- Adds two additional types of SMESs which contain new coil types by default. These will be used in next commit.
2015-02-09 01:14:33 +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
Amunak
158573f066 Corrects names of computers, code formatting, updated computer descriptions.
Everything in game/machinery/computers/ and modules/shuttles should now have properly (de)capitalized names. Computer, board and research names should now be coherent, too. Adds a research for employment records circuit board.
2014-12-14 05:00:38 +01:00
Amunak
1e769b4314 Attempt to normalize computer and circuit board names and their research names.
Also moved RCON console board and SMES board where they belong. Formatted some board code and fixed some typos, too.

Cloning console renamed to Cloning Control Console.
The teleporter console is now called Teleporter Control Console.
The power monitor is now called Power Monitoring Console.
SMES board glass and acid construction price normalized (though other resources are still required; is that a good thing? It would be better to just introduce a new expensive part that is used to build it (if the coils aren't enough) rather than have a single board with atypical price.
2014-12-10 20:37:18 +01:00
Atlantiscze
321e4d443c Adds ability to modify RCON tags on SMES units and breaker boxes.
- Use multitool to change (for SMES, screwdriver the SMES first to open cover)
2014-12-08 06:10:47 +01:00
Atlantiscze
994ad591e6 RCON System (v1.0)
- Allows remote control of SMES units and Breaker Boxes.
- Adds wires to SMES units. Wires may be cut/pulsed for various effects. Signallers are supported.
- RCON console(s) may be used to monitor the SMES units (which have RCON enabled) remotely, showing output loads and charge percentages.
- SMESs may be quickly discharged by cutting the grounding wire. This however comes with little risk of overload which may damage APCs on output powernet.
2014-12-08 03:30:20 +01:00
PsiOmega
0731badf87 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/modules/power/smes.dm
	code/modules/power/smes_construction.dm
	maps/tgstation2.dmm
2014-11-30 10:54:15 +01:00
Atlantiscze
12c8b73bdf Fixed exploit that allowed you to generate infinite power by repeatedly disassembling and building SMES with same parts. New SMES would always start on 20% charge. 2014-11-29 01:19:34 +01:00
Atlantiscze
8594697552 SMES Failure logging + small fix
- SMES failures are now logged, including position of SMES, user and intensity of failure (from 1 to 100). Also included is JMP button.
- Instead of using ugly long string nice proc ping is used.
- Fixes issue with SMES overloads almost never causing APC failures.
2014-11-25 18:09:49 +01:00
Atlantiscze
3ae77af341 Fixes some SMESs on station which had wrong type
- Atmospherics, north solar and outpost SMESs remapped to be of /smes/buildable type instead of /smes/ which can't be upgraded and/or disassembled.
- Added warning which shows in the log when non-magical or non-buildable SMES is mapped in/spawned. This should *hopefully* remind mappers that regular SMESs are not suposed to be mapped in unless specifically needed.
2014-11-25 17:10:20 +01:00
PsiOmega
0468f12e91 Merge remote-tracking branch 'upstream/dev' into APC
Conflicts:
	code/game/gamemodes/events/power_failure.dm
	code/modules/power/smes.dm
2014-11-11 14:13:02 +01:00
Atlantiscze
1a274475d1 Fixes SMES deconstructing yielding no parts.
- Damn you indentation.
2014-11-05 11:33:14 +01:00
Atlantiscze
a93b6313e0 Buildable SMES overload EM pulse now won't now slow other effects from happening (which was not intended and can be noticed, espicially with larger overloads.) 2014-11-05 11:21:35 +01:00
PsiOmega
a1c19b78be Ports more of /tg/'s powernet code.
Among other things this fixes a a bug where SMES would draw excess power from the powergrid they were outputting to, rather than drawing from.
2014-10-29 14:01:35 +01:00
Atlantiscze
cbeff523ac Attempt to resolve merge conflict. I hope i won't break something. 2014-09-12 20:07:21 +02: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
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