Commit Graph

32 Commits

Author SHA1 Message Date
PsiOmega
710abd0921 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/spells/mind_transfer.dm
2015-03-29 16:23:06 +02:00
PsiOmegaDelta
84e4f6315f Merge pull request #8660 from Baystation12/master
Dev-freeze
2015-03-29 16:19:38 +02:00
mwerezak
09fea22231 Fixes camera wires
Seems like pulsing was mistakenly set to deactivate the camera during the wire datum update.
2015-03-27 23:35:38 -04:00
PsiOmega
ce30b00287 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/setup.dm
	icons/mob/items_righthand.dmi
	maps/exodus-1.dmm
	maps/exodus-5.dmm
2015-03-13 09:23:26 +01:00
PsiOmega
533ccef0ab Robot code clean up and fixes.
Fixes runtime when a borg is reset.
Fixes issue where /proc/select_active_ai_with_fewest_borgs() would not always return the intended AI.
Fixes issues with new borgs spamming the master AI with creation messages under some circumstances.
2015-03-10 13:37:20 +01:00
PsiOmega
99406e3077 NanoUI AI door interface.
Related:
Cleans up airlock Topic()
Power and electricity is now also handled by process instead of sleeps().
Wires, remote door controls, etc. now use airlock procs instead of manhandling variables directly.
2015-03-03 13:23:18 +01:00
PsiOmega
f510c38d22 Alarm centralization completion
Atmosphere alarms now handled centrally.
2015-02-23 15:11:13 +01:00
Zuhayr
a8089d4437 Merge master into dev. 2015-02-12 23:01:08 +10:30
D Anzorge
9dffc8f922 Add NanoUI to vending machines
Error messages are now displayed in the NanoUI interface, instead of going to
the text log. Wire UI now consistent with other wire-enabled wire devices
that use NanoUI.
2015-02-11 10:42:50 -05:00
D Anzorge
b826e5bb77 Rewrite and refactor vending.dm
Remove some redundant procs and /obj/machinery/vending members. Rework the way
product lists and advert lists are stored within /obj/machinery/vending.

/obj/machinery/vending now uses a simpler way of storing the product list. The
old variables, `products`, `contraband`, etc., are still used for initialization
of the new list, but are not used beyond that.

This commit removes colors from vending lists in anticipation of introducing
NanoUI.
2015-02-11 10:42:50 -05:00
PsiOmega
93a479099a Air alarm deconstruction fix.
Air alarms can again be deconstructed, at the price of lost convenience.
2015-02-10 10:35:45 +01:00
mwerezak
2d744fd47a Fixes doors being usable remotely when broken
Fixes airlock doors being able to be opened and closed remotely (by
buttons, airlocks, or docking) when broken. Also removes some redundant
code, and refactors a few checks.
2015-02-07 17:52:16 -05:00
mkalash
f9e352b768 Gets rid of the white wire in Omega's new wire system. The background of the UI is white, so you can't read the wire's name. I replace it with dark red. 2015-01-04 22:26:41 -05:00
PsiOmega
cf78fe903b Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-12-12 09:04:09 +01:00
PsiOmega
087cc1882c Fixes #7366.
Kills unecessary photo datum which wasn't even used correctly anymore.
Photos have a global id for ease of synth syncing.
Changes how law/photo syncing is handled when pulsing the appropriate borg wire.
Also ensures re-synced borgs are added/removed from the appropriate AIs.
2014-12-10 21:54:57 +01:00
Atlantiscze
d761eaf38c I am an idiot.
- Replaces typo which caused SMES wire pulsing to be broken.
2014-12-08 06:27:11 +01:00
Atlantiscze
39229e4a1f Few updates to SMES wiring datum:
- Pulsing input/output wires now toggles the input/output settings, instead of disabling for 60s
- Pulsing grounding wire now disables grounding until the wire is cut and mended again.
2014-12-08 03:55:35 +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
mwerezak
89cef05a19 Merge remote-tracking branch 'upstream/dev' into secure-airlock 2014-12-04 17:15:27 -05:00
mwerezak
674817ff0b The wire datum UI now indicates if the wires have been randomized. 2014-12-04 16:49:18 -05:00
mwerezak
fad5506683 Cameras can be broken by weapons/projectiles, fixes
Fixes being able to show papers to AIs through deactivated cameras.
Fixes being able to break doors with TOX, OXY, and CLONE damage.
Fixes camera alarms persisting after the camera is deleted.
Fixes #7021.
Some camera cleanup.
2014-12-03 10:36:30 -05:00
PsiOmega
c3a80e4ace Radio wires - Take 2. Can now also cut wiring. 2014-11-24 15:23:06 +01:00
PsiOmega
e98649fa5e Plastique wiring. 2014-11-24 11:21:31 +01:00
PsiOmega
1e479536db Radio wires. 2014-11-24 10:19:57 +01:00
PsiOmega
bf24d288ea Particle acceleration wiring. 2014-11-24 10:12:57 +01:00
PsiOmega
2d832b19cd Mulebot wiring. 2014-11-24 09:50:19 +01:00
PsiOmega
2bfce70376 Autolathe wiring. 2014-11-24 09:17:22 +01:00
PsiOmega
f412eb8e1d Merge remote-tracking branch 'upstream/dev' into StateLaws 2014-11-07 09:42:53 +01:00
PsiOmega
f2dcf1acaa AI fixes
Telecommunication interruption no longer permanently disables the ability for synths to state laws if they attempt it during the downtime.
If a synth attempts to state laws during telecommunication interruption it now receives a clear feedback message about its impossibility.
Fixes runtime errors when AIs uses shortcut keys to operate APCs/turret controls when the corresponding window isn't open.
Adds missing AI-restriction check for turret controls.
Airlocks no longer lie about dropping bolts when they cannot be dropped.
2014-11-06 15:36:02 +01:00
PsiOmega
a9ef2b61c0 Wiring Upgrade
Continues the wiring upgrade. Now cameras, airlocks, robots, and air alarms also use the new wire datum system.
Global wiring code is now removed but there are sneaky objects which didn't rely on them such as mulebots and autolathes.

Fixes a few issues from the previous upgrade.
2014-11-04 14:27:46 +01:00
PsiOmega
97a5186cee Converts all machines relying on RandomAPCWires() to the new wire datum system. 2014-10-13 21:46:45 +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