PsiOmegaDelta
dbe840b32e
Merge pull request #11811 from Baystation12/master
...
Dev-freeze.
2015-12-29 14:13:28 +01:00
GinjaNinja32
3dfb821eed
add revision topic call
2015-12-28 17:25:37 +00:00
PsiOmegaDelta
949d3d0c7f
Merge pull request #11770 from Baystation12/master
...
Dev-feeeze
2015-12-28 16:32:46 +01:00
ccomp5950
8614484408
Hidden doors when open can be seen through.
...
Fixes #11765
2015-12-27 19:17:21 -05:00
PsiOmegaDelta
45a55db766
Merge pull request #11761 from Baystation12/master
...
Dev-freeze
2015-12-27 16:04:26 +01:00
mwerezak
8b685fdf8f
Fixes #11380
2015-12-27 01:39:34 -05:00
mwerezak
b30f81c7ea
Fixes #11381
2015-12-27 01:28:41 -05:00
Chinsky
976666dcc9
Merge pull request #11747 from PsiOmegaDelta/151224-ByeByeForeverClown
...
Fixes #11745 .
2015-12-26 19:24:47 +03:00
PsiOmegaDelta
da0a4c47cf
Merge pull request #11756 from Baystation12/master
...
Dev-freeze
2015-12-26 11:58:42 +01:00
Zuhayr
4169bac4cb
Merge pull request #11754 from PsiOmegaDelta/151225-StackThoseCablesRightHereRightNow
...
Can now join compatible cable coils of any type.
2015-12-26 18:23:43 +10:30
PsiOmegaDelta
faec92b553
Can now join compatible cable coils of any type.
...
Partial backport of #11656 . Fixes #10935 .
2015-12-25 11:19:59 +01:00
GinjaNinja32
7cca8416b3
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-12-25 03:41:33 +00:00
Zuhayr
d5124057fe
Merge pull request #11751 from GinjaNinja32/master-examine
...
fix human examine gender
2015-12-25 14:05:06 +10:30
GinjaNinja32
04006f5b9e
fix human examine gender
2015-12-25 01:06:35 +00:00
GinjaNinja32
34b8c99d52
backport fix for #10705 from dev
...
fix #10705
2015-12-25 00:56:16 +00:00
PsiOmegaDelta
b0aa56089e
Fixes #11745 .
2015-12-24 19:11:32 +01:00
PsiOmegaDelta
6617ab6bf9
Merge pull request #11744 from Ccomp5950/fix_ai_malf_dualism
...
AI Malf will no longer be able to spawn a non-antag AI
2015-12-24 19:10:34 +01:00
ccomp5950
ccda750ee1
AI Malf will no longer be able to spawn a non-antag AI
...
fixes #10554
2015-12-24 12:26:56 -05:00
GinjaNinja32
0bd51d2712
make vote window closeable via normal means
2015-12-24 05:28:18 +00:00
Sebastian Broberg
90f27ca42c
Fixes chemgrenades
...
Fixes #11686
2015-12-23 23:46:53 +01:00
Zuhayr
53b2c6be80
Merge pull request #11737 from PsiOmegaDelta/151223-Paralysis
...
Adds a paralyze button for easier administration
2015-12-23 23:28:37 +10:30
PsiOmegaDelta
70b84d87a6
Tweaks permission rights.
2015-12-23 13:01:03 +01:00
Datraen
65f68602e7
Adds a longer timer to paralyze, allows for other mobs to fall under this proc.
...
Conflicts:
code/modules/admin/admin.dm
2015-12-23 12:57:43 +01:00
Datraen
c5912b988c
Adds a paralyze button for easy administration.
...
Conflicts:
code/modules/admin/admin.dm
2015-12-23 12:56:48 +01:00
PsiOmegaDelta
f54dd94a66
Merge pull request #11735 from Baystation12/master
...
Dev-freeze
2015-12-23 11:33:35 +01:00
Atlantis
9fa1513647
Fixes AI's Examine()
...
- Message about AI's backup power now only show when the AI still lacks external power.
2015-12-23 00:57:54 +01:00
PsiOmegaDelta
d7eaed8c67
Span correction.
2015-12-22 10:59:33 +01:00
PsiOmegaDelta
3cf0a0e182
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-12-22 10:46:55 +01:00
GinjaNinja32
ea6cdd4f65
Merge pull request #11724 from Ccomp5950/I_Feel_NOTHING
...
Fixes the icon for numbness.
2015-12-22 03:00:51 +00:00
GinjaNinja32
ae7f59a23f
Merge pull request #11725 from Ccomp5950/stumpy
...
Stumpy hands and arms can no longer pull stuff out of bags and such.
2015-12-22 03:00:21 +00:00
GinjaNinja32
073ef62976
Merge pull request #11723 from Ccomp5950/canisters
...
Canisters now work in unpowered areas.
2015-12-22 02:59:55 +00:00
ccomp5950
fe62634775
Stumpy hands and arms can no longer pull stuff out of bags and such.
...
Resolves #11404
2015-12-21 17:56:30 -05:00
ccomp5950
5873a92df8
Fixes the icon for numbness.
...
Resolves #11435
2015-12-21 15:30:26 -05:00
ccomp5950
d574d60e26
Canisters now work in unpowered areas.
2015-12-21 15:00:25 -05:00
PsiOmegaDelta
c78f98754a
Utensils now respect the lack of mouths, and has a delay on feeding others.
2015-12-20 11:46:42 +01:00
PsiOmegaDelta
5d3d0c5dc3
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/material/kitchen.dm
2015-12-20 11:22:08 +01:00
ccomp5950
ce3587d867
Hallucinations no longer burn on the SuperMatter
2015-12-19 21:33:02 -05:00
Zuhayr
593759b4e3
Merge pull request #11713 from PsiOmegaDelta/151219-AIQdels
...
AI qdel() improvements.
2015-12-20 11:15:10 +10:30
PsiOmegaDelta
378f62b81e
AI qdel() improvements.
...
AI destruction now cleans up more of its held objects and variables.
Fixes some issues with the AI powersupply qdel().
Fixes #11710 .
2015-12-19 11:45:24 +01:00
Chinsky
4a0d121f25
Merge pull request #11702 from PsiOmegaDelta/151217-PolarFixesMaster
...
No verbose cantouch check when not climbable
2015-12-19 03:13:45 +03:00
Loganbacca
07e81c059c
Fixed bullets traveling diagonally through windows
...
- Fixes #11465
2015-12-18 20:12:46 +13:00
Hubblenaut
56d8975a19
Tweaks Filtering and Toxic Gases
2015-12-17 17:50:30 +01:00
Hubblenaut
dc2ad43dc5
No verbose cantouch check when not climbable
2015-12-17 17:44:04 +01:00
Spamcat
905070bc96
\the
2015-12-16 20:30:26 +03:00
Spamcat
8df6ee3318
\red >> styles
2015-12-16 20:21:10 +03:00
Spamcat
485a2fdd45
Made kitchen utensils less dangerous.
...
#11370
2015-12-16 20:07:35 +03:00
Spamcat
f2ac9a023b
pAIs no longer see custom emotes twice.
...
fuck i spent way too much time on a single line fix
2015-12-16 19:36:14 +03:00
Spamcat
a515f0469a
Wrenched opwn welding tanks now explode when exposed to fire.
...
#11537
2015-12-16 17:59:05 +03:00
PsiOmegaDelta
f62f24e1ac
Removes Stat() sleep.
...
Fixes a Stat() runtime that occasionally occur if the client was logged out when the sleep() was done sleeping.
Fixes delays when using alt+Turf click.
Makes the alt+Turf click panel only update when viewed instead. Seems like the better performance fix option in general.
Makes the alt+Turf click panel always use the "Turf" name, consistency.
2015-12-16 13:24:40 +01:00
PsiOmegaDelta
df6972dbbb
Merge pull request #11695 from Baystation12/master
...
Dev-freeze
2015-12-16 10:51:05 +01:00
