cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds aquariums and aquarium fish. (#56343) (#2920)

Browse Source 
Co-authored-by: tralezab <spamqetuo2@gmail.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: coiax <yellowbounder@gmail.com>

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: tralezab <spamqetuo2@gmail.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: coiax <yellowbounder@gmail.com>
This commit is contained in:
SkyratBot
2021-01-28 03:27:25 +01:00
committed by GitHub
co-authored by tralezab Mothblocks Aleksej Komarov Qustinnus coiax AnturK
parent 8c3d2811c2
commit 3000d75ad5
24 changed files with 1285 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/storage/concrete/fish_case.dm
+10
View File
@@ -0,0 +1,10 @@
/datum/component/storage/concrete/fish_case
max_items = 1
can_hold_trait = TRAIT_FISH_CASE_COMPATIBILE
can_hold_description = "fish and aquarium equipment"
/datum/component/storage/concrete/fish_case/can_be_inserted(obj/item/I, stop_messages, mob/M)
/// Activate deferred components if any.
SEND_SIGNAL(I, COMSIG_AQUARIUM_BEFORE_INSERT_CHECK)
. = ..()
code/datums/components/storage/storage.dm
+4 -2
View File
@@ -8,7 +8,9 @@
var/list/can_hold //if this is set, only items, and their children, will fit
var/list/cant_hold //if this is set, items, and their children, won't fit
var/list/exception_hold //if set, these items will be the exception to the max size of object that can fit.
var/list/exception_hold //if set, these items will be the exception to the max size of object that can fit.
/// If set can only contain stuff with this single trait present.
var/list/can_hold_trait
var/can_hold_description
@@ -630,7 +632,7 @@
if(!stop_messages)
to_chat(M, "<span class='warning'>[host] cannot hold [I]!</span>")
return FALSE
if(is_type_in_typecache(I, cant_hold) || HAS_TRAIT(I, TRAIT_NO_STORAGE_INSERT)) //Items which this container can't hold.
if(is_type_in_typecache(I, cant_hold) || HAS_TRAIT(I, TRAIT_NO_STORAGE_INSERT) || (can_hold_trait && !HAS_TRAIT(I, can_hold_trait))) //Items which this container can't hold.
if(!stop_messages)
to_chat(M, "<span class='warning'>[host] cannot hold [I]!</span>")
return FALSE