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

Merge remote-tracking branch 'upstream/dev' into NarsiePort

Browse Source 
Conflicts:
	code/modules/projectiles/projectile/change.dm
This commit is contained in:
PsiOmega
2015-03-30 20:17:05 +02:00
parent 23bbbb7e4c 6f1f18c3a7
commit ef8b7466ac
12 changed files with 2373 additions and 2338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/holodeck/HolodeckObjects.dm
View File

@@ -392,10 +392,15 @@
icon_state = "holo4"
icon_living = "holo4"
icon_dead = "holo4"
alpha = 127
icon_gib = null
meat_amount = 0
meat_type = null
/mob/living/simple_animal/hostile/carp/holodeck/New()
..()
SetLuminosity(2) //hologram lighting
/mob/living/simple_animal/hostile/carp/holodeck/proc/set_safety(var/safe)
if (safe)
faction = "neutral"