mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 20:48:56 +01:00
Roxy Comments
This commit is contained in:
Roxy
@@ -4,6 +4,7 @@
|
||||
/datum/reagent/medicine/c2/convermol,\
|
||||
/datum/reagent/medicine/epinephrine,\
|
||||
/datum/reagent/medicine/c2/libital,\
|
||||
/datum/reagent/medicine/lidocaine, /* BUBBER EDIT ADD */ \
|
||||
/datum/reagent/medicine/c2/multiver,\
|
||||
/datum/reagent/medicine/salglu_solution,\
|
||||
/datum/reagent/medicine/spaceacillin,\
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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)
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 5.9 KiB |
@@ -61,7 +61,7 @@ GLOBAL_LIST_INIT(skyrat_rod_recipes, list(
|
||||
new/datum/stack_recipe("towel bin", /obj/structure/towel_bin/empty, 2, time = 0.5 SECONDS, crafting_flags = CRAFT_ONE_PER_TURF, category = CAT_CONTAINERS),
|
||||
new/datum/stack_recipe("guard rail", /obj/structure/deployable_barricade/guardrail, 2, time = 1 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ON_SOLID_GROUND | CRAFT_CHECK_DIRECTION, category = CAT_STRUCTURE),
|
||||
new/datum/stack_recipe("wrestling ropes", /obj/structure/railing/wrestling, 3, time = 1.8 SECONDS, crafting_flags = CRAFT_ON_SOLID_GROUND | CRAFT_CHECK_DIRECTION, category = CAT_STRUCTURE),
|
||||
new/datum/stack_recipe("crutch", /obj/item/cane/crutch, 3, time = 1 SECONDS, category = CAT_TOOLS),
|
||||
new/datum/stack_recipe("crutch", /obj/item/cane/crutch, 3, time = 1 SECONDS, category = CAT_TOOLS, crafting_flags = CRAFT_SKIP_MATERIALS_PARITY),
|
||||
))
|
||||
|
||||
/obj/item/stack/rods/get_main_recipes()
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
@@ -305,18 +305,6 @@
|
||||
desc = "They're just missing the celestial body they belong to."
|
||||
neon_color = ""
|
||||
|
||||
/datum/barsign/skyrat/coldones
|
||||
name = "Cold Ones"
|
||||
icon_state = "cold-ones"
|
||||
desc = "That's what they call the yogurt effect."
|
||||
neon_color = "#dabd70"
|
||||
|
||||
/datum/barsign/skyrat/doctorsorders
|
||||
name = "Doctor's Orders"
|
||||
icon_state = "doctors-orders"
|
||||
desc = "For over-the-counter painkillers."
|
||||
neon_color = "#3e92e0"
|
||||
|
||||
/datum/barsign/skyrat/lowhanginfruit
|
||||
name = "The Low Hangin Fruit"
|
||||
icon_state = "the-low-hangin-fruit"
|
||||
@@ -329,12 +317,6 @@
|
||||
desc = "Twice, like a bird!"
|
||||
neon_color = ""
|
||||
|
||||
/datum/barsign/skyrat/wrongturn
|
||||
name = "Wrong Turn"
|
||||
icon_state = "wrong-turn"
|
||||
desc = "You don't feel lost. Nothing a few drinks cant fix, though."
|
||||
neon_color = "#c52121"
|
||||
|
||||
/datum/barsign/skyrat/o2n2
|
||||
name = "02n2"
|
||||
icon_state = "02n2"
|
||||
|
||||
@@ -54,6 +54,7 @@
|
||||
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/armadyne
|
||||
mask = /obj/item/clothing/mask/balaclava
|
||||
head = /obj/item/clothing/head/helmet/cin_surplus_helmet/forest
|
||||
back = /obj/item/storage/backpack/industrial/cin_surplus/forest
|
||||
backpack_contents = list(
|
||||
/obj/item/gun/ballistic/automatic/pistol/plasma_marksman,
|
||||
/obj/item/ammo_box/magazine/recharge/plasma_battery = 3,
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 614 B After Width: | Height: | Size: 1.3 KiB |
@@ -67,10 +67,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/space_heater/wall_mounted, 29)
|
||||
/// lazy-initialized cell stored in the actual heater (so that it can start with one without making a new one every placement)
|
||||
var/obj/item/stock_parts/power_store/cell = /obj/machinery/space_heater::cell
|
||||
|
||||
/obj/item/wallframe/wall_heater/Initialize(mapload)
|
||||
. = ..()
|
||||
register_context()
|
||||
|
||||
/obj/item/wallframe/wall_heater/after_attach(obj/machinery/space_heater/wall_mounted/attached_to)
|
||||
. = ..()
|
||||
if(!istype(attached_to))
|
||||
|
||||
@@ -168,6 +168,7 @@
|
||||
desc = "A datadisk that can be used to upload a loaded NIFSoft to the user's NIF"
|
||||
icon = 'modular_skyrat/modules/modular_implants/icons/obj/disks.dmi'
|
||||
icon_state = "base_disk"
|
||||
sticker_icon_state = null
|
||||
///What NIFSoft is currently loaded in?
|
||||
var/datum/nifsoft/loaded_nifsoft = /datum/nifsoft
|
||||
///Is the datadisk reusable?
|
||||
|
||||
@@ -41,6 +41,8 @@
|
||||
var/tagname = null
|
||||
/// Item path of on-init creation in the collar's storage
|
||||
var/treat_path = /obj/item/food/cookie
|
||||
/// Whether to add reskin component in Initialize
|
||||
var/reskins = TRUE
|
||||
|
||||
//spawn thing in collar
|
||||
|
||||
@@ -56,7 +58,8 @@
|
||||
var/id = REF(src)
|
||||
var/obj/item/key/kink_collar/collar_key = key
|
||||
collar_key.key_id = id
|
||||
AddComponent(/datum/component/reskinable_item, /datum/atom_skin/kink_collar)
|
||||
if(reskins)
|
||||
AddComponent(/datum/component/reskinable_item, /datum/atom_skin/kink_collar)
|
||||
|
||||
/datum/atom_skin/kink_collar
|
||||
abstract_type = /datum/atom_skin/kink_collar
|
||||
@@ -131,7 +134,8 @@
|
||||
/obj/item/clothing/neck/kink_collar/locked/Initialize(mapload)
|
||||
. = ..()
|
||||
create_storage(storage_type = /datum/storage/pockets/small/kink_collar/locked)
|
||||
AddComponent(/datum/component/reskinable_item, /datum/atom_skin/kink_collar_locked)
|
||||
if(reskins)
|
||||
AddComponent(/datum/component/reskinable_item, /datum/atom_skin/kink_collar_locked)
|
||||
|
||||
/datum/atom_skin/kink_collar_locked
|
||||
abstract_type = /datum/atom_skin/kink_collar_locked
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
|
||||
/datum/crafting_recipe/mosin_pro/New()
|
||||
. = ..()
|
||||
blacklist |= subtypesof(/obj/item/gun/ballistic/rifle/boltaction) - list(/obj/item/gun/ballistic/rifle/boltaction/surplus)
|
||||
LAZYOR(blacklist, subtypesof(/obj/item/gun/ballistic/rifle/boltaction) - list(/obj/item/gun/ballistic/rifle/boltaction/surplus))
|
||||
|
||||
/datum/crafting_recipe/mosin_pro/check_requirements(mob/user, list/collected_requirements)
|
||||
var/obj/item/gun/ballistic/rifle/boltaction/the_piece = collected_requirements[/obj/item/gun/ballistic/rifle/boltaction][1]
|
||||
|
||||
@@ -2,7 +2,12 @@
|
||||
var/warning_range_low = 60
|
||||
var/warning_range_high = TIME_BLOODSUCKER_DAY_WARN
|
||||
|
||||
/datum/component/weather_announcer/Initialize(state_normal, state_warning, state_danger)
|
||||
/datum/component/weather_announcer/Initialize(
|
||||
state_normal,
|
||||
state_warning,
|
||||
state_danger,
|
||||
radar_z_trait,
|
||||
)
|
||||
. = ..()
|
||||
RegisterSignal(SSsunlight, COMSIG_SOL_NEAR_START, PROC_REF(on_daylight_warning))
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/obj/item/rbmk_upgrade
|
||||
name = "\improper RB-MK2 software upgrade disk"
|
||||
desc = "It seems to be empty. Good fucking job, coders."
|
||||
icon = 'icons/obj/devices/circuitry_n_data.dmi'
|
||||
icon = 'icons/obj/devices/floppy_disks.dmi'
|
||||
icon_state = "datadisk2"
|
||||
|
||||
/obj/item/rbmk_upgrade/proc/apply_upgrade(obj/machinery/power/rbmk2/machine)
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
/obj/item/disk/bitrunning/prefs
|
||||
name = "DeForest biological simulation disk"
|
||||
desc = "A disk containing the biological simulation data necessary to load custom characters into bitrunning domains."
|
||||
icon = 'icons/obj/devices/circuitry_n_data.dmi'
|
||||
base_icon_state = "datadisk"
|
||||
icon_state = "datadisk0"
|
||||
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
greyscale_colors = "#8B96B7#505665"
|
||||
flags_1 = IS_PLAYER_COLORABLE_1
|
||||
resistance_flags = FIRE_PROOF
|
||||
reskins = FALSE
|
||||
|
||||
/obj/item/clothing/neck/kink_collar/locked/gps/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -32,9 +33,6 @@
|
||||
register_context()
|
||||
update_icon(UPDATE_OVERLAYS)
|
||||
RegisterSignal(src, COMSIG_NAME_CHANGED, PROC_REF(on_update_name))
|
||||
var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
|
||||
for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
|
||||
qdel(reskin_component)
|
||||
|
||||
/obj/item/clothing/neck/kink_collar/locked/gps/proc/on_update_name()
|
||||
SIGNAL_HANDLER
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
|
||||
/datum/atom_skin/midnight_gown
|
||||
abstract_type = /datum/atom_skin/midnight_gown
|
||||
reset_missing = FALSE
|
||||
greyscale_item_path = /obj/item/clothing/under/dress/bubber/midnight_gown
|
||||
|
||||
/datum/atom_skin/midnight_gown/right
|
||||
preview_name = "Right"
|
||||
@@ -64,7 +64,7 @@
|
||||
|
||||
/datum/atom_skin/giant_scarf
|
||||
abstract_type = /datum/atom_skin/giant_scarf
|
||||
reset_missing = FALSE
|
||||
greyscale_item_path = /obj/item/clothing/under/dress/bubber/giant_scarf
|
||||
|
||||
/datum/atom_skin/giant_scarf/giant_scarf
|
||||
preview_name = "Plain"
|
||||
|
||||
@@ -440,7 +440,7 @@
|
||||
/obj/item/disk/computer/plantgene
|
||||
name = "plant data disk"
|
||||
desc = "A disk for storing plant genetic data."
|
||||
icon_state = "datadisk_hydro"
|
||||
icon_state = "datadisk4"
|
||||
custom_materials = list(/datum/material/iron=30, /datum/material/glass=10)
|
||||
var/datum/plant_gene/gene
|
||||
read_only = FALSE //Well, it's still a floppy disk
|
||||
@@ -448,7 +448,7 @@
|
||||
|
||||
/obj/item/disk/computer/plantgene/Initialize(mapload)
|
||||
. = ..()
|
||||
add_overlay("datadisk_gene")
|
||||
set_sticker_icon_state("o_dna1")
|
||||
src.pixel_x = rand(-5, 5)
|
||||
src.pixel_y = rand(-5, 5)
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
/obj/machinery/computer/nanite_chamber_control
|
||||
name = "nanite chamber control console"
|
||||
desc = "Controls a connected nanite chamber. Can inoculate nanites, load programs, and analyze existing nanite swarms."
|
||||
icon = 'modular_zubbers/icons/obj/machines/computer.dmi'
|
||||
icon_screen = "nanite_chamber_control"
|
||||
circuit = /obj/item/circuitboard/computer/nanite_chamber_control
|
||||
var/obj/machinery/nanite_chamber/chamber
|
||||
|
||||
@@ -174,9 +174,6 @@
|
||||
. = ..()
|
||||
|
||||
/datum/techweb_node/syndicate_basic/New()
|
||||
design_ids -= "mag_autorifle"
|
||||
design_ids -= "mag_autorifle_ap"
|
||||
design_ids -= "mag_autorifle_ic"
|
||||
design_ids += "wt550_ammo_incendiary"
|
||||
design_ids += "mod_mind_transfer"
|
||||
. = ..()
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 137 KiB |
@@ -69,7 +69,6 @@
|
||||
/obj/machinery/ammo_workbench/Initialize(mapload)
|
||||
materials = new( \
|
||||
src, \
|
||||
/datum/material_container, \
|
||||
SSmaterials.materials_by_category[MAT_CATEGORY_ITEM_MATERIAL], \
|
||||
200000, \
|
||||
MATCONTAINER_EXAMINE, \
|
||||
@@ -462,6 +461,7 @@
|
||||
. += "ammobench_loaded"
|
||||
|
||||
/obj/machinery/ammo_workbench/Destroy()
|
||||
QDEL_NULL(materials)
|
||||
QDEL_NULL(wires)
|
||||
if(timer_id)
|
||||
deltimer(timer_id)
|
||||
|
||||
Reference in New Issue
Block a user