mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-04-05 03:41:50 +01:00
b5e57216ee
About The Pull Request
kép
This PR does the following:
Force event menu uses tgUI.
Arranged events into categories, and added a little description to each. The descriptions appear as tooltips when you hover over the Trigger button.
Rewrote how "Announce to crew?" works. It no longer pops up a panel after the event has been already announced. Instead, the admins select it via a checkbox, and the result is passed through an optional argument.
announceChance's comment is tweaked a bit to reflect how it actually works at the moment.
Moved rpgtitles to wizard events, where it belongs.
Fake Virus and Electric Storms show up to observers, as I believe they are not as common as Space Dust or Camera Failure, and should be cancelable.
Potential issues:
This only solves half of #68408, I don't think admin triggering having a timer and a cancel button is a big issue, as it allows other admins to overrule you if needed, but if i is, I will try to fix it within this PR.
Fixes #68408. Events now spawn immediately, and the the announceChance is overwritten before it begins.
My choices for categories and descriptions might not be the best, feedback would be appreciated.
Why It's Good For The Game
The old spawn menu was completely unorganized, and you could only search using the browser search tool. I believe a built in search bar helps with this issue a bit. I also believe that organizing the events into categories, and adding descriptions will help with newer admins who might not be familiar with all events.
Changelog
cl
refactor: The Force Event UI has been refactored
refactor: Events now have categories and descriptions
refactor: Admin triggered events happen immediately
balance: Fake Virus and Electric Storms are shown to admins, making them cancelable
/cl
62 lines
2.6 KiB
Plaintext
62 lines
2.6 KiB
Plaintext
/datum/round_event_control/wizard/cursed_items //fashion disasters
|
|
name = "Cursed Items"
|
|
weight = 3
|
|
typepath = /datum/round_event/wizard/cursed_items
|
|
max_occurrences = 3
|
|
earliest_start = 0 MINUTES
|
|
description = "Gives everyone a cursed item."
|
|
|
|
//Note about adding items to this: Because of how NODROP_1 works if an item spawned to the hands can also be equiped to a slot
|
|
//it will be able to be put into that slot from the hand, but then get stuck there. To avoid this make a new subtype of any
|
|
//item you want to equip to the hand, and set its slots_flags = null. Only items equiped to hands need do this.
|
|
|
|
/datum/round_event/wizard/cursed_items/start()
|
|
var/item_set = pick("wizardmimic", "swords", "bigfatdoobie", "boxing", "voicemodulators", "catgirls2015")
|
|
var/list/loadout[SLOTS_AMT]
|
|
var/ruins_spaceworthiness
|
|
var/ruins_wizard_loadout
|
|
|
|
switch(item_set)
|
|
if("wizardmimic")
|
|
loadout[ITEM_SLOT_OCLOTHING] = /obj/item/clothing/suit/wizrobe
|
|
loadout[ITEM_SLOT_FEET] = /obj/item/clothing/shoes/sandal/magic
|
|
loadout[ITEM_SLOT_HEAD] = /obj/item/clothing/head/wizard
|
|
ruins_spaceworthiness = 1
|
|
if("swords")
|
|
loadout[ITEM_SLOT_HANDS] = /obj/item/katana/cursed
|
|
if("bigfatdoobie")
|
|
loadout[ITEM_SLOT_MASK] = /obj/item/clothing/mask/cigarette/rollie/trippy
|
|
ruins_spaceworthiness = 1
|
|
if("boxing")
|
|
loadout[ITEM_SLOT_MASK] = /obj/item/clothing/mask/luchador
|
|
loadout[ITEM_SLOT_GLOVES] = /obj/item/clothing/gloves/boxing
|
|
ruins_spaceworthiness = 1
|
|
if("voicemodulators")
|
|
loadout[ITEM_SLOT_MASK] = /obj/item/clothing/mask/chameleon
|
|
if("catgirls2015")
|
|
loadout[ITEM_SLOT_HEAD] = /obj/item/clothing/head/kitty
|
|
ruins_spaceworthiness = 1
|
|
ruins_wizard_loadout = 1
|
|
|
|
for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
|
|
if(ruins_spaceworthiness && !is_station_level(H.z) || isspaceturf(H.loc) || isplasmaman(H))
|
|
continue //#savetheminers
|
|
if(ruins_wizard_loadout && IS_WIZARD(H))
|
|
continue
|
|
if(item_set == "catgirls2015") //Wizard code means never having to say you're sorry
|
|
H.gender = FEMALE
|
|
for(var/i in 1 to loadout.len)
|
|
if(loadout[i])
|
|
var/obj/item/J = loadout[i]
|
|
var/obj/item/I = new J //dumb but required because of byond throwing a fit anytime new gets too close to a list
|
|
H.dropItemToGround(H.get_item_by_slot(i), TRUE)
|
|
H.equip_to_slot_or_del(I, i)
|
|
ADD_TRAIT(I, TRAIT_NODROP, CURSED_ITEM_TRAIT(I))
|
|
I.item_flags |= DROPDEL
|
|
I.name = "cursed " + I.name
|
|
|
|
for(var/mob/living/carbon/human/victim in GLOB.alive_mob_list)
|
|
var/datum/effect_system/fluid_spread/smoke/smoke = new
|
|
smoke.set_up(0, holder = victim, location = victim.loc)
|
|
smoke.start()
|