cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 10:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace

Browse Source 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/fox.dm
	code/modules/organs/organ_alien.dm
This commit is contained in:
Markolie
2015-08-18 18:38:59 +02:00
parent c10b62959b 577df08d6b
commit 8bede1db99
246 changed files with 2655 additions and 2105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ.dm
+3 -3
View File
@@ -242,9 +242,9 @@ var/list/organ_cache = list()
if(owner && vital)
if(user)
user.attack_log += "\[[time_stamp()]\]<font color='red'> removed a vital organ ([src]) from [owner.name] ([owner.ckey]) (INTENT: [uppertext(user.a_intent)])</font>"
owner.attack_log += "\[[time_stamp()]\]<font color='orange'> had a vital organ ([src]) removed by [user.name] ([user.ckey]) (INTENT: [uppertext(user.a_intent)])</font>"
msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] removed a vital organ ([src]) from [owner.name] ([owner.ckey]) (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
user.attack_log += "\[[time_stamp()]\]<font color='red'> removed a vital organ ([src]) from [key_name(owner)] (INTENT: [uppertext(user.a_intent)])</font>"
owner.attack_log += "\[[time_stamp()]\]<font color='orange'> had a vital organ ([src]) removed by [key_name(user)] (INTENT: [uppertext(user.a_intent)])</font>"
msg_admin_attack("[key_name_admin(user)] removed a vital organ ([src]) from [key_name_admin(owner)]")
owner.death()
owner = null
code/modules/organs/subtypes/diona.dm
+1 -1
View File
@@ -8,7 +8,7 @@
return 0
spawn(1) // So it has time to be thrown about by the gib() proc.
var/mob/living/carbon/alien/diona/D = new(get_turf(organ))
var/mob/living/simple_animal/diona/D = new(get_turf(organ))
var/datum/ghosttrap/plant/P = get_ghost_trap("living plant")
P.request_player(D, "A diona nymph has split off from its gestalt. ")
spawn(60)