Commit Graph

3075 Commits

Author SHA1 Message Date
mwerezak
f9344a5a2d Atmos machine update
Takes a pass at updating ATMOSPHERICS to take advantage of the new powernet changes.

Also removes var/on definitions from many atmos machines. Machines generally shouldn't
be doing "on" things if they aren't using power, and most players don't expect a machine
to use power if it isn't "on," so I guess this is fair game.

Also, further refactoring.
2015-01-02 01:46:18 -05:00
Zuhayr
cf6dbcba69 Fixes #7594 2015-01-01 23:36:48 +10:30
Atlantiscze
bf74130383 Map Adjustments:
- Fixes #7597 and #7594
- Solars turned from tiled turfs to plating to make wiring easier.
- Atmospherics sensor reconnected to the grid.
- Corrected issue with engine waste handling which caused approximately 50% of waste to remain in pipes, requiring multiple canister swaps to actually empty it.
- Added two bottles of space cleaner. One at security, second at engineering.
- Changed the material crates in engineering workshop to reinforced tables (supplies are now easier to see)
- Changed engineering workshop access to allow both engineers and atmosphere technicians inside.
2015-01-01 09:15:50 +01:00
Loganbacca
36f2ce019d Genetics/Science map area cleanup
- Changes small room between R&D and Genetics to be part of R&D hallway area since Genetics doesn't have a working APC
- Changed access door on R&D side to an R&D access door
2015-01-01 16:43:32 +13:00
Zuhayr
11d5f7a306 Fixes #7278 2014-12-31 19:53:52 +10:30
Atlantiscze
301af06033 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into blast-door-refactor 2014-12-28 23:50:15 +01:00
Zuhayr
d853d62f7f Fixes #7431 2014-12-27 10:15:25 +10:30
Atlantiscze
bf995520a4 Resolves map conflicts
- This fully finishes first implementation of refactored blast doors.
2014-12-27 00:06:34 +01:00
Atlantiscze
7997a3c05f Outpost Cold Fix
- Fixes research outpost hallway being at very low temperature on round start.
- This only patches this specific occurrence on research outpost.
- Core of this issue is apparently in ZAS. When lots of turfs with normal air come into contact with few airless turfs, massive drop of temperature occurs. I will try to investigate further.
2014-12-25 02:15:43 +01:00
Zuhayr
c49cb0c645 Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze 2014-12-24 22:43:10 +10:30
Zuhayr
aeb93d8c4a Fixes #7108 2014-12-24 22:43:00 +10:30
Zuhayr
591fc164de Updating rack paths to match previous commit. 2014-12-24 12:26:43 +10:30
Atlantiscze
6e8f0fc9e9 Area adjustments/fixes
Minor adjustment to Areas and few little things. Nothing that would significantly impact the game.
2014-12-16 12:32:29 +01:00
Atlantiscze
edbb347c73 Finishes substation remap. For more details on what was changed see the PR. 2014-12-16 12:23:38 +01:00
Atlantiscze
1429a8a12d Resolves mapmerge issue from previous commit (hopefully) 2014-12-16 10:33:13 +01:00
Atlantiscze
71cb87b423 Substation Remap 1
- Remaps Medical, Research and Civilian West substations completed. Medical Research substation split into two rooms.
- Minor changes at Security substation (adds 2nd door to avoid wiring under doors)
- TODO: Remap all remaining substations
2014-12-16 10:31:37 +01:00
PsiOmega
e3d8d2a8d1 Post-merge map correction. 2014-12-15 09:01:26 +01:00
PsiOmega
8aa5ee4d9a Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-12-15 08:58:28 +01:00
PsiOmegaDelta
af4a377221 Merge pull request #7463 from mwerezak/map
Dev-freeze map pipe fixes
2014-12-15 08:54:23 +01:00
mwerezak
bc0dc839e6 Fixes broken piping
Replaces round-start broken piping with endcaps, lines up atmos UPAs.
Fixes intercooler piping preventing the h/e from doing much cooling.
2014-12-14 17:30:50 -05:00
PsiOmega
efb6adb452 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-12-14 00:27:16 +01:00
Amunak
18bcbab05f Removes merc. RIG, fixes map bugs.
Removed mercenary RIG from the nukeop station. Swapped floor tile in one of the pens on wizard station for the correct one. Fixed nukeop shuttle transit 'space' turfs that had incorrect texture. Made nukeop transit 'thrower' object line symmetrical.
2014-12-14 00:20:26 +01:00
PsiOmega
34ec705b0b Merge remote-tracking branch 'upstream/dev-freeze' into ShowerCurtains 2014-12-13 15:07:31 +01:00
Chinsky
1082c03a29 Merge pull request #7433 from PsiOmegaDelta/Atmos
Atmospherics piping fix.
2014-12-13 17:06:05 +03:00
PsiOmega
6a982559c0 Merge branch 'dev-freeze' into Atmos 2014-12-13 15:02:51 +01:00
PsiOmegaDelta
0bba4e6f68 Merge pull request #7441 from sabiram/dev-freeze
Adds 'me' hotkey again, corrects hotkeys-help, typo fixes.
2014-12-13 14:59:41 +01:00
PsiOmega
5aa2bd691b Merge remote-tracking branch 'upstream/dev-freeze' into ShowerCurtains 2014-12-13 14:59:37 +01:00
Zuhayr
d2803ec4d7 Merge resolution. 2014-12-13 23:10:46 +10:30
PsiOmega
0e9d62d7eb Merge remote-tracking branch 'upstream/dev-freeze' into GasWork 2014-12-13 10:26:43 +01:00
Zuhayr
cd096fd45b Merge pull request #7385 from Zuhayr/dev-freeze
Reverts colours and catwalks.
2014-12-13 12:25:13 +10:30
sabiram
953f365292 Adds 'me' hotkey again. Pedantic spelling changes. 2014-12-12 15:44:22 -05:00
PsiOmega
0d443dca7d Atmospherics piping fix.
Installs a UPA between distribution and filter input/waste output.
2014-12-12 19:21:06 +01:00
PsiOmega
2a9b315689 More map.
Adds an empty canister to the engine waste output connector.
Yet again adds missing meter IDs used by the atmospherics monitor.
2014-12-12 14:39:38 +01:00
PsiOmega
693793340d Map Changes
Engineering showers are no longer restricted to atmos techs, anyone may get clean.
A few more personal lockers in the dorms. Adds an additional camera in the dorms for coverage.
2014-12-12 10:28:06 +01:00
PsiOmega
cf78fe903b Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-12-12 09:04:09 +01:00
PsiOmega
791a467993 AI SMES charge by default.
This is something AIs tend to forget, which is extra painful with the new power demand.
2014-12-11 20:14:41 +01:00
PsiOmega
5c90d95adc Command Substation
Changes the layout to allow for an unbolted access door.
2014-12-11 13:29:43 +01:00
Zuhayr
9daa93a851 Amendment to previous commit. 2014-12-11 18:46:30 +10:30
Zuhayr
72ea7d9063 Removed the Goon catwalks. 2014-12-11 14:03:59 +10:30
Atlantiscze
389b12091d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into substation-features 2014-12-09 20:48:56 +01:00
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