shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4807 from Citadel-Station-13/upstream-merge-34358

Browse Source 
[MIRROR] Cleans up a nesting level in pet attackby
This commit is contained in:
deathride58
2018-01-13 20:27:12 +00:00
committed by GitHub
parent 412e43674c 1afe0b1d1e
commit 6df769de46
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
code/modules/mob/living/simple_animal/friendly/pet.dm
View File

@@ -7,17 +7,16 @@
blood_volume = BLOOD_VOLUME_NORMAL
/mob/living/simple_animal/pet/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/clothing/neck/petcollar) && !pcollar)
if(collar_type)
var/obj/item/clothing/neck/petcollar/P = O
pcollar = P.type
regenerate_icons()
to_chat(user, "<span class='notice'>You put the [P] around [src]'s neck.</span>")
if(P.tagname && !unique_pet)
real_name = "\proper [P.tagname]"
name = real_name
qdel(P)
return
if(istype(O, /obj/item/clothing/neck/petcollar) && !pcollar && collar_type)
var/obj/item/clothing/neck/petcollar/P = O
pcollar = P.type
regenerate_icons()
to_chat(user, "<span class='notice'>You put the [P] around [src]'s neck.</span>")
if(P.tagname && !unique_pet)
real_name = "\proper [P.tagname]"
name = real_name
qdel(P)
return
if(istype(O, /obj/item/newspaper))
if(!stat)