mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-30 11:01:35 +00:00
d2f34e33be
## About The Pull Request moves all implementations (im aware of) for "Im a parent type dont spawn me please" to the datum layer to standardized behavior adds a standerized proc for filtering out "bad" items that we dont want spawning. applies to it the subtype vendor, gifts, and a new spawner and mystery box for a random gun (neither playerfacing) "port" of https://github.com/shiptest-ss13/Shiptest/pull/4621 https://github.com/user-attachments/assets/22f6f0b2-b44e-411a-b3dc-6b97dc0287aa small warning: I dont have EVERY abstract type defined right now but, ive done a good enough job for now. Im tired of data entry rn ## Why It's Good For The Game standardizing behavior. Might be a micro hit to performance however having this lets us not rely on icon state to determine whether something is a parent type and makes it much easier to tell something is a parent type (could be applied further to things like admin spawning menus and things like that). need feedback on if this is actually good for the game. ## Changelog 🆑 add: Soda cans show up in the silver slime drink table. add: Examine tag for items that are not mean to show up ingame. refactor: Standardizes how gifts rule out abstract types. fix: gifts no longer check if something has an inhand, massively expanding the list of potential items. /🆑
118 lines
3.9 KiB
Plaintext
118 lines
3.9 KiB
Plaintext
/* Gifts
|
|
* Contains:
|
|
* Gifts
|
|
*/
|
|
|
|
/// Gifts to give to players, will contain a nice toy or other fun item for them to play with.
|
|
/obj/item/gift
|
|
name = "gift"
|
|
desc = "PRESENTS!!!! eek!"
|
|
icon = 'icons/obj/storage/wrapping.dmi'
|
|
icon_state = "giftdeliverypackage3"
|
|
inhand_icon_state = "gift"
|
|
resistance_flags = FLAMMABLE
|
|
|
|
/// What type of thing are we guaranteed to spawn in with?
|
|
var/obj/item/contains_type = null
|
|
|
|
/obj/item/gift/Initialize(mapload)
|
|
. = ..()
|
|
pixel_x = rand(-10,10)
|
|
pixel_y = rand(-10,10)
|
|
icon_state = "giftdeliverypackage[rand(1,5)]"
|
|
|
|
if(isnull(contains_type))
|
|
contains_type = get_gift_type()
|
|
|
|
/obj/item/gift/suicide_act(mob/living/user)
|
|
user.visible_message(span_suicide("[user] peeks inside [src] and cries [user.p_them()]self to death! It looks like [user.p_they()] [user.p_were()] on the naughty list..."))
|
|
return BRUTELOSS
|
|
|
|
/obj/item/gift/examine(mob/user)
|
|
. = ..()
|
|
if(HAS_MIND_TRAIT(user, TRAIT_PRESENT_VISION) || isobserver(user))
|
|
. += span_notice("It contains \a [initial(contains_type.name)].")
|
|
|
|
/obj/item/gift/attack_self(mob/user)
|
|
if(HAS_MIND_TRAIT(user, TRAIT_CANNOT_OPEN_PRESENTS))
|
|
to_chat(user, span_warning("You're supposed to be spreading gifts, not opening them yourself!"))
|
|
return
|
|
|
|
moveToNullspace()
|
|
|
|
var/obj/item/thing = new contains_type(get_turf(user))
|
|
|
|
if (QDELETED(thing)) //might contain something like metal rods that might merge with a stack on the ground
|
|
user.visible_message(span_danger("Oh no! The present that [user] opened had nothing inside it!"))
|
|
else
|
|
user.visible_message(span_notice("[user] unwraps \the [src], finding \a [thing] inside!"))
|
|
user.investigate_log("has unwrapped a present containing [thing.type].", INVESTIGATE_PRESENTS)
|
|
user.put_in_hands(thing)
|
|
thing.add_fingerprint(user)
|
|
|
|
qdel(src)
|
|
|
|
/obj/item/gift/proc/get_gift_type()
|
|
var/static/list/gift_type_list = null
|
|
|
|
if(isnull(gift_type_list))
|
|
gift_type_list = list(
|
|
/obj/item/banhammer,
|
|
/obj/item/bikehorn,
|
|
/obj/item/book/manual/chef_recipes,
|
|
/obj/item/book/manual/wiki/barman_recipes,
|
|
/obj/item/clothing/head/costume/snowman,
|
|
/obj/item/clothing/neck/tie/horrible,
|
|
/obj/item/clothing/suit/costume/poncho,
|
|
/obj/item/clothing/suit/costume/poncho/green,
|
|
/obj/item/clothing/suit/costume/poncho/red,
|
|
/obj/item/clothing/suit/costume/snowman,
|
|
/obj/item/clothing/suit/jacket/leather,
|
|
/obj/item/clothing/suit/jacket/leather/biker,
|
|
/obj/item/food/grown/ambrosia/deus,
|
|
/obj/item/food/grown/ambrosia/vulgaris,
|
|
/obj/item/grenade/smokebomb,
|
|
/obj/item/grown/corncob,
|
|
/obj/item/instrument/guitar,
|
|
/obj/item/instrument/violin,
|
|
/obj/item/lipstick/random,
|
|
/obj/item/pai_card,
|
|
/obj/item/pen/invisible,
|
|
/obj/item/pickaxe/diamond,
|
|
/obj/item/poster/random_contraband,
|
|
/obj/item/poster/random_official,
|
|
/obj/item/soap/deluxe,
|
|
/obj/item/sord,
|
|
/obj/item/stack/sheet/mineral/coal,
|
|
/obj/item/storage/backpack/holding,
|
|
/obj/item/storage/belt/champion,
|
|
/obj/item/storage/belt/utility/full,
|
|
/obj/item/storage/box/snappops,
|
|
/obj/item/storage/crayons,
|
|
/obj/item/storage/photo_album,
|
|
/obj/item/storage/wallet,
|
|
/obj/item/toy/basketball,
|
|
/obj/item/toy/beach_ball,
|
|
)
|
|
|
|
gift_type_list += subtypesof(/obj/item/clothing/head/collectable)
|
|
//Add all toys, except for abstract types and syndicate cards.
|
|
gift_type_list += subtypesof(/obj/item/toy) - (((typesof(/obj/item/toy/cards) - /obj/item/toy/cards/deck) + /obj/item/toy/figure + /obj/item/toy/ammo))
|
|
|
|
var/gift_type = pick(gift_type_list)
|
|
return gift_type
|
|
|
|
/// Gifts that typically only very OP stuff or admins or Santa Claus himself should be giving out, as they contain ANY valid subtype of `/obj/item`, including stuff like instagib rifles. Wow!
|
|
/obj/item/gift/anything
|
|
name = "christmas gift"
|
|
desc = "It could be anything!"
|
|
|
|
/obj/item/gift/anything/get_gift_type()
|
|
var/static/list/obj/item/possible_gifts = null
|
|
|
|
if(isnull(possible_gifts))
|
|
possible_gifts = get_sane_item_types(/obj/item)
|
|
|
|
var/gift_type = pick(possible_gifts)
|
|
return gift_type
|