Commit Graph

12990 Commits

Author SHA1 Message Date
Jon
7993d10a3b I'm a moron and this will teach me to not lazy copypaste. 2015-12-05 18:22:48 +00:00
Jon
cb62041cad Adds an "emo fringe" hairstyle that's just emo long without the long bits. I quite like it so whatever. 2015-12-05 15:38:54 +00:00
sabess
dc816938ae Adds some hairstyles! 2015-12-06 01:56:29 +11:00
GinjaNinja32
944b1255e4 add verbs to allow players to spin their view 2015-12-05 10:52:29 +00:00
EmperorJon
f6cb53835c Merge pull request #429 from EmperorJon/05_Dec._Update_main_z_level_space_areas
Updates all get_base_turf usages to get_base_turf_by_area.
2015-12-05 04:37:35 +00:00
Jon
85c704676f Updates all get_base_turf usages to get_base_turf_by_area.
This means that instead of the base turf being defined by the z-level, it's now defined by area and defaulted by z-level.

Updates all "shuttle" and "solar" areas to have a base_turf of space.
Updates docking arms 1, 2, and 3 on the main asteroid level to have a base_turf of space.

Other z-levels may still need updating.

This change means that all actions which destroy or dismantle a tile - for example bombs, a singularity, a shuttle leaving, or deconstruction - now leave these new areas as space not asteroid. Future mapping efforts may need to take this into account.
2015-12-05 04:24:17 +00:00
Hubblenaut
470d2bb54a Fixes stack creation logic and return value 2015-12-04 15:49:31 +01: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
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
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
2c81761494 Removes most references to NSS Exodus. 2015-12-03 13:47:37 -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
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
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
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
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
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
Mark9013100
7a26afb464 Merge branch 'master' into 11/29/2015FixesandEdits1 2015-11-30 23:39:25 -05: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
Neerti
5b59945032 Fixes gun aiming, adds logging for aiming and firing, and ballistic weapons should no longer be named 'the three round burst' or such. 2015-11-29 12:44:10 -05:00