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

more fixies

Browse Source 
Fixes vorgan vac destination not checking if vorgan owner is present or adjacent.
Fixes massive piles bypassing any capacity checks on trashbag mode.
This commit is contained in:
Verkister
2023-05-11 21:47:38 +03:00
parent ff327a5a3d
commit 9cb7a29b23
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modular_chomp/code/game/objects/items/devices/vacpack.dm
View File

@@ -91,6 +91,13 @@
if(B.current_capacity >= B.max_ore_storage) if(B.current_capacity >= B.max_ore_storage)
to_chat(user, "<span class='warning'>Ore storage full. Deposit ore contents to a box continue.</span>") to_chat(user, "<span class='warning'>Ore storage full. Deposit ore contents to a box continue.</span>")
return return
if(isbelly(output_dest))
if(output_dest.loc != user && !output_dest.loc.Adjacent(user)) //Can still be used as a feeding tube by another adjacent player.
vac_power = 0
icon_state = "sucker-0"
output_dest = null
to_chat(user, "<span class='warning'>Target destination not found. Shutting down.</span>")
return
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
var/auto_setting = 1 var/auto_setting = 1
if(isturf(target)) if(isturf(target))
@@ -160,6 +167,11 @@
if(istype(F,/obj/effect/decal/cleanable)) if(istype(F,/obj/effect/decal/cleanable))
qdel(F) qdel(F)
continue continue
if(istype(output_dest,/obj/item/weapon/storage/bag/trash))
var/obj/item/weapon/storage/bag/trash/B = output_dest
if(LAZYLEN(B.contents) >= B.max_storage_space)
to_chat(user, "<span class='warning'>Trash bag full. Empty trash bag contents to continue.</span>")
return
if(vac_conga < 100) if(vac_conga < 100)
vac_conga += 3 vac_conga += 3
spawn(3 + vac_conga) spawn(3 + vac_conga)

18
vorestation.dme
View File

@@ -4651,20 +4651,28 @@
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\fleshtaker.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\fleshtaker.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\xenomorph.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\xenomorph.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\xenomorph_abilities.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\xenomorph_abilities.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\animal\spider.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\animal\space\alien.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\animal\space\alien.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\animal\space\mouse_army_ch.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\animal\space\mouse_army_ch.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\horror\Master.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\horror\Master.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\humanoid\cultboss.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\humanoid\cultboss.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\humanoid\cultist_ch.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\humanoid\cultist_ch.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\humanoid\mercenary.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\humanoid\pirate.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\humanoid\eclipse\eclipse.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\humanoid\eclipse\eclipse.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\humanoid\eclipse\noms.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\humanoid\eclipse\noms.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\cyber_horror.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\disbot.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\disbot.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\drones\combat_drone.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\drones\combat_drone.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\hivebot\boss.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\hivebot\boss.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\hivebot\hivebot.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\hivebot\precusor_hivebots.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\hivebot\precusor_hivebots.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\hivebot\tank.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\hivebot\tank.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\combat.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\gygax.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\gygax.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\phazon.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\phazon.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\meteroid\metTypes.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\occult\constructs\construct.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\occult\constructs\juggernaut.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\occult\constructs\juggernaut.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\bigdragon.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\bigdragon.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\desert_planet_mobs.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\desert_planet_mobs.dm"
@@ -4685,6 +4693,7 @@
#include "modular_chomp\code\modules\power\cells\esoteric_cells.dm" #include "modular_chomp\code\modules\power\cells\esoteric_cells.dm"
#include "modular_chomp\code\modules\power\cells\power_cells.dm" #include "modular_chomp\code\modules\power\cells\power_cells.dm"
#include "modular_chomp\code\modules\projectiles\gun.dm" #include "modular_chomp\code\modules\projectiles\gun.dm"
#include "modular_chomp\code\modules\projectiles\mob.dm"
#include "modular_chomp\code\modules\projectiles\clockwork\clockwork_guns_ch.dm" #include "modular_chomp\code\modules\projectiles\clockwork\clockwork_guns_ch.dm"
#include "modular_chomp\code\modules\projectiles\guns\phase.dm" #include "modular_chomp\code\modules\projectiles\guns\phase.dm"
#include "modular_chomp\code\modules\reagents\machinery\dispenser\chem_synthesizer_ch.dm" #include "modular_chomp\code\modules\reagents\machinery\dispenser\chem_synthesizer_ch.dm"
@@ -4703,13 +4712,4 @@
#include "modular_chomp\code\modules\vore\resizing\resize.dm" #include "modular_chomp\code\modules\vore\resizing\resize.dm"
#include "modular_chomp\code\modules\xenobio\machinery\monkey_processor.dm" #include "modular_chomp\code\modules\xenobio\machinery\monkey_processor.dm"
#include "modular_chomp\maps\overmap\space_pois\space_pois.dm" #include "modular_chomp\maps\overmap\space_pois\space_pois.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\animal\spider.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\humanoid\mercenary.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\humanoid\pirate.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\cyber_horror.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\hivebot\hivebot.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\meteroid\metTypes.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\occult\constructs\construct.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\combat.dm"
#include "modular_chomp\code\modules\projectiles\mob.dm"
// END_INCLUDE // END_INCLUDE