Commit Graph

1789 Commits

Author SHA1 Message Date
PsiOmegaDelta 77d0bbd643 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
Conflicts:
	code/game/gamemodes/changeling/modularchangling.dm
2015-08-13 08:09:28 +02:00
PsiOmega ba240cb768 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/atmoalter/portable_atmospherics.dm
	code/game/machinery/spaceheater.dm
	code/modules/clothing/head/soft_caps.dm
	maps/exodus-5.dmm
2015-08-12 21:18:18 +02:00
PsiOmegaDelta 1b7b69306c Prevents APC wires from being displayed to the AI.
Restores and makes the mob type check more specific. Fixes #10559.
2015-08-12 13:34:12 +02:00
GinjaNinja32 631ff21980 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm
2015-08-11 18:47:05 +01:00
Chinsky 7f2d6e8b7f Merge pull request #10434 from Kelenius/ofCablesAndSnowflakes
Of cables and snowflakes
2015-08-11 19:40:45 +03:00
PsiOmega e875a7ce48 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/machinery/computer3/buildandrepair.dm
	code/game/objects/items/devices/lightreplacer.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
2015-08-08 15:34:51 +02:00
Kelenius 92ca942fa9 Fixes #10219 - cables don't always qdel
Dem snowflake code
2015-08-05 18:13:38 +03:00
mwerezak d1bd146b1a Changes reinforced glass material name
Gives the reinforced glass material a name that is easier to verify for
correctness.
2015-08-03 23:01:34 -04:00
mwerezak 0ceb0e291d Fixes #10314
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
2015-08-02 00:01:10 -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
PsiOmegaDelta 0ba7643217 Updates files as necessary to adhere to the new standard. 2015-07-27 09:32:51 +02: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
Zuhayr a45d26079f Merge pull request #10239 from mwerezak/lighting-fix
Fixes #10210
2015-07-19 20:13:55 +09:30
mwerezak ac2dd5f3ca Fixes #10210 2015-07-19 00:25:09 -04:00
Zuhayr c779482afc Merge with dev. 2015-07-15 16:20:39 +09:30
mwerezak 0b2b475be4 Adds lights to ERT shuttle, ERT ready light
Fixes #10155
2015-07-12 18:41:24 -04:00
PsiOmegaDelta b5a47fd43b Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/power/rust/circuits_and_design.dm
	code/modules/power/rust/core_gen.dm
	code/modules/power/rust/fuel_compressor_construction.dm
	code/modules/power/rust/fuel_injector.dm
2015-07-01 22:46:40 +02:00
Zuhayr 8ab80b7394 Removes the RUST engine. 2015-07-01 15:50:55 +09:30
Zuhayr f096d5cabe Merge resolution. 2015-06-28 06:13:24 +09:30
Zuhayr 411987c68b Merge resolution with master. 2015-06-28 06:02:52 +09:30
GinjaNinja32 98572db1a0 Merge pull request #9940 from atlantiscze/connection_estabilished
Fixes #9929
2015-06-26 19:24:24 +01:00
Atlantis 90f08d3fa7 Fixes #9929
- Adds missing connect_to_network() and disconnect_from_network() into TEG wrenching code.
2015-06-26 18:22:59 +02:00
Zuhayr 6f00d831e5 Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct
Base proc: emag_act
2015-06-21 01:18:25 +09:30
PsiOmegaDelta 307f36e919 Compilation fixes. 2015-06-16 11:03:25 +02:00
PsiOmegaDelta 06a1ece4b8 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/ZAS/Controller.dm
	code/datums/mind.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-06-16 10:52:33 +02:00
PsiOmegaDelta cc7c502fb8 Updates emag attackby usages to emag_act where it's not too much of a headache. 2015-06-16 09:34:13 +02:00
PsiOmega 0a05c2659f All the span-corrected dm files. 2015-06-14 22:08:14 +02:00
Zuhayr 347e6df2ac Merge pull request #9704 from atlantiscze/clean-up-your-trash
[Done] Implements Destroy()'s on some things
2015-06-10 23:07:38 +09:30
Zuhayr 73146a62fe Merge pull request #9747 from PsiOmegaDelta/150608-NanoPaths
NanoUI sources can now be datums instead of atom/movable.
2015-06-09 20:08:02 +09:30
PsiOmegaDelta 20542bf84b NanoUI sources can now be datums instead of atom/movable.
Also accidentally fixes #7042 as the AI no longer cares about the machinery var.
2015-06-08 17:06:06 +02:00
Chinsky 94406a6430 Merge pull request #9694 from PsiOmegaDelta/150605-Meteors
Ports /tg/'s meteors.
2015-06-08 14:17:57 +03:00
PsiOmegaDelta 81ee9178bd Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-06-08 09:57:33 +02:00
Atlantis 41d4c2eb13 Refactors /obj/item/apc_frame to /obj/item/frame/apc
- This fixes broken APC frame placement on walls - #9537
2015-06-07 06:26:10 +02:00
Atlantis 8a5a969002 More Destroy()s, better implementation
- Re-implements Destroy() for SMES units. This time moves relevant (de)construction code all the way up to obj/machinery/. This should fix any potential GC issues with deconstruction of component-based machines.
- Implements Destroy() for breaker boxes.
- Fixes SMES units lacking disconnect_terminal(), causing GC errors.
2015-06-06 11:04:41 +02:00
Atlantis b16bf61d03 Implements Destroy() for buildable SMES units.
- This also means GC errors for SMES coils and probably cable coils are fixed. Both of these things are in used in SMESs' construction components.
2015-06-06 09:43:39 +02:00
PsiOmegaDelta bad9c103eb Merge remote-tracking branch 'upstream/dev' into 150605-Meteors
Conflicts:
	code/game/gamemodes/meteor/meteors.dm
2015-06-05 14:59:52 +02:00
PsiOmegaDelta a07d20d657 Ports /tg/'s meteor implementation.
Merges the two meteor events into one, and now takes severity into consideration instead.
Including the basic meteors there are also new types ranging from flaming to radioactive which may drop appropriate types of ore.
2015-06-05 14:58:35 +02:00
Chinsky e3f64178c8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into definecrusade 2015-06-05 13:24:03 +03:00
PsiOmegaDelta c3f0a46c19 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/weapons/storage/briefcase.dm
	html/changelogs/.all_changelog.yml
2015-06-05 10:39:41 +02:00
PsiOmegaDelta 7f9996eece Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-05 10:23:23 +02:00
Chinsky ad0652d864 Moved some stuff from global.dm into defines files that fit the theme, some into files where they are used (and only there, much global). Axed some obsolete stuff (rip Debug var). 2015-06-04 22:51:15 +03:00
PsiOmegaDelta 65fc980b20 Stack splitting and cable merging fixes.
Split stacks will now keep the same colors.
Can now only join cables of the same color together, unless you are a borg.
2015-06-04 13:24:12 +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
PsiOmega 3d49ad3927 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/jobs/job/job.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/organs/organ_external.dm
	icons/obj/objects.dmi
2015-06-01 09:07:03 +02:00
Techhead0 2b8d6db61e Refactors Prison Break event.
Affects the Brig, Virology, Xenobiology or all three.
Adds warning messages to Engineering request consoles and AI.
Prevents doors from bolting open if unpowered
Reduces light overload frequency.
2015-05-31 23:25:52 -04:00
Chinsky ff592c751a Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks
End game tweaks
2015-05-31 23:55:08 +03:00
Zuhayr c2c8911aed Additional IPC tweaks. 2015-05-31 02:30:57 +09:30
Zuhayr ff5c815d01 Fixes #9487 2015-05-31 01:38:04 +09:30