Commit Graph

3032 Commits

Author SHA1 Message Date
PsiOmega
52e6f96dc7 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-12-09 17:55:14 +01:00
PsiOmega
c6c7ee8729 Map fixes.
Removes lone pipe in the nuke arrival airlock.
A pipe for the new atmos ejection line had relocated itself into space. Returned to its place.
Adds airlocks mentioned in #7325.
2014-12-09 09:57:24 +01:00
PsiOmega
48aeefa85a Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/gamemodes/cult/talisman.dm
	maps/exodus-1.dmm
2014-12-09 09:42:14 +01:00
Zuhayr
b44321775e Merge pull request #7276 from mwerezak/poster
Poster fixes
2014-12-09 18:17:46 +10:30
mwerezak
ab89ce59dc Merge remote-tracking branch 'upstream/dev-freeze' into poster
Conflicts:
	code/game/objects/effects/decals/contraband.dm
2014-12-09 00:17:22 -05:00
mwerezak
e954f27116 Merge remote-tracking branch 'upstream/dev-freeze' into dev-freeze-map 2014-12-09 00:13:08 -05:00
Ccomp5950
cb0eca68ac Merge pull request #7297 from Amunak/pipez
Engine remap, valves now show open/close state on examine.
2014-12-08 20:47:09 -05:00
mwerezak
3eec743a93 Fixes #7277, map adjustments
Fixes #7277, and includes some map changes and fixes from PR #7249.
2014-12-08 20:31:34 -05:00
Raptor1628
921249a335 Hardsuit Fixes
Should merge now, was missing the .dme. Fixes #7307. Adds helmet cameras
for ERT and nukeops. Fixes incorrect lighting overlays. Fixes a weird
sprite.
2014-12-08 19:12:39 -05:00
PsiOmega
445dba869d Merge branch 'dev-freeze' into dev 2014-12-08 17:38:13 +01:00
Amunak
8e50fd7ab3 Another slight engine remap.
Removed pressure regulator. Made room more symmetrical. Moved the engine port intended for venting to the left side so that tdvalve could be changed to regular dvalve.
2014-12-08 12:40:48 +01:00
Zuhayr
f34803ac33 Merge pull request #7281 from mwerezak/nukeops-airlock
Fixes #7279
2014-12-08 19:52:23 +10:30
mwerezak
52d0604001 Fixes #7279 2014-12-08 00:13:16 -05:00
mwerezak
f9564cbe5e Poster fixes
Fixes #7261
Fixes placed posters being visible on both sides of the wall.
Fixes the poster_type var used to specify certain poster designs on the
map not working correctly, and makes the nuke op shuttle poster an
actual poster.
Poster placement now belongs to the poster object instead of turf/simulated/
Posters can now be placed on unsimulated and shuttle walls.
2014-12-07 22:30:08 -05:00
Raptor1628
75659ab66a Hardsuit Mark Two, more Hulabaloo
Adds all sprites for the nukeop and research hardsuit. Shuffles around
hardsuit spawns and gear so they make sense, especially for the ERT,
they still only have two hardsuits per department, but there are enough
magboots and vests for the people who need the regular armor. Added the
medical hardsuit and its attendant gear to the station hardsuit list.
Added all of the xenoarch gear to the hazmat hardsuit for Zuh. Moves
some suit storage things around as they were lost somewhere along the
way since I committed them. Moves the Hazard Suit custom item over to
hardsuit code to prep for them being buildable on station at some point.
For now has the same stats as a voidsuit, no modules, just drains power
and has some extra pretty sprites. Sending this over to dev freeze
because most of it is required for hardsuits to be nice and pretty for
master. Now compatible with latest fixes.
2014-12-07 21:25:08 -05:00
PsiOmegaDelta
3ddb6eed96 Merge pull request #7222 from mwerezak/holospace
Holodeck
2014-12-07 22:05:49 +01:00
mwerezak
f6609729ce Merge remote-tracking branch 'upstream/dev' into mapfix 2014-12-06 09:43:18 -05:00
mwerezak
fdf190241e Fixes leftover maintenance docking arm
Removes some remaining bits of the maintenance docking arm.
2014-12-06 01:43:57 -05:00
mwerezak
8dd218489a Readds the engine coolant replacement tvalve and splits the coolant loop into two pipenets again (allows for a pressure/temp difference). 2014-12-05 22:14:57 -05:00
mwerezak
51bbd6e0da Merge remote-tracking branch 'upstream/dev' into holospace 2014-12-05 21:29:50 -05:00
mwerezak
44f2891966 Emagged holodeck consoles stay that way.
Separates emagged state and holodeck safety state, prevents silicons from re-enabling safeties if someone has emagged the console.
2014-12-05 21:28:29 -05:00
mwerezak
ab7bb836a8 Adjusts the nuke op shuttle prison cell 2014-12-05 20:10:30 -05:00
mwerezak
c200d18ccd Readds the atmos venting tower 2014-12-05 20:10:15 -05: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
99910686ad Holocarp can spawn in the space scenery with a small probability. 2014-12-04 10:03:35 -05:00
PsiOmega
55f2dc2233 Merge remote-tracking branch 'upstream/dev' into 'origin/Beds'.
Conflicts:
  maps/exodus-1.dmm
2014-12-04 14:26:27 +01:00
PsiOmega
201d2f42a3 Merge remote-tracking branch 'upstream/dev' into Beds 2014-12-04 14:12:54 +01:00
Loganbacca
feda97bfe3 Duct Tape
- Added several rolls of duct tape around the map
2014-12-04 21:55:26 +13:00
Loganbacca
883e4991ed Psych office chair fix
- Fixes #7216
2014-12-04 20:59:11 +13:00
PsiOmega
806e200857 Merge remote-tracking branch 'upstream/dev' into Beds 2014-12-03 23:03:43 +01:00
PsiOmega
cb4a4d67a1 Merge remote-tracking branch 'upstream/dev' into Turrets 2014-12-03 11:38:54 +01:00
PsiOmega
74d9441a1c Merge remote-tracking branch 'upstream/dev' into Beds 2014-12-03 09:06:34 +01:00
Ccomp5950
19bbd2c60c Merge pull request #7193 from PsiOmegaDelta/MapItMore
Fixes #7191
2014-12-02 20:30:52 -05:00
Ccomp5950
a463f90d36 Merge pull request #7189 from PsiOmegaDelta/FixingTheMap
Minor Map Stuff
2014-12-02 20:28:57 -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
fd23b0c56b AI APC now has larger power cell. 2014-12-01 04:03:13 +01:00
PsiOmega
e7fdf58f7f Fixes #7191
Corrects broken id-tag.
2014-11-30 16:00:13 +01:00
PsiOmega
493465453e Turret controls now affects all aspects of slaved turrets. 2014-11-30 15:50:51 +01:00
PsiOmega
c6673bea70 Minor Map Stuff
Moves the atmospherics powernet sensor into the small maintenance room. Looked a bit odd on-top of the floor.
Adds some lights to the new maintenance arm between xeno/viro.
Shuffle some maintenance lights around.
Sorts out a dimly lit room on the research outpost.
2014-11-30 12:39:52 +01: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
Atlantiscze
0b414ca3db Merge remote-tracking branch 'origin/dev' into nice-atmos
Had some strange merge problems. This may have broken something. Visual map inspection however shows no problems.
2014-11-29 23:51:07 +01:00
Chinsky
079b35c158 Merge pull request #7163 from PsiOmegaDelta/Cactii
Fixes #6165.
2014-11-30 00:56:46 +03:00
Atlantiscze
914a778254 Fixes one missing pipe segment between Virology and Xenobio i somehow forgot to map in before. 2014-11-29 16:25:35 +01:00
Atlantiscze
df50049889 Attempt to fix mapmerge issue 2014-11-29 04:04:51 +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
Atlantiscze
d8e3f98224 Map Rework
* New engine layout *
- More compact and much easier to modify layout
- Properly used omni filters
- Waste handling is now more straightforward, all waste is pumped into one canister which is significantly easier to process in atmospherics.

* New atmospherics layout *
- Expanded the room slightly to the south
- Completely remapped all pipes, goal being once again simplicity
- Fully functional layout, but without ton of useless things which have to be disassembled if you want to make your own modifications ingame
- Filling stations at each large storage tank to allow for filling canisters with pure gas without having to contaminate the whole pure and mix pipelines

* Minor updates *
- Remaining non-buildable SMESs are now buildable [again]
- Engineering substation spare SMESs are no longer connected into the grid, required cables are added in area so if anyone actually wants to connect them, they can
- TCommsat no longer has magical SMES. Instead, Fractal Generator is used (true infinite powersource). Breaker box was added next to it to allow
2014-11-29 02:01:51 +01:00
PsiOmega
7167b389f5 Fixes #6165.
Restores the missing desert tiles.
2014-11-28 12:30:11 +01:00
PsiOmega
7a57a2f8d4 Updates the posibrain path on map. 2014-11-27 09:12:42 +01:00
PsiOmega
11158995f7 Fixes #7113.
The dev version.
2014-11-26 22:20:57 +01:00
PsiOmega
e4127843a6 Z-level split.
Splits each individual Z-level into its own map file.
2014-11-24 12:40:12 +01:00