Commit Graph

20478 Commits

Author SHA1 Message Date
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
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
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
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
Zuhayr
c2a4ee22cf Merge pull request #11316 from atlantiscze/apc-fix
Fixes #11149
2015-12-02 09:57:26 +10:30
Hubblenaut
44cb040e54 Fixes camera repair 2015-12-01 17:43:34 +01:00
PsiOmegaDelta
1a293e2d96 Renames the rig mounted taser.
Was previously called an energy gun, which could be mildly confusing.
Port of https://github.com/PolarisSS13/Polaris/pull/127.
2015-12-01 08:48:47 +01:00
PsiOmegaDelta
5a0d76d876 Merge pull request #11548 from Baystation12/master
Dev-freeze
2015-12-01 08:09:15 +01:00
Atlantis
e33ae21f75 Adjusts APC emag behavior
- Mostly under-the-hood changes.
- Emagged APCs may now have their panel removed with screwdriver, so you can access wires
- Emagged APCs no longer rely on locked var, instead they check for emagged var as mwerezak suggested.
2015-11-30 23:19:04 +01:00
Atlantis
5958a25e80 Fixes airlocks losing air, again.
- Replaces #11123 - this PR fixes the issue itself, instead of using delays to work around the issue.
- update_nearby_tiles() is now being called right after density is changed, instead of sleeping for 0.7 seconds.
- Tested this in engineering shuttle dock airlock, which is one of few airlocks which don't have pump replenishing lost gas installed. Loss of air is minimal (few kilopascals, likely caused by airlocks opening at 5kPa as reaching pure vacuum would take too long) in comparsion to situation without this fix (where, once cycled out, you can't cycle back in without forcing the inner side of airlock)
2015-11-30 22:47:39 +01:00
PsiOmegaDelta
2d5677109f Build mode throws now admin logs.
Fixes #11514.
2015-11-29 12:14:31 +01:00
PsiOmegaDelta
554af8e9ca Merge pull request #11530 from Baystation12/master
Dev-f
2015-11-28 11:48:39 +01:00
Chinsky
035a2eb195 Merge pull request #11525 from GinjaNinja32/info
info topic improvements
2015-11-28 01:16:56 +03:00
GinjaNinja32
b15497aa51 info topic improvements 2015-11-26 20:27:51 +00:00
PsiOmegaDelta
9b1123cbaa Replaces misc. checks with usr.incapacitated(). 2015-11-24 14:05:04 +01:00
PsiOmegaDelta
e67ff9e903 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-24 14:02:15 +01:00
PsiOmegaDelta
0e5fc06b13 Merge pull request #11491 from Datraen/Trayfix
Fixes Non-human, Non-synth mobs (ghosts, mice) being able to interact with trays.
2015-11-24 10:48:17 +01:00
GinjaNinja32
b72cb1f45b Merge pull request #11504 from PsiOmegaDelta/151122-EMPSafeShuttle
Makes shuttle control consoles sturdier.
2015-11-23 09:28:03 +00:00
Bjorn Neergaard
0f78998377 Fix Dionea home system
Fixes #11492
2015-11-22 20:34:29 -06:00
PsiOmegaDelta
26f167453c Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-22 11:40:44 +01:00
PsiOmegaDelta
782f0a8bfb Makes shuttle control consoles sturdier.
Fixes #11501.
2015-11-22 11:37:14 +01:00
PsiOmegaDelta
0dd630124c Merge pull request #11486 from neersighted/master
Fix Laptop Vendors and Personal Lockers not accepting ID Containers
2015-11-22 11:20:12 +01:00
Bjorn Neergaard
ef1f91e334 Fix Laptop Vendors and Personal Lockers not accepting ID Containers
Fixes #11092
2015-11-22 00:27:03 -06:00
Datraen
301f7f5c8d Fixes #11489, fixes labels as well 2015-11-20 19:37:00 -05:00