e557a71fdc
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2016-01-20 08:01:14 +10:30
c0889f09e0
Fixes #728
2016-01-13 23:59:12 +10:30
f93ea6a78f
Tweaks to previous commits.
...
More tweaks to IPC fixes.
Merge resolution/compile fixes.
Further work on properly integrating, updating and fixing prosthetic options.
Repathed internal organs to organ/internal.
More work on full synthetics, changelings, overheating.
Working on getting organs to qdel properly and spawn properly when robotized.
Finalized some overheating values, added remaining prosthetic icons.
Finalizing the testing version of the full prosthetic bodies branch.
Added suit cyclers to the autolathe and map.
Fixing runtime errors.
Fixing errors.
Changelog.
Replacing limb and organ strings with constants.
Prevented brainless species from becoming full cyborgs.
Fixed issues with brain/MMIs renaming themselves inappropriately.
Various fixes and oversights.
2015-12-24 21:13:40 +10:30
d71573e749
Further work on properly integrating, updating and fixing prosthetic options.
...
WIP
Allowed heads/bodies to be prosthetic. Removed IPC. Refactored some flags.
2015-12-24 21:10:33 +10:30
51bec27882
Merge pull request #628 from Datraen/SparksQdelFix
...
Stops sparks from trying to qdel twice.
2015-12-20 15:17:17 -05:00
c778ff59b2
Returns the deincrementation of spark count on the tile. Removal time is in line with the deincrementation time.
2015-12-20 14:41:55 -05:00
84a55c2f87
Stops sparks from trying to qdel twice.
2015-12-20 13:16:45 -05:00
a22195aed3
1.3.0 of Grenades and Elevators
...
- Explosive grenades have gotten a major upgrade, (borrowed code from fragmentation grenades).
- Box for explosive grenades lowered to 5 grenades per box instead of 7.
- Evidence locker moved to forensics area from detective's office. Body bags, latex gloves, and evidence bags moved to said locker.
- Low yield EMP grenades created including sprites. Box for them created (neither added to the map).
- Can now spawn from the elevator.
2015-12-11 23:05:15 -08:00
4376948bdf
Forensics fixes/tweaks.
2015-12-10 19:20:09 +10:30
565e39a28f
Porting forensics from Aurora.
2015-12-10 19:16:28 +10:30
7c758dfbb1
Updates changelog, fixes comment
2015-12-08 18:16:04 +01:00
a9d3f02cd5
Updates preset TTV bombs, adds debug verb
2015-12-08 18:15:55 +01:00
5fcf13ac55
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/surgery_limbattachment.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/organs/organ.dm
code/modules/organs/organ_external.dm
code/setup.dm
2015-12-08 08:09:37 +01:00
9135a609cb
Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468
2015-12-06 04:17:52 -05:00
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
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
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
3db2c4fb49
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
2015-10-27 12:38:28 +01:00
47ace5ed3e
Chem smoke refactor
2015-10-18 11:54:17 -04:00
e8d6772523
Smoke clouds dissipate faster in low pressure
2015-10-15 16:53:06 -04:00
d260b3bb18
Fixes #11300
...
Atoms crossing a smoke cloud now get splashed with up to 10 units of reagent.
2015-10-15 06:44:21 -04:00
8c8b5a34d3
Merge pull request #11288 from PsiOmegaDelta/151310-RandomBlob
...
Blob spawn locations are now more random
2015-10-14 03:24:28 +03:00
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
5dc6ff5da1
Merge pull request #11230 from PsiOmegaDelta/xenomorphs
...
Xenomorph update
2015-10-13 08:31:27 +10:30
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
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
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
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
6c3bbb9ee8
Updates changelog, fixes comment
2015-10-09 11:39:22 -04:00
63838b01d4
Updates preset TTV bombs, adds debug verb
2015-10-09 11:18:12 -04:00
83adba88d4
Updates blob
...
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106 .
Fixes #10705 .
2015-10-05 18:10:16 +03:00
a3a1f495a3
Implements my own comment suggestions and updates Travis' macro count.
2015-10-01 09:56:30 +02:00
bfe1d5a599
Span classes.
2015-09-21 20:36:51 +09:30
22ef779f65
Cherrypicked xenophage-rewrite mechanics over.
2015-09-21 20:36:45 +09:30
e27eda4c86
Merge pull request #10672 from mwerezak/frag-grenade
...
Adds fragmentation grenades
2015-09-07 14:12:27 +09:30
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
35ea424edc
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/modules/clothing/spacesuits/rig/rig.dm
2015-08-29 10:06:18 +02:00
9087466552
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap
2015-08-25 12:29:59 +09:30
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
e48fbdd1e6
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/game/machinery/newscaster.dm
code/modules/admin/admin.dm
2015-08-21 20:27:48 +02:00
b702c81060
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap
...
Conflicts:
code/game/turfs/simulated/floor_types.dm
2015-08-22 03:57:12 +09:30
edf74e4721
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/modules/admin/topic.dm
2015-08-22 02:30:14 +09:30
d001489d14
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/modules/admin/topic.dm
2015-08-21 18:59:19 +02:00
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
bed03443d1
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/ZAS/Airflow.dm
code/__defines/items_clothing.dm
2015-08-21 16:15:07 +03:00
a0a09c04e4
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
2015-08-20 14:09:07 +02:00
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
c8baafed2a
Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and
...
construction/deconstruction. Major map rework/changes.
2015-08-16 06:05:21 -07:00
77ddae4e26
Structures now take damage properly from projectile clouds
2015-08-15 19:08:45 -04:00
73e15512f4
Made landmarks simulated (so that pods don't qdel them, oops)
2015-08-14 16:39:44 -07:00
Zuhayr