cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] up port muffle items (#10476)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-03-20 16:49:01 -07:00
committed by GitHub
parent f601906363
commit b25441e2b0
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/objects/items/weapons/storage/backpack.dm
View File

@@ -36,7 +36,12 @@
/* /*
/obj/item/storage/backpack/dropped(mob/user) /obj/item/storage/backpack/dropped(mob/user)
if (loc == user && src.use_sound) if (loc == user && src.use_sound)
playsound(src, src.use_sound, 50, 1, -5) if(isbelly(user.loc))
var/obj/belly/B = user.loc
if(B.mode_flags & DM_FLAG_MUFFLEITEMS)
return
else
playsound(src, src.use_sound, 50, 1, -5)
..(user) ..(user)
*/ */

2
code/game/objects/items/weapons/storage/storage.dm
View File

@@ -238,11 +238,9 @@
/obj/item/storage/proc/open(mob/user as mob) /obj/item/storage/proc/open(mob/user as mob)
if (use_sound) if (use_sound)
//CHOMPStation Edit
var/obj/belly/B = user.loc var/obj/belly/B = user.loc
if(isliving(user) && (!isbelly(B) || !(B.mode_flags & DM_FLAG_MUFFLEITEMS))) if(isliving(user) && (!isbelly(B) || !(B.mode_flags & DM_FLAG_MUFFLEITEMS)))
playsound(src, src.use_sound, 50, 0, -5) playsound(src, src.use_sound, 50, 0, -5)
//CHOMPStation Edit end
orient2hud(user) orient2hud(user)
if(user.s_active) if(user.s_active)

12
code/modules/power/batteryrack.dm
View File

@@ -26,20 +26,12 @@
var/icon_update = 0 // Timer in ticks for icon update. var/icon_update = 0 // Timer in ticks for icon update.
var/ui_tick = 0 var/ui_tick = 0
should_be_mapped = TRUE should_be_mapped = TRUE
circuit = /obj/item/circuitboard/batteryrack
/obj/machinery/power/smes/batteryrack/Initialize(mapload) /obj/machinery/power/smes/batteryrack/Initialize(mapload)
. = ..() . = ..()
add_parts() default_apply_parts()
RefreshParts()
/obj/machinery/power/smes/batteryrack/proc/add_parts()
component_parts = list()
component_parts += new /obj/item/circuitboard/batteryrack
component_parts += new /obj/item/stock_parts/capacitor // Capacitors: Maximal I/O
component_parts += new /obj/item/stock_parts/capacitor
component_parts += new /obj/item/stock_parts/capacitor
component_parts += new /obj/item/stock_parts/matter_bin // Matter Bin: Max. amount of cells.
/obj/machinery/power/smes/batteryrack/RefreshParts() /obj/machinery/power/smes/batteryrack/RefreshParts()
var/capacitor_efficiency = 0 var/capacitor_efficiency = 0

13
code/modules/vore/eating/soulcatcher.dm
View File

@@ -40,12 +40,17 @@
// Store the vars_to_save into the save file // Store the vars_to_save into the save file
/obj/soulgem/deserialize(list/data) /obj/soulgem/deserialize(list/data)
. = ..() . = ..()
for(var/obj/belly in owner.vore_organs) if(apply_stored_belly(data["linked_belly"], TRUE))
if(belly.name == data["linked_belly"]) return
update_linked_belly(belly, TRUE)
return
linked_belly = null linked_belly = null
/obj/soulgem/proc/apply_stored_belly(var/belly_string, var/skip_unreg = FALSE)
for(var/obj/belly in owner.vore_organs)
if(belly.name == belly_string)
update_linked_belly(belly, TRUE)
return TRUE
return FALSE
// Allows to transfer the soulgem to the given mob // Allows to transfer the soulgem to the given mob
/obj/soulgem/proc/transfer_self(var/mob/target) /obj/soulgem/proc/transfer_self(var/mob/target)
QDEL_NULL(target.soulgem) QDEL_NULL(target.soulgem)