Arokha Sieyes 055c998f82 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync ...

# Conflicts:
#	code/modules/integrated_electronics/subtypes/reagents.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/organs/organ_external.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	html/changelogs/.all_changelog.yml

2017-04-25 15:04:54 -04:00

..

animate.dm

Added vore capabilies to the new simple_animal system.

2017-03-22 19:32:19 -04:00

beams_vr.dm

Adds the 'Hunter' Capture Gun

2017-04-02 19:25:27 -04:00

beams.dm

More toys kikiki

2017-01-25 22:20:52 -06:00

bullets_vr.dm

Properly Done the .357 flash rounds

2017-01-26 15:53:43 -03:00

bullets.dm

Adds hollowpoint rounds, for bears and such

2017-04-03 18:27:19 -05:00

change.dm

First commit of manual port of BS12

2016-05-29 00:56:11 +01:00

energy_vr.dm

Security non-lethal balance

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

energy.dm

Adds Modifier System, Changes Some Ling Stuff

2017-04-18 21:23:59 -04:00

force.dm

…

special.dm

Adds Modifier System, Changes Some Ling Stuff

2017-04-18 21:23:59 -04:00