Commit Graph

28 Commits

Author SHA1 Message Date
PsiOmegaDelta
851d5423f3 Merge pull request #8971 from mwerezak/burst-fire
Gun firemode system, burst firing
2015-04-28 20:24:03 +02:00
mwerezak
e93e9c1434 Expands firemodes to include energy gun settings
Expands on firemodes to include settings for the egun/adv egun,
floraray, and pulse rifle.

By default attack_self() now cycles firemodes for any gun. Updates
several projectile guns in a desperate attempt to avoid the need for an
unload ammo verb.
2015-04-28 02:06:54 -04:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
GinjaNinja32
d4eb42b38b Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/projectiles/targeting.dm
2015-04-13 12:49:07 +01:00
Chinsky
d6d005db6a Fixes #8550 2015-04-13 06:41:58 +03:00
Loganbacca
2063ebb8d8 Reflex runtime fix
- Fixed runtime when reflex shooting targets
- Fixed runtime when stopping aiming at a target which has lost its connected client
2015-04-05 23:42:01 +12:00
Mustafa Kalash
3c767c50fa Refactors 2015-04-03 21:33:33 -04:00
Mustafa Kalash
94a56e3c2b Adds a toggle for allowing a target to use a radio (handheld or headset.) 2015-04-03 17:42:16 -04:00
Zuhayr
c3eb6102b4 Added a few null checks. 2015-04-01 17:15:59 -07:00
mwerezak
9b2f5cea33 Merge remote-tracking branch 'upstream/dev' into inventoryfix
Conflicts:
	code/game/gamemodes/revolution/rp-revolution.dm
	code/game/machinery/kitchen/juicer.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/structures/stool_bed_chair_nest/stools.dm
	code/modules/destilery/main.dm
	code/modules/hydroponics/biogenerator.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/carbon/monkey/inventory.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm
2015-03-31 01:37:55 -04:00
mwerezak
1b4e13aabc Removes unnecessary and cruft procs from mob/inventory.dm 2015-03-30 05:28:09 -04:00
PsiOmega
464d702d4b Mob refactoring.
Updates Bump() code.
Intents now use constants.
Simple animals can now use languages without overriding say().
There is now a difference between being able to smash normal and reinforced walls.
Reworks simple_animal/attackby so that constructs don't need to override it simply to add damage resistance.
2015-03-29 10:44:31 +02:00
mwerezak
931213fb7e Adds targeting hotkey 2015-02-11 22:54:40 -05:00
mwerezak
611a42bb33 Gun cleanup and rewrite
Rewrites gun.dm. Reorganizes the firing procedure into logical procs and cleans up some unnecessary variables or demotes them to the subtypes that actually care. Energy weapons that create their own projectiles no longer care about in_chamber. Launcher support is much more natural now.

Cleans up duplicated cyborg energy weapon power supply code. Adds support for energy weapons to recharge from external power sources, unifying cyborg and hardsuit mounted weapons. Incorporates the cyborg taser recharging mechanism. Cleans up laser tag gun duplication

Changes path strings to actual paths. Changes relative paths to absolute paths.

Renamed several targeting vars to make their purposes more clear.

Fixed targeting not handling firing correctly for certain subtypes.
2015-02-11 15:46:09 -05:00
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()'
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-01 13:44:02 +00:00
mwerezak
aaba7e5c74 Adds intent-based firing control to guns 2014-11-20 23:10:47 -05:00
DJSnapshot
f8d478fcbb Updates to gun targeting UI. Fixes #5710 2014-07-23 20:51:58 -07:00
Zuhayr
1dc85149ce Fixes #4716 2014-05-10 00:33:09 +09:30
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