Commit Graph

22674 Commits

Author SHA1 Message Date
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
Zuhayr
4d2db18c70 Added a click delay to interactions with the fire axe cabinet. 2015-12-02 20:38:28 +10:30
Zuhayr
7801c2dc3b Minor runtime fixes. 2015-12-02 20:11:31 +10:30
Zuhayr
2f344ed111 Adds a confirmation to user-activated ninja self destruct. 2015-12-02 19:55:54 +10:30
Zuhayr
6623c1650f Rig unEquip() amendments. 2015-12-02 19:55:43 +10:30
Zuhayr
1b6282b43f Fix for a merge error resulting in very wonky hardsuit behavior. 2015-12-02 19:55:32 +10:30
Zuhayr
1eabcfeffe Removes a leftover world << 2015-12-02 19:55:23 +10:30
Zuhayr
4fc314bf85 Adds a /prebuilt floor light for use by mappers. 2015-12-02 19:55:15 +10:30
Zuhayr
16c039aadc Fixes reset decals not destroying themselves. 2015-12-02 19:55:07 +10:30
Zuhayr
0c23217d7c Fixes drop pods activating each other's doors. 2015-12-02 19:54:57 +10:30
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
Jon
03a4b91ad0 Removes erroneous world.log line. 2015-12-02 03:47:05 +00:00
Jon
230d676c3f Changes the arbitrary failure return for surgery from 2 to -1. This is because ORGAN_BLEEDING in damage_organs.dm is now 2 so some statements evaluate to 2, which causes bleeding clamp surgery to fail as it triggered the "This is an error that's already been dealt with" condition coincidentally.
Surgeries which report failures (like trying to stick a brain in someone who's already got one) now throw back a -1 not a 2.
2015-12-02 03:45:24 +00:00
Mark9013100
97a52b3815 Replaces the default berets with /tg/'s. 2015-12-01 22:26:30 -05:00
SinTwo
1f42ba7961 BERETS DAMMIT 2015-12-01 20:53:25 -05:00
EmperorJon
101f2b227e Merge pull request #377 from EmperorJon/01_Dec._Fix_closet_emagging
Fixes emagging for secure closets
2015-12-01 23:59:33 +00:00
Jon
8986c49b82 Fixes emagging for secure closets. 2015-12-01 23:53:50 +00: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
Zuhayr
1a0eecd09a Runtime fixes. 2015-12-01 18:07:50 -05:00
Zuhayr
622fb93a3e Emergency fix for HasProximity being passed a turf. 2015-12-01 18:07:21 -05:00
Neerti
602493cc08 Removes gun firing logs due to possible lag. 2015-12-01 14:12:35 -05:00
Hubblenaut
44cb040e54 Fixes camera repair 2015-12-01 17:43:34 +01:00
Zuhayr
4487db9c14 Fixes several issues with drones. 2015-12-01 09:38:12 -05:00
Neerti
765ac00c6c Merge pull request #367 from Neerti/12/1/2015_armor_refactor
Refactors how armor works.
2015-12-01 04:32:30 -05:00
Neerti
062a092cfe Refactors how armor works. It's now less of a dice roll, but still retains some randomness. This makes weaker armor worth using, and stronger armor not godlike.
Also fixes a bug with the auto shotgun causing runtimes.
2015-12-01 03:45:47 -05: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
Datraen
f48bdb3c66 Merge pull request #366 from Datraen/DevTweaks
Lets mods see and toggle attack logs.
2015-12-01 01:15:23 -05:00
Datraen
1886eaa066 Lets mods see and toggle attack logs. 2015-12-01 01:07:45 -05:00
Neerti
15aebf8974 Merge pull request #359 from EmperorJon/30_Nov._Fix_AI_door_UI
Fixes #328, maybe temporarily
2015-12-01 00:46:18 -05:00
Neerti
88d090ab34 Merge pull request #353 from Mark9013100/11/29/2015FixesandEdits1
Combination of my previous PRs, mostly fixes
2015-12-01 00:46:12 -05:00
EmperorJon
d0ee55a6f1 Merge branch 'master' into 30_Nov._Fix_AI_door_UI 2015-12-01 05:03:32 +00:00
Mark9013100
7a26afb464 Merge branch 'master' into 11/29/2015FixesandEdits1 2015-11-30 23:39:25 -05:00
Datraen
147d743f9c Merge branch 'Devtweaks' of https://github.com/Datraen/Polaris into Devtweaks 2015-11-30 17:41:47 -05:00
Datraen
716401fffc Allows people to see through fake walls when opened, removes that when closed. 2015-11-30 17:41:15 -05: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
Datraen
60764d014f Makes fake-walls not air tight once opened. Fake walls continue to not be air tight after being closed. 2015-11-30 17:14:29 -05: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
Jon
539e9fba9a Changes here (https://github.com/Baystation12/Baystation12/pull/11446) were made when adding some sort of hacking tool.
I don't believe we have these changes, but I do know that our UI for AI doesn't currently work(see #328).
A few of the changes made in the linked Baystation Dev change fix our current UI issues. I'll leave it up to Neerti to decide whether we want to work out and pull what's necessary for the hacking tool, but for now this contains the single changes which appear to fix the bug.
2015-11-30 18:11:33 +00:00
Datraen
6f6cb4661f Merge branch 'master' into Devtweaks 2015-11-29 22:36:08 -05:00
Datraen
3506e0861c Fixes jumping, adds dev access to msay and ahelps. 2015-11-29 22:34:00 -05:00
Neerti
75c574eddd Adds verb to toggle hub visibility. 2015-11-29 22:06:05 -05:00
SinTwo
bc2f3ce654 Merge branch 'master' into Moderator 2015-11-29 13:40:27 -05:00