Commit Graph

3714 Commits

Author SHA1 Message Date
Mark9013100
02e494cb57 CentCom Z edits/fixes
Removes a few instances of /obj.
Removes some ghost sleepers & body scanners.
Adds 2 syringes of spaceaccilian to the raider shuttle.
CentCom brig overhaul.
2015-11-27 04:55:05 -05:00
Woodratt
7a91ba4339 Merge branch 'master' into Woodrat_9.9_Black_Friday 2015-11-27 00:07:04 -08:00
Woodrat
2209bec9b8 Woodrat 9.9 Black Friday Prep
- Maintenance access removed from research maintenance doors.
- Void tiles on Engineering Outpost replaced with ones that have warranty
- Hand labler moved from security evidence storage to the locker room
- Minor improvements to the centcom station on the centcom z-level
- Areas on Central fixed
- Light fixed on ERT shuttle
2015-11-26 15:38:20 -08:00
PsiOmegaDelta
2200bfe436 Map tweaks.
Adds a couple of decals to the Thunderdome.
Rotates sleepers/scanners on z-level 1 and 2. Had already done so for z-level 5. Fixes #11058.
Full tile windows no longer appear to exist? Replaces the glass on the toxin test site with reinforced glass spawners.
2015-11-22 21:41:41 -05:00
PsiOmega
5bf7158c9d Non-headset/borg radios now all allow access to department channels. Headset and borg radios still rely on their encryption keys.
Conflicts:
	html/changelogs/PsiOmegaDelta-Radio.yml
2015-11-22 21:37:21 -05:00
PsiOmega
42342bedcb Rotates and otherwise cleans up map intercom usage.
Conflicts:
	code/controllers/communications.dm
2015-11-22 21:35:36 -05:00
Neerti
d6b88bb64f Merge branch 'master' into Woodrat_9.8 2015-11-19 04:56:55 -05:00
Woodrat
0f6517ebe3 Woodrat 9.8 'Bug Hunt'
- Grille added to shuttle window
- Employment record computers added to IA
- Entertainment monitors added to cafe, bar, vistor's, coffee shop.
- Extra rubber gloves added to medical.
- HoS Office now had the privacy needed for ERP (window tixt fixed)
- White medkits added to storage in medical.
- Proper access for security voidsuit storage.
- Four -O Bloodbags on shuttle.
- Fixed Sleepers on Escape Pod Shuttle.
- Bluespace rifts added to outposts.
2015-11-18 15:09:52 -08:00
Woodrat
3f42779163 Woodrat 9.8 'Bug Hunt'
- Missing grille added to shuttle window.
- Employment record computers added to IA office.
- Entertainment monitors added to cafe, bar, visitor's rooms, coffee shop.
- Extra rubber gloves added to medical (secondary storage).
- HoS Office now has the privacy needed for ERP (Window Tint Fixed).
- White Medkits added to storage in medical.
- Proper access for security voidsuit storage.
- Four -O bloodbags on shuttle.
- Blue space rifts added to outposts.
2015-11-18 15:04:29 -08:00
Mark9013100
326ba2d28c Minor edits to the station and Centcom Z-level. 2015-11-14 21:03:40 -05:00
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
Neerti
d82ac2d40c Merge branch 'master' into Woodrat_9.7 2015-11-06 23:43:39 -05:00
Neerti
45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme
2015-11-06 17:41:18 -05:00
Woodrat
bd7f01f89d Woodrat 9.7 "Bug Bash"
- Controller for evac/departures shuttle fixed (was missing)
- Fixed the issue with engine room APC and power draw (missing area)
- Air Vent and scrubbers next to engineering starboard airlock fixed.
- Sulfuric Acid Dispenser added to R&D
- Ninja spawn point readded to centcomm z level
- Air Pumps and Scrubbers added to Engineering Foyer
- Tech Storage stripes fixed
- Body scanner console in surgery obs removed
- Fixed Stripe in toxins storage
- Mining Engineering Outpost has second SMES installed, probably need a third
- Extra phoron stacks added to the mining engineering outpost
- Mining exterior APC fixed, no longer hovering
- Cargo shuttle area fixed and glass reinstalled over the engines
2015-11-06 14:20:47 -08:00
PsiOmegaDelta
b1fe5e3eab Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/antagonist/outsider/ert.dm
2015-11-06 17:50:34 +01:00
PsiOmegaDelta
e81f42840a Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/species/station/station.dm
2015-11-06 17:43:05 +01:00
Woodrat
0929cb4cc2 Woodrat v9.6 "Open Beta"
- Minor tweaks to sleepers so they can can be set in different directions
- Sleepers and body scanners added to all maps
2015-11-03 14:30:56 -08:00
PsiOmegaDelta
ae4d463fcb Map cleanup, tweaks and merge fixes. 2015-11-02 10:05:14 +01:00
PsiOmegaDelta
19051ec27e Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-11-02 09:25:04 +01:00
PsiOmegaDelta
d7f572f671 Map merge fixes. 2015-11-02 09:19:12 +01:00
PsiOmegaDelta
694a35c10b Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-02 09:08:06 +01:00
Atlantis
f8752c7456 Fixes #11395 + 2 other minor issues
- Fixes #11395 - light fixtures in xenobiology access moved by one tile, so they may be reached without deconstructing windows.
- Adds missing air canister to departures airlock port.
- One turf in engineering shuttle dock had wrong area (engine maintenance). I assume this was not intended, as rest of the room had proper area set (engineering shuttle dock)
2015-11-01 14:33:54 +01:00
PsiOmegaDelta
5ab090c22b Asteroid solar sun exposure. 2015-10-27 13:34:14 +01:00
PsiOmegaDelta
9d6c99aaf3 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	.travis.yml
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
	html/changelogs/.all_changelog.yml
2015-10-27 13:08:33 +01:00
PsiOmegaDelta
988c8fb2c8 Increases solar star exposure on the asteroid.
Cuts away huge swats of asteroid around the solars to give them star exposure.
A panel is considered unblocked when there are 20 steps of non-dense turfs in the current direction of the star/sun.
2015-10-26 09:59:06 +01:00
Woodrat
e1146be586 Dev2 v9.5
- Light added to outside of EVA storage, bridge hallway, virology, chapel maintenance
- Extra suits added to the IA office
- Privacy shutters added to the janitorial closet
- Paper bins added to IA office
- Hologram projectors added to Research misc lab, Detective's lab, cryo pods hallway, fore escape pods, medical back room, cloning lab, virology, visitor's lodging, kitchen, hydroponics, cafeteria, dock, bar
- Lamps added to the bar (might be overkill)
- EMT bay wire re-added again
- Missing piping in virology and docks fixed
- Bar windoor access fixed
- Cameras added to art storage, janitor's closet, docks, IA
2015-10-23 16:55:07 -07:00
Woodrat
6b63b65c61 Dev2 Woodrat 9.4 Bug Fixes
- Heater and scrubber added to Cargo Engineering Maintenance
- Heater and scrubber added to EVA maintenance
- Secondary Tool storage added to cargo hallway
- Cameras installed, Cargo Hallway, Port Primary Hallway, Engineering Primary Hallway, Cargo, Bridge, EVA, Elevator.
- Hazard stripes around the AI core fixed.
- Misc items added to central ring maint
- Redundant APC and wire removed from locker room maint.
- redundant APC and wire removed from chapel maint
- Redundant wire removed from central maint
- Light added to command substation and medical maintenance aft
- Plants and a table added outside of the bar, dice added to bar
- Security voidsuit added to security armory
2015-10-22 11:49:27 -07:00
Woodrat
0be7ec3326 Woodrat dev2 9.3
- Missing wire in the EMT bay fixed
- Server room has wires to the APC now, APC moved
- Meeting room APC has wires leading to it now
- Cargo Shuttle fixed
- Xenoflora disposal pipe fixed
- Polaris-2 map floor tiles fixed, dock slightly redesigned and medical bay overhaul pending new changes
2015-10-21 12:15:38 -07:00
Woodrat
a7a9901623 Woodrat Dev 9.2 'Engine patch'
- Moved Power Sensor
- Replaced the tiles in the engine core with nitrogen tiles of a reasonable pressure
- Floor tile added to SMES engine door
- Adjusted area of engine room
- Added missing door bolt button to engine SMES room
2015-10-17 12:31:15 -07:00
Woodrat
7128aa72db Woodrat 9.1 "Back in Action"
- Super APC installed in Atmos
- Fixed APC, Mining Exterior APC
- Fixed Crematorium button, Installed mass driver button.
- Chapel hallway APC installed
- Gateway plugged in, console installed
- Elevator Console Installed, Bell Hop removed.
- Hazard stripes should be fixed
- Restored missing tiles (Hydro, Cafeteria Neutral, Asteroid exterior) (75% complete)
- Kitchen button restored
- Rec area bathroom lights restored
- Meat is back on the menu, two fridges with meat in the kitchen
- Unneeded wires in engineering maint removed.
- Medical substation wires fixed.
- Locker room maint APC installed
- Chapel maint APC installed
- Installed another light in robotics
- APC central maint installed
- Disposals pipe in engineering workshop fixed.
- Wire in atmos substation fixed.
2015-10-16 22:57:13 -07:00
Zuhayr
5dc6ff5da1 Merge pull request #11230 from PsiOmegaDelta/xenomorphs
Xenomorph update
2015-10-13 08:31:27 +10:30
PsiOmegaDelta
27feb09a31 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/machinery/computer/computer.dm
	html/changelogs/.all_changelog.yml
2015-10-11 17:37:01 +02:00
PsiOmegaDelta
070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
2015-10-11 17:17:41 +02:00
Mark9013100
a2c8e3ee10 Minor edits to the sec lockers
Conflicts:
	maps/colony-1.dmm
2015-10-11 00:45:22 -04:00
Neerti
945aad7b4f Fixes some map stuff. 2015-10-11 00:04:28 -04:00
Neerti
e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme
2015-10-10 23:17:26 -04:00
Chinsky
debe69aa80 Merge pull request #11268 from PsiOmegaDelta/151010-LessHolographicHoloComputer
Fixes #11263.
2015-10-10 17:51:15 +03:00
PsiOmegaDelta
13b175c529 Merge remote-tracking branch 'upstream/dev' into xenomorphs
Conflicts:
	code/game/objects/effects/aliens.dm
	code/game/objects/structures/lamarr_cage.dm
2015-10-10 12:05:36 +02:00
PsiOmegaDelta
fd3370c01f Fixes #11263.
Now possible to use items other than emags on holodeck computers
Blobs no longer make computers lose their density state.
Holodeck computers can now be repaired (and built, but since they cannot be configured they'll be useless).
Fixes #11263.
2015-10-10 10:11:48 +02:00
PsiOmegaDelta
2daa53ba4f Fixes #11266.
Rotates the connector properly.
2015-10-10 08:37:16 +02:00
LachBee
1903879660 Added rescue rig and rack to CMO office 2015-10-04 18:39:32 +08:00
PsiOmegaDelta
8eee143177 Merge remote-tracking branch 'upstream/dev' into xenomorphs
Conflicts:
	baystation12.dme
2015-10-01 09:48:51 +02:00
PsiOmegaDelta
357c716a2b Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-29 11:52:48 +02:00
PsiOmegaDelta
597631687b Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-29 11:26:42 +02:00
PsiOmegaDelta
eb28b1f304 Removes double-layered Chemistry windoor.
Seems a bit excessive to have two windoors on the same location.
2015-09-28 12:01:25 +02:00
PsiOmega
26564179dc Found an airlock that was running pipes under walls. Bad airlock. 2015-09-25 19:33:44 +02:00
PsiOmegaDelta
613b2486ca Map tweaks.
Fixes issues with colored floor tiles having their item state reset, appearing black IG.
Pipe fixes and state cleanup. Floor plating under doors cleanup.
2015-09-25 14:05:39 +02:00
PsiOmegaDelta
b3b657ee37 Random maintenance dirt.
The state of maintenance is now randomly generated.
This includes patches of oil, trash, spiderwebs, dirt, and so forth.

Utilizes a system which makes it possible to apply custom turf initializers per area.
2015-09-22 14:53:04 +02:00
PsiOmega
9ddb8ec84c Map conflict fix. 2015-09-21 17:38:19 +02:00
PsiOmega
38c0251b6d Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-21 17:35:49 +02:00