mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-20 04:17:33 +01:00
Tail Overhaul 2 (#15577)
* Tail Styles * sql migration * finishing touches * cl * accidentally left this in * credit spriter * animated cloth * cl fix * update migration * updated SQL & changelog, merge conflicts resolved * adds checks for species type in standard.dm * the above but better * Applies Suggestions --------- Co-authored-by: Geeves <ggrobler447@gmail.com> Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com> Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
This commit is contained in:
@@ -130,3 +130,47 @@
|
||||
if(. && istype(loc, /obj/item/clothing/head/helmet))
|
||||
var/obj/item/clothing/head/helmet/helmet = loc
|
||||
helmet.update_clothing_icon()
|
||||
|
||||
/obj/item/storage/internal/tail
|
||||
name = "tail storage"
|
||||
storage_slots = 1
|
||||
max_storage_space = 2
|
||||
max_w_class = ITEMSIZE_SMALL
|
||||
use_sound = null
|
||||
|
||||
/obj/item/storage/internal/tail/can_be_inserted(obj/item/clothing/tail_accessory/TA, stop_messages)
|
||||
if(!istype(TA))
|
||||
return FALSE
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
|
||||
var/obj/item/organ/external/E = loc
|
||||
if(!istype(E))
|
||||
return FALSE
|
||||
|
||||
var/mob/living/carbon/human/H = E.owner
|
||||
if(!istype(H))
|
||||
return FALSE
|
||||
|
||||
if(!TA.compatible_with_human(H))
|
||||
return FALSE
|
||||
|
||||
return TRUE
|
||||
|
||||
// we can generally assume user has all the proper groin stuff here, otherwise the above block of code is busted
|
||||
/obj/item/storage/internal/tail/handle_item_insertion(obj/item/W, prevent_warning, mob/living/carbon/human/user)
|
||||
. = ..()
|
||||
if(.)
|
||||
user.update_tail_showing()
|
||||
|
||||
/obj/item/storage/internal/tail/remove_from_storage(obj/item/W, atom/new_location)
|
||||
. = ..()
|
||||
if(.)
|
||||
var/obj/item/organ/external/E = loc
|
||||
if(!istype(E))
|
||||
return
|
||||
var/mob/living/carbon/human/H = E.owner
|
||||
if(!istype(H))
|
||||
return
|
||||
H.update_tail_showing()
|
||||
@@ -565,7 +565,7 @@
|
||||
return
|
||||
|
||||
W.add_fingerprint(user)
|
||||
return handle_item_insertion(W)
|
||||
return handle_item_insertion(W, null, user)
|
||||
|
||||
/obj/item/storage/dropped(mob/user as mob)
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user