mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-28 01:51:46 +00:00
68be76e817
## About The Pull Request Adds the following new general shuttle events:_ **Hitchhiker** - 1% chance - A single assistant in an EVA suit and some PBJs in a suitcase **Assistant Wave** - 0.1% chance - Spawns 10 assistants with internals - For clarity, they don't get sent to the shuttle, but get launched at it from space. It's a scuffle of 10 assistants trying to get in without being spaced or succumbing to the cold/pressure **Intern Wave** - Admin only - Unarmed and armed version - Spawns centcom interns, with a little announcement to warn they're coming I've also fixed projectiles bugging out and admin forced shuttle events not activating if they were added after the shuttle launched <details> <summary>Admin only events added</summary> **Nukie** Spawns a single nukie, armed with a shotgun, pistol and edagger. Basically the deathmatch nukie loadout, you dont want to fight this **Meaty ores** Meaty-ores meteors. Have a 4% chance to hit the shuttle, posing a potential hazard **3 player controlled fire-sharks** 3 fire sharks controlled by players. Not much to talk about here **Fireball Wave** Shoots a wave of fireballs at the shuttle. I think it's cool but apparently shuttle walls and windows deflect fireballs so it's kind of moot unless you're outside :/ </details> ## Why It's Good For The Game The assistant and hitchhiker events are some flavoring that I thought up a while ago. The Hitchhiker is just intentionally a flavor addition, but the assistant wave and intern wave can be used by admins to repopulate or retake the emergency shuttle as well. ## Changelog 🆑 add: Adds an assistant and hitchiker shuttle event, replenishing the crew mid flight! admin: Adds two intern wave shuttle events code: You can now supply shuttle events with outfits! code: You can now shoot projectiles with the shuttle events! fix: Fixes projectiles bugging out when fired in shuttle transit space fix: Fixes admin forced shuttle events not activating when added mid transit /🆑
122 lines
4.6 KiB
Plaintext
122 lines
4.6 KiB
Plaintext
/obj/item/storage/briefcase
|
|
name = "briefcase"
|
|
desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional."
|
|
icon = 'icons/obj/storage/case.dmi'
|
|
icon_state = "briefcase"
|
|
inhand_icon_state = "briefcase"
|
|
lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/equipment/briefcase_righthand.dmi'
|
|
obj_flags = CONDUCTS_ELECTRICITY
|
|
force = 8
|
|
hitsound = SFX_SWING_HIT
|
|
throw_speed = 2
|
|
throw_range = 4
|
|
w_class = WEIGHT_CLASS_BULKY
|
|
attack_verb_continuous = list("bashes", "batters", "bludgeons", "thrashes", "whacks")
|
|
attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "whack")
|
|
resistance_flags = FLAMMABLE
|
|
max_integrity = 150
|
|
var/folder_path = /obj/item/folder //this is the path of the folder that gets spawned in New()
|
|
|
|
/obj/item/storage/briefcase/Initialize(mapload)
|
|
. = ..()
|
|
atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL
|
|
atom_storage.max_total_storage = 21
|
|
|
|
/obj/item/storage/briefcase/PopulateContents()
|
|
new /obj/item/pen(src)
|
|
var/obj/item/folder/folder = new folder_path(src)
|
|
for(var/i in 1 to 6)
|
|
new /obj/item/paper(folder)
|
|
|
|
/obj/item/storage/briefcase/lawyer
|
|
folder_path = /obj/item/folder/blue
|
|
|
|
/obj/item/storage/briefcase/lawyer/PopulateContents()
|
|
new /obj/item/stamp/law(src)
|
|
..()
|
|
|
|
/obj/item/storage/briefcase/suicide_act(mob/living/user)
|
|
var/list/papers_found = list()
|
|
var/turf/item_loc = get_turf(src)
|
|
|
|
if(!item_loc)
|
|
return OXYLOSS
|
|
|
|
for(var/obj/item/potentially_paper in contents)
|
|
if(istype(potentially_paper, /obj/item/paper) || istype(potentially_paper, /obj/item/paperplane))
|
|
papers_found += potentially_paper
|
|
if(!papers_found.len || !item_loc)
|
|
user.visible_message(span_suicide("[user] bashes [user.p_them()]self in the head with [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
|
|
return BRUTELOSS
|
|
|
|
user.visible_message(span_suicide("[user] opens [src] and all of [user.p_their()] papers fly out!"))
|
|
for(var/obj/item/paper as anything in papers_found) //Throws the papers in a random direction
|
|
var/turf/turf_to_throw_at = prob(20) ? item_loc : get_ranged_target_turf(item_loc, pick(GLOB.alldirs))
|
|
paper.throw_at(turf_to_throw_at, 2)
|
|
|
|
stoplag(1 SECONDS)
|
|
user.say("ARGGHH, HOW WILL I GET THIS WORK DONE NOW?!!")
|
|
user.visible_message(span_suicide("[user] looks overwhelmed with paperwork! It looks like [user.p_theyre()] trying to commit suicide!"))
|
|
return OXYLOSS
|
|
|
|
/obj/item/storage/briefcase/sniper
|
|
desc = "Its label reads \"genuine hardened Captain leather\", but suspiciously has no other tags or branding. Smells like L'Air du Temps."
|
|
force = 10
|
|
|
|
/obj/item/storage/briefcase/sniper/PopulateContents()
|
|
..() // in case you need any paperwork done after your rampage
|
|
new /obj/item/gun/ballistic/rifle/sniper_rifle/syndicate(src)
|
|
new /obj/item/clothing/neck/tie/red/hitman(src)
|
|
new /obj/item/clothing/under/syndicate/sniper(src)
|
|
new /obj/item/ammo_box/magazine/sniper_rounds(src)
|
|
new /obj/item/ammo_box/magazine/sniper_rounds(src)
|
|
new /obj/item/ammo_box/magazine/sniper_rounds/disruptor(src)
|
|
|
|
/**
|
|
* Secure briefcase
|
|
* Uses the lockable storage component to give it a lock.
|
|
*/
|
|
/obj/item/storage/briefcase/secure
|
|
name = "secure briefcase"
|
|
desc = "A large briefcase with a digital locking system."
|
|
icon_state = "secure"
|
|
base_icon_state = "secure"
|
|
inhand_icon_state = "sec-case"
|
|
|
|
/obj/item/storage/briefcase/secure/Initialize(mapload)
|
|
. = ..()
|
|
atom_storage.max_total_storage = 21
|
|
atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL
|
|
AddComponent(/datum/component/lockable_storage)
|
|
|
|
///Syndie variant of Secure Briefcase. Contains space cash, slightly more robust.
|
|
/obj/item/storage/briefcase/secure/syndie
|
|
force = 15
|
|
|
|
/obj/item/storage/briefcase/secure/syndie/PopulateContents()
|
|
. = ..()
|
|
for(var/iterator in 1 to 5)
|
|
new /obj/item/stack/spacecash/c1000(src)
|
|
|
|
/// A briefcase that contains various sought-after spoils
|
|
/obj/item/storage/briefcase/secure/riches
|
|
|
|
/obj/item/storage/briefcase/secure/riches/PopulateContents()
|
|
new /obj/item/clothing/suit/armor/vest(src)
|
|
new /obj/item/gun/ballistic/automatic/pistol(src)
|
|
new /obj/item/suppressor(src)
|
|
new /obj/item/melee/baton/telescopic(src)
|
|
new /obj/item/clothing/mask/balaclava(src)
|
|
new /obj/item/bodybag(src)
|
|
new /obj/item/soap/nanotrasen(src)
|
|
|
|
/obj/item/storage/briefcase/hitchiker/PopulateContents()
|
|
new /obj/item/food/sandwich/peanut_butter_jelly(src)
|
|
new /obj/item/food/sandwich/peanut_butter_jelly(src)
|
|
new /obj/item/reagent_containers/cup/glass/waterbottle/large(src)
|
|
new /obj/item/soap(src)
|
|
new /obj/item/pillow/random(src)
|
|
new /obj/item/tank/internals/emergency_oxygen(src)
|
|
new /obj/item/tank/internals/emergency_oxygen(src)
|