Repede 372e145108 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm

Fixed conflicts, fixed race racism money bs

2018-04-27 21:45:13 -04:00

..

kinetic_accelerator_vr.dm

Adds the Kinetic Accelerator

2018-04-24 12:59:23 -04:00

laser.dm

Corrects a few accuracy/evasion errors (#4864)

2018-02-18 11:44:43 -08:00

netgun_vr.dm

Ports 'head' guns from Eris, change Hunter sprite

2017-05-09 02:42:32 -04:00

nuclear_vr.dm

Improves contrasts on sprites and removes the need for mirroring upstream sprites

2018-04-06 17:59:10 +08:00

nuclear_yw.dm

MG42-E and dogborgs now got more modules (crowbar+pounce) and stuff

2017-01-04 14:04:13 -05:00

nuclear.dm

unions no longer make firearms (#4836)

2018-02-17 20:40:15 -08:00

particle.dm

Allows emitters to blast through rocks again.

2017-09-29 01:05:40 -04:00

pulse.dm

Gun changes (#4185)

2018-02-12 23:12:14 -08:00

special_vr.dm

squashed commits - ion pistol refactor and away mission emp nerf

2018-02-11 09:27:40 +00:00

special.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23

2018-02-23 21:55:42 -05:00

stun_vr.dm

Security non-lethal balance

2017-02-13 15:49:35 +00:00

stun.dm

Gun changes (#4185)

2018-02-12 23:12:14 -08:00

temperature.dm

work

2017-09-04 21:52:47 -04:00