Zuhayr
2da40e525e
Removed targeting.
2015-12-16 10:09:20 +10:30
PsiOmegaDelta
037e9264e1
Merge pull request #11690 from Baystation12/dev-freeze
...
Dev
2015-12-15 11:51:12 +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
12078c48e9
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/__defines/mobs.dm
code/game/asteroid.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/silicon/robot/robot_modules.dm
code/modules/mob/new_player/preferences_setup.dm
code/modules/recycling/disposal.dm
2015-12-13 10:47:33 +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
36803747a2
Merge pull request #11445 from Kearel/fluff2
...
[FEATURES] Adds entertainment items
2015-12-12 16:49:01 +03: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
0bd13d5617
Merge pull request #11669 from PsiOmegaDelta/151212-DestroyDestroy
...
Observer fixups.
2015-12-12 14:42:05 +03: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
PsiOmegaDelta
f74bd5e1d9
Observer fixups.
...
Adds a proper proc for raising events.
Now only creates the observer lists when an object registers itself.
Multitools now unregister themselves properly from buffers on Destroy().
2015-12-12 12:06:05 +01:00
Chinsky
1927d1744f
Fixes #11667
2015-12-12 13:57:26 +03:00
PsiOmegaDelta
2f73635cf3
Misc fixes.
...
The station alert console no longer uses the old interact proc() to open the window interface.
Makes the records computers use the ui_interact proc to show the window.
This fixes https://github.com/PolarisSS13/Polaris/issues/537 .
The station alert console now registers alarms using the correct procs.
The proper fingerprint type should now be applied during Topic() call (this means that admin observer object NanoUI interactions now have a degree of logging).
2015-12-12 10:59:29 +01: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
Chinsky
39af995c05
Merge pull request #11641 from PsiOmegaDelta/151209-BlobTweak
...
Blob tweaks.
2015-12-12 02:56:43 +03:00
Chinsky
21f8c4aef1
Merge pull request #11645 from PsiOmegaDelta/151209-CableRainbow
...
Now possible to change cable coil color using a multitool.
2015-12-12 02:54:49 +03:00
GinjaNinja32
dbf38872b1
Merge pull request #11660 from PsiOmegaDelta/151211-CargoOutput
...
Adds the missing cargo department to the world Topic() manifest request.
2015-12-11 23:54:32 +00:00
PsiOmegaDelta
4d9b1ffcd0
Adds the missing cargo department to the world Topic() manifest request.
2015-12-11 21:13:49 +01:00
PsiOmegaDelta
a29bbc28c0
Cargo tugs now uses a more finally grained incapacitation check.
2015-12-11 13:48:18 +01: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
PsiOmegaDelta
e0c092fc54
Cleans up the previous commit's use of stacktype.
2015-12-11 11:18:27 +01:00
Hubblenaut
6b37b860d7
Fixes subcategories of cable coils not being mergeable
2015-12-11 11:09:11 +01:00
Hubblenaut
3127ee28b5
Fixes subcategories of floor tiles not being placable
2015-12-11 11:08:36 +01:00
Datraen
6120e09684
Fixes the inability to use cargo tugs
2015-12-11 11:08:00 +01:00
Kearel
9450680b1c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2
2015-12-10 13:04:52 -06:00
GinjaNinja32
0f2b17f7bb
fix #11631
2015-12-10 13:01:06 +00:00
PsiOmegaDelta
5ffa49d994
Blob tweaks.
...
The blob no longer holds the entire obj process hostage while it sleeps.
The blob now respects its own growth limit. Fixes #11627 .
Blobs still grow in an X-shape but this should now be much less distinct.
2015-12-10 13:20:20 +01:00
GinjaNinja32
1979a909d4
Merge pull request #11651 from Zuhayr/dev
...
Forensics fixes/tweaks.
2015-12-10 10:44:01 +00:00
