PsiOmegaDelta
659873d943
Merge pull request #9598 from mwerezak/knifing
...
Polishes the knifing mechanic
2015-05-31 18:50:12 +02: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
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
c2c8911aed
Additional IPC tweaks.
2015-05-31 02:30:57 +09:30
Zuhayr
388b2612b0
Fixes #9488
2015-05-31 01:43:06 +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
PsiOmegaDelta
139b868143
Merge pull request #9574 from GinjaNinja32/close_your_damn_spans
...
Closes some span tags
2015-05-29 23:30:30 +02:00
PsiOmegaDelta
aa165cf7c5
Merge pull request #9555 from GinjaNinja32/welder
...
Fixes welder overlay with welding goggles plus breacher suit
2015-05-29 23:30:13 +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
deb806c4cb
Fixes #9076
2015-05-30 05:24:44 +09:30
Zuhayr
a3f3009eb4
Fixes #9063
2015-05-30 05:16:01 +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
Zuhayr
a4c2267984
Fixes #9386
2015-05-30 04:01:13 +09:30
Zuhayr
445056ba5f
'Fixes' #9395
2015-05-30 03:59:54 +09:30
Zuhayr
7b8abdab01
Fixes #9361
2015-05-30 03:55:41 +09:30
Zuhayr
c5df326533
Fixes #9414
2015-05-30 03:15:19 +09:30
GinjaNinja32
9546c8a5e1
Better shuttle override logging, span classes, \The, GetID() instead of typechecks
2015-05-29 18:31:21 +01:00
Zuhayr
887b8163cc
Fixes #9498
2015-05-30 02:56:01 +09:30
Zuhayr
5a339a66c1
Fixes #9510
2015-05-30 02:52:16 +09:30
Zuhayr
d3b7bcc42e
Fixes #9397
2015-05-30 02:41:13 +09:30
Zuhayr
ac822de309
Fixes #9524
2015-05-30 02:33:41 +09:30
GinjaNinja32
cf722a2d34
Closes some span tags
2015-05-29 18:01:50 +01:00
GinjaNinja32
daff60f8e3
Merge pull request #9563 from mwerezak/malflimb
...
Adjusts malfunctioning limb stance damage
2015-05-29 17:48:18 +01:00
Zuhayr
6e1d39ba2e
Merge pull request #9554 from GinjaNinja32/nano_template
...
Fixes #6077
2015-05-30 02:16:32 +09:30
Zuhayr
fa7c43bf39
Merge pull request #9549 from atlantiscze/bright-solution
...
Refactor floodlights
2015-05-30 02:11:10 +09:30
Zuhayr
b6ddafb476
Merge pull request #9502 from Kelenius/ofAIAndLooc
...
AI now hears LOOC both around its eye and its core, and speaks in LOO…
2015-05-30 02:10:25 +09:30
GinjaNinja32
76daebe0db
More consistent logging via admin_inject_log proc
2015-05-29 16:57:42 +01:00
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
Atlantis
919c23d146
Adjustments
...
- Implements AI Control for floodlights
- Adds \the suggestion from github
2015-05-29 11:42:46 +02:00
PsiOmega
4ce737d87d
Server build date and revision.
...
Can now see the current compilation date and revision:
* In the Dream Daemon log output.
* By using the "Show Server Revision" client verb which also links you to the commit in question.
2015-05-29 08:26:31 +02:00
