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

[MIRROR] Fixes a bunch of harddels that are sourced from player action (#6252)

Browse Source 
* Fixes a bunch of harddels that are sourced from player action

* Mirror!

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
This commit is contained in:
SkyratBot
2021-06-11 03:13:33 +01:00
committed by GitHub
co-authored by LemonInTheDark Funce
parent cc5595fddf
commit 6f3b151bb8
165 changed files with 1076 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/fantasy/_fantasy.dm
+1 -2
View File
@@ -132,8 +132,7 @@
for(var/i in affixes)
var/datum/fantasy_affix/affix = i
affix.remove(src)
for(var/i in appliedComponents)
qdel(i)
QDEL_LIST(appliedComponents)
master.force = max(0, master.force - quality)
master.throwforce = max(0, master.throwforce - quality)
code/datums/components/pellet_cloud.dm
+1 -1
View File
@@ -308,7 +308,7 @@
var/w_bonus = wound_info_by_part[hit_part][CLOUD_POSITION_W_BONUS]
var/bw_bonus = wound_info_by_part[hit_part][CLOUD_POSITION_BW_BONUS]
var/wound_type = (initial(P.damage_type) == BRUTE) ? WOUND_BLUNT : WOUND_BURN // sharpness is handled in the wound rolling
wound_info_by_part[hit_part] = null
wound_info_by_part -= hit_part
hit_part.painless_wound_roll(wound_type, damage_dealt, w_bonus, bw_bonus, initial(P.sharpness))
if(num_hits > 1)
code/datums/components/squeak.dm
+1 -1
View File
@@ -97,7 +97,7 @@
if(AM.movement_type & (FLYING|FLOATING) || !AM.has_gravity())
return
var/atom/current_parent = parent
if(isturf(current_parent.loc))
if(isturf(current_parent?.loc))
play_squeak()
/datum/component/squeak/proc/use_squeak()
code/datums/components/storage/storage.dm
+12 -4
View File
@@ -398,20 +398,27 @@
M.client.screen |= boxes
M.client.screen |= closer
M.client.screen |= real_location.contents
M.active_storage = src
M.set_active_storage(src)
LAZYOR(is_using, M)
RegisterSignal(M, COMSIG_PARENT_QDELETING, .proc/mob_deleted)
return TRUE
/datum/component/storage/proc/mob_deleted(datum/source)
SIGNAL_HANDLER
hide_from(source)
/datum/component/storage/proc/hide_from(mob/M)
if(M.active_storage == src)
M.set_active_storage(null)
LAZYREMOVE(is_using, M)
UnregisterSignal(M, COMSIG_PARENT_QDELETING)
if(!M.client)
return TRUE
var/atom/real_location = real_location()
M.client.screen -= boxes
M.client.screen -= closer
M.client.screen -= real_location.contents
if(M.active_storage == src)
M.active_storage = null
LAZYREMOVE(is_using, M)
return TRUE
/datum/component/storage/proc/close(mob/M)
@@ -490,6 +497,7 @@
cansee |= M
else
LAZYREMOVE(is_using, M)
UnregisterSignal(M, COMSIG_PARENT_QDELETING)
return cansee
//Tries to dump content
code/datums/components/udder.dm
+1 -4
View File
@@ -77,6 +77,7 @@
/obj/item/udder/Destroy()
. = ..()
STOP_PROCESSING(SSobj, src)
udder_mob = null
/obj/item/udder/process(delta_time)
if(udder_mob.stat != DEAD)
@@ -132,10 +133,6 @@
START_PROCESSING(SSobj, src)
RegisterSignal(udder_mob, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, .proc/on_mob_attacking)
/obj/item/udder/gutlunch/Destroy()
. = ..()
UnregisterSignal(udder_mob, COMSIG_HOSTILE_PRE_ATTACKINGTARGET)
/obj/item/udder/gutlunch/process(delta_time)
var/mob/living/simple_animal/hostile/asteroid/gutlunch/gutlunch = udder_mob
if(reagents.total_volume != reagents.maximum_volume)