Commit Graph

2616 Commits

Author SHA1 Message Date
mwerezak
3d9f1754cd Updates eng rig path, adds obj sprites
Adds object sprite sheets for tajaran, unathi and skrell hardsuits, where the icons were available (just engineering and syndie hardsuits for now).

Makes engineering hardsuits a subtype of the parent rig type, so it is
now possible to update eng hardsuits without affecting every other
hardsuit type.
2014-07-19 23:18:32 -04:00
Zuhayr
d5784c653c Reapplied scanners to map, stopped braces working on drill turfs with no resources. 2014-07-10 20:13:59 +09:30
Zuhayr
b2033c0825 Adjusted suit cycler code, added cyclers to EVA, Engineering and Mining. 2014-07-09 17:55:25 +09:30
Zuhayr
c8de1da363 Merge pull request #5528 from PsiOmegaDelta/LazyCaptain
Fixes #4737 - Door control in captain's office now works
2014-07-08 09:42:19 +09:30
PsiOmega
05f2642ea9 Fixes #4737, allowing the captain to open his office door from the comfort of his chair.
Makes the door control in the captain's office look for tagged doors instead of shutters.
Adjusts the pixel shift of the door control so the captain doesn't have to lean over his own desk to push it.
Makes the button require captain's access to use.
2014-07-07 14:52:25 +02:00
PsiOmega
9e56140dd4 Fixes #5512 - Renames the Botanist spawn point to Gardener 2014-07-06 12:49:36 +02:00
PsiOmega
9371f47e96 #Fixes #5497
Removes the fire alarm happily floating in space by the toxin firing range.
2014-07-04 21:40:40 +02:00
PsiOmega
f35d51f0bf Repairs broken section of disposals. 2014-07-04 20:34:04 +02:00
PsiOmega
a79955ba77 Connects APC in Misc. Research, removes runaway emergency shutter
The APC in misc. research was lacking a cable end under its terminal. Has been corrected
There was a random emergency shutter in Xenofauna.. no idea how it got there >_>
Freebie: Sets up the vents in the server room to utilize the new environment mode change defaults.
2014-07-03 18:24:35 +02:00
Chinsky
9377d078d6 Merge pull request #5469 from PsiOmegaDelta/Mining
Fixes #5468
2014-07-03 05:11:04 +04:00
PsiOmega
79d3c0ae3f Fixes #5468
Less space inside the west mining wing.
2014-07-02 17:53:16 +02:00
PsiOmega
c5121812d6 Emergency shutters and Xenobiology door-renaming.
New setup of emergency shutters to replace a currently removed set in Xenobiology.
The door to Xenobiology/fauna is no longer labeled Misc. Research.
Moves a fire extinguisher away from emergency shutter turf, as a closed shutter may prevent access.
2014-07-02 16:56:26 +02:00
Asanadas
fe0c38e269 RD office fixes. 2014-07-01 17:52:55 -04:00
PsiOmega
0bc4b2b2d6 Removes fire shutters that were doing more harm than good in xenobiology. Adds missing air alarm in medbay starboard corridor. 2014-07-01 22:45:12 +02:00
PsiOmega
30a3e093fa Fixes an APC in medbay lobby not being connected to the power grid. 2014-07-01 21:34:40 +02:00
PsiOmega
5d5c10d887 Fixes #5441
Engineering shuttle doors now require either Atmos or Engineering access, not both.
2014-07-01 21:15:35 +02:00
PsiOmega
049a6e3760 Fixes #5440.
The botanist lockers in Xenofauna now have the same access requirement as the relevant door.
2014-07-01 21:05:38 +02:00
PsiOmega
34f12da652 Completely fixes #5422.
Can now operate the inner perma-sec doors using the button outside.
2014-07-01 19:07:45 +02:00
PsiOmega
14a11a999b Fire alarms, extinguishers, intercoms and pipes (always pipes)
Draws some pipes through doors or other more convenient objects than walls, mostly affects cargo maintenance.
Adds vents/scrubbers to the surgery storages.
Ensures that each shutter divided section in the primary hallways have at least one fire alarm, extinguisher and intercom. Also tries to group them together so that if you see one you can expect the rest.
Decorates various rooms around the station with fire alarms, due to (hopefully) increased fun.
Adds an AI holopad to the HoS office, seeing how all other heads of staff could have the AI's company.
Relocates the holopad in the library slightly because it was annoying to see it on a carpet.
2014-07-01 18:50:01 +02:00
PsiOmega
af34a8d410 Partially fixes #5422.
The button to activate the flash in the permabrig is now properly assigned with an id.
Would previously activate all un-tagged mounted/stationary flashes in the known universe.

The door button is still not functional, appears to be mapped as correctly as can be but I don't think doors (with access requirements) can currently be remote controlled the same way as shutters.
2014-07-01 08:39:58 +02: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
Zuhayr
87d8deb9c9 Tidied up the Vox and Nuke Op shuttles a bit. 2014-07-01 09:24:40 +09:30
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
Zuhayr
675ef894e1 Fixes #5414 2014-07-01 02:56:32 +09:30
PsiOmega
d7047091c5 Creates proper area instance of the engineering washroom. 2014-06-30 13:22:16 +02:00
PsiOmega
a3f13fd3bb Creates proper area instance of Cyborg Station, AI zone. 2014-06-30 13:16:56 +02:00
PsiOmega
d6ee97a640 Xenoflora and Xenoflora storage are now proper area instances. 2014-06-30 13:08:33 +02:00
PsiOmega
3d60faac79 Creates an instance of the Hydrophonics garden area.
Creates proper instance of the Hydrophonics garden area to avoid issues, mainly with power/APCs.
Adjusts areas to ensure that alarms in the Hydrophonics garden do not lower emergency shutters outside in the primary hallway.
2014-06-30 09:12:43 +02:00
PsiOmega
d04cb88884 Fixes #5405
Restores missing shutter button in Cargo bay, once again allowing (easy) access into the warehouse.
2014-06-30 08:49:50 +02:00
Zuhayr
86553920bf Merge pull request #5397 from Zuhayr/dev
Dev fixes.
2014-06-30 00:04:25 +09:30
Chinsky
b84f55863d Merge pull request #5385 from Zuhayr/derelict
Listening post and Xenoflora remap.
2014-06-29 14:21:39 +04:00
Zuhayr
69d99cbced Merge pull request #5378 from PsiOmegaDelta/AlarmsAndVents
Adds support to better handle air alarms in sensitive areas and vents with custom settings
2014-06-29 18:33:16 +09:30
Zuhayr
48f02db5a0 Fixed some icon issues with vox/adjusted paths, fixed icon issue with armalis cannon. 2014-06-29 10:00:35 +09:30
mwerezak
1cc840dccc Adds the ability to force launch escape pods
Also reduces their countdown from 15 to 10 seconds.
2014-06-28 19:40:18 -04:00
Zuhayr
6af2c5bc19 Some minor fixes to new areas. 2014-06-29 04:30:38 +09:30
Zuhayr
25f601cb2d Added Cael_Aslinn's flora and fauna reconstitutors by request, cleaned up some Xenobio containment pen cruft. 2014-06-28 22:59:41 +09:30
Zuhayr
463e0958c1 Added quality of life bits and pieces to xenoflora, listening post and merged hydro. 2014-06-28 22:23:57 +09:30
Zuhayr
08aed7ad99 Merge branch 'derelict' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-28 21:32:06 +09:30
Zuhayr
dc9009d34d Merged Botany and the Kitchen, added Xenoflora laboratory. 2014-06-28 21:31:54 +09:30
Loganbacca
20c7a7397b Engineering outpost airlock
- Added airlock
- Removed DJ station note
- Changed pipes in derelict atmos to hidden so they run under the wall
2014-06-28 23:30:30 +12:00
Zuhayr
4cca641cd8 Added skeleton airlock and pod garage to the listening post, tweaked the toilet area a bit. 2014-06-28 19:52:55 +09:30
PsiOmega
478e2a4eab Camera relocation - part 2. Based on PR to dev.
Adjusts a camera in research to reveal the entire main entrance.
Adjusts camera on the main mining station to allow seeing both sides of the bridge.
Adjusts camera in virology quarantine.
2014-06-28 01:00:55 +02:00
PsiOmega
078bff85be Map changes relevant to the air alarm and vent update.
The engine air alarm no longer automatically turns off in the case of a breach.
The engine core vents now have defaults set, to ensure their custom pressure levels/checks are not lost in case of air alarm mode changes.
2014-06-27 11:17:06 +02:00
Loganbacca
3aee224d12 Merge remote-tracking branch 'remotes/upstream/dev' into atmomerge 2014-06-27 10:18:17 +12:00
PsiOmega
9311f492b1 EVA NVGs were not supposed to leave my own environment. 2014-06-26 17:41:51 +02:00
Loganbacca
2218164df9 Bug fix and mapping example
- Fixed mapped omni devices being set to off at round start
- Remapped the research outpost atmos room, taking advantage of omni devices
2014-06-26 21:10:17 +12:00
PsiOmega
d3e1b3a97f Fixes #5261
Replaces the super strength full-tile reinforced windows on the research outpost with standard health variants.
Did consider renaming the super-variants to avoid accidental use in the future but I thought not after seeing the massive diff it'd cause.

Should be fully compatible with PR #5363 no matter the merge order but should be safest to merge #5363 first, then this.
2014-06-25 20:29:00 +02:00
mwerezak
e80f42cad4 Merge remote-tracking branch 'upstream/dev' into emergency-shuttle
Conflicts:
	code/setup.dm
2014-06-25 13:28:18 -04:00
mwerezak
96e584d517 Adds escape pod docking controllers 2014-06-25 13:08:22 -04:00
PsiOmega
8eba53fecf Missed change - Nudges both cameras in EVA north one step. 2014-06-25 18:39:03 +02:00