PsiOmegaDelta
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
Chinsky
1e5d6f9f57
Merge pull request #11567 from PsiOmegaDelta/151202-PlasmaCuttingPower
...
Adds energy costs to some rig equipment.
2015-12-07 19:58:19 +03:00
Chinsky
b1ec8253a1
Merge pull request #11587 from PsiOmegaDelta/151204-WizardsAreTheWorst
...
Wizard spell Destroy() additions.
2015-12-07 19:55:02 +03:00
GinjaNinja32
0b8bc7fb0b
Merge pull request #11623 from BlueNexus/mechafix
...
Fixes #11470
2015-12-07 13:59:15 +00:00
BlueNexus
050c1f631a
Added a missing update_icon()
2015-12-07 11:27:33 +00:00
BlueNexus
908ae91a08
Can no longer enter mechs while buckled
2015-12-07 11:17:12 +00:00
Zuhayr
c2eba995ac
Merge pull request #11604 from mwerezak/organ-tag-fix
...
Organ fixes
2015-12-07 19:13:09 +10:30
PsiOmegaDelta
9d0e13b977
Merge pull request #11608 from mwerezak/soap-fix
...
Fixes runtime when cleaning turfs with soap
2015-12-07 09:42:33 +01:00
HarpyEagle
93233b6dd9
Adds soap wetting log message
2015-12-06 14:03:33 -05:00
PsiOmegaDelta
6299f9cc13
Fixes the broken Antag Uplink.
...
NanoUI re-assigns src_object, rather than merely acquiring the host, causing ui_interact() updates to be called on the wrong object.
Fixes #11607 .
2015-12-06 16:24:40 +01:00
PsiOmegaDelta
da946eda99
Adds energy costs to some rig equipment.
...
Plasma cutter - 5 units
Drill - 1 unit
2015-12-06 13:30:28 +01:00
PsiOmegaDelta
6a22086c17
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/verbs/suicide.dm
code/modules/nano/modules/crew_monitor.dm
2015-12-06 11:34:36 +01:00
GinjaNinja32
85bb2778d0
Merge pull request #11610 from mwerezak/suicide-logging
...
Fixes #11466
2015-12-06 10:23:31 +00:00
GinjaNinja32
a569a0fe30
Merge pull request #11609 from mwerezak/pipeline-fix
...
Fixes #11594
2015-12-06 10:22:23 +00:00
mwerezak
39ab31cbf8
Removes unused ORGAN_ATTACHABLE define
2015-12-06 04:34:33 -05:00
mwerezak
9135a609cb
Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468
2015-12-06 04:17:52 -05:00
mwerezak
5de9314803
Clears reference to parent when removing external organs
2015-12-06 03:57:15 -05:00
mwerezak
2312631508
Fixes #11510
...
Splashing and external transfer now checks if the container is open
2015-12-06 02:49:46 -05:00
mwerezak
d508893e3c
Tweaks pointblank multipliers to play better with droplimb thresholds
2015-12-06 02:44:09 -05:00
mwerezak
6688fc49fb
Adds logging for regular suicide
2015-12-06 02:43:50 -05:00
mwerezak
29192fd8e8
Fixes #11466
2015-12-06 02:35:18 -05:00
mwerezak
e6790c7e6d
Fixes #11594
2015-12-06 02:24:37 -05:00
mwerezak
87648e86ef
Fixes runtime when cleaning turfs with soap
...
Partial fix of #11490
2015-12-06 02:00:50 -05:00
mwerezak
a7d80a93e5
Fixes mismatching diona internal organ tags
2015-12-05 23:39:16 -05:00
mwerezak
b12e094112
Removes unreachable return in organ/external/remove(), smaller embedded items are no longer deleted. Implants changed to w_class 1 because seriously a w_class 3 implant makes no sense at all.
2015-12-05 23:38:57 -05:00
mwerezak
92b47c94de
Makes organ/externa/attack_self() control flow easier to follow, handles embeded non-items
2015-12-05 19:19:39 -05:00
mwerezak
a5411f26c5
Fixes runtime when moving with missing legs or feet
2015-12-05 18:10:39 -05:00
PsiOmegaDelta
da080df765
Fixes records unintentionally referencing each other.
...
Because of the limitations of BYOND's bitwise operators (which affect both the old and new implementations of num2hex()), you cannot use numbers larger than 2^16 with that proc.
Manual port of https://github.com/PolarisSS13/Polaris/pull/430 .
2015-12-05 09:25:56 +01:00
Zuhayr
6997361c3c
Merge pull request #11586 from PsiOmegaDelta/151204-AwfulWizards
...
Corrects Wizard spell overlay positioning.
2015-12-05 00:50:56 +10:30
Zuhayr
834f86241a
Alters an unEquip() conditional in Give().
2015-12-05 00:49:35 +10:30
PsiOmegaDelta
4d8ff90857
Wizard spell Destroy() additions.
...
Backport of #11586 . Fixes #11555 .
2015-12-04 09:48:46 +01:00
Chinsky
939c1a3146
Merge pull request #11376 from NullSnapshot/dev-freeze
...
Bunch of IPC fixes.
2015-12-04 11:28:25 +03:00
PsiOmegaDelta
67ba794f0c
Corrects Wizard spell overlay positioning.
...
Includes some Destroy() cleanup.
Fixes the rest of #11583 . Fixes #11555 .
2015-12-04 09:15:42 +01:00
NullSnapshot
c946ca7468
cleaning up recharge station's go_in proc by implementing a helper.
2015-12-04 00:05:00 -08:00
Zuhayr
398541f4eb
Amendments.
2015-12-04 18:14:40 +10:30
Zuhayr
0cf5a709d1
Refactored give().
2015-12-04 17:58:53 +10:30
Zuhayr
7c85f846eb
put_in_hands() refactor.
2015-12-04 17:38:58 +10:30
Zuhayr
fd59c3ad76
More tweaks to IPC fixes.
2015-12-03 22:56:19 -08:00
Zuhayr
5561964204
Tweaks to previous commits.
2015-12-03 22:56:19 -08:00
GinjaNinja32
56392affe5
Merge pull request #11557 from PsiOmegaDelta/151202-SecureEmagging
...
Fixes being unable to emag secure closets.
2015-12-04 05:14:45 +00:00
PsiOmegaDelta
cc72f82371
Backports NanoUI fixes from dev.
...
Fixes #11579 .
2015-12-03 21:50:24 +01:00
Zuhayr
1ffb2098bc
Merge pull request #11565 from atlantiscze/02-12-2015-closet_explosions
...
Fixes #11540
2015-12-02 21:11:26 +10:30
Atlantis
89f5c9f405
Fixes #11540
2015-12-02 11:27:28 +01:00
PsiOmegaDelta
fa0d1bea3f
Merge pull request #11564 from atlantiscze/02-12-2015-anomaly_anchoring
...
Fixes #11546
2015-12-02 11:19:18 +01:00
GinjaNinja32
aa4820411f
Merge pull request #11554 from Hubblenaut/master
...
Fixes camera repair
2015-12-02 10:14:43 +00:00
Atlantis
c7e7c05a34
Fixes #11546
2015-12-02 11:14:41 +01:00
PsiOmegaDelta
89d20b9195
Updates macro/span use.
2015-12-02 09:25:00 +01:00
PsiOmegaDelta
2560c13816
Fixes hemostat surgery.
...
Port of https://github.com/PolarisSS13/Polaris/pull/381 .
2015-12-02 08:56:58 +01:00
PsiOmegaDelta
11e47bc8c2
Fixes being unable to emag secure closets.
...
And ensures that this costs an emag charge.
Also corrects emag_act calls. Partial port of https://github.com/PolarisSS13/Polaris/pull/377 .
2015-12-02 08:30:47 +01:00
Zuhayr
c8b6986b62
Merge pull request #11551 from PsiOmegaDelta/151201-DontTazeMeBro
...
Renames the rig mounted taser.
2015-12-02 09:59:47 +10:30
