cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-06-02 12:38:56 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
d32cffaefea46ceb1fb53b68991ed027fa246517
Aurora.3/code/modules/customitems
T
History
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
..
item_defines.dm
Merge branch 'guns' into gun-rewrite
2015-02-11 18:08:43 -05:00
item_spawning.dm
Fix a runtime for Mloc
2014-06-17 16:29:37 +01:00