Commit Graph

21285 Commits

Author SHA1 Message Date
Jon 1a94dea2ea Allows you to define a base turf for an area which overrides the z-level's base turf in unsorted.dm.
It will first check to see if the turf is set, and if not it will still use the z-level default.
This means we can mark areas as having a base of space to override the z-level base of asteroid that we're using.
As a result, we can ensure the bombs, shuttles moving, etc. leave behind an space turf by defining shuttles, solars/"external" areas as using space as a base.
Areas will need to be updated to check with base_turf = /turf/space and references to the old get_base_turf proc updated so all calls (bombs, Nar'Sie, deconstruction, etc.) have the correct effect, but it's tired and I want to commit this now so I'm committed to finishing it tomorrow.
2015-12-03 22:51:15 +00:00
Neerti 42bb4aee39 Merge pull request #398 from Neerti/12/2/2015_round_end_salt_mine
Makes round-end last five minutes instead of one.
2015-12-02 21:04:46 -05:00
Neerti 7d1e3c63ab Merge pull request #399 from MagmaRam/clonerfix
Fixes the bug where cloners would spawn corpses
2015-12-02 17:08:19 -05:00
Merchoven 7f9f6cf8e3 Fixes the bug where cloners would spawn corpses
Cloners spawned new clones with enough brain damage to kill them instantly.
I toned down the brain damage done to fix this.
2015-12-02 13:03:04 -06:00
Neerti 79c5f4a1a8 Makes a line more readable. Thanks GinjaNinja32. 2015-12-02 13:22:14 -05:00
Neerti b002a75539 Makes round-end last five minutes instead of one, with a per-minute countdown. 2015-12-02 12:32:28 -05:00
Neerti 29ae1073dd Merge pull request #395 from Hubblenaut/master
Fixes camera repair
2015-12-02 11:40:14 -05:00
Neerti 55107fa50c Merge pull request #381 from EmperorJon/Branch_01_Dec._Fix_hemostat_surgery
Fixes hemostat surgery
2015-12-02 10:11:12 -05:00
PsiOmegaDelta ba423361bd Updates macro/span use. 2015-12-02 15:00:58 +00:00
PsiOmegaDelta 7ef07aeca6 Fixes hemostat surgery.
Port of https://github.com/PolarisSS13/Polaris/pull/381.

# Conflicts:
#	code/modules/surgery/organs_internal.dm
#	code/modules/surgery/robotics.dm
#	code/modules/surgery/surgery.dm
#	polaris.dme
2015-12-02 14:42:41 +00:00
Hubblenaut a0e0f235ab Fixes camera repair 2015-12-02 15:35:27 +01:00
Neerti e0986cb7ab Ballistic weapons will now correctly say that the firing mode was changed. 2015-12-02 08:04:34 -05:00
Neerti d50e2afae9 Merge pull request #387 from Neerti/12/2/2015_fuck-dream-maker-for-its-horrible-search-abilities-because-i-broke-armor-god-damn-how-hard-is-it-to-look-up-if(armor
Fixes armor making melee combat utterly useless.
2015-12-02 06:39:39 -05:00
Neerti c0412094f6 Fixes armor making melee combat utterly useless. 2015-12-02 06:30:20 -05: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
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 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
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
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
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
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
SinTwo 8d747eed8d Moderator Logs 2015-11-29 13:34:00 -05:00