cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 13:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Roxy Comments

Browse Source
This commit is contained in:
Roxy
2026-04-11 08:57:59 -06:00
committed by The Sharkening
parent 4504eda0c2
commit 26d7f00a76
27 changed files with 36 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/under/pants.dm
+1 -1
View File
@@ -2,7 +2,7 @@
gender = PLURAL
body_parts_covered = GROIN|LEGS
female_sprite_flags = NO_FEMALE_UNIFORM
can_adjust = TRUE
can_adjust = FALSE // BUBBER EDIT CHANGE - ORIGINAL: TRUE
custom_price = PAYCHECK_CREW
icon = 'icons/obj/clothing/under/shorts_pants_shirts.dmi'
worn_icon = 'icons/mob/clothing/under/shorts_pants_shirts.dmi'
code/modules/reagents/reagent_containers/condiment.dm
+1 -1
View File
@@ -25,7 +25,7 @@
/obj/item/reagent_containers/condiment/update_icon_state()
. = ..()
if(reagents.reagent_list.len)
if(length(reagents.reagent_list)) // BUBBER EDIT CHANGE - FIXES A RUNTIME I LITERALLY CANNOT FIGURE OUT IM SORRY - ORIGINAL: reagents.reagent_list.len
if(icon_preempty)
icon_state = icon_preempty
icon_preempty = null
code/modules/research/designs/weapon_designs.dm
+2
View File
@@ -275,6 +275,7 @@
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
autolathe_exportable = FALSE
/* BUBBER EDIT REMOVAL BEGIN
/datum/design/mag_autorifle
name = "WT-550 Autorifle Magazine (4.6x30mm) (Lethal)"
desc = "A 20 round magazine for the out of date WT-550 Autorifle."
@@ -302,6 +303,7 @@
materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 6, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT)
build_path = /obj/item/ammo_box/magazine/wt550m9/wtic
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
*/// BUBBER EDIT REMOVAL END
/datum/design/pin_testing
name = "Test-Range Firing Pin"
code/modules/research/techweb/nodes/syndicate_nodes.dm
+2
View File
@@ -9,9 +9,11 @@
"borg_syndicate_module",
"donksoft_refill",
"largecrossbow",
/* BUBBER EDIT REMOVAL BEGIN
"mag_autorifle",
"mag_autorifle_ap",
"mag_autorifle_ic",
*/// BUBBER EDIT REMOVAL END
"rapidsyringe",
"suppressor",
"super_pointy_tape",
code/modules/surgery/operations/operation_filter.dm
+5 -1
View File
@@ -35,7 +35,7 @@
for(var/datum/reagent/chem as anything in limb.owner.reagents?.reagent_list)
if(!length(bloodfilter.whitelist) || !(chem.type in bloodfilter.whitelist))
limb.owner.reagents.remove_reagent(chem.type, clamp(round(chem.volume * 0.22, 0.2), 0.4, 10))
limb.owner.adjust_tox_loss(clamp(round(limb.owner.get_tox_loss() * -0.07, 2), -2, -10), forced = TRUE) // BUBBER EDIT ADDITION - Filtration fixes toxins
display_results(
surgeon,
limb.owner,
@@ -58,6 +58,10 @@
limb.receive_damage(5, damage_source = tool)
/datum/surgery_operation/limb/filter_blood/proc/has_filterable_chems(mob/living/carbon/target, obj/item/blood_filter/bloodfilter)
// BUBBER EDIT ADDITION BEGIN - Filtration fixes toxins
if(target.get_tox_loss() > 0)
return TRUE
// BUBBER EDIT ADDITION END
if(!length(target.reagents?.reagent_list))
bloodfilter.audible_message(span_notice("[bloodfilter] pings as it reports no chemicals detected in [target]'s blood."))
playsound(target, 'sound/machines/ping.ogg', 75, TRUE, falloff_exponent = 12, falloff_distance = 1)