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

Grah

Browse Source
This commit is contained in:
xPokee
2025-10-04 06:09:47 -04:00
parent 8aa39b75f0
commit 312085b95c
18 changed files with 19 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/girders.dm
+6 -6
View File
@@ -113,7 +113,7 @@
return
rod.use(amount)
var/obj/structure/falsewall/iron/FW = new (loc)
user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT
user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT
transfer_fingerprints_to(FW)
qdel(src)
return
@@ -132,7 +132,7 @@
rod.use(amount)
var/turf/T = get_turf(src)
T.place_on_top(/turf/closed/wall/mineral/iron)
user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT
user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT
transfer_fingerprints_to(T)
qdel(src)
return
@@ -194,7 +194,7 @@
return
stack.use(amount)
var/obj/structure/tram/tram_wall = new(loc)
user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT
user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT
transfer_fingerprints_to(tram_wall)
qdel(src)
return
@@ -281,7 +281,7 @@
return
var/obj/structure/tram/tram_wall
tram_wall = new tram_wall_type(loc)
user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT
user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT
stack.use(amount)
transfer_fingerprints_to(tram_wall)
qdel(src)
@@ -297,7 +297,7 @@
return
stack.use(amount)
var/obj/structure/falsewall/falsewall
user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT
user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT
if(falsewall_type)
falsewall = new falsewall_type (loc)
else
@@ -320,7 +320,7 @@
return
stack.use(amount)
var/turf/T = get_turf(src)
user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT
user.mind.adjust_experience(/datum/skill/construction, 5) //SKYRAT EDIT
if(stack.walltype)
T.place_on_top(stack.walltype)
else
code/modules/reagents/reagent_containers/condiment.dm
+1 -1
View File
@@ -64,7 +64,7 @@
)
log_combat(user, target, "fed", reagents.get_reagent_log_string())
SEND_SIGNAL(M, COMSIG_GLASS_DRANK, src, user) // SKYRAT EDIT ADDITION - Hemophages can't casually drink what's not going to regenerate their blood
SEND_SIGNAL(target, COMSIG_GLASS_DRANK, src, user) // SKYRAT EDIT ADDITION - Hemophages can't casually drink what's not going to regenerate their blood
reagents.trans_to(target, 10, transferred_by = user, methods = INGEST)
playsound(target, 'sound/items/drink.ogg', rand(10, 50), TRUE)
return ITEM_INTERACT_SUCCESS
modular_skyrat/modules/mapping/code/spaceship_items.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "sheet-spaceship"
inhand_icon_state = "sheet-plastitaniumglass"
singular_name = "spaceship plate"
sheettype = "spaceship"
construction_path_type = "spaceship"
merge_type = /obj/item/stack/sheet/spaceship
walltype = /turf/closed/wall/mineral/titanium/spaceship
modular_skyrat/modules/medical/code/wounds/muscle.dm
+1 -2
View File
@@ -22,8 +22,7 @@
viable_zones = list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
required_limb_biostate = BIO_FLESH
required_wounding_types = list(WOUND_BLUNT, WOUND_SLASH, WOUND_PIERCE)
match_all_wounding_types = FALSE
required_wounding_type = list(WOUND_BLUNT, WOUND_SLASH, WOUND_PIERCE)
wound_series = WOUND_SERIES_MUSCLE_DAMAGE
modular_skyrat/modules/medical/code/wounds/synth/blunt/robotic_blunt.dm
+1 -1
View File
@@ -97,7 +97,7 @@
abstract = TRUE
required_limb_biostate = BIO_METAL
wound_series = WOUND_SERIES_METAL_BLUNT_BASIC
required_wounding_types = list(WOUND_BLUNT)
required_wounding_type = WOUND_BLUNT
/datum/wound_pregen_data/blunt_metal/generate_scar_priorities()
return list("[BIO_METAL]")
modular_skyrat/modules/medical/code/wounds/synth/robotic_burns.dm
+1 -1
View File
@@ -3,7 +3,7 @@
/datum/wound_pregen_data/burnt_metal
abstract = TRUE
required_limb_biostate = BIO_METAL
required_wounding_types = list(WOUND_BURN)
required_wounding_type = WOUND_BURN
wound_series = WOUND_SERIES_METAL_BURN_OVERHEAT
/datum/wound_pregen_data/burnt_metal/generate_scar_priorities()
modular_skyrat/modules/medical/code/wounds/synth/robotic_pierce.dm
+1 -1
View File
@@ -8,7 +8,7 @@
/datum/wound_pregen_data/electrical_damage/pierce
abstract = TRUE
wound_series = WOUND_SERIES_WIRE_PIERCE_ELECTRICAL_DAMAGE
required_wounding_types = list(WOUND_PIERCE)
required_wounding_type = WOUND_PIERCE
/datum/wound/burn/electrical_damage/pierce/get_limb_examine_description()
return span_warning("The metal on this limb is pierced open.")
modular_skyrat/modules/medical/code/wounds/synth/robotic_slash.dm
+1 -1
View File
@@ -105,7 +105,7 @@
/datum/wound_pregen_data/electrical_damage
abstract = TRUE
required_limb_biostate = (BIO_WIRED)
required_wounding_types = list(WOUND_SLASH)
required_wounding_type = WOUND_SLASH
wound_series = WOUND_SERIES_WIRE_SLASH_ELECTRICAL_DAMAGE
/datum/wound_pregen_data/electrical_damage/generate_scar_priorities()
modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/venom_milker.dm
+1 -1
View File
@@ -8,7 +8,7 @@
volume = 20
reagent_flags = OPENCONTAINER
initial_reagent_flags = OPENCONTAINER
w_class = WEIGHT_CLASS_SMALL
/obj/item/reagent_containers/venom_milker/Initialize(mapload)
modular_skyrat/modules/morenarcotics/code/vapecarts.dm
+1 -1
View File
@@ -28,7 +28,7 @@
name = "customizable vape cart"
desc = "Fill with whatever hazardous concoction of chemicals you desire!"
list_reagents = list()
reagent_flags = OPENCONTAINER
initial_reagent_flags = OPENCONTAINER
var/labelled = FALSE
/obj/item/reagent_containers/vapecart/empty/attack_self(mob/user)
modular_skyrat/modules/moretraitoritems/code/drinkingglass.dm
+1 -1
View File
@@ -7,7 +7,7 @@
amount_per_transfer_from_this = 50
possible_transfer_amounts = list(50)
volume = 50
reagent_flags = REFILLABLE | DRAINABLE
initial_reagent_flags = REFILLABLE | DRAINABLE
/obj/item/storage/box/syndieshotglasses
name = "box of shot glasses"
modular_zubbers/code/datums/components/vore/belly.dm
-2
View File
@@ -341,8 +341,6 @@
sensor_clothing.sensor_mode = SENSOR_OFF
if(ishuman(arrived))
var/mob/living/carbon/human/H = arrived
if(H.w_uniform == sensor_clothing)
H.update_suit_sensors()
/// Handles prey leaving a belly
/obj/vore_belly/Exited(atom/movable/gone, direction)
modular_zubbers/code/datums/mood_events/food_events.dm
-33
View File
@@ -1,33 +0,0 @@
/datum/mood_event/food/add_effects(param)
. = ..()
if(quality >= FOOD_QUALITY_VERYGOOD)
var/effect_strength = quality - FOOD_QUALITY_VERYGOOD
var/mob/living/carbon/human/O = owner
if(istype(O))
O.apply_status_effect(/datum/status_effect/food/quality_healing, effect_strength)
/datum/status_effect/food/quality_healing
id = "food_quality_healing"
status_type = STATUS_EFFECT_REPLACE //The last food you ate should be the one to affect it
/// Used to determine how good our heal is
var/qheal_strength = 0
var/healpwr = 3
/datum/status_effect/food/quality_healing/on_creation(mob/living/new_owner, _qheal_strength)
qheal_strength = _qheal_strength
if(qheal_strength > 2) //Godlike food is pretty hard to achieve (Unless you're a moff) and should be rewarded
healpwr = 5
return ..()
/datum/status_effect/food/quality_healing/tick(seconds_between_ticks)
. = ..()
var/mob/living/carbon/human/O = owner
if(istype(O))
if(O.stat == HARD_CRIT)
return
if(prob(5 + (qheal_strength * 2.5))) //Very tiny and in no way combat viable, might pick you up from crit in a very rare case
O.heal_bodypart_damage(brute = healpwr, burn = healpwr, required_bodytype = BODYTYPE_ORGANIC)
for(var/obj/item/organ/stomach/S in O.organs)
S.apply_organ_damage((S.healing_factor * healpwr))
modular_zubbers/code/datums/mood_events/miasma_events.dm
-14
View File
@@ -1,14 +0,0 @@
/datum/mood_event/miasma/
category = "Miasma"
/datum/mood_event/miasma/light
description = "Something terrible smells."
mood_change = -2
/datum/mood_event/miasma/moderate
description = "It smells like something horribly decayed inside this room!"
mood_change = -4
/datum/mood_event/miasma/heavy
description = "The stench of rotting carcasses is unbearable!"
mood_change = -8
modular_zubbers/code/datums/wounds/permanent_limp.dm
+1 -1
View File
@@ -39,7 +39,7 @@
required_limb_biostate = BIO_BONE | BIO_METAL
require_any_biostate = TRUE
required_wounding_types = list(WOUND_ALL)
required_wounding_type = WOUND_ALL
wound_series = WOUND_SERIES_PERM_LIMP_BASIC
can_be_randomly_generated = FALSE
modular_zubbers/code/modules/pen_medipens/pen_medipens.dm
+1 -1
View File
@@ -15,7 +15,7 @@
/// If this pen has a timer for injecting others with, just for safety with some of the drugs in these (actually to stop people from gaming too hard)
inject_others_time = 1.5 SECONDS
no_sticker = TRUE
reagent_flags = TRANSPARENT
initial_reagent_flags = TRANSPARENT
/obj/item/reagent_containers/hypospray/medipen/deforest/printable/Initialize(mapload)
. = ..()
modular_zubbers/modules/ammo_workbench/code/ammo_workbench.dm
+1 -1
View File
@@ -247,7 +247,7 @@
var/sheets_to_remove = round(min(desired,50,stored_amount))
mat_container.retrieve_sheets(sheets_to_remove, mat, loc)
mat_container.retrieve_stack(sheets_to_remove, mat, loc)
. = TRUE
if("ReadDisk")
tgstation.dme
-2
View File
@@ -8943,8 +8943,6 @@
#include "modular_zubbers\code\datums\mood_events\_mood_event.dm"
#include "modular_zubbers\code\datums\mood_events\bloodsucker_events.dm"
#include "modular_zubbers\code\datums\mood_events\dominant_mood.dm"
#include "modular_zubbers\code\datums\mood_events\food_events.dm"
#include "modular_zubbers\code\datums\mood_events\miasma_events.dm"
#include "modular_zubbers\code\datums\mood_events\nanite_events.dm"
#include "modular_zubbers\code\datums\mutations\harmonizing_pulses.dm"
#include "modular_zubbers\code\datums\mutations\visuals_override.dm"