Commit Graph

8411 Commits

Author SHA1 Message Date
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
Zuhayr
93805d5742 Merge pull request #7225 from PsiOmegaDelta/SyndiBorg
Syndicate borg code refactoring.
2014-12-05 23:37:31 +10:30
PsiOmegaDelta
422ff9b39e Merge pull request #7236 from mwerezak/ops-docking
Remaps the nuke ops shuttle for station docking
2014-12-05 13:57:31 +01:00
mwerezak
5b1f7695e3 Remaps the nuke ops shuttle for station docking
Adjusts the shuttle to incorporate a nice, 2-tile wide docking hatch.
Drops the viro/xenobio docking arm.
Adds a button so that the teleporter blast door can be operated
independently of the airlock blast door.
Fixes some leftover arrivals area just hanging around in space.
Adds a poster specifically for the nuke ops shuttle.
2014-12-05 01:17:17 -05:00
mwerezak
3dc947806f Cameras now use the broken circuitboard item as well. 2014-12-04 17:16:56 -05:00
mwerezak
89cef05a19 Merge remote-tracking branch 'upstream/dev' into secure-airlock 2014-12-04 17:15:27 -05:00
mwerezak
58f227ec69 Cleans up airlock electronics
Removes the icon_state hack
Moves airlock electronics creation into it's own proc.
Moved airlock creation from a door assembly to airlock/New()
2014-12-04 16:40:27 -05:00
mwerezak
83a482a548 Makes secure airlock electronics available from the circuit imprinter 2014-12-04 13:28:26 -05:00
PsiOmega
201d2f42a3 Merge remote-tracking branch 'upstream/dev' into Beds 2014-12-04 14:12:54 +01:00
PsiOmega
1f9cb08102 Syndicate borg code refactoring.
Refactors the borg syndicate code to be more accessible to adminbus.
Syndicate borgs have a jetpack module.
Overrides canUseTopic() to limit what the Syndi-borg can interact.
Still has all access, may be more limited in the future if Bump() is refactored /tg/ style. Admins: Spawn with care.
2014-12-04 12:56:29 +01:00
mwerezak
77288fb951 Merge remote-tracking branch 'upstream/dev' into camera
Conflicts:
	code/game/machinery/portable_turret.dm
2014-12-03 23:37:02 -05:00
PsiOmega
806e200857 Merge remote-tracking branch 'upstream/dev' into Beds 2014-12-03 23:03:43 +01:00
Ccomp5950
5fc6518e21 Merge pull request #7217 from mwerezak/syndie-suit
Adds mask and oxygen tank to uplink kits that provide space suits.
2014-12-03 17:02:48 -05:00
Ccomp5950
55b66b9039 Merge pull request #7220 from PsiOmegaDelta/DismantleThatWindow
Fixes #7214.
2014-12-03 17:02:29 -05:00
mwerezak
01fbe4b542 Fixes portable turret ex_act()
Class 3 is the least severe, not the most.
2014-12-03 10:36:30 -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
cb4a4d67a1 Merge remote-tracking branch 'upstream/dev' into Turrets 2014-12-03 11:38:54 +01:00
PsiOmega
52346094f8 Fixes #7214.
Dismantling a window should now return an appropriate number of sheets for its type.
2014-12-03 11:06:33 +01:00
PsiOmega
74d9441a1c Merge remote-tracking branch 'upstream/dev' into Beds 2014-12-03 09:06:34 +01:00
mwerezak
7049156519 Adds mask and oxygen tank to uplink kits that provide space suits. 2014-12-02 22:24:53 -05:00
Ccomp5950
19bbc4a004 Merge pull request #7212 from Loganbacca/ducttape
Duct Tape
2014-12-02 20:32:04 -05:00
Ccomp5950
cadfecddce Merge pull request #7202 from PsiOmegaDelta/PlasticBag
Constructable blood packs.
2014-12-02 20:31:12 -05:00
Ccomp5950
f1c77dcb16 Merge pull request #7190 from PsiOmegaDelta/Topic
Fixes exploit that lets AIs use machinery even after cameras are disabled.
2014-12-02 20:29:47 -05:00
Snapshot
867e69c770 Merge pull request #7210 from Zuhayr/dev
Fixes #7209
2014-12-02 17:23:19 -08:00
PsiOmegaDelta
4582c0038b Merge pull request #7205 from Mloc/bs12-setdir
refactor 'dir = ' into 'set_dir()'
2014-12-02 14:38:31 +01:00
Loganbacca
c5833dfb9a Allow reading of taped paper via examine 2014-12-03 00:02:47 +13:00
Loganbacca
76d87e7c84 Tape fixes
- Shrunk tape roll sprite
- Disabled tearing off individual strips of tape until they have a use
- Fixed a runtime when removing tape with nothing stuck to it
2014-12-02 23:45:33 +13:00
Loganbacca
26d428e659 Reverted wall repairing with tape 2014-12-02 23:17:46 +13:00
Loganbacca
224b2f3899 Duct Tape
First pass for adding duct tape.
It can stick paper to things.
It can patch up walls (crudely).
Coder sprites!
2014-12-02 23:17:45 +13:00
PsiOmegaDelta
b05c966b64 Merge pull request #7198 from atlantiscze/interactions
(mostly) silicon adjustments/features
2014-12-02 07:20:58 +01:00
Zuhayr
8e2b0978a8 Fixes #7209 2014-12-02 11:26:44 +10:30
PsiOmega
c936e2bb4f Bed and mercenary shuttle refactoring.
Re-arranges the dormitory bedrooms again. Slightly fewer beds, slightly more maintenance.
Re-shapes the mercenary shuttle airlock and docking points to restore the cabin compartment shape.
Gives the xeno/viro some raison d'être until a something more can be done about it.
2014-12-01 22:31:31 +01:00
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()'
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-01 13:44:02 +00:00
PsiOmega
8f342ada74 Constructable blood packs.
Can now make your own blood packs from plastic.
2014-12-01 08:40:58 +01:00
PsiOmegaDelta
e5c5209f7a Merge pull request #7183 from Zuhayr/dev
Hardsuit fixes.
2014-12-01 05:58:24 +01:00
Atlantiscze
64f9a502f9 Mining robot module upgrade
- Mining cyborgs can now properly work with drills.
- Mining cyborgs have received ore scanner, crowbar, and limited version of magnetic gripper.
- Mining cyborgs can now swap power cells inside mining drills, as well as upgrade them if provided better parts.
- As a bonus, cyborgs can now see how much ore is in ore boxes (because it makes sense that cyborg which mined ton of ore can check how much ore it mined)
2014-12-01 05:11:35 +01:00
Zuhayr
0903bd7fc5 Working on some suit bugs, attempted to fix the welding overlay issue with no success. 2014-12-01 01:51:52 +10:30
PsiOmega
493465453e Turret controls now affects all aspects of slaved turrets. 2014-11-30 15:50:51 +01:00
PsiOmega
8857365c1c Fixes exploit that lets AIs use machinery even after cameras are disabled. 2014-11-30 15:24:39 +01:00
Zuhayr
a5ee32d4ca Fixes some colour macros, removes inactive jetpack icon for rigs. 2014-11-30 23:47:34 +10:30
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
Chinsky
c0e54f23cf Merge pull request #7152 from PsiOmegaDelta/RoboCircuit
Robo circuit
2014-11-30 12:50:36 +03:00
Chinsky
edede8ad34 Merge pull request #7153 from PsiOmegaDelta/BeaconBanCheck
Syndicate Beacons no longer attempt to convert traitor banned players.
2014-11-30 12:50:12 +03:00
PsiOmega
5e34d12877 Merge remote-tracking branch 'upstream/dev' into RoboCircuit
Conflicts:
	code/modules/mob/living/carbon/brain/posibrain.dm
	maps/exodus-1.dmm
2014-11-30 10:47:36 +01:00
Zuhayr
4c1ea8cd3a Several hardsuit fixes. 2014-11-30 12:46:03 +10:30
Chinsky
8cdd094e1b Merge pull request #7156 from PsiOmegaDelta/RadioFix
Radio fixes
2014-11-30 00:56:53 +03:00
Chinsky
79562c8f27 Merge pull request #7168 from atlantiscze/syndie-shuttle-docking
Nukeops shuttle docking
2014-11-30 00:56:22 +03:00
PsiOmegaDelta
1780b9904f Merge pull request #7164 from Amunak/chat-shenanigans
Mostly chat-related improvements, mainly adding chattags (icons) to important channels
2014-11-29 16:07:35 +01:00
Loganbacca
7a94f30da2 Grass seed runtime fix
Fixes grass seeds causing a runtime when putting a stack through the seed extractor with only 1 tile left in the stack.
2014-11-30 00:11:47 +13:00
PsiOmega
0f8156e77e Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/game/objects/structures.dm
	code/game/objects/structures/inflatable.dm
2014-11-29 10:09:03 +01:00