Cadyn 07775449d7 Fixing conflicts

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

..

sniper

…

automatic_vr.dm

Gun Refactors and Changes

2020-04-11 19:39:49 -04:00

automatic_yw.dm

Weapons changes

2020-07-20 22:12:01 -03:00

automatic.dm

Flavour Enhancement: Guns

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

boltaction.dm

Improve gun animations to be more modular. (#7645)

2020-09-20 06:51:14 -04:00

caseless.dm

Flavour Enhancement: Guns

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

contender.dm

Flavour Enhancement: Guns

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

dartgun_vr.dm

Gun Refactors and Changes

2020-04-11 19:39:49 -04:00

dartgun.dm

Rewrite examine() to pass a list around

2020-04-29 16:42:50 -04:00

pistol_vr.dm

Gun Refactors and Changes

2020-04-11 19:39:49 -04:00

pistol_yw.dm

mag and round cleanup

2020-05-25 15:47:44 +02:00

pistol.dm

Flavour Enhancement: Guns

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

revolver_vr.dm

Gun Refactors and Changes

2020-04-11 19:39:49 -04:00

revolver_yw.dm

…

revolver.dm

Flavour Enhancement: Guns

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

semiauto.dm

Flavour Enhancement: Guns

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

shotgun_vr.dm

Gun Refactors and Changes

2020-04-11 19:39:49 -04:00

shotgun_yw.dm

More thingus

2020-09-14 14:09:52 +02:00

shotgun.dm

Improve gun animations to be more modular. (#7645)

2020-09-20 06:51:14 -04:00

sniper.dm

Flavour Enhancement: Guns

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