Commit Graph

20570 Commits

Author SHA1 Message Date
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
Hubblenaut
d1f14cd16d Fixes duplicate gas layers 2015-12-15 13:42:31 +01:00
PsiOmegaDelta
a2d2a092c5 All the macros. 2015-12-13 15:19:14 +01:00
Dibasic
1e06889ef1 Fixes window 'bang' typo
Fixes the typo when harm-intent clicking a window with your bare hand:

<You bang against the window!

to:

You bang against the window!
2015-12-13 15:06:14 +01:00
PsiOmegaDelta
b31a5ba836 Compilation fixes. 2015-12-13 10:21:00 +01:00
PsiOmegaDelta
f382626075 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/asteroid.dm
	code/game/verbs/ooc.dm
	code/modules/admin/verbs/icarus.dm
	code/modules/mob/living/silicon/robot/robot_items.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/random_map/random_map.dm
	code/setup.dm
2015-12-13 10:15:29 +01:00
Chinsky
911498fc32 Merge pull request #11679 from Baystation12/GinjaNinja32-patch-1
fix slime core injecting not working
2015-12-13 11:05:16 +03:00
Chinsky
939f62adc2 Merge pull request #11680 from SkyMarshal/melty-grenades
Chem grenades are no longer melted by acid.
2015-12-13 11:05:07 +03:00
SkyMarshal
415f78ee18 Chem grenades are no longer melted by acid.
Fixes #10478
2015-12-12 16:29:05 -07:00
PsiOmegaDelta
9332e39ef9 Merge pull request #11665 from SkyMarshal/monkeying-with-disposals
Fixes #11093
2015-12-12 23:32:58 +01:00
GinjaNinja32
972942552e Merge pull request #11676 from Kearel/mindswapfix
Fixes #10550
2015-12-12 22:24:45 +00:00
Joseph Heinemeyer
a5b0f86c19 s/"help"/I_HELP/g 2015-12-12 15:24:13 -07:00
GinjaNinja32
ddf66a5f39 fix slime core injecting not working 2015-12-12 21:56:37 +00:00
PsiOmegaDelta
6f75954863 Merge pull request #11678 from SkyMarshal/newscaster-silliness
Admin created newscaster channels now function correctly.
2015-12-12 22:51:48 +01:00
SkyMarshal
f9af885ee1 Admin created newscaster channels now function correctly.
Fixes #8326
2015-12-12 14:32:22 -07:00
SkyMarshal
d10118e3d0 Fixes #11346
Fixes #8123

Removes adminbus ability to call down the Icarus... because it's pretty broken.
2015-12-12 12:03:15 -07:00
Kearel
6c3972f979 Fixes #10550
From what I could tell the bugs were caused by the HUD not being removed
and spells not being properly removed from players.
2015-12-12 12:47:08 -06:00
PsiOmegaDelta
fd14a90c34 Merge pull request #11673 from comma/dev-freeze
Impulse directions and zombie vomit
2015-12-12 16:38:36 +01:00
Chinsky
637abb5d12 Fixes #10597 2015-12-12 15:29:10 +03:00
Chinsky
0a4ebb2765 Fixes #10751 Thrown items now use last_move direction isntead of neverchanging dir 2015-12-12 15:29:08 +03:00
PsiOmegaDelta
db9615f94d Merge pull request #11672 from comma/tooreal
Fixes #9091
2015-12-12 12:47:07 +01:00
PsiOmegaDelta
a731571d60 Merge pull request #11670 from comma/norandom
Fixes #9197
2015-12-12 12:45:13 +01:00
Chinsky
8940705921 Fixes #9091 2015-12-12 14:40:51 +03:00
Chinsky
e89eae05bb Fixes #9197 2015-12-12 14:23:00 +03:00
Chinsky
37a93231d6 Fixes #8741 2015-12-12 14:09:59 +03:00