mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-22 20:43:10 +01:00
Persistent trash (#21217)
# Summary This PR adds trash to the persistence system. - Trash becomes persistent the moment it is dropped unless it is dropped in a maint or the disposal room. - It looses persistence when it lands in a maint/disposal room or gets picked up again. - Persistent trash can be found up to three days. Those are the base rules, some trash types have additional rules. List of trash to be implemented: - [x] Basic trash (snacks and such) - Cigarette buts - spitwad - Burned matches - [x] Broken bottles - [x] Torn inflatable (-doors) > Littering is a i120 violation and can be punished with 3-7 minutes of prison time or with a 40-150 credit fine. > Stop littering and keep the ship clean. ## Follow-up tasks - [x] Update GitHub Wiki: Add section on how to add persistent trash types. - [x] Update GitHub Wiki: Make persistence_get_content nullable/empty.
This commit is contained in:
@@ -543,6 +543,7 @@ GLOBAL_LIST_INIT(_preloader_path, null)
|
||||
/area/template_noop
|
||||
name = "Area Passthrough"
|
||||
icon_state = "noop"
|
||||
area_flags = AREA_FLAG_PREVENT_PERSISTENT_TRASH
|
||||
|
||||
/turf/template_noop
|
||||
name = "Turf Passthrough"
|
||||
|
||||
@@ -247,6 +247,12 @@
|
||||
///The mask image for mimicking a broken-off neck of the bottle
|
||||
var/static/icon/flipped_broken_outline = icon('icons/obj/item/reagent_containers/food/drinks/drink_effects.dmi', "broken-flipped")
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
persistency_considered_trash = TRUE
|
||||
|
||||
/obj/item/broken_bottle/persistence_apply_content(content, x, y, z)
|
||||
src.x = x
|
||||
src.y = y
|
||||
src.z = z
|
||||
|
||||
#define DRINK_FLUFF_GETMORE "This drink is made by Getmore Corporation, a subsidiary of NanoTrasen. It mostly specializes in fast food and consumer food products, \
|
||||
but also makes average quality alcohol. Many can find Getmore products in grocery stores, vending machines, \
|
||||
|
||||
Reference in New Issue
Block a user