Commit Graph

320 Commits

Author SHA1 Message Date
SinTwo
a2a2f58e93 Fixes #2352 2016-08-27 13:44:32 -04:00
woodratt
55562aeb3f - Adds Serena's Trade Ship along with all the odds and ends required to have it work properly.
- Adds a special snowflake mutt as well for ease of teleportation to the trade ship area prep area.
2016-07-04 14:07:14 -07:00
HarpyEagle
6888fa1982 Increases stun time from falling due to gravity change
It was ridiculously short, and strange to watch
2016-06-07 19:48:48 +01:00
Datraen
54627608e1 Adds a portables pump station to the station.
* Adds a pump station to the station.

* Adds a digital valve for switching between the canisters and the waste loop.
2016-04-04 04:12:35 -04:00
Yoshax
d0d3d3cb16 Merge remote-tracking branch 'upstream/master' into morepreferences 2016-03-27 00:17:24 +00:00
Kelenius
e883863f4b Merge branch 'master' into playingWithTravis 2016-03-23 17:12:11 +03:00
Neerti
0891eba8cd Merge pull request #1207 from Datraen/GTStationWide
Adds a check to the greytide virus to see if the APCs are operating.
2016-03-22 21:36:35 -04:00
Yoshax
5d9596a72d Makes it possible to have more than 16 preferences 2016-03-21 18:56:27 +00:00
Datraen
eb6f621ca9 Adds a check to the greytide virus to see if the APCs are operating. 2016-03-18 15:20:48 -04:00
Kelenius
3fdda5e8c5 Fixes issues travis found 2016-03-11 11:59:51 +03:00
Kelenius
b7d0818e27 Removes unused code - old turrets
Removes /obj/machinery/turret (by the looks of if they wouldn't fire
anyway)
Removes /obj/machinery/turretcover
Removes /area/turret_protected (new turrets don't use it), its
associated procs, changes areas from /area/turret_protected/x to area/x
2016-02-25 15:08:30 +03:00
Minijar
83113302b9 Adds first aid stations. 2016-02-23 21:13:11 +00:00
woodratt
7b1b4d081b 1.4.7 Bar Nerfs
- Fixed wrong plating around the research break area.
- Navi beacons added to the central hallway, Beepsky sold separately.
- Newer smaller bar added, second spawn for bartender added. Button to lock the doors to and from the bar added to the security checkpoint.
- Garden Camera added for seeing the center of the park.
- Mule drop off point in medical added.
- Scrubbers and vents added to the CE's Office.
- Disposals on the research outpost linked to the outlet.
- Minor layout change in the warden's office.
- 2x more sunglasses added to maintenance.
- 2x more Welding goggles added to engineering, seriously I'm not adding anymore.
- Added a extra mop and bucket to the janitor's closet.
- Space heaters now available in hard storage for engineering.
- Fixed black tiles on Tcomms.
- All existing deck of cards on the main z-level should properly be a deck of cards and not null.
2016-02-20 21:26:37 -08:00
woodratt
30acc6de7e 1.3.7. Fixes and Adjustments
- Rough fix in place for the holodeck thunder dome.
- Jukebox added to the coffee shop and bar.
- Latex gloves added to Xenoflora.
- Insulated gloves added to Engineering Outpost.
- Connected the main airlocks on the mining and research outposts to the distro.
- Changes 'Vir Regional Spaceport' to ' Vir Interstellar Spaceport'
- Fixed another name issue in reference to crew transfer shuttle.
2015-12-22 22:51:36 -08:00
woodratt
8cd20b03f3 1.3.6 - Bug Fixes and Spurs
- Replaced 971 left facing windows with ones without super health.
- Adjusted lights in both the medical and engineering rest rooms.
- Adjusted several intercoms across the station, including the AI core ones.
- Centcomm beach area sounds removed.
- Adjusted maintenance between bridge and kitchen.
- Keycard Identification thing added to HoP office.
- Plastic flaps added to cargo deliveries office.
- Fixed Emitter in Engineering outpost.
- Fixed voided tile on t-comms, fixed the dark tiles.
- Added a mighty fine cowboy hat.
2015-12-19 21:41:35 -08:00
Jon
c2773ee725 Heist and Merc ships no longer leave sand! Whoopsy. 2015-12-18 00:29:13 +00:00
Jon
af14c2d03a Space's default turf is space. You'd think that was pretty clear and easy to remember to do, right?
Wrong. Apparently.
2015-12-11 20:21:26 +00:00
Woodratt
eae31c8ed8 Merge pull request #433 from Woodratt/Woodrat_Needs2GitGood_1.2
1.2 GITting good at Git
2015-12-04 23:32:14 -08:00
woodratt
04998bfdf6 1.2 GITting good at Git
- Disposals conveyor belt should be fixed, intercom adjusted.
- Industrial hardsuit now on top of rack.
- Atmos center post re-centered, intercom adjusted. Light switch and intercom for monitoring room.
- Cig packs added to the detective's office and fire alarm. Adjusted Intercoms
- Captain's office overhauled, adjusted intercoms, moved furniture, added shutters for that alone time with the secretary.
- Kitchen light moved from behind microwave to behind fridge. Intercoms adjusted.
- Displays and intercoms added to the research and mining outposts, guest pass added to research outpost.
- Fixed a hole in the socks with a pixel
- Tape added to art storage, adjusted intercom.
- Intercoms added to janitorial, IAA, and holodeck control.
- Coffee shop doors now have dual kitchen and bar access, front windoor added, adjusted layout, light switch installed.
- Cloner biomass increased to 600, button to open door added. Atmos alarm added.
- Several intercoms throughout medical adjusted and added.
- Security overhaul, several intercoms adjusted and added. Flashbang box added to the firing range. Warden's desk adjusted. Fire alarm added to front of brig. Photocopier added. Security huds added to lockers.
- Moved research disposal point to science break room. Fixed xenobio windoors and adjusted disposal.
- Xenoflora design overhaul.
- Emergency toolboxes added to the dorms.
- Bar drink dispensers moved two tiles up. Floor dance lights should work.
- Wire guards installed for the AI, Atmos alarms as well.
- Holodeck maint. APC and atmos alarm added. Locker with genetics backpack and coat added as well.
- Soap added to research, security, and medical rest rooms.
- Camera added to medical emergency hall.
- CE's Office front windows electrified.
- Disabled dynamic lighting on the engineering elevator.
- Guess pass terminal added to HOP office.
- Captain's beret in captain's locker.
- Fixed all active edges on Polaris-2, turret controls added for main areas.
2015-12-04 23:12:30 -08:00
Jon
85c704676f Updates all get_base_turf usages to get_base_turf_by_area.
This means that instead of the base turf being defined by the z-level, it's now defined by area and defaulted by z-level.

Updates all "shuttle" and "solar" areas to have a base_turf of space.
Updates docking arms 1, 2, and 3 on the main asteroid level to have a base_turf of space.

Other z-levels may still need updating.

This change means that all actions which destroy or dismantle a tile - for example bombs, a singularity, a shuttle leaving, or deconstruction - now leave these new areas as space not asteroid. Future mapping efforts may need to take this into account.
2015-12-05 04:24:17 +00:00
Jon
1a94dea2ea Allows you to define a base turf for an area which overrides the z-level's base turf in unsorted.dm.
It will first check to see if the turf is set, and if not it will still use the z-level default.
This means we can mark areas as having a base of space to override the z-level base of asteroid that we're using.
As a result, we can ensure the bombs, shuttles moving, etc. leave behind an space turf by defining shuttles, solars/"external" areas as using space as a base.
Areas will need to be updated to check with base_turf = /turf/space and references to the old get_base_turf proc updated so all calls (bombs, Nar'Sie, deconstruction, etc.) have the correct effect, but it's tired and I want to commit this now so I'm committed to finishing it tomorrow.
2015-12-03 22:51:15 +00:00
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -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
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
PsiOmegaDelta
3b5990121f Blobs locations are now more random.
Blobs now randomly pick a random turf without obstructions in maintenance, instead of from a pre-determined list of locations.
Blobs also now log their spawn location, which admins can use to jump to it.

Space vines and nuclear discs have been updated to use the same mechanics.
2015-10-13 18:49:55 +02:00
Neerti
6740dea5ad Update Space Station 13 areas.dm
Conflicts:
	code/game/area/Space Station 13 areas.dm
2015-10-11 00:26:23 -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
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
GinjaNinja32
c014866ac9 Remove unneccessary /area/start definition 2015-09-12 08:46:50 +01:00
Neerti
a9dda6cf3f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
Conflicts:
	.travis.yml
	code/game/gamemodes/cult/cult.dm
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/ninja/ninja.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/gamemodes/wizard/wizard.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/objects/structures/lattice.dm
	code/global.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/reagents/Chemistry-Recipes.dm
	config/example/config.txt
	polaris.dme
2015-09-06 18:26:06 -04:00
Cael Aislinn
d41083cfae resolves issue with space and unsimulated turfs being odd and dark
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2015-08-30 15:27:04 +10:00
PsiOmegaDelta
bf3040cc2d Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-27 09:01:50 +02:00
PsiOmegaDelta
d293b9ea25 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/ZAS/Controller.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/stripping.dm
	code/modules/mob/living/carbon/human/update_icons.dm
2015-08-27 08:53:22 +02:00
mwerezak
39feaf0870 Space areas no longer use dynamic lighting 2015-08-23 17:05:56 -04:00
Neerti
00fa623c9d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/global.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	polaris.dme
2015-08-23 01:30:46 -04:00
Woodrat
c192378bab Woodrat Work v8.2
- Placed missing metal and glass from R&D back into R&D.
- Fixed a broken scrubber pipe on the research outpost catwalk.
- Mining and Research Outpost power issues should not be as major right off the bat. In theory should at least last half the round? Further testing needed.
- Discovery about research and mining elevators made. Filled in more asteroid turf around both, added lights to both.
- Wrong tile used in port security maintenance fixed.
- Second camera added to the AI core cause Koco is a dum dum.
- New door sprites and new door. Mixture between atmos and engieering doors, dual access. Placed on the monitoring room behind the front desk.
- Fixed Filter to phoron on the mining engineering outpost.
- Mining engineering outpost fully camera'd
- Lattice added to underneath heat exchange pipes and around the engine heat exchange pipes.
- Complete and total overhaul of the mining outpost.
- Re-removed the RCD from the industrial hardsuit.
- Blue flags created.
- One blue flag and one red flag added to the laser tag lockers.
2015-08-22 12:33:27 -07:00
Woodrat
7a42e001f8 Woodrat Work v8.1 "Glasslock Edition"
- Air Alarm added to tool storage and security port maintenance
- Fire Alarm and General Radio added to port emergency shuttle hallway.
- Fire alarm, radios, fire extinguishers, and glasslocks added to the central ring.
- Art Storage now has a light switch
- Blocking walls added to unused airlocks at central. Turret control and more turrets added on central.
- Glasslocks added all the way down the cargo hallway and in cargo. Fire alarms added as well.
- Fore Escape Pod hallway glasslocked and camera'd
- Phoron sheets for engineering generator readded to the crate in hard storage.
- Solar array on the engineering outpost now has a area, more outside lights.
- Cameras installed around the entire central ring.
- Civilian sector and library fully glasslocked.
- Handlabeler and newscaster added to visitor's lobby.
- Downgraded the amount of water used by fire extinguishers from eight to two.
- Changes made to make fire extinguishers useless against slimes half fixed.
- Added fuzzy cuffs
- Rigsuit knives now a option.
- Cameras added all the way through the civilian area hallways.
- AI pet called Steve.
2015-08-20 16:55:56 -07:00
Chinsky
317eaf4771 Merge pull request #10101 from mwerezak/shards
Refactors obj flags and changes defined bitflag representation
2015-08-20 19:47:58 +03:00
Chinsky
b2e9a7c2a6 Merge pull request #9942 from RavingManiac/dev
Sound environment revamp
2015-08-20 19:47:09 +03:00
GinjaNinja32
894b559e29 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-19 07:04:40 +01:00
mwerezak
ac738f3db4 Moves flags values to item_flags var
Moves flags that seemed to pertain more to equipment to a new item_flags
var in /obj/item
2015-08-18 17:18:25 -04:00
mwerezak
d3a40f4269 Cleans up defines
Replaces bitflag values with hex literals. Some other miscellaneous
cleanup.
2015-08-18 17:05:26 -04:00
mwerezak
b361f9ad12 Fixes #10723 2015-08-18 10:28:06 -04:00
mwerezak
7c8c42137e Fixes #10680 2015-08-18 02:54:13 -04:00
PsiOmegaDelta
55bc41241f Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/setup.dm
2015-08-17 09:37:49 +02:00
mwerezak
524548cc95 Fixes #10680 2015-08-16 14:58:27 -04:00
Woodrat
df92e8d1d1 Woodrat Work 7.9 - Minty Fresh Edition
- EMP box sprite added and now used for the EMP box.
- Adjusted lights in Janitorial
- 5 Earmuffs added to Engineering. 3 to atmos, 2 in the engine monitoring room.
- Dock Port broken wire fixed and pipes removed.
- Misplaced CMD camera near the park deleted.
- Fixed EVA maint door access.
- Due to popular request, laser tag lockers now have 5 sets of equipment rather than two.
- Fixed some holodeck designs
- Slimes added to xenobio
- Random gas sensors in space near the research outpost fixed.
- CE door access fixed.
- Changed Northern Star issue tag to mint green.
- Mining z-level overhaul, mining engineering outpost given its own area. Standardized wire colors, overhauled engineering outpost on the mining z-level, added substations to each outpost.
- Empty jar added to the RD office
- Beepsky removed until I can figure out how he beeps.
- AI and status displays added to the pool.
- Random shovel now in science/cargo maintenance.
- Fire alarms and other equipment added to the coffee shop.
- Fire alarm, radio, fire extinguisher, light switches, shutters, and a button added to the IA office.
- Furniture changes to the metal chair and comfy chair.
2015-08-12 21:47:49 -07:00
PsiOmegaDelta
4bb6749f24 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-11 08:34:46 +02:00
PsiOmegaDelta
e1aff6a668 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/machinery/doors/door.dm
	code/game/machinery/portable_turret.dm
2015-08-11 08:21:06 +02:00
Atlantis
d3dbf3c199 Adjusts names of two areas
- Messaging Server Room -> Research Server Room - That's the server room near toxins storage/misc. research. It has absolutely nothing to do with messaging, as it houses Research's servers only.
- AI Server Room -> Messaging Server Room - That's the actual server room that houses messaging server in central section of the station.
2015-08-10 21:39:35 +02:00