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
Chinsky
1927d1744f
Fixes #11667
2015-12-12 13:57:26 +03:00
SkyMarshal
a97da84b18
Fixes #11093
...
Also fixes a runtime error trying to disposal monkeys and the like. It was doing a type check too late.
2015-12-11 21:32:00 -07:00
SkyMarshal
eae12b8f9c
Fixes #8568
2015-12-11 19:52:18 -07:00
SkyMarshal
02d1a875d1
Fixes #7075
...
Disposal holders will now be emptied if they get expelled from a disposal pipe, instead of sitting there hoarding their contents.
2015-12-11 18:26:52 -07:00
PsiOmegaDelta
19ad46230e
Merge pull request #11659 from atlantiscze/11-12-2015-dual-ui-fix
...
Fixes #11456
2015-12-11 13:36:22 +01:00
Atlantis
b13e445b40
Fixes #11456
...
- Fixes #11456 by using wires.Interact() rather than current method.
2015-12-11 13:29:42 +01:00
Atlantis
ac0e70612f
Fixes #11621
...
- Fixes #11621 by ensuring reference to analyzed object is nulled even if the analyzed object is not reliable enough
- Adds feedback message that warns the user that analyzed item wasn't reliable enough.
2015-12-11 12:15:53 +01:00
GinjaNinja32
0f2b17f7bb
fix #11631
2015-12-10 13:01:06 +00:00
PsiOmegaDelta
c4d6a76887
Merge pull request #11649 from Baystation12/master
...
Dev-freeze
2015-12-10 08:21:43 +01:00
Zuhayr
e9cdc8a0f5
Fixes #9257
2015-12-10 11:57:34 +10:30
Zuhayr
7a9d7bf0c9
Fixes #10753
2015-12-10 10:41:48 +10:30
Zuhayr
f1630108db
Fixes #10915
2015-12-10 10:32:35 +10:30
Zuhayr
d5447d9e95
Fixes #10838
2015-12-10 10:23:49 +10:30
Zuhayr
d6514ff2f2
Merge pull request #11646 from Ccomp5950/ninja_VANISH
...
Ninjas teleporter: Checks Z levels and distance.
2015-12-10 09:54:49 +10:30
ccomp5950
f6f6a4ef87
Ninjas teleporter: Checks Z levels and distance.
...
Ninjas are able to use a camera console and teleport across the map. This resolves that.
2015-12-09 17:27:27 -05:00
GinjaNinja32
a1f22d19b2
Merge pull request #11640 from PsiOmegaDelta/151209-LoadoutSafetyMeasures
...
Gear loadout sanity checking.
2015-12-09 21:34:48 +00:00
GinjaNinja32
1a46db4aaf
fix #11637
2015-12-09 17:04:24 +00:00
PsiOmegaDelta
12b9d30923
Gear loadout sanity checking.
...
Adds gear loadout sanity checking to reduce the risk of https://github.com/PolarisSS13/Polaris/issues/376 from happening, as well as ' /datum/'.
2015-12-09 12:27:41 +01:00
Hubblenaut
706e12e9ab
Camera Hotfix
2015-12-09 09:03:01 +01:00
GinjaNinja32
0b76c62a8d
Merge pull request #11632 from Ccomp5950/fix_nvgs_and_shit_that_changes_see_invis
...
Fixes NVGs and other items that change see_invis.
2015-12-08 08:13:45 +00:00
PsiOmegaDelta
0f986b0098
Compilation fixes.
2015-12-08 08:10:59 +01:00
PsiOmegaDelta
5fcf13ac55
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/surgery_limbattachment.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/organs/organ.dm
code/modules/organs/organ_external.dm
code/setup.dm
2015-12-08 08:09:37 +01:00
ccomp5950
c919aabfd5
Fixes NVGs and other items that change see_invis.
...
I blame a bad merge or something. There is no reason for vision changes to be made in this part of the code.
2015-12-08 01:05:46 -05:00
Chinsky
1e5d6f9f57
Merge pull request #11567 from PsiOmegaDelta/151202-PlasmaCuttingPower
...
Adds energy costs to some rig equipment.
2015-12-07 19:58:19 +03:00
Chinsky
b1ec8253a1
Merge pull request #11587 from PsiOmegaDelta/151204-WizardsAreTheWorst
...
Wizard spell Destroy() additions.
2015-12-07 19:55:02 +03:00
