Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Crit Story Content update and Story Rapid Status! #674

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions maplestation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6584,6 +6584,8 @@
#include "maplestation_modules\story_content\armored_corps\code\mecha_weapons\ppc_override.dm"
#include "maplestation_modules\story_content\armored_corps\code\melee\void_blade.dm"
#include "maplestation_modules\story_content\bell_equipment\code\bellclothing.dm"
#include "maplestation_modules\story_content\common_story\code\story_rapid_status.dm"
#include "maplestation_modules\story_content\crit_equipment\code\pendant.dm"
#include "maplestation_modules\story_content\grey_equipment\code\greyclothing.dm"
#include "maplestation_modules\story_content\jessie_equipment\code\jessie_clothing.dm"
#include "maplestation_modules\story_content\laurence_equipment\code\laurence_clothing.dm"
Expand Down
1 change: 1 addition & 0 deletions maplestation_modules/story_content/common_story/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
A common folder for story-related code and icons, for things to share or things that can't be easily split off into their own folders.
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
//Rapid status, a way to make a lot of changes to a mob quickly, albeit preset. Hopefully eventually replaced with JSON. Pretty much taken from the "make me tanky" menu
#define VV_STORY_RAPID_STATUS "story_rapid_status"

/mob/living/carbon/human/vv_get_dropdown()
. = ..()
VV_DROPDOWN_OPTION(VV_STORY_RAPID_STATUS, "Story Rapid Status")

/mob/living/carbon/human/vv_do_topic(list/href_list)
. = ..()

if(href_list[VV_STORY_RAPID_STATUS])
if(!check_rights(R_SPAWN))
return

var/list/options = list(
"Herald of Cosmos",
)

var/result = tgui_input_list(usr, "Pick something. You can also cancel with \"Cancel\".", "Rapid Status", options + "Cancel")
if(QDELETED(src) || !result || result == "Cancel")
return
var/picked = result

if(!picked)
return
message_admins("[key_name(usr)] has rapidly given [key_name(src)] the following preset: [picked]")
log_admin("[key_name(usr)] has rapidly given [key_name(src)] the following preset: [picked]")

switch(picked)
if("Herald of Cosmos") // kind of like a super-ascended cosmic heretic without a stargazer and a bit of void sidepathing, no regeneration or protection beyond ehp/speed means they can be worn down. very op
src?.mind.add_antag_datum(/datum/antagonist/heretic)
var/datum/antagonist/heretic/our_heretic = src?.mind.has_antag_datum(/datum/antagonist/heretic)
var/list/knowledges_to_grant = list( // cosmic heretic with a sidepath, some void spells and no ascension
/datum/heretic_knowledge/limited_amount/starting/base_cosmic,
/datum/heretic_knowledge/cosmic_grasp,
/datum/heretic_knowledge/spell/cosmic_runes,
/datum/heretic_knowledge/mark/cosmic_mark,
/datum/heretic_knowledge/spell/star_touch,
/datum/heretic_knowledge/spell/star_blast,
/datum/heretic_knowledge/blade_upgrade/cosmic,
/datum/heretic_knowledge/spell/cosmic_expansion,
/datum/heretic_knowledge/cold_snap,
/datum/heretic_knowledge/spell/void_phase,
/datum/heretic_knowledge/spell/void_pull,
/datum/heretic_knowledge/spell/space_phase,
)
if(our_heretic) // in case this entire chain broke along the way
our_heretic.ascended = TRUE
for(var/i in knowledges_to_grant)
our_heretic.gain_knowledge(i)

// the cosmic heretic ascension upgrades
var/datum/heretic_knowledge/blade_upgrade/cosmic/blade_upgrade = our_heretic.get_knowledge(/datum/heretic_knowledge/blade_upgrade/cosmic)
blade_upgrade.combo_duration = 10 SECONDS
blade_upgrade.combo_duration_amount = 10 SECONDS
blade_upgrade.max_combo_duration = 30 SECONDS
blade_upgrade.increase_amount = 2 SECONDS

var/datum/action/cooldown/spell/touch/star_touch/star_touch_spell = locate() in actions
if(star_touch_spell)
star_touch_spell.ascended = TRUE

var/datum/action/cooldown/spell/conjure/cosmic_expansion/cosmic_expansion_spell = locate() in actions
cosmic_expansion_spell?.ascended = TRUE

physiology.brute_mod = 0.25
physiology.burn_mod = 0.25
physiology.tox_mod = 0.5
physiology.oxy_mod = 0.5
physiology.stamina_mod = 0.5
physiology.stun_mod = 0.5
physiology.bleed_mod = 0
set_pain_mod("badmin", 0.6)

var/obj/item/bodypart/arm/left_arm = get_bodypart(BODY_ZONE_L_ARM) // your fists are now claws
left_arm.unarmed_attack_verb = "slash"
left_arm.grappled_attack_verb = "lacerate"
left_arm.unarmed_attack_effect = ATTACK_EFFECT_CLAW
left_arm.unarmed_attack_sound = 'sound/weapons/slash.ogg'
left_arm.unarmed_miss_sound = 'sound/weapons/slashmiss.ogg'
left_arm.unarmed_damage_low = 25
left_arm.unarmed_damage_high = 25
left_arm.unarmed_effectiveness = 30

var/obj/item/bodypart/arm/right_arm = get_bodypart(BODY_ZONE_R_ARM)
right_arm.unarmed_attack_verb = "slash"
right_arm.grappled_attack_verb = "lacerate"
right_arm.unarmed_attack_effect = ATTACK_EFFECT_CLAW
right_arm.unarmed_attack_sound = 'sound/weapons/slash.ogg'
right_arm.unarmed_miss_sound = 'sound/weapons/slashmiss.ogg'
right_arm.unarmed_damage_low = 25
right_arm.unarmed_damage_high = 25
right_arm.unarmed_effectiveness = 30

ADD_TRAIT(src, TRAIT_SLEEPIMMUNE, REF(src)) //needed to prevent chem cheese using wellcheers and sulfonal

19 changes: 19 additions & 0 deletions maplestation_modules/story_content/crit_equipment/code/pendant.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/obj/item/clothing/neck/annatto_pendant
name = "orange-blue pendant"
desc = "A orange and blue swirl pendant with a purple chain made of obsidian-like material. It seems like it can open."
icon = 'maplestation_modules/story_content/crit_equipment/icons/greenleaf_amulet.dmi'
icon_state = "greenleaf_amulet"
worn_icon = 'maplestation_modules/story_content/crit_equipment/icons/greenleaf_amulet_worn.dmi'
worn_icon_state = "greenleaf_amulet"
w_class = WEIGHT_CLASS_SMALL
resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF | INDESTRUCTIBLE // thing is built TOUGH
var/pendant_open = FALSE

/obj/item/clothing/neck/annatto_pendant/attack_self(mob/user)
if(!pendant_open)
pendant_open = TRUE
message_admins("[user] has opened the [src]. [ADMIN_FLW(src)]") // spoiler protection
icon_state = "greenleaf_amulet-open"
else
pendant_open = FALSE
icon_state = "greenleaf_amulet"
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
/obj/structure/sign/poster/official/post_er
name = "Wanted: Olivia \"Post\" Starfall"
desc = "If you see this dangerous person or any other member of the Clockwork Cult, please contact your appropriate commanding officer so they may alert Central Command."
icon_state = "post-er"
icon = 'maplestation_modules/story_content/story_posters/icons/contraband.dmi'

/obj/structure/sign/poster/official/mu_steve //omg,, steve,..
name = "An Interactive Guide to the Mu Sector with Steve"
desc = "A poster depicting the Mu Sector's unique tour guide, a talking UFO named Steve, ready to talk all about the monarchy in the center of the cosmos."
Expand Down
Binary file not shown.
Loading