Commit Graph

197 Commits

Author SHA1 Message Date
mwerezak
51bbd6e0da Merge remote-tracking branch 'upstream/dev' into holospace 2014-12-05 21:29:50 -05:00
mwerezak
6a2ceeb4af Allows floating in the space holodeck scene 2014-12-03 12:55:51 -05:00
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
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
PsiOmega
ffbbf2b858 Merge remote-tracking branch 'upstream/dev' into APC
Conflicts:
	code/ATMOSPHERICS/components/unary/heat_source.dm
2014-11-16 10:38:01 +01:00
PsiOmega
9096b74f54 Silent Alarms
Attempt to fix the issue where air alarms with disabled alarm reporting still notified the monitoring consoles.
2014-11-14 15:11:27 +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
PsiOmega
7809b7143a Medbay Areas
Breaks the medbay hallway down into smaller areas.
Reduces the headache caused by breaches.
2014-11-08 21:51:23 +01:00
Chinsky
ed8963eb2a Merge pull request #6876 from PsiOmegaDelta/Jukebox
Area-based Jukebox
2014-11-05 09:24:09 +03:00
PsiOmega
955b64e0a5 Merge remote-tracking branch 'upstream/dev' into APC. Updates map with new SMES variable names. 2014-11-03 12:51:01 +01:00
PsiOmega
19b157db10 More Mapping
Fixes #6913.
Splits the arrival section up into sub-areas to reduce the need of crew rescue.
Makes catwalks act as plating instead of floor.
Misc. changes.
2014-11-01 19:20:34 +01:00
Chinsky
7c284141b8 Merge pull request #6891 from PsiOmegaDelta/Z
Multi Z-Level Compatibility
2014-11-01 02:18:23 +03:00
PsiOmega
bf1e6af508 Z-Level Compatibility
Now possible to configure 3 different kind of Z-levels.
Station levels: Which Z-levels the station exists on.
Contact levels: Which Z-levels are typically affected by, for example, Code Red which alters the visual state of fire alarms.
Player levels: Which Z-levels a character can typically reach.
2014-10-30 14:29:56 +01:00
PsiOmega
010929252b The great bed increase.
Increases both the number of beds and cryogenic freezers.
More cables in maintenance.
Restores electricity to the CE's space windows.
2014-10-30 13:10:11 +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
PsiOmega
9adb94ff55 Area-based Jukebox
A jukebox which alters the ambient sound in the current area and plays it with 100% probability.
Leaving the area stops the ambient sound.
Entering the area resumes playing the ambient sound.
2014-10-29 08:19:42 +01:00
Chinsky
3839644bd8 Merge pull request #6651 from PsiOmegaDelta/PowerTwo
Ports /tg/'s cable and powernet code
2014-10-26 23:54:31 +03:00
PsiOmega
6a0f92e0e9 Engineering Dormitory redux
Removes the engineering dormitory.
Replaces it with a washroom and a room with previously lost medical supplies (some gauze rolls and ointment) and some of the wardrobes from the now removes dormitory.
Adds more beds to the public dormitory area.
2014-10-25 16:53:16 +02:00
PsiOmega
8e3861141c Merge branch 'dev' into PowerTwo
Conflicts:
	code/modules/power/solar.dm
2014-10-24 13:32:36 +02: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
Zuhayr
99ff852e46 Removes references to the Syndicate and renames nuclear emergency mode. 2014-10-19 16:05:40 +10:30
PsiOmega
2acd5c22d2 Space icon 2014-10-15 13:08:09 +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
36abc43a7a Map alterations. Fixes #6677.
Re-organizes maintenance areas, adds missing air alarms, lights and cameras to substations.
Re-adds a number of suddenly missing power cables, mainly affecting security.
Replaces a few instances of blood on the station with oil. Having round-start blood in secluded areas would get annoying fast..
2014-10-12 12:44:13 +02:00
PsiOmega
e1168271c8 Divides central primary hallway
Divides central primary hallway into 3 area-sub sections, reducing the impact of automatic breach control, etc.
2014-10-03 10:38:39 +02:00
PsiOmega
e9581c823c Fixes the CMO's doors
The CMO's remote door control should now work again.
The CMO's doors are now powered by the ACP in his office.
The command staff now have offices, don't quarters. Felt a bit generous to call them such.
2014-10-02 08:21:08 +02:00
RavingManiac
66527ab763 gravitychange() now makes all affected mobs have the floating animation unless magbooted, etc.
New mob proc Check_Dense_Object() seperated from Process_Spacemove(), checks for adjacent objects or turfs that can be pushed off, also handles magboots on gravity-less floors.
2014-09-30 23:18:04 +08:00
RavingManiac
c4875e7d36 Floating effect now uses animate() instead of pixel_y while loop thingy.
Distinct actions that indefinitely change a mob's pixel_y or pixel_x, like strapping someone to a roller bed, should also alter new variables old_y or old_x accordingly. This means that floating and jittering animations no longer interfere, as the animations use old_x/old_y as the "base" position.

Entering areas with gravity from areas without grabity now removes floating effect.
2014-09-30 22:37:48 +08:00
PsiOmega
778f47649c Departments now have their air/scrubber pipes routed through relevant substations. 2014-09-26 23:21:40 +02:00
PsiOmega
93ef5dbe2f Map fixes
Restores maintenance areas to the new variants.
The HoP's office is no longer a crew sleeping quarter.
Fixes disconnected power cables all over the place.
Connects the engineering power monitor to the main/red power grid.
Emergency shutters.
New icon for the research dock.
2014-09-24 15:59:08 +02:00
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
mwerezak
dd1b4b00d6 Fixes map area issues
Replaces missing station escape pod area, removes random security office
area in maintenance and replaces it with maintenance area, and splits
research dock off onto it's own area.
2014-09-20 20:19:56 -04:00
mwerezak
e513041768 Renames syndicate mothership area, fixes temp_factor calc 2014-09-08 22:38:52 -04:00
PsiOmega
dda1449404 Includes mwerezak's fore solar area changes. 2014-09-02 12:29:57 +02:00
PsiOmega
9cd5a1b1fe Maintenance Cleanup 2014-09-02 09:22:14 +02:00
PsiOmega
208cd8d1cc Re-arranges areas
Less emergency shutters dropping due to alarms in adjacent but connected rooms. Primarily affects security.
Main hallways are now less jagged, making fire alarm/emergency shuttle flashing look better.
Replaces the chief engineer/head of security areas with the existing crew_quarter variants as these are rad-storm protected (and are likely to contain SSD crew).
2014-08-31 11:49:56 +02:00
Atlantiscze
87cc0e509c Adds Substation related areas
- Adds areas for Substations
- Adds mapping icon for Substations.
2014-08-29 20:55:28 +02:00
PsiOmega
d8b803d5e3 Fixes #6130
The construction outpost now has an air supply and rudimentary distribution system.
Glass and wood stacks are filled to their max stack sizes, 50 and 32 sheets respectively.
Ghosts can now teleport to Z-level 4.

There are now special air alarms which do not broadcast their alarms. These are used in the mass driver areas to let crew know when it's safe to use them again.
These air alarms have also been installed in the Research isolation cells to finally allow scientists to check what's up, at least as long as they are in there or have AI assistance.
2014-08-23 10:20:24 +02:00
mwerezak
5d97c9d6a2 Fixes fore solars control room area
Also changes solar area requires_power and always_unpowered to match
area/space
2014-08-21 20:11:23 -04:00
Chinsky
03cdfaf896 Changed /area to /area/space to get rid of anicent and terrible strict typechecks every time you needed to check if it's space area. 2014-08-16 05:28:45 +04:00
Chinsky
f71e43d06c Moved ambiance sounds out of horrendous ifchain to area definitions.
Changed ambiance spamcheck to use time instead of 10 minute spawn.
2014-08-16 04:40:46 +04:00
PsiOmega
1bee077475 Engine room and Atmospherics changeup.
The supply pipe in Atmospherics no longer cross the middle of the room, after having seen many a complaint about this. Now passes through the aft windows instead.

Atmosphere technicians can now assist in handling the engine waste without entering the engine room itself.

Engine waste canisters are now pre-labeled according to future contents. Can be re-labeled should someone desire to try the oxygen setup instead.

The engine core now uses a similar setup as the atmospheric tanks, allowing control of the injection/extraction of gases from the monitor room.

Pipes  in the engine room overlapp less, making them easier to follow.

There is now a basic meteor protection layer around the engine room like solar panels have. Should stop a lone meteor or two, for anything more Renwick shields will still be desirable.
There is also a fairly wide gap by the ejection port, to ensure the supermatter doesn't snag into it, where meteor can sneak through.
2014-07-26 11:44:22 +02:00
PsiOmega
31fdd4bfdd The Research division is now a pure area instance.
With this it's now possible to create a grep, or similar check, for Travis to ensure /area{name = *} never happens again as this can cause issues with APCs.
2014-07-22 08:24:38 +02:00
mwerezak
1a52aa7b06 Merge remote-tracking branch 'upstream/dev' into op-hideout 2014-07-16 17:41:30 -04:00
mwerezak
a4bef09a69 Fixes air alarm icons not updating
I'm not sure how I missed that the first time.
2014-07-15 18:27:15 -04:00
Hubblenaut
768306c4ce Rechargers being able to charge weapons in Syndicate HQ/Ship and added to
map
2014-07-15 17:20:49 +02:00
mwerezak
ac1a7ad6e2 Fixes air alarms not updating when area changes alert status 2014-07-04 03:00:42 -04:00
PsiOmega
b60b555ffa Pipes, cameras, air alarms, emergency shutters, and new maintenance area added.
Adds a number of missing supply pipes around the station.
Adds cameras to the new Hydrophonics/Garden and Xenoflora areas.
Adds an air alarm to one of the Hydrophonics areas, just fore of the new Garden.
Adds emergency shutters to the exterior windows of the Xenoflora lab.
The maintenance section port of the engine recycled another maintenance area, causing APC 'duplication'. Created new area instance.
2014-07-01 08:24:54 +02:00
Mloc-Argent
6630e4838e Merge remote-tracking branch 'upstream/master' into dev-freeze
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/alarm.dm
2014-06-30 23:44:46 +01:00
PsiOmega
d7047091c5 Creates proper area instance of the engineering washroom. 2014-06-30 13:22:16 +02:00