Commit Graph

197 Commits

Author SHA1 Message Date
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
mwerezak
909e8a4e95 Fixes #4688
Or attempts to at least.
2014-06-28 17:42:27 -04:00
Mloc-Argent
9896e44d8a Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/__HELPERS/unsorted.dm
2014-06-12 18:56:26 +01:00
PsiOmega
6dd8e1e022 Fixes #5205.
Creates a new area instance for the PDA messaging room in the AI zone.
2014-06-10 20:32:16 +02:00
PsiOmega
305ee44aaa Creates a proper area instance for the new engineering shuttle room, to avoid issues with multiple APCs among other things.
Replaces the vent in the fitness room with one which does not show it's connection pipe.
Properly aligns conveyor belt levers on the Research outpost with each other.

Re-locates cameras to improve coverage (no additions), with the purpose of ensuring that the AI can assist in opening main doors (fun times) by seeing both sides.
Affects:
Virology Entrance - Can now see people south of door connecting Viro/Medbay.
Permanent Brig - Can now see the north set of doors by default (would randomly gain coverage, potentially caused by doors closing/opening)
East Central Primary Hallway - Coverage would previously be lost if chemists closed their window shutters.
South Central Primary Hallway - Can now see the south set of doors to the engineering lobby, default coverage of the HoP's and nearby all-access doors (again, coverage would eventually be granted by unknown process)
West Mining Wing - Can now assist in opening both sides of the bridge connecting the wings
2014-06-05 10:53:38 +02:00
Zuhayr
ba9434366c Replaces the derelict, modifies the DJ station, adds a shuttle bay to Engineering. 2014-06-02 15:54:40 +09:30
PsiOmega
a8e4dc045d Fixes #4816 and nothing else. Cherry picked from #5036.
Creates proper area instances for sections in engineering.
Removes one out of two APCs in the same area in medbay, adds two missing ones.
2014-05-22 23:12:50 +02:00
PsiOmega
c4f3e3fd67 Fixes #4816 (or attempts to)
Creates proper instances of areas in engineering to prevent issues with APCs.
Removes one of the two APCs in the medbay sleeper area.
Corrects a few more places where atmosphere alarms would lower shutters in adjacent but otherwise unrelated rooms.
Adds a camera at the virology entrance to remove a tiny strip of missing coverage that prevented AI from assisting people in and out from viro (perhaps intended).
2014-05-21 22:36:11 +02:00
Zuhayr
ff56d3e1bb Added drone fabricators to the map in their own area. Replaced Vox crossbows with spike throwers. 2014-05-11 21:38:29 +09:30
Mloc-Argent
e1ddec4a73 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-05-03 16:56:19 +01:00
Ccomp5950
976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
2014-04-25 21:14:58 -05:00
SkyMarshal
efcad9f527 Removal of Telescience. 2014-04-16 20:23:56 -07:00
Ravensdale
1d6655850f Changes all appropriate instances of toxins to phoron 2014-04-10 15:11:26 -07:00
Ccomp5950
6f55b60120 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev
Conflicts:
	html/changelog.html
2014-04-04 01:14:31 -05:00
PsiOmega
af32a714ce Engineering EVA now its own area.
Fixes #4671.
2014-04-01 18:01:15 +02:00
PsiOmega
d025e4d2e3 The Tactic Equipment room is now its own area with APC, air alarm, and camera.
Changed light source from bulb to light tube.
2014-04-01 15:46:37 +02:00
Ccomp5950
6af132b834 APC bugfix after someone messed with mah areas!
This was probably bound to happen either way the previous version was based upon a faulty understanding of how the areas worked this is much more robust and only messes with the master areas
and master areas needing power updates call power updates for the each of it's child areas.  Also added where messing with SMESes called for an update on all areas power consumption, probably
not required but doing so either way.

We also rebuild the active_areas list every 5 minutes, if you get a engineer that wants to build a new area off of the station with APC's set rebuild_all_areas in the master controller and it will
update instantly, otherwise wait 5 minutes.  The only downside to this 5 minutes is you might get free energy until that area becomes active.
2014-04-01 03:06:58 -05:00
Ccomp5950
56ef5c165c Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm
2014-03-28 18:46:04 -05:00
Mloc-Hibernia
d4324901d3 Revert "Merge pull request #4478 from Aryn/master"
This reverts commit 86941a58f0, reversing
changes made to 65b8215ec7.
2014-03-24 13:55:41 +00:00
Ccomp5950
6fa08b233d Law office -> Internal Affairs in Area code.
fixes #4577
2014-03-23 04:44:06 -05:00
Chinsky
0e08c90571 Merge branch 'dev-freeze' into dev
Conflicts:
	maps/tgstation2.dmm
2014-03-10 19:05:24 +04:00
Loganbacca
36c3b49234 Multiple map fixes
Fixes #4507
Fixes #4508
Fixes #4540
2014-03-09 09:34:45 +13:00
Ccomp5950
bb9a66cc3a Effeciency Project: APC / Machinery power usage.
We no longer run auto_use_power() on every machine every tick.
We now have a global list of areas, and areas that have an APC in them (all_areas and active_areas) no more looping through world bullshit.
A bunch of snowflakey as fuck machines won't use_power() in their process, you get two options, active and idle, use them!
This means a lot of machines won't double dip on power as well so power usage for the station has dropped about 20%

Because everything is snowflakey as fuck we're going to have some machines that don't force an update on their power usage.  Fuck them.
We should catch them with the root obj/machine/proc's forcing updates.
2014-03-08 03:42:44 -06:00
Ccomp5950
e0e1bd9cfb APC Area update initial commit. 2014-03-07 23:42:28 -06:00
Vetinari
1d62ceddaa Merged Upstream
This is a big one.
2014-03-04 22:19:09 +11:00
Vetinari
309cd0844d Medbay Area Tweaks 2014-02-26 21:00:11 +11:00
Aryn
ca7d4026b8 Lighting system is too buggy to continue until I know wtf is going on 2014-02-24 05:58:09 -07:00
Vetinari
28b84ce8b8 Merge remote-tracking branch 'upstream/dev' into dev 2014-02-21 20:01:33 +11:00
Vetinari
db76f164fe Revert "derp"
This reverts commit 77072625dd.
2014-02-21 18:17:15 +11:00
Vetinari
77072625dd derp 2014-02-21 18:17:09 +11:00
Vetinari
67ec7739c5 Tweaks 2014-02-21 18:06:05 +11:00
Loganbacca
8fd037820b Map fixes
- Fixed lighting issues in dorms (added APC to bedroom area, also gave cryo storage and dorm bedrooms their own area subtypes so light switches don't conflict anymore)
- Fixed 0-2 cable "pixel_y = 1" offset (it was making a 1 pixel gap between south-to-end cables on the map)
- Replaced research outpost piping with new subtypes
- Fixed a broken air supply pipe running to the research outpost auxiliary storage area
- Replaced a few plating turfs in space with airless platings
2014-02-20 15:59:10 +13:00
Loganbacca
e26844df12 New areas for engineering remap
- Also moved hallway from Caels Rust areas.dm file to main Space Station 13 areas.dm file
2014-02-08 18:34:32 +13:00
Ccomp5950
283df26fa7 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-01-23 00:19:01 -06:00
Loganbacca
0ede7ed9cb Engineering area tweaks
- Added a few Engineering areas, and moved one from the Rust files
- Made the "Engineering Storage" area overlay sprite transparent
2014-01-20 01:57:57 +13:00
Loganbacca
e145b61681 Refined earlier fix
Tried a couple of other solutions, but this ended up being the most reliable.

Now checks all areas associated with the firedoor to see if they should still be down.

Also makes a final check before closing the door in case the fire alarm turns off in the middle of an autoclose cycle.
2014-01-15 18:18:58 +13:00
Loganbacca
4953608bda Previous fix code cleanup
Fixes #4295

Todo: investigate sub-areas not inheriting var/fire
2014-01-14 18:47:29 +13:00
Loganbacca
c55e71c739 Fixes #4295
Issue: firedoor not correctly entering alarmed state.

Todo: cleanup fix before PR
2014-01-14 15:53:24 +13:00
Chinsky
5b168c8e4b Merge branch 'dev-freeze' into dev
Conflicts:
	icons/obj/ammo.dmi
2013-11-30 05:15:22 +04:00
Mloc-Argent
33805e639b Implements hooks, an easier way to write code to be called at startup/roundstart/roundend.
Current hooks are "startup", "roundstart", and "roundend".
Most stuff in world/New() has been moved over to the startup hook.
Roundstart and roundend have no hooks yet.

Removed the unused "newbanjob.dm" file and associated verbs/topics.
Bumped RECOMMENDED_VERSION up to 501.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-11-25 21:16:09 +00:00
Nanai
808653ed12 Map Fixes IV: Areas Rising
Removed the odd locker room area.

Properly edited dorm areas to individual areas UNDER the sleep area so as to properly reap the benefits of being a dorm.

Added a camera to security dorms.

SMES wiring adjustment.
2013-11-17 15:50:55 -05:00
Nanai
160e0f9ee8 Poultice potency, bugfixes
Herbal poultice effectiveness now scales with potency of base herb.
2013-11-14 15:21:29 -05:00
Iamgoofball
60e73bc9ac Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into boozetaketwo 2013-11-05 11:44:37 -08:00
Mloc-Argent
37fbf3848a Uses fancy new 501 blendmodes to make fire alarms look fancier.
See: http://i.imgur.com/GLzdBfv.gif

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-11-04 14:01:28 +00:00
Iamgoofball
e4a2936e2b Added Telescience! Moves Misc. Research to the spot between the Solars and Xenobio. 2013-11-03 21:49:09 -08:00
Zuhayr
97b0272e80 Added stealth engines to the Vox ship to allow the Exodus to hear that they are coming. 2013-08-24 21:24:41 -07:00
Segrain
cd2922cebe Name fix. 2013-08-23 15:30:49 +03:00
Segrain
f13c84ed04 Fix for power alarms cameras. 2013-08-04 01:05:50 +03:00