Commit Graph

433 Commits

Author SHA1 Message Date
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
PsiOmega
570806046b Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/custom_sprites.dm
	code/modules/organs/organ_stump.dm
	code/setup.dm
2015-08-10 17:56:14 +02:00
PsiOmega
fb6ab23189 Makes the new initialization message use the proper method. 2015-08-10 17:46:38 +02:00
PsiOmega
a710e77d46 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/controllers/master_controller.dm
	code/game/area/areas.dm
2015-08-10 17:42:40 +02:00
mwerezak
12549b7e93 Fixes area power initialization
Power channels start on when objects initialize, then are turned off and area machines notified in area initialization if an apc is not found.
2015-08-09 19:58:37 -04:00
PsiOmega
d1a4f4b0a4 Compilation fixes and partial revert of #10456. 2015-08-09 13:27:59 +02:00
PsiOmega
889f399356 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/area/areas.dm
	code/game/machinery/alarm.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/reagents/Chemistry-Machinery.dm
2015-08-09 13:15:22 +02:00
mwerezak
83abfcf7af Fixes #9594
Areas now initialize to having all power channels off.
2015-08-09 00:02:50 -04:00
Neerti
d911badae8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/7/2015_bay_merge
Conflicts:
	.travis.yml
	polaris.dme
2015-08-07 20:25:57 -04:00
PsiOmegaDelta
03578d4ea3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-06 08:12:38 +02:00
RavingManiac
aeea42ded9 Refactors floating and magboot checks. Fixes #10256 2015-08-03 23:19:04 +10:00
Neerti
8913f0c9df Merge pull request #80 from Woodratt/Woodrat_Work_v6
Woodrat Work v6 with Engineering Outpost DLC
2015-08-03 02:44:33 -04:00
Woodrat
9858ea7fef Woodrat Work v6 with Engineering Outpost DLC
- More Cameras added to Civilian Areas
- Cargo foyer area added.
- Cafeteria Floors Properly Painted
- Improper access restrictions removed from security checkpoint and medical door bolt locks
- Guide signs posted all around the central ring
- Engineering dome oupost DLC added for $19.99
- - (Minor bug with docking will fix later)
- Recreation area vented to space fixed, (holes under doors, removed extra wires and pipes)
- Captain's Bathroom now with 100% more lighting
- Extra pipes in Atmos removed, one tweak left to be done.
- Windows in the AI core fixed, Door button added, Power wire fixed. Hatch access fixed.
- Visitor beds upgraded.
- Captain's bed now improved for ERP
- ERT Chem dispenser fixed.
- Engineering soda dispenser fixed.
- Mixed air outlet valve fixed??
- Missing area tile for small admin shuttle fixed.
- Dorms now has R-walls
- Gateway Cryo added.
- Teleporter reworked and now operational and fixed.
2015-08-02 23:39:00 -07:00
Neerti
41ead053e1 Adds Redman's map. 2015-08-02 23:56:56 -04:00
Woodrat
2420f05034 Commit verison v5 Pre-Alpha Playable Release
Changes -

- Research
  - Work finalized on Research, all extra items such as newscasters, alarms, fire extinguishers added. Cargo drop of point added Door access completed, landmarks and spawn points added, floor painted. No further major changes to be made to research.

- Cargo
  - Work finalized, One new area added (second one to be added at a later date but causes no issues at this point). No major changes to be done to cargo at this time.

- Security
  - Work finalized, brig cells work properly, cargo drop off point made, cameras added, blastdoors working properly, no major changes to be made.

- Medical
  - Work finalized, hallways painted, shutters working properly, cameras added, virolocks functional. Cargo drop off point to still be added. No major changes to be done.

- Command
  - Work in Progress, door access done including AI and AI upload, landmarks added, few light changes such as additional lights to the bridge. No major changes to be done

- Engineering
  - Work in Progress, door access done, cargo drop off point added. Materials supplied, engineering 'elevator' functional. Blast doors need to be added. Detail work needs to be added. No major changes to be done.

- Civilian
  - Work in Progress, door access should be finalized for areas such as the bar, kitchen, hydroponics coffee shop. Chapel driver now operational. Several areas with cameras, several areas still lacking cameras. Detail work missing such as newscasters and fire alarms. No major changes to be done.

- Misc
  - Work in Progress,
    - Tech storage access completed. Security checkpoint door control and access done.
    - Airlock next to the research fixed. Waste disposals tweaked and fixed.
    - Work completed on EVA, finalized. No further changes.
    - IAA access and landmarks completed.
    - Holopads added to areas previously without such as in front of escape pods.

- Other Tweaks
  - Light ranges increased for both small and large lights.
  - Small lights have had their color changed to a much fainter tint
  - Comfy Chair tweak pending.
2015-08-01 00:02:29 -07:00
Neerti
94a2ec5bf1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2
Conflicts:
	.travis.yml
	polaris.dme
2015-07-26 16:01:27 -04:00
PsiOmegaDelta
388343a84e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/machinery/recharger.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob.dm
2015-07-20 08:28:32 +02:00
mwerezak
d3717a23a0 Removes unlimited_power var
Redundant and only used in one place.
2015-07-19 00:33:17 -04:00
Neerti
6eece8ac45 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/16/2015_bay_merge_2
Conflicts:
	.travis.yml
	polaris.dme
2015-07-16 22:46:53 -04:00
Woodrat
62ddc29194 Fixed transfer and Escape Shuttle.
- Added more lights and cameras
- Fixed the outposts
- Started work on medical
2015-07-13 16:26:29 -07:00
PsiOmegaDelta
9b4d09c974 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/_helpers/unsorted.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/grenades/emgrenade.dm
	code/modules/clothing/spacesuits/rig/rig_attackby.dm
2015-07-11 10:58:49 +02:00
Zuhayr
20f93b6009 Fixes #9394 2015-07-10 00:21:17 +09:30
Mloc
ffbf547923 Merge pull request #9889 from PJB3005/bay-lights
Lighting optimizations + NVG meson fix
2015-07-09 14:50:10 +01:00
Woodrat
c5b30257f7 Neerti is Satan, updates map. Updates files. 2015-07-07 20:31:00 -07:00
SledgeLP
aad66360d9 Adding New Outpost Areas
Adds the additional areas needed for the outpost z level map
2015-07-06 23:36:25 -05:00
RavingManiac
8062bed76f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2015-07-07 11:53:33 +08:00
Neerti
a0fdf03760 Adds Woodrat's centcom z-level and some other stuff on the first one. 2015-07-02 23:27:48 -04:00
PsiOmegaDelta
f420dd9f01 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	.travis.yml
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living_defines.dm
	code/modules/mob/living/silicon/silicon.dm
	code/setup.dm
2015-06-30 08:59:34 +02:00
PsiOmegaDelta
0624fced64 Compilation.. fix and ensuring the Thunderdome isn't a dark pit. 2015-06-30 08:46:32 +02:00
RavingManiac
389b3fdf74 Changed the way sound environments are defined. More tweaks to sound environments. Hallucination, drugging and dizziness affect sound environment 2015-06-27 15:33:01 +10:00
RavingManiac
d1cc0517ce Sound environment changes. Different values for hallways, carpeted rooms, maintenance tunnels, etc. Holodeck sound environment changes with the loaded program
In low-pressure or space, sounds will be heard in sound environment 22 (underwater))
2015-06-27 03:47:37 +10:00
PJB3005
c48ffa8d63 Lighting optimizations + meson fix 2015-06-23 17:46:11 +02:00
Neerti
0a7f5b42cb Converts woodrat's map to this codebase after 12 hours nonstop of fixing it.
Cryo is a huge asshole and I had to make a quick hack because twelve hours etc.
2015-06-22 11:05:35 -04:00
PsiOmegaDelta
9887f16135 mob/living/Life() now has basic gravity handling (no overrides). 2015-06-17 15:32:23 +02:00
GinjaNinja32
3434826eaf Merge pull request #9490 from Zuhayr/xenoruins
Random map generator expansion.
2015-06-02 20:59:52 +01:00
Zuhayr
ebe62cefd8 Refactored random map generator system and added several terrain generators.
Created a global list to track base turfs for explosions/shuttle moves.
Remaps the asteroid to be a moonlet. Tidies up some references to 'asteroid', removes moonbase from the accessible z level list.
2015-06-03 04:36:19 +09:30
PsiOmegaDelta
3988d6ac90 Merge pull request #9388 from Techhead0/prisonBreak2.0
Refactors and expands the Prison Break event.
2015-06-02 18:58:20 +02:00
Techhead0
637135b0b5 Removes relative pathing, adds better comments. 2015-06-01 00:02:56 -04:00