[MIRROR] Removes a source of ian harddels, restores soul (#1871)

* Removes a source of ian harddels, keeps mcgruffs bed discription from getting overwritten at roundstart, moves the bed claiming feature to just the dogbed typepath, none of the subtypes, this applies to buckling too (#55158)

Removes a source of ian harddels, keeps mcgruff's bed description from getting overwritten at roundstart, moves the bed claiming feature to just the dogbed typepath, blacklisting subtypes. This applies to buckling too.

This means that a dogbed can only ever belong to one dog. Fuck you.
Remake of #54892, github doesn't like force pushes, not sure why

* Removes a source of ian harddels, restores soul

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-11-27 07:45:11 +00:00
committed by GitHub
co-authored by LemonInTheDark
parent c5f60f33e1
commit f6d60b49f4
2 changed files with 7 additions and 4 deletions
@@ -171,7 +171,7 @@
anchored = FALSE
buildstacktype = /obj/item/stack/sheet/mineral/wood
buildstackamount = 10
var/mob/living/owner = null
var/owned = FALSE
/obj/structure/bed/dogbed/ian
desc = "Ian's bed! Looks comfy."
@@ -202,10 +202,14 @@
name = "Runtime's bed"
anchored = TRUE
///Used to set the owner of a dogbed, returns FALSE if called on an owned bed or an invalid one, TRUE if the possesion succeeds
/obj/structure/bed/dogbed/proc/update_owner(mob/living/M)
owner = M
if(owned || type != /obj/structure/bed/dogbed) //Only marked beds work, this is hacky but I'm a hacky man
return FALSE //Failed
owned = TRUE
name = "[M]'s bed"
desc = "[M]'s bed! Looks comfy."
return TRUE //Let any callers know that this bed is ours now
/obj/structure/bed/dogbed/buckle_mob(mob/living/M, force, check_loc)
. = ..()