cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-09 16:05:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unapologetically buffs cute boys (#2841)

Browse Source 
## About The Pull Request
This pull request makes the flower items that can be worn in the hair no
longer donator only, just like on TG.

## Why It's Good For The Game
Cute boys everywhere may rejoice for they may wear a cute flower in
their hair

## Proof Of Testing

![image](https://github.com/user-attachments/assets/c1d1b7b7-8fbb-429c-8833-fffa1971d9d0)

## Changelog

🆑 ReturnToZender
qol: Flowers no longer donator-only in the loadout
Fix: Donator Only nullcheck from Skyrat to work properly
/🆑
This commit is contained in:
Return
2025-01-04 17:16:12 -06:00
committed by GitHub
parent 3b0c54f8cd
commit 1136da5bd5
3 changed files with 1 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/loadout/loadout_menu.dm
View File

@@ -80,7 +80,7 @@
to_chat(preferences.parent, span_warning("You cannot select this item!"))
return
if(!isnull(selected_item.donator_only) && !GLOB.donator_list[preferences?.parent?.ckey])
if(selected_item.donator_only && !GLOB.donator_list[preferences?.parent?.ckey])
to_chat(preferences.parent, span_warning("This item is for donators only."))
return
// SKYRAT EDIT END

9
modular_skyrat/master_files/code/modules/loadout/categories/heads.dm
View File

@@ -606,48 +606,39 @@
/datum/loadout_item/head/poppy
name = "Poppy Flower"
item_path = /obj/item/food/grown/poppy
donator_only = TRUE
/datum/loadout_item/head/lily
name = "Lily Flower"
item_path = /obj/item/food/grown/poppy/lily
donator_only = TRUE
/datum/loadout_item/head/geranium
name = "Geranium Flower"
item_path = /obj/item/food/grown/poppy/geranium
donator_only = TRUE
/datum/loadout_item/head/fraxinella
name = "Fraxinella Flower"
item_path = /obj/item/food/grown/poppy/geranium/fraxinella
donator_only = TRUE
/datum/loadout_item/head/harebell
name = "Harebell Flower"
item_path = /obj/item/food/grown/harebell
donator_only = TRUE
/datum/loadout_item/head/rose
name = "Rose Flower"
item_path = /obj/item/food/grown/rose
donator_only = TRUE
/datum/loadout_item/head/carbon_rose
name = "Carbon Rose Flower"
item_path = /obj/item/grown/carbon_rose
donator_only = TRUE
/datum/loadout_item/head/sunflower
name = "Sunflower"
item_path = /obj/item/food/grown/sunflower
donator_only = TRUE
/datum/loadout_item/head/rainbow_bunch
name = "Rainbow Bunch"
item_path = /obj/item/food/grown/rainbow_flower
additional_displayed_text = list(TOOLTIP_RANDOM_COLOR)
donator_only = TRUE
// Legacy unpaintable cowboy hat because it fits a character better
/datum/loadout_item/head/cowboyhat_legacy

29
modular_zubbers/code/modules/loadout/overrides/loadout_items/loadout_datum.dm
View File

@@ -74,32 +74,3 @@
restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER)
//Every other item in this set is role restricted, and it's like they forgot the boots.
//I don't think anyone on Skyrat noticed because this is ckey whitelisted there.
//Flowers
/datum/loadout_item/head/donator/poppy
donator_only = FALSE
/datum/loadout_item/head/donator/lily
donator_only = FALSE
/datum/loadout_item/head/donator/geranium
donator_only = FALSE
/datum/loadout_item/head/donator/fraxinella
donator_only = FALSE
/datum/loadout_item/head/donator/harebell
donator_only = FALSE
/datum/loadout_item/head/donator/rose
donator_only = FALSE
/datum/loadout_item/head/donator/carbon_rose
donator_only = FALSE
/datum/loadout_item/head/donator/sunflower
donator_only = FALSE
/datum/loadout_item/head/donator/rainbow_bunch
donator_only = FALSE