Commit Graph

19656 Commits

Author SHA1 Message Date
mwerezak
5b6c5ee5ce Merge pull request #10570 from Zuhayr/master
Couple of fixes.
2015-08-12 15:00:36 -04:00
Zuhayr
5f17cf4397 Merge pull request #10568 from SparklySheep/patch-14
Fixes #10532
2015-08-13 04:18:23 +09:30
Zuhayr
64a89fc5e4 Removes seed colour from nymphs. 2015-08-13 03:33:28 +09:30
Zuhayr
9831aede3f Fixes drone pulling. 2015-08-13 03:31:57 +09:30
PsiOmegaDelta
94e3fe6f5f Merge pull request #10567 from mwerezak/fire-cooling-fix
Fixes carbon fire_act()
2015-08-12 19:54:42 +02:00
Chinsky
8c8c2bce85 Merge pull request #10503 from PsiOmegaDelta/150811-BorgSpawnRuntime
Fixes a borg spawn runtime.
2015-08-12 20:42:04 +03:00
Chinsky
0e52b3d4df Merge pull request #10562 from PsiOmegaDelta/150812-OneCrew
Fixes the One Crew Member module.
2015-08-12 20:38:52 +03:00
Chinsky
069de7dcb6 Merge pull request #10560 from PsiOmegaDelta/150812-CorrectTypeCheck
Prevents APC wires from being displayed to the AI.
2015-08-12 20:38:34 +03:00
Chinsky
e562affd13 Merge pull request #10551 from PsiOmegaDelta/150812-RuntimeFixes
Runtime fixes.
2015-08-12 20:38:20 +03:00
SparklySheep
27296e7caf Update preferences_gear.dm 2015-08-12 12:13:28 -05:00
SparklySheep
cefd32fa69 Update glasses.dm 2015-08-12 12:09:00 -05:00
HarpyEagle
a62edc5b3a Fixes #10548 2015-08-12 12:21:28 -04:00
HarpyEagle
9609ce0b0d Fixes #10546 2015-08-12 12:06:31 -04:00
HarpyEagle
1e8e0547e4 Fixes carbon fire_act()
Caused fire to actually cool down the mob if the mob was already hotter
than the exposed temperature.
2015-08-12 11:58:11 -04:00
Zuhayr
4db1a553f2 Merge pull request #10556 from PsiOmegaDelta/150812-Stripping
Adds sanity checks for stripping.
2015-08-13 00:39:41 +09:30
mwerezak
565ccc2baa Merge pull request #10545 from PsiOmegaDelta/150812-QdelFix
Qdels the photo dummy.
2015-08-12 10:29:41 -04:00
mwerezak
db71f6a03d Merge pull request #10541 from PsiOmegaDelta/150812-BotCheck
Re-adds missing bot check.
2015-08-12 10:28:45 -04:00
mwerezak
8da78d09e9 Merge pull request #10542 from PsiOmegaDelta/150812-HoloStools
Holodeck stool icon fix.
2015-08-12 10:28:12 -04:00
PsiOmegaDelta
249db0b03d Fixes the One Crew Member module.
Didn't return properly in install().
Override transmitInstructions() when addAdditionalLaws() was more than sufficient.
2015-08-12 14:42:52 +02:00
PsiOmegaDelta
1b7b69306c Prevents APC wires from being displayed to the AI.
Restores and makes the mob type check more specific. Fixes #10559.
2015-08-12 13:34:12 +02:00
PsiOmegaDelta
67c79e7a1b Adds sanity checks for stripping.
Mobs can no longer strip other mobs while prone, unconscious, or buckled down. Fixes #10553.
2015-08-12 13:12:52 +02:00
PsiOmegaDelta
3e4ec4d7b7 NanoUI windows now close on Destroy(), preventing all sorts of qdel issues. 2015-08-12 09:41:22 +02:00
PsiOmegaDelta
93e666e67c Adds a missing not-null check that is made in another case. 2015-08-12 09:22:46 +02:00
PsiOmegaDelta
3bba0f95b1 Qdels the photo dummy. 2015-08-12 09:14:36 +02:00
PsiOmegaDelta
48d5e73729 Fixes an observer runtime. 2015-08-12 09:10:16 +02:00
PsiOmegaDelta
7031ff0b43 Fixes human spawn runtime.
Similar to #10503.
2015-08-12 09:07:48 +02:00
PsiOmegaDelta
3cb6b1ca79 Holodeck stool icon fix.
Backports the icon state change from dev. Fixes #10515.
2015-08-12 08:33:57 +02:00
PsiOmegaDelta
32338716bf Re-adds missing bot check.
Not all bots are of the type /mob/living/bot yet. Re-adds the /obj/machinery/bot-type check on airlock bump.
Fixes #10507.
2015-08-12 08:28:39 +02:00
PsiOmega
da6a3e98d8 Fixes a borg spawn runtime.
Adds client check to prevent null.statpanel runtime.
2015-08-12 08:04:11 +02:00
GinjaNinja32
8915edcce2 Merge pull request #10537 from mwerezak/mapping-fixes
Fixes and mapping
2015-08-12 06:39:30 +01:00
mwerezak
341e6c22ff Merge pull request #10538 from GinjaNinja32/debug
Debug code to try to figure out the cause of the player-panel etc breaking
2015-08-12 01:21:29 -04:00
mwerezak
a90e1f3f7e Fixes #10501
Also future proofs spaceheaters
2015-08-12 01:16:08 -04:00
GinjaNinja32
9dacc146cd Debug code to try to figure out the cause of the player-panel etc breaking 2015-08-12 06:15:06 +01:00
mwerezak
c70544f021 Fixes #10509 2015-08-12 00:58:40 -04:00
PsiOmegaDelta
163ac0de1e Merge pull request #10521 from GinjaNinja32/mirror_gender
Mirrors no longer check the user's gender when finding the list of valid hairstyles
2015-08-12 06:26:45 +02:00
GinjaNinja32
5a1c80d843 Fix for non-ANTAG_OVERRIDE_JOB antags breaking with malf fix 2015-08-12 05:06:18 +01:00
GinjaNinja32
54930b69b4 Malfunction 2015-08-12 04:41:59 +01:00
GinjaNinja32
41965d93ef Mirrors no longer check the user's gender when finding the list of valid hairstyles 2015-08-12 01:00:43 +01:00
GinjaNinja32
056a14f4f4 Merge pull request #10504 from PsiOmegaDelta/150811-ForcedHardwareAcceleration
Forces hardware acceleration.
2015-08-11 20:54:02 +01:00
PsiOmega
242c9444ef Forces hardware acceleration.
Most likely also fixes the hickup where BYOND still rending lights are blobs of light despite having hardware acceleration enabled.
Ports https://github.com/ParadiseSS13/Paradise/pull/1690. Fixes #10147 as much as it can be fixed I believe.
2015-08-11 21:47:07 +02:00
Zuhayr
e29a9ce89c Merge pull request #10499 from PsiOmegaDelta/150811-BorgRadio
Fixes #10494.
2015-08-12 04:46:23 +09:30
PsiOmega
e4f6436a85 Fixes #10494.
Borgs have their very own custom little headset, so cute.
2015-08-11 21:11:16 +02:00
PsiOmega
862fad60c2 Fixes #10488.
A simple matter if incorrect type definition.
2015-08-11 19:36:02 +02:00
Chinsky
076e7d6788 Merge pull request #10432 from Baystation12/dev-freeze
Dev freeze -> Master
2015-08-11 20:13:49 +03:00
Chinsky
7b1656f40c Merge pull request #10470 from Karolis2011/dev-freeze
[Dev-Freeze] Replace \red with <span> in runes.dm, fix many "his/her/their" gender messages
2015-08-11 20:07:06 +03:00
Zuhayr
20e7ee0b71 Merge pull request #10111 from mwerezak/eye-attack
Makes grab eye attacking respect species lore better
2015-08-12 02:36:50 +09:30
mwerezak
8064a76f39 Merge pull request #10484 from atlantiscze/laptop-quickfix
Fixes #10136
2015-08-11 13:06:32 -04:00
Chinsky
7f2d6e8b7f Merge pull request #10434 from Kelenius/ofCablesAndSnowflakes
Of cables and snowflakes
2015-08-11 19:40:45 +03:00
Chinsky
4c628ff2c5 Merge pull request #10483 from PsiOmegaDelta/150811-AntagName
Fixes #10468 and #10467
2015-08-11 19:39:15 +03:00
Zuhayr
7bd301161f Merge pull request #9988 from PsiOmegaDelta/150702-SpellFixes
Magical fixes.
2015-08-12 01:54:31 +09:30