Ccomp5950
c56ec21ee3
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
2014-02-26 09:34:38 -06:00
Ccomp5950
3d88998123
Runtime fix: usr = 0???
...
runtime error: Cannot read 0.item_use_icon
proc name: remove gun icons (/client/proc/remove_gun_icons)
source file: targeting.dm,273
usr: 0
src: Vivalas (/client)
call stack:
Vivalas (/client): remove gun icons()
the taser gun (/obj/item/weapon/gun/energy/taser): dropped(Jonathon Sommer (/mob/living/carbon/human))
Jonathon Sommer (/mob/living/carbon/human): drop r hand(null)
Jonathon Sommer (/mob/living/carbon/human): update canmove()
Jonathon Sommer (/mob/living/carbon/human): Weaken(5)
Jonathon Sommer (/mob/living/carbon/human): Weaken(5)
Jonathon Sommer (/mob/living/carbon/human): apply effect(5, "weaken", 0)
Jonathon Sommer (/mob/living/carbon/human): apply effects(0, 5, 0, 0, 0, 0, 0, 0, 0)
2014-02-24 01:35:04 -06:00
Zuhayr
e870d614c2
Mass correction of controler to controller.
2014-01-25 03:15:13 +10:30
Ccomp5950
570c98f0e2
Runtime fix: N00k agents on spawn were causing a runtime here.
2013-12-07 05:18:27 -06:00
Mloc-Argent
a084f74c7d
Expansion of every "icon = ''" path.
...
Supposed to help compilation times. Who knows.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-09-01 21:53:36 +01:00
Chinsky
4749d6016d
Made syringe gun work with aiming system.
2013-06-01 08:23:38 +04:00
Chinsky
793f472a4f
Should fix quite a few of false positives on gun targeting.
...
Allows mob to click on turfs with empty hand.
2013-06-01 04:11:16 +04:00
Chinsky
1a51aefaac
Fixes #2922
...
Putting gun away now properly lowers aim.
Prevents gun from going off if it's not in active hand.
2013-06-01 04:05:33 +04:00
Chinsky
81a432930b
Bit of refactoring.
...
Moved gun icons adding/deletion in separate procs.
Moved dropping aim in separate procs.
Moved gun empty clicking in separate proc because all the copypaste.
Fixed issues with aim mode HUD icons not being updated in some cases.
Now toggling mode cancels aim properly.
Fixed type in firing message.
2013-03-08 02:56:55 +04:00
Chinsky
5a916019de
Refactored and moved targeting code around a little.
...
Refactored suicide and point blank shooting code to use their projectiles properties instead of huge chain of conditions with arbitrary values.
2013-03-07 00:44:28 +04:00
