cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14

Browse Source 
# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
This commit is contained in:
Leshana
2018-04-15 14:19:36 -04:00
parent 700c902d14 337e5e7436
commit b5cf8383f6
59 changed files with 1608 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
code/modules/projectiles/effects.dm
View File

@@ -267,4 +267,25 @@
icon_state = "impact_darkb"
light_range = 2
light_power = 0.5
light_color = "#8837A3"
light_color = "#8837A3"
//----------------------------
// Inversion / Cult
//----------------------------
/obj/effect/projectile/inversion/tracer
icon_state = "invert"
light_range = 2
light_power = -2
light_color = "#FFFFFF"
/obj/effect/projectile/inversion/muzzle
icon_state = "muzzle_invert"
light_range = 2
light_power = -2
light_color = "#FFFFFF"
/obj/effect/projectile/inversion/impact
icon_state = "impact_invert"
light_range = 2
light_power = -2
light_color = "#FFFFFF"

4
code/modules/projectiles/gun.dm
View File

@@ -172,6 +172,10 @@
return 0
if(!user.IsAdvancedToolUser())
return 0
if(isanimal(user))
var/mob/living/simple_animal/S = user
if(!S.IsHumanoidToolUser(src))
return 0
var/mob/living/M = user
if(dna_lock && attached_lock.stored_dna)