cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-03 14:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
This commit is contained in:
mwerezak
2015-06-28 22:35:14 -04:00
parent 0071ed3f24 4a2d7b661e
commit 087a978d56
438 changed files with 8879 additions and 7628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/projectiles/guns/launcher/syringe_gun.dm
View File

@@ -6,7 +6,7 @@
var/icon_flight = "syringe-cartridge-flight" //so it doesn't look so weird when shot
matter = list(DEFAULT_WALL_MATERIAL = 125, "glass" = 375)
flags = CONDUCT
slot_flags = SLOT_BELT
slot_flags = SLOT_BELT | SLOT_EARS
throwforce = 3
force = 3
w_class = 1