Polaris

mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-04 14:33:30 +00:00

Files

mwerezak 5740f52964 Merge branch 'guns' into gun-rewrite

Conflicts:
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/energy/laser.dm
	code/modules/projectiles/guns/energy/nuclear.dm
	code/modules/projectiles/guns/energy/pulse.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/projectiles/guns/projectile/launcher.dm
	code/modules/projectiles/guns/projectile/shotgun.dm

2015-02-11 18:08:43 -05:00

ears

Response to #7686

2015-01-06 21:48:56 +01:00

glasses

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev

2014-10-20 04:52:45 +04:00

gloves

Changed prefix on gloves modified for alien use from "Mangled" to "Modified". Removed stungloves.dm on request of Zuhayr.

2015-01-30 18:22:58 -05:00

head

Merge remote-tracking branch 'refs/remotes/origin/dev' into dev