Cadyn 07775449d7 Fixing conflicts

2020-10-05 18:10:53 -07:00

..

cell_loaded_vr

Forgot the charging change; made sure cells cannot be used on corpses unless it is corpsemend.

2020-08-14 09:19:05 -04:00

bsharpoon_vr.dm

…

crestrose_vr.dm

…

dominator_vr.dm

…

gunsword_vr.dm

…

hooklauncher.dm

Merge pull request #7561 from Mechoid/ProjectileUpkeep

2020-08-31 18:23:39 -04:00

kinetic_accelerator_vr.dm

…

laser_vr.dm

…

laser_yw.dm

fixes a space bar that was put in there somehow *sigh*

2020-08-10 16:32:06 -03:00

laser.dm

Flavour Enhancement: Guns

2020-07-13 23:06:11 -04:00

netgun_vr.dm

Voreupdate (small)

2020-07-27 06:34:28 +02:00

netgun_yw.dm

nerfs charge cost and fire delay at taser mode

2020-05-21 15:49:12 -03:00

nuclear_vr.dm

…

nuclear_yw.dm

guuns!

2020-08-09 04:24:50 -03:00

nuclear.dm

Flavour Enhancement: Guns

2020-07-13 23:06:11 -04:00

particle.dm

…

phase.dm

Flavour Enhancement: Guns

2020-07-13 23:06:11 -04:00

protector_vr.dm

…

pulse.dm

Flavour Enhancement: Guns

2020-07-13 23:06:11 -04:00

pummeler_vr.dm

…

sickshot_vr.dm

Changing Sickshot desc and info_desc

2020-09-25 14:50:43 -04:00

special_vr.dm

Take two

2020-08-13 09:54:11 -04:00

special.dm

TGUI Research

2020-08-25 13:30:47 -07:00

stun_vr.dm

…

stun.dm

Flavour Enhancement: Guns

2020-07-13 23:06:11 -04:00

temperature.dm

…