mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 21:18:37 +01:00
JacquerelandGitHub
2cf56ab1e1
## About The Pull Request This PR moves most of the code for using an item to commit suicide from `human` to `living`, so that anything with hands can use what it is holding to commit suicide. This was surprisingly painless, as most `suicide_act` procs were already written without the assumption that the person killing themselves was a human even though they couldn't be anything else. This might occasionally mean that in some cases (like drones) it may reference anatomy that they don't have (like necks) but I think that's not a big deal and don't worry about it. ## Why It's Good For The Game It's funny. ## Changelog 🆑 balance: Anything with hands can now use the things it is holding to commit suicide /🆑
75 lines
2.7 KiB
Plaintext
75 lines
2.7 KiB
Plaintext
/obj/item/storage/cans
|
|
name = "can ring"
|
|
desc = "Holds up to six drink cans, and select bottles."
|
|
icon = 'icons/obj/storage/storage.dmi'
|
|
icon_state = "canholder"
|
|
inhand_icon_state = "cola"
|
|
lefthand_file = 'icons/mob/inhands/items/drinks_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/items/drinks_righthand.dmi'
|
|
custom_materials = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT*1.2)
|
|
max_integrity = 500
|
|
storage_type = /datum/storage/sixcan
|
|
|
|
/obj/item/storage/cans/suicide_act(mob/living/user)
|
|
user.visible_message(span_suicide("[user] begins popping open a final cold one with the boys! It looks like [user.p_theyre()] trying to commit suicide!"))
|
|
return BRUTELOSS
|
|
|
|
/obj/item/storage/cans/update_icon_state()
|
|
icon_state = "[initial(icon_state)][contents.len]"
|
|
return ..()
|
|
|
|
/obj/item/storage/cans/Initialize(mapload)
|
|
. = ..()
|
|
update_appearance()
|
|
|
|
/obj/item/storage/cans/sixsoda
|
|
name = "soda bottle ring"
|
|
desc = "Holds six soda cans. Remember to recycle when you're done!"
|
|
|
|
/obj/item/storage/cans/sixsoda/PopulateContents()
|
|
for(var/i in 1 to 6)
|
|
new /obj/item/reagent_containers/cup/soda_cans/cola(src)
|
|
|
|
/obj/item/storage/cans/sixbeer
|
|
name = "beer can ring"
|
|
desc = "Holds six beers. Remember to recycle when you're done!"
|
|
|
|
/obj/item/storage/cans/sixbeer/PopulateContents()
|
|
for(var/i in 1 to 6)
|
|
new /obj/item/reagent_containers/cup/soda_cans/beer(src)
|
|
|
|
/obj/item/storage/cans/sixgamerdrink
|
|
name = "gamer drink bottle ring"
|
|
desc = "Holds six gamer drink cans. Remember to recycle when you're done!"
|
|
|
|
/// Pool of gamer drinks tm we may add from
|
|
var/list/gamer_drink_options = list(
|
|
/obj/item/reagent_containers/cup/soda_cans/pwr_game = 55,
|
|
/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind = 15,
|
|
/obj/item/reagent_containers/cup/soda_cans/monkey_energy = 15,
|
|
/obj/item/reagent_containers/cup/soda_cans/volt_energy = 10,
|
|
/obj/item/reagent_containers/cup/soda_cans/thirteenloko = 5,
|
|
)
|
|
|
|
/obj/item/storage/cans/sixgamerdrink/PopulateContents()
|
|
for(var/i in 1 to 6)
|
|
var/obj/item/chosen_gamer_drink = pick_weight(gamer_drink_options)
|
|
new chosen_gamer_drink(src)
|
|
|
|
/obj/item/storage/cans/sixenergydrink
|
|
name = "energy drink bottle ring"
|
|
desc = "Holds six energy drink cans. Remember to recycle when you're done!"
|
|
|
|
/// Pool of energy drinks tm we may add from
|
|
var/list/energy_drink_options = list(
|
|
/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind = 50,
|
|
/obj/item/reagent_containers/cup/soda_cans/monkey_energy = 30,
|
|
/obj/item/reagent_containers/cup/soda_cans/volt_energy = 15,
|
|
/obj/item/reagent_containers/cup/soda_cans/thirteenloko = 5,
|
|
)
|
|
|
|
/obj/item/storage/cans/sixenergydrink/PopulateContents()
|
|
for(var/i in 1 to 6)
|
|
var/obj/item/chosen_energy_drink = pick_weight(energy_drink_options)
|
|
new chosen_energy_drink(src)
|