Commit Graph

21305 Commits

Author SHA1 Message Date
Hubblenaut
baec8f15d1 Changes to Pushing Mechanics 2015-12-08 15:15:00 +01:00
Hubblenaut
470d2bb54a Fixes stack creation logic and return value 2015-12-04 15:49:31 +01:00
Neerti
69efa14405 Merge pull request #416 from PolarisSS13/12/3/2013_round_end_time_reduction
Reduces round-end timer from five to three minutes.
2015-12-04 01:49:27 -05:00
MagmaRam
e7952d2334 Halves light necessary for diona to live
Halves the amount of light diona need to feed/maintain health/whatever.
Shouldn't affect the rate at which they do these things, it should only touch
the rate.
2015-12-03 23:20:12 -06:00
Neerti
b05b34c8e7 Merge pull request #414 from MagmaRam/disposals_fix
Fix for disposal pipes not vanishing under floors.
2015-12-03 22:36:06 -05:00
Neerti
5333ba66af Reduces round-end timer from five to three minutes. 2015-12-03 22:34:34 -05:00
Earthcrusher
61c8140c01 My first contribution to Polaris! Adds a few new brands of cigarettes to vending machines. 2015-12-03 21:20:11 -06:00
Merchoven
5b3dadfe69 Fix for disposal pipes not vanishing under floors.
This is a fix for issue #291. Disposals pipes should now properly stop
displaying when a floor is placed on top of them.
2015-12-03 21:03:46 -06:00
Mark9013100
6e0b906e23 Adds Security/Medical cargopacks. 2015-12-03 20:22:12 -05:00
SinTwo
6c59f7f6ff Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sin2clothes 2015-12-03 18:29:05 -05:00
SinTwo
700ee6177b Clothes Addition, Captain alt title, custom loadout tweakes. 2015-12-03 18:25:45 -05:00
EmperorJon
1a1873d8b3 Merge pull request #410 from EmperorJon/03_Dec._Add_area_base_turf
Allows you to define a base turf for an area
2015-12-03 22:59:39 +00:00
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
c137d40484 Makes stating laws over binary work again. 2015-12-03 14:16:01 -05:00
Neerti
58149b8f4d Replaces :b with #b whenever a synthetic mob joins the game. 2015-12-03 14:02:56 -05:00
Neerti
2b1ff40189 Merge pull request #407 from Neerti/12/3/2015_exodus_from_the_exodus
Removes most references of NSS Exodus.
2015-12-03 13:54:29 -05:00
Neerti
2c81761494 Removes most references to NSS Exodus. 2015-12-03 13:47:37 -05:00
Neerti
e528bb13cb Removes references to Lesser Form, a power that no longer exists. 2015-12-03 13:26:50 -05:00
Neerti
de8db6f909 Merge pull request #405 from Neerti/12/3/2015_psi_is_most_ideal_fixes_handcuffs
Fixes handcuffs.
2015-12-03 13:10:35 -05:00
SinTwo
c9db7fdab1 Fixes Voidsuit Helmets 2015-12-03 12:48:53 -05:00
PsiOmegaDelta
2d39621801 Makes it possible to ignore some incapacitation checks.
This fixes  #11576. Also corrects the viewers() usage in visible_message.

Conflicts:
	code/__defines/mobs.dm
	code/modules/mob/living/carbon/resist.dm
2015-12-03 12:37:30 -05: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