Commit Graph

8480 Commits

Author SHA1 Message Date
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
Atlantiscze
0fda5bf9b8 Nukeops shuttle docking
- Nukeops (or newly mercenaries) can now dock with the station. Two locations are available, maintenance between virology and xenobiology and arrivals.
- You always have to hack in or be let in. The door won't open on it's own. This is intentional as the shuttle is considered unrecognised by station's docking system. AI or anyone else can open the doors for you if needed.
- Also fixes bug which broke the shuttle console, since someone who was renaming nukeops to mercenaries forgot to change one line in antagonist.dm
2014-11-29 03:51:45 +01:00
mwerezak
b84bb4ff23 Fixes bubble/hull shield generators not updating air zones, update_nearby_tiles() cleanup. 2014-11-28 19:37:31 -05:00
Amunak
93859e9652 Dead chat will get announcements when someone joins or leaves it.
This is mainly for wizard and cult rounds, where it is important to know that a wizard/cultist is watching. The announcement was added for most other types of leaving/joining the ghost realm. Admin ghost doesn't get announced for obvious reasons.
2014-11-28 13:05:26 +01:00
Amunak
92d811fd61 Chat tags for OOC and LOOC. 2014-11-28 11:15:53 +01:00
Amunak
5dff5228a0 Changed radio format: channel now goes before name 2014-11-28 10:18:42 +01:00
PsiOmega
8ae93e2616 Radio fixes
Intercoms no longer have to check wiring, they can simply use the listening/receiving flags.
Can no longer enable reception/broadcasting if the relevant cables have been cut.
2014-11-27 17:10:26 +01:00
PsiOmega
23e4a4fd6a Syndicate Beacons no longer attempt to convert traitor banned players. 2014-11-27 09:24:25 +01:00
PsiOmega
5b8942543b Merge remote-tracking branch 'upstream/dev' into RoboCircuit 2014-11-27 08:58:34 +01:00
PsiOmega
c14411d979 Robots can now be rebuilt after destruction.
Robotic borgs now have a circuit which can be re-installed in a new chassi after the destruction of the original.
2014-11-27 08:58:29 +01:00
PsiOmegaDelta
fae43793a4 Merge pull request #7142 from PsiOmegaDelta/Singularity
Syndicate beacon power consumption and objective.
2014-11-26 22:08:48 +01:00
Chinsky
5cc4d3490c Merge pull request #7141 from Amunak/chat-shenanigans
OOC and LOOC colors now use stylesheet; also LOOC rewrite
2014-11-27 00:03:06 +03:00
Chinsky
ee815b719e Merge pull request #7129 from PsiOmegaDelta/Wires
Wires
2014-11-27 00:02:39 +03:00
PsiOmegaDelta
d2a5689d61 Merge pull request #7131 from GinjaNinja32/nullspace
Fixes most nullspace items, rewrites floor tiles not to del() so much
2014-11-26 14:09:36 +01:00
PsiOmega
d6c0ebf138 Syndicate beacon power consumption and objective.
Cleans up syndicate beacon power consumption.
Objectives are now only given if not disabled.
Relative-proc cleanup.
2014-11-26 09:56:15 +01:00
Amunak
caf153ca61 Rewrite of LOOC code
LOOC now uses stylesheet.
It is less messy (there is now only one loop)
Added shortcut for admins to jump to mob
2014-11-26 04:17:19 +01:00
Amunak
5a65c85cb0 Moved OOC color definitions to stylesheet:
Removes the unused (and abused) set-player-OOC-colour verb.
Adds definitions for each rank to the stylesheet, moving it from the OOC file.
Updates the OOC-text-color verb accordingly.
Made the custom OOC text color resetable.
Cleaned up hardcoded values, old code and comments.
2014-11-26 04:04:32 +01:00
GinjaNinja32
a9111cc8e1 Fixes and guards against strange values 2014-11-25 20:01:30 +00:00
GinjaNinja32
c567bd93e9 Add defines, change comment 2014-11-25 19:44:36 +00:00
PsiOmega
31fc696026 Merge remote-tracking branch 'upstream/dev' into Wires
Conflicts:
	code/game/machinery/autolathe.dm
2014-11-25 11:19:39 +01:00
GinjaNinja32
f8ea85b30e Typo fix 2014-11-24 17:29:48 +00:00
GinjaNinja32
48343a23fb Fix most nullspace items, rewrite floor tiles not to del() on every place/remove 2014-11-24 17:05:46 +00: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
2d832b19cd Mulebot wiring. 2014-11-24 09:50:19 +01:00
PsiOmega
2bfce70376 Autolathe wiring. 2014-11-24 09:17:22 +01:00
Zuhayr
2b93a89d51 Generalizing lathe recipes. 2014-11-24 17:31:15 +10:30
PsiOmega
dc5ab9bb64 Merge remote-tracking branch 'upstream/master' into dev 2014-11-23 12:07:45 +01:00
PsiOmegaDelta
8e50a32ba8 Merge pull request #7103 from Segrain/dev
Robotic appearances.
2014-11-23 12:05:51 +01:00
PsiOmegaDelta
6db8680406 Merge pull request #7097 from GinjaNinja32/sensors
Crew Monitoring Computer improvements, wallets working with computers
2014-11-22 22:36:40 +01:00
PsiOmegaDelta
51386b6b45 Merge pull request #7102 from PsiOmegaDelta/AssignmentERT
ERT and Xenobiology security HUD icons
2014-11-22 11:18:09 +01:00
PsiOmegaDelta
d9aae79a32 Merge pull request #7008 from Zuhayr/spaceninjas
Hardsuit/voidsuit change, ninja refactor.
2014-11-22 09:30:54 +01:00