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
mwerezak
ed7c8f6513
Fixes #10517
...
Also changes the eng break room chairs back to brown and lowers the
amount of phoron glass in the workshop to be just enough to replace the
SM core.
2015-08-12 00:46:24 -04:00
mwerezak
4518c976d8
Fixes engineering outpost shuttle dock
...
Fixes mismatched tags on the sensor and pumps and incorrect frequencies
on the access buttons. Fixes #10506 .
Also includes some cosmetic mapping changes to the engineering outpost,
tones down the number of r-walls a bit.
2015-08-12 00:36:32 -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
mwerezak
0c94f1d84d
Merge pull request #10533 from GinjaNinja32/gamemode
...
fix malf not working
2015-08-12 00:11:19 -04: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
f04d2be27f
Merge pull request #10502 from PsiOmegaDelta/150811-StackedTables
...
Fixes #10496 .
2015-08-11 20:55:33 +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
728105b49b
Fixes #10496 .
...
Apparently stacking tables causes one of them to self-terminate into sheets.
Removes the stacked tables in the engineering docking area.
2015-08-11 21:36:34 +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
PsiOmegaDelta
e7622efca4
Merge pull request #10491 from PsiOmegaDelta/150811-Changelog
...
Updates the changelog.
2015-08-11 20:04:10 +02:00
GinjaNinja32
650b4a7759
Merge pull request #10489 from PsiOmegaDelta/150811-FromZeroToHero
...
Fixes #10488 .
2015-08-11 18:57:27 +01:00
GinjaNinja32
6fa5d2d81e
Merge pull request #10490 from GinjaNinja32/dev
...
dev...dev-freeze
2015-08-11 18:55:39 +01:00
PsiOmega
59f855b52d
Updates the changelog.
2015-08-11 19:55:25 +02:00
GinjaNinja32
005dcda1d5
Macro count update, fixes span tag
2015-08-11 18:52:24 +01:00
GinjaNinja32
ea76feb3cd
Compile fix
2015-08-11 18:47:25 +01:00
GinjaNinja32
631ff21980
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/game/objects/items/weapons/implants/implantcase.dm
code/game/objects/items/weapons/melee/energy.dm
code/modules/mob/living/carbon/human/emote.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/silicon/robot/drone/drone.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/nano/modules/crew_monitor.dm
code/modules/organs/organ_internal.dm
2015-08-11 18:47:05 +01: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
Zuhayr
a40e84f34a
Merge pull request #10480 from PsiOmegaDelta/dev
...
Dev
2015-08-12 02:39:25 +09:30
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
mwerezak
bc1c062c83
Merge pull request #10486 from Karolis2011/wikilinkfix
...
Updated old wiki links to a new ones.
2015-08-11 12:42:24 -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
Zuhayr
fab3939423
Merge pull request #10481 from PsiOmegaDelta/150811-CrewEfficiency
...
Crew monitor balance and lag fixes.
2015-08-12 01:18:32 +09:30
PsiOmega
78ffb5835a
Misc.
2015-08-11 17:33:03 +02:00
Karolis2011
cc029828bb
Updated old wiki link to a new one.
2015-08-11 17:20:55 +03:00
mwerezak
9b00b217e4
Merge pull request #10482 from Kelenius/ofImplantsAndSyringes
...
Fixes #10466 - chem implant can't be loaded
2015-08-11 08:36:54 -04:00
Zuhayr
d672278ad2
Merge pull request #10485 from PsiOmegaDelta/150811-CameraFix
...
Fixes #9158 .
2015-08-11 22:01:44 +09:30
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
Atlantis
d63d2817a1
Fixes #10136
...
- Quick fix for #10136 , laptops now use the #define-d values rather than hardcoded strings. Camera net keys work again properly.
- I also adjusted laptop's power usage. With how it used to be, you could buy laptop and let it run for whole shift, never having to recharge even with weakest cell. Right now, it lasts about 10 minutes on worst cell, and almost one hour on the best one. Actual power usage (in watts) is slightly lower than stationbound consoles.
2015-08-11 12:42:26 +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
f85e9146ab
Fixes #10468 . Fixes #10467 .
...
Updates the DNA name as well, upon antag name change.
2015-08-11 12:11:32 +02:00
PsiOmegaDelta
56382e8806
Changelog entry.
2015-08-11 09:37:38 +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
Kelenius
1324e69a19
Fixes #10466 - chem implant can't be loaded
...
What the literal shit.
2015-08-11 10:26:22 +03:00
PsiOmegaDelta
4bb6749f24
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-11 08:34:46 +02:00
PsiOmegaDelta
8c14f7738e
Merge pull request #10479 from PsiOmegaDelta/dev-freeze
...
Dev freeze
2015-08-11 08:34:00 +02:00