Chinsky
e5a8eb2dfc
Actually renames 'going' var.
...
Axes speed of light and procs that used it (but were not used by anything). More maths too, and max stack amounts, not used anywhere.
Ticks back stuff that was unticked for faster compile, whoops.
2015-06-05 11:07:24 +03: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
00953968dd
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-06-04 08:20:00 +02:00
PsiOmegaDelta
6c903907c0
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-06-04 08:10:49 +02:00
Zuhayr
da3ee37df9
Merge pull request #9638 from PsiOmegaDelta/150602-LawSets
...
Allows all synths to view the alternative law sets.
2015-06-03 04:00:11 +09:30
PsiOmegaDelta
3f26eeac99
Allows all synths to view the alternative law sets.
...
This does not include laws such as the syndicate, spider clan, etc. laws.
Makes it less of a headache for a synth to state the standard NT laws while subverted, etc.
2015-06-02 14:48:08 +02:00
PsiOmegaDelta
fcb0841646
Reduction of admin right-click verbs.
...
Removes verbs which only works on specific mob types from the admin right-click context.
Fixes #9627 .
Fixes #9628 .
2015-06-02 14:20:14 +02:00
PsiOmegaDelta
4a69d0a4f7
More MayRespawn checks.
...
Astral projecting wizards/cultists may no longer respawn as something else.
2015-06-02 13:40:53 +02:00
Zuhayr
717b191fe2
Minor refactor to reduce calls to handle_actions().
2015-06-02 18:30:13 +09:30
Zuhayr
dadc434f4e
Ported action button system from Paradise/tg
2015-06-02 17:17:13 +09:30
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
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
Zuhayr
1a4f3952d1
Cosmetic fixups.
2015-05-31 17:10:49 +09:30
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
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
bf1733640a
Fixes #9586
2015-05-31 02:56:54 +09:30
Zuhayr
c2c8911aed
Additional IPC tweaks.
2015-05-31 02:30:57 +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
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
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
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
GinjaNinja32
daff60f8e3
Merge pull request #9563 from mwerezak/malflimb
...
Adjusts malfunctioning limb stance damage
2015-05-29 17:48:18 +01:00
Zuhayr
fa7c43bf39
Merge pull request #9549 from atlantiscze/bright-solution
...
Refactor floodlights
2015-05-30 02:11:10 +09:30
Zuhayr
15070d729d
Dev-freeze into dev merge.
2015-05-30 00:31:12 +09:30
Atlantis
477204e8c8
Fixes two newmalf-related issues
...
- Fixes APC runtime. I am an idiot. I know.
- Fixes potentional power issue with AI powersupply object, caused by AI having more than one powersupply. This sometimes caused AI to use 100kW instead of 50kW
2015-05-29 12:23:39 +02:00
mwerezak
ad5c5680a2
Adjusts malfunctioning limb stance damage
2015-05-28 22:57:36 -04:00
mwerezak
34ceac7cc6
Fixes IPCs getting fleshy stumps, makes robot limbs become unusable above max_damage
2015-05-28 22:10:28 -04:00
GinjaNinja32
562651a876
Fixes #8162
2015-05-28 23:11:00 +01:00
Atlantis
30e4550e2e
Refactor floodlights
...
- Fixes #9543
- Removes ugly floodlight/proc/updateicon() and replaces it with proper floodlight/update_icon() which is standard on all objects/items. Does the same refactor for power cells and adjusts the proc call in relevant files (hence the amount of 1-line changes in various files)
- Makes floodlights properly use CELLRATE. Their load is 200 watts. Cell adjusted accordingly, it starts with 1k cell, which is enough for ~40 minutes (roughly)
- Floodlights with almost discharged cell (less than 10%) ocassionally "flicker", dimming for few seconds. This serves as indicator that the power cell is running low.
- Floodlight luminosity adjusted. They now shine slightly more, espicially closer to the floodlight.
2015-05-28 21:45:54 +02:00
Atlantis
7981777c41
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge
2015-05-28 20:16:12 +02:00
Zuhayr
5ea78421ff
Merge pull request #9408 from mwerezak/sm-eject
...
Limits the ability of the SM to return to the station zlevel once ejected
2015-05-28 11:35:39 +09:30
mwerezak
af8a173e30
Changes IPC eyes to optics, generalizes vision organs
...
Now any organ can cause vision loss if damaged, not just ones that
inherit from organ/internal/eye.
2015-05-27 02:18:11 -04:00
mwerezak
7423f2ecfd
IPC mmi_holder is now carried in the chest
...
Adds an optical sensor organ (eyes) for IPCs so that losing their head
still does something to them.
2015-05-27 01:24:34 -04:00
mwerezak
2098c80849
Damage on robot limbs no longer counts towards shock and crit
...
Damage on robot limbs no longer counts towards traumatic_shock and crit.
Raises the damage mod in exchange.
2015-05-27 01:24:00 -04:00
mwerezak
68e205e7b3
Fixes robot limbs spamming sparks and messages endlessly
...
Fixes robot limbs spamming malfunctioning messages and spark effects
endlessly if one arm is malfunctioning while holding an item in the
other arm.
2015-05-27 01:15:14 -04:00
mwerezak
7d4c3235dc
Fixes #9460
2015-05-27 01:13:53 -04:00
Chinsky
8eb75ae398
Merge pull request #9480 from Kelenius/ofResearchAndRuntime
...
Fixes #9473
2015-05-27 06:36:50 +03:00
