cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 20:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Skillchips are now copied to bitrunning avatars, plus a new chip to dodge bullets while flipping. (#81980)

Browse Source 
## About The Pull Request
Active skillchips are now copied on bitrunning avatars. To celebrate
this, I've made a skillchip, which can be ordered through the bitrunning
vendor, that lets you dodge projectiles for the duration of your flips
plus 1/10 of a second (so 8/10 of a sec), at the cost of stamina (if you
think 20 is a bit too low, tell me).

I've also renamed the files containing the orderable bepis disks and
bitrunning tech because they inconsistent with the names of their
sections shown in the UI.

## Why It's Good For The Game
I think (active) skillchips being copied to bitrunning avatars makes
sense as after all they're both tech-y, brainy stuff. It's a bit of a
shame that no one thought of doing that.

## Changelog

🆑
add: Active skillchips are now copied on bitrunning avatars.
add: To celebrate it, a skillchip is now available from the bitrunning
order console, which lets you dodge projectiles for the duration of your
flips, at the cost of stamina.
/🆑
This commit is contained in:
Ghom
2024-03-21 21:44:10 +01:00
committed by GitHub
parent bd8a641a5a
commit 76fa5bcdad
12 changed files with 102 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/mobs.dm
+3
View File
@@ -970,6 +970,9 @@ GLOBAL_LIST_INIT(layers_to_offset, list(
/// Types of bullets that mining mobs take full damage from
#define MINING_MOB_PROJECTILE_VULNERABILITY list(BRUTE)
/// The duration of the flip emote animation
#define FLIP_EMOTE_DURATION 0.7 SECONDS
// Sprites for photocopying butts
#define BUTT_SPRITE_HUMAN_MALE "human_male"
#define BUTT_SPRITE_HUMAN_FEMALE "human_female"
code/__DEFINES/traits/declarations.dm
+2
View File
@@ -497,6 +497,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_ADAMANTINE_EXTRACT_ARMOR "adamantine_extract_armor"
/// Mobs with this trait won't be able to dual wield guns.
#define TRAIT_NO_GUN_AKIMBO "no_gun_akimbo"
/// Mobs with this trait cannot be hit by projectiles, meaning the projectiles will just go through.
#define TRAIT_UNHITTABLE_BY_PROJECTILES "unhittable_by_projectiles"
/// Projectile with this trait will always hit the defined zone of a struck living mob.
#define TRAIT_ALWAYS_HIT_ZONE "always_hit_zone"
code/_globalvars/traits/_traits.dm
+2 -1
View File
@@ -10,6 +10,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_AI_PAUSED" = TRAIT_AI_PAUSED,
"TRAIT_BANNED_FROM_CARGO_SHUTTLE" = TRAIT_BANNED_FROM_CARGO_SHUTTLE,
"TRAIT_BEING_SHOCKED" = TRAIT_BEING_SHOCKED,
"TRAIT_COMMISSIONED" = TRAIT_COMMISSIONED,
"TRAIT_CLIMBABLE" = TRAIT_CLIMBABLE,
"TRAIT_CURRENTLY_CLEANING" = TRAIT_CURRENTLY_CLEANING,
"TRAIT_CUSTOMIZABLE_REAGENT_HOLDER" = TRAIT_CUSTOMIZABLE_REAGENT_HOLDER,
@@ -25,7 +26,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_RUSTY" = TRAIT_RUSTY,
"TRAIT_SPINNING" = TRAIT_SPINNING,
"TRAIT_STICKERED" = TRAIT_STICKERED,
"TRAIT_COMMISSIONED" = TRAIT_COMMISSIONED,
"TRAIT_UNHITTABLE_BY_PROJECTILES" = TRAIT_UNHITTABLE_BY_PROJECTILES,
),
/atom/movable = list(
"TRAIT_ACTIVE_STORAGE" = TRAIT_ACTIVE_STORAGE,
code/_globalvars/traits/admin_tooling.dm
+1
View File
@@ -4,6 +4,7 @@
GLOBAL_LIST_INIT(admin_visible_traits, list(
/atom = list(
"TRAIT_UNHITTABLE_BY_PROJECTILES" = TRAIT_UNHITTABLE_BY_PROJECTILES,
"TRAIT_KEEP_TOGETHER" = TRAIT_KEEP_TOGETHER,
),
/atom/movable = list(
code/modules/bitrunning/orders/bepis.dm
+23
View File
@@ -0,0 +1,23 @@
/datum/orderable_item/bepis
category_index = CATEGORY_BEPIS
/datum/orderable_item/bepis/circuit_stack
item_path = /obj/item/stack/circuit_stack/full
cost_per_order = 150
/datum/orderable_item/bepis/survival_pen
item_path = /obj/item/pen/survival
cost_per_order = 150
/datum/orderable_item/bepis/party_sleeper
item_path = /obj/item/circuitboard/machine/sleeper/party
cost_per_order = 750
desc = "A decommissioned sleeper circuitboard, repurposed for recreational purposes."
/datum/orderable_item/bepis/sprayoncan
item_path = /obj/item/toy/sprayoncan
cost_per_order = 750
/datum/orderable_item/bepis/pristine
item_path = /obj/item/disk/design_disk/bepis/remove_tech
cost_per_order = 1000
code/modules/bitrunning/orders/disks.dm
-32
View File
@@ -1,32 +0,0 @@
/datum/orderable_item/bitrunning_tech
category_index = CATEGORY_BITRUNNING_TECH
/datum/orderable_item/bitrunning_tech/item_tier1
cost_per_order = 1000
item_path = /obj/item/bitrunning_disk/item/tier1
desc = "This disk contains a program that lets you equip a medical beamgun, a C4 explosive, or a box of infinite pizza."
/datum/orderable_item/bitrunning_tech/item_tier2
cost_per_order = 1500
item_path = /obj/item/bitrunning_disk/item/tier2
desc = "This disk contains a program that lets you equip a luxury medipen, a pistol, or an armour vest."
/datum/orderable_item/bitrunning_tech/item_tier3
cost_per_order = 2500
item_path = /obj/item/bitrunning_disk/item/tier3
desc = "This disk contains a program that lets you equip an advanced energy gun, a dual bladed energy sword, or a minibomb."
/datum/orderable_item/bitrunning_tech/ability_tier1
cost_per_order = 1000
item_path = /obj/item/bitrunning_disk/ability/tier1
desc = "This disk contains a program that lets you cast Summon Cheese or Lesser Heal."
/datum/orderable_item/bitrunning_tech/ability_tier2
cost_per_order = 1800
item_path = /obj/item/bitrunning_disk/ability/tier2
desc = "This disk contains a program that lets you cast Fireball, Lightning Bolt, or Forcewall."
/datum/orderable_item/bitrunning_tech/ability_tier3
cost_per_order = 3200
item_path = /obj/item/bitrunning_disk/ability/tier3
desc = "This disk contains a program that lets you shapeshift into a lesser ashdrake, or a polar bear."
code/modules/bitrunning/orders/tech.dm
+34 -21
View File
@@ -1,23 +1,36 @@
/datum/orderable_item/bepis
category_index = CATEGORY_BEPIS
/datum/orderable_item/bitrunning_tech
category_index = CATEGORY_BITRUNNING_TECH
/datum/orderable_item/bepis/circuit_stack
item_path = /obj/item/stack/circuit_stack/full
cost_per_order = 150
/datum/orderable_item/bepis/survival_pen
item_path = /obj/item/pen/survival
cost_per_order = 150
/datum/orderable_item/bepis/party_sleeper
item_path = /obj/item/circuitboard/machine/sleeper/party
cost_per_order = 750
desc = "A decommissioned sleeper circuitboard, repurposed for recreational purposes."
/datum/orderable_item/bepis/sprayoncan
item_path = /obj/item/toy/sprayoncan
cost_per_order = 750
/datum/orderable_item/bepis/pristine
item_path = /obj/item/disk/design_disk/bepis/remove_tech
/datum/orderable_item/bitrunning_tech/item_tier1
cost_per_order = 1000
item_path = /obj/item/bitrunning_disk/item/tier1
desc = "This disk contains a program that lets you equip a medical beamgun, a C4 explosive, or a box of infinite pizza."
/datum/orderable_item/bitrunning_tech/item_tier2
cost_per_order = 1500
item_path = /obj/item/bitrunning_disk/item/tier2
desc = "This disk contains a program that lets you equip a luxury medipen, a pistol, or an armour vest."
/datum/orderable_item/bitrunning_tech/item_tier3
cost_per_order = 2500
item_path = /obj/item/bitrunning_disk/item/tier3
desc = "This disk contains a program that lets you equip an advanced energy gun, a dual bladed energy sword, or a minibomb."
/datum/orderable_item/bitrunning_tech/ability_tier1
cost_per_order = 1000
item_path = /obj/item/bitrunning_disk/ability/tier1
desc = "This disk contains a program that lets you cast Summon Cheese or Lesser Heal."
/datum/orderable_item/bitrunning_tech/ability_tier2
cost_per_order = 1800
item_path = /obj/item/bitrunning_disk/ability/tier2
desc = "This disk contains a program that lets you cast Fireball, Lightning Bolt, or Forcewall."
/datum/orderable_item/bitrunning_tech/ability_tier3
cost_per_order = 3200
item_path = /obj/item/bitrunning_disk/ability/tier3
desc = "This disk contains a program that lets you shapeshift into a lesser ashdrake, or a polar bear."
/datum/orderable_item/bitrunning_tech/flip_skillchip
item_path = /obj/item/skillchip/matrix_flip
cost_per_order = 2000
code/modules/bitrunning/server/obj_generation.dm
+8
View File
@@ -187,3 +187,11 @@
if(failed)
to_chat(neo, span_warning("One of your disks failed to load. Check for duplicate or inactive disks."))
var/obj/item/organ/internal/brain/neo_brain = neo.get_organ_slot(ORGAN_SLOT_BRAIN)
for(var/obj/item/skillchip/skill_chip as anything in neo_brain?.skillchips)
if(!skill_chip.active)
continue
var/obj/item/skillchip/clone_chip = new skill_chip.type
avatar.implant_skillchip(clone_chip, force = TRUE)
clone_chip.try_activate_skillchip(silent = TRUE, force = TRUE)
code/modules/library/skill_learning/skillchip.dm
+25
View File
@@ -507,4 +507,29 @@
activate_message = span_notice("You think of your favourite food and realise that you can rotate its flavour in your mind.")
deactivate_message = span_notice("You feel your food-based mind palace crumbling...")
/obj/item/skillchip/matrix_flip
name = "BULLET_DODGER skillchip"
skill_name = "Flip 2 Dodge"
skill_description = "At the cost of stamina, your flips can also be used to dodge incoming projectiles."
skill_icon = FA_ICON_SPINNER
activate_message = span_notice("You feel the urge to flip scenically as if you are the 'Chosen One'.")
deactivate_message = span_notice("The urge to flip goes away.")
/obj/item/skillchip/matrix_flip/on_activate(mob/living/carbon/user, silent = FALSE)
. = ..()
RegisterSignal(user, COMSIG_MOB_EMOTED("flip"), PROC_REF(on_flip))
/obj/item/skillchip/matrix_flip/on_deactivate(mob/living/carbon/user, silent=FALSE)
UnregisterSignal(user, COMSIG_MOB_EMOTED("flip"))
return ..()
/obj/item/skillchip/matrix_flip/proc/on_flip(mob/living/source)
SIGNAL_HANDLER
if(HAS_TRAIT_FROM(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT))
return
playsound(source, 'sound/weapons/fwoosh.ogg', 90, FALSE)
ADD_TRAIT(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT)
source.adjustStaminaLoss(20)
addtimer(TRAIT_CALLBACK_REMOVE(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT), FLIP_EMOTE_DURATION + 0.1 SECONDS)
#undef SKILLCHIP_CATEGORY_GENERAL
code/modules/mob/emote.dm
+1 -1
View File
@@ -79,7 +79,7 @@
/datum/emote/flip/run_emote(mob/user, params , type_override, intentional)
. = ..()
if(.)
user.SpinAnimation(7,1)
user.SpinAnimation(FLIP_EMOTE_DURATION,1)
/datum/emote/flip/check_cooldown(mob/user, intentional)
. = ..()
code/modules/projectiles/projectile.dm
+2
View File
@@ -594,6 +594,8 @@
// if pass_flags match, pass through entirely - unless direct target is set.
if((target.pass_flags_self & pass_flags) && !direct_target)
return FALSE
if(HAS_TRAIT(target, TRAIT_UNHITTABLE_BY_PROJECTILES))
return FALSE
if(!ignore_source_check && firer)
var/mob/M = firer
if((target == firer) || ((target == firer.loc) && ismecha(firer.loc)) || (target in firer.buckled_mobs) || (istype(M) && (M.buckled == target)))
tgstation.dme
+1 -1
View File
@@ -3437,7 +3437,7 @@
#include "code\modules\bitrunning\objects\netpod.dm"
#include "code\modules\bitrunning\objects\quantum_console.dm"
#include "code\modules\bitrunning\objects\vendor.dm"
#include "code\modules\bitrunning\orders\disks.dm"
#include "code\modules\bitrunning\orders\bepis.dm"
#include "code\modules\bitrunning\orders\flair.dm"
#include "code\modules\bitrunning\orders\tech.dm"
#include "code\modules\bitrunning\server\_parent.dm"