Commit Graph

11842 Commits

Author SHA1 Message Date
mwerezak
a5fd2d386c Fixes #10637 2015-08-14 23:34:24 -04:00
GinjaNinja32
792d6e2864 Merge pull request #10579 from mwerezak/misc
Fixes
2015-08-12 22:21:34 +01:00
HarpyEagle
74f9e6ce63 Fixes #10552 2015-08-12 16:45:45 -04:00
HarpyEagle
7a86d6e658 Fixes #10571
Adds another snowflake electronic item to the can_hold list.
2015-08-12 16:06:31 -04:00
HarpyEagle
19fbc71249 Removes req_amount from stack_recipe_list
The stack_recipe_list datum itself is not used to make anything, so having
a req_amount made little sense. Fixes #10572.
2015-08-12 15:54:16 -04:00
HarpyEagle
3e6889927e Fixes #10500 2015-08-12 15:26:57 -04:00
HarpyEagle
a43f77b070 Gives hydro soil recipe a better name
Gives the hydro soil recipe a name that better conveys it's purpose.
2015-08-12 15:25:01 -04:00
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
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
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
8da78d09e9 Merge pull request #10542 from PsiOmegaDelta/150812-HoloStools
Holodeck stool icon fix.
2015-08-12 10:28:12 -04: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
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
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
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
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
PsiOmega
e4f6436a85 Fixes #10494.
Borgs have their very own custom little headset, so cute.
2015-08-11 21:11:16 +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
Chinsky
7f2d6e8b7f Merge pull request #10434 from Kelenius/ofCablesAndSnowflakes
Of cables and snowflakes
2015-08-11 19:40:45 +03:00
Zuhayr
7bd301161f Merge pull request #9988 from PsiOmegaDelta/150702-SpellFixes
Magical fixes.
2015-08-12 01:54:31 +09:30
PsiOmega
78ffb5835a Misc. 2015-08-11 17:33:03 +02:00
PsiOmegaDelta
edce8f73a4 Removes faulty attempt of garbage collecting. 2015-08-11 14:26:32 +02:00
PsiOmegaDelta
adda1d9448 Fixes #9158.
Neither the value True nor False are null. Removes breaking null check
2015-08-11 14:00:13 +02:00
PsiOmegaDelta
3185005496 Fixes #10410. Fixes #10411.
Removes improper code, that would cause spell projectiles to be deleted pre-maturely as well as cast the spell effect all too often.
Also removes completely unused code.
2015-08-11 13:36:56 +02:00
SomeoneElse
8c0984d5b1 Fix gender issues, some typos from various files 2015-08-11 13:41:40 +03:00
PsiOmegaDelta
54162f1c7d Merge remote-tracking branch 'upstream/dev-freeze' into 150702-SpellFixes 2015-08-11 12:20:54 +02:00
PsiOmegaDelta
211a427d65 Crew monitor balance and lag fixes.
Creates a central repository for crew data. This repository only updates data as necessary and only every 5th second, no matter how many times it is requested.
Reduces any lag caused by having multiple crew monitor windows open and as a bonus gives antags a larger window of opportunity for disabling sensors before detection of harm.
2015-08-11 09:27:18 +02:00
PsiOmegaDelta
e1aff6a668 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/machinery/doors/door.dm
	code/game/machinery/portable_turret.dm
2015-08-11 08:21:06 +02:00