PsiOmega
40a373a7fe
APC event tweak.
...
The APC event now instead checks for the new is_critical flag.
2015-06-01 18:13:05 +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
Chinsky
ff592c751a
Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks
...
End game tweaks
2015-05-31 23:55:08 +03:00
Chinsky
d39d9deeeb
Merge pull request #9417 from mwerezak/chem-kinetics
...
Chemistry reaction cleanup, Implements reaction-over-time and yield
2015-05-31 23:54:39 +03:00
GinjaNinja32
c1cc002109
Merge pull request #9601 from Techhead0/survivalBox
...
Survival box and job spawning fixes.
2015-05-31 19:47:44 +01:00
Techhead0
9047bbe2a2
Removes O2 tank and spare mask from Vox boxes.
2015-05-31 14:17:24 -04:00
Techhead0
0f0fcf2d46
Re-adds extended oxygen tanks to relevant jobs.
2015-05-31 14:08:46 -04:00
Techhead0
99e9172d31
Cleans up Vox survival gear, adds belt icons to emergency nitrogen tanks.
2015-05-31 13:04:32 -04:00
PsiOmegaDelta
659873d943
Merge pull request #9598 from mwerezak/knifing
...
Polishes the knifing mechanic
2015-05-31 18:50:12 +02:00
Techhead0
3620c49b08
Fixes #9462
2015-05-31 12:41:39 -04:00
mwerezak
3f5976bc3b
Updates knifing
...
Fixes weirdness with knifing where attempting to knife someone before
`world.time >= (G.last_action + 20)` could be met.
Knifing damage scales with weapon force and an attempted measure of
throat protection.
Knifing switches on harm intent.
2015-05-31 11:36:38 -04:00
PsiOmegaDelta
8d13f434f0
Merge pull request #9587 from Zuhayr/ipcfixes
...
IPC fixes
2015-05-31 15:53:11 +02:00
Chinsky
10218eb8c9
Merge pull request #9573 from Zuhayr/chairs
...
Chair update.
2015-05-31 11:33:24 +03:00
Zuhayr
201712eb3d
Added MATERIAL_PADDING flag.
2015-05-31 17:19:32 +09:30
Zuhayr
fd2855800f
Merge pull request #9582 from mwerezak/robolimbs
...
limb fixes
2015-05-31 17:14:25 +09:30
Zuhayr
1a4f3952d1
Cosmetic fixups.
2015-05-31 17:10:49 +09:30
mwerezak
d541fda7be
Sets w_class for external organs
...
Adjusts the edge w_class requirement to require a weapon that is larger
than or equal to the limb's w_class. Also makes the surgical saw and
surgical drill w_class = 3, and the scalpel w_class = 1.
2015-05-30 19:02:37 -04:00
mwerezak
f23a656526
Replaces assignments to health with max_damage
...
Except where they were already equal.
2015-05-30 19:02:06 -04:00
mwerezak
217e7b966f
sharp no longer causes DROPLIMB_EDGE
2015-05-30 19:01:34 -04:00
mwerezak
43cc0e6705
Fixes internal organs only being damaged with prob(5) if brute_dam >= max_damage
2015-05-30 19:01:01 -04:00
mwerezak
1c4239190d
Having a vital internal organ die now kills you
...
Internal organs now die once they hit max_health.
Also adjusts final brain damage effect.
Conflicts:
code/modules/organs/organ.dm
2015-05-30 18:53:20 -04:00
mwerezak
6b85a13de7
Merge remote-tracking branch 'upstream/dev' into chem-kinetics
...
Conflicts:
code/modules/reagents/Chemistry-Recipes.dm
2015-05-30 17:25:57 -04:00
mwerezak
fd7830fd1b
Adjusts most catalysts values
2015-05-30 17:21:33 -04:00
mwerezak
2d92a871aa
Optimizes reaction checks
2015-05-30 17:21:05 -04:00
mwerezak
33487c76fa
Implements reaction-over-time and reaction yield
2015-05-30 16:44:24 -04:00
mwerezak
783b5aecc9
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into robolimbs2
...
Conflicts:
code/modules/mob/living/carbon/human/human_organs.dm
2015-05-30 14:31:19 -04:00
Zuhayr
b3102824a0
Fixes #9544
2015-05-31 03:56:06 +09:30
mwerezak
cbeaabee9c
Replaces setting ORGAN_ROBOT flag with robotize() call
2015-05-30 14:25:53 -04:00
mwerezak
40d437f988
Assigns w_class to external organ types
2015-05-30 14:24:46 -04:00
mwerezak
92de9fb432
Replaces health assignments with max_damage
2015-05-30 14:20:50 -04:00
Zuhayr
f9e99e1ee9
Fixes #9581
2015-05-31 03:34:29 +09:30
Zuhayr
bf1733640a
Fixes #9586
2015-05-31 02:56:54 +09:30
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
PsiOmega
d0232732d4
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/floodlight.dm
code/game/objects/items/devices/suit_cooling.dm
code/modules/organs/subtypes/diona.dm
code/modules/paperwork/pen.dm
code/modules/reagents/reagent_containers/hypospray.dm
html/changelogs/.all_changelog.yml
2015-05-30 16:11:57 +02:00
PsiOmega
5e84bfa57c
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/clothing/spacesuits/rig/suits/ert.dm
2015-05-30 15:59:54 +02:00
mwerezak
6dbd565079
Merge remote-tracking branch 'upstream/dev' into robolimbs2
2015-05-30 08:32:31 -04:00
PsiOmegaDelta
12d1277925
Merge pull request #9577 from Zuhayr/dev-freeze
...
Fixes
2015-05-30 08:35:39 +02:00
Zuhayr
eaf7e6718d
Merge pull request #9553 from GinjaNinja32/reagent_protection
...
Fixes #5945 , de-copy-pastes parapens and sleepypens
2015-05-30 13:57:31 +09:30
Zuhayr
40780165a2
Merge pull request #9569 from comma/master
...
Fixes corpses and unconscious people still showing typing indicators.
2015-05-30 12:36:14 +09:30
Chinsky
f61380adfc
Merge pull request #9576 from GinjaNinja32/shuttle_logging
...
Shuttle improvements
2015-05-30 03:15:18 +03:00
Chinsky
44db730482
Fixes corpses and unconscious people still showing typing indicators.
...
Indicator also has same visibility as the owner, so no magicaly sensing where someone is going to talk soon (chat bubbles works well enough)
Since images do not have visibility, had to make it an object decal. Also since it's set per mob, it's no longer global. Shouldn't really be much of an issue, since it's only created when mob tries to speak (so ~60 objects total on high-usual load)
2015-05-30 03:13:45 +03:00
PsiOmega
bf27545841
End game turf changes now simply alters color.
2015-05-29 23:38:09 +02:00
Zuhayr
21a019b34f
Cleanup
2015-05-30 05:35:00 +09:30
Zuhayr
97cbcff3df
Fixes #9124
2015-05-30 05:29:33 +09:30
Zuhayr
b67622b23c
Fixes 9077
2015-05-30 05:06:43 +09:30
Zuhayr
5f2cf7b4a3
Fixes limbs and wounds not being visible on limbs.
2015-05-30 04:59:12 +09:30
Zuhayr
ce36d07f79
Fixes #9180
2015-05-30 04:58:49 +09:30
Zuhayr
4a012a90ca
Fixes #8929
2015-05-30 04:38:41 +09:30
Zuhayr
6564fd6663
Messed this up.
2015-05-30 04:06:23 +09:30
