cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-2025-11-05

Browse Source
This commit is contained in:
Roxy
2025-11-05 19:43:07 -05:00
parent 7ebdda5853 7e6a7978c3
commit d0ca474789
461 changed files with 41708 additions and 37517 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/bitrunning/objects/disks.dm
+5 -5
View File
@@ -35,7 +35,7 @@
. += span_notice("It cannot make another selection.")
/// Handles loading our stuff onto avatars
/obj/item/bitrunning_disk/proc/load_onto_avatar(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, external_load_flags)
/obj/item/bitrunning_disk/proc/load_onto_avatar(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, domain_flags)
return NONE
@@ -46,8 +46,8 @@
/// The list of actions that this can grant
var/list/datum/action/selectable_actions = list()
/obj/item/bitrunning_disk/ability/load_onto_avatar(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, external_load_flags)
if(external_load_flags & DOMAIN_FORBIDS_ABILITIES)
/obj/item/bitrunning_disk/ability/load_onto_avatar(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, domain_flags)
if(domain_flags & DOMAIN_FORBIDS_ABILITIES)
return BITRUNNER_GEAR_LOAD_BLOCKED
if(isnull(granted_action))
@@ -118,8 +118,8 @@
/// The list of actions that this can grant
var/list/obj/selectable_items = list()
/obj/item/bitrunning_disk/item/load_onto_avatar(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, external_load_flags)
if(external_load_flags & DOMAIN_FORBIDS_ITEMS)
/obj/item/bitrunning_disk/item/load_onto_avatar(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, domain_flags)
if(domain_flags & DOMAIN_FORBIDS_ITEMS)
return BITRUNNER_GEAR_LOAD_BLOCKED
if(isnull(granted_item))
code/modules/bitrunning/objects/gimmick_disks/_gimmick_disk.dm
+9 -10
View File
@@ -13,10 +13,10 @@
QDEL_NULL(granted_loadout)
return ..()
/obj/item/bitrunning_disk/gimmick/load_onto_avatar(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, external_load_flags)
/obj/item/bitrunning_disk/gimmick/load_onto_avatar(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, domain_flags)
if(isnull(granted_loadout))
return BITRUNNER_GEAR_LOAD_FAILED
return granted_loadout.grant_loadout(neo, avatar, external_load_flags)
return granted_loadout.grant_loadout(neo, avatar, domain_flags)
/obj/item/bitrunning_disk/gimmick/attack_self(mob/user, modifiers)
. = ..()
@@ -57,17 +57,17 @@
var/prefix_container_name = TRUE
/// Grants out loadout.
/datum/bitrunning_gimmick/proc/grant_loadout(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, external_load_flags)
/datum/bitrunning_gimmick/proc/grant_loadout(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, domain_flags)
var/return_flags = NONE
return_flags |= grant_items(neo, avatar, external_load_flags)
return_flags |= grant_abilities(neo, avatar, external_load_flags)
return_flags |= grant_items(neo, avatar, domain_flags)
return_flags |= grant_abilities(neo, avatar, domain_flags)
return return_flags
/datum/bitrunning_gimmick/proc/grant_items(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, external_load_flags)
/datum/bitrunning_gimmick/proc/grant_items(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, domain_flags)
if(!length(granted_items))
return NONE
if(external_load_flags & DOMAIN_FORBIDS_ITEMS)
if(domain_flags & DOMAIN_FORBIDS_ITEMS)
return BITRUNNER_GEAR_LOAD_BLOCKED
var/obj/item/container_item = new container_item_type()
@@ -81,11 +81,11 @@
return NONE
/datum/bitrunning_gimmick/proc/grant_abilities(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, external_load_flags)
/datum/bitrunning_gimmick/proc/grant_abilities(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, domain_flags)
if(!length(granted_actions))
return NONE
if(external_load_flags & DOMAIN_FORBIDS_ABILITIES)
if(domain_flags & DOMAIN_FORBIDS_ABILITIES)
return BITRUNNER_GEAR_LOAD_BLOCKED
var/return_flags = NONE
@@ -99,4 +99,3 @@
our_action.Grant(avatar)
return return_flags