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

More runtimes (#7917)

Browse Source
This commit is contained in:
Raeschen
2024-03-10 14:47:41 +01:00
committed by GitHub
parent 2b30041c6f
commit 05552c5c7a
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/_helpers/unsorted.dm
View File

@@ -871,7 +871,11 @@ Turf and target are seperate in case you want to teleport some distance from a t
"parent_type", "parent_type",
"verbs", "verbs",
"ckey", "ckey",
"key" "key",
"_active_timers", // ChompEDIT - blacklist timers
"_datum_components", // ChompEDIT - blacklist DCS
"_listen_lookup", // ChompEDIT - blacklist signal listeners
"_signal_procs" // ChompEDIT - blacklist signal procs
) )
if(perfectcopy) if(perfectcopy)
if((O) && (original)) if((O) && (original))

4
code/modules/mob/living/bot/farmbot.dm
View File

@@ -147,7 +147,7 @@
target = tray target = tray
times_idle = 0 //VOREStation Add - Idle shutoff time times_idle = 0 //VOREStation Add - Idle shutoff time
return return
if(!target && refills_water && tank && tank.reagents.total_volume < tank.reagents.maximum_volume) if(!target && refills_water && tank && tank.reagents?.total_volume < tank.reagents.maximum_volume) // ChompEDIT - runtime
for(var/obj/structure/sink/source in view(7, src)) for(var/obj/structure/sink/source in view(7, src))
target = source target = source
times_idle = 0 //VOREStation Add - Idle shutoff time times_idle = 0 //VOREStation Add - Idle shutoff time
@@ -419,4 +419,4 @@
created_name = t created_name = t
/obj/item/weapon/farmbot_arm_assembly/attack_hand(mob/user as mob) /obj/item/weapon/farmbot_arm_assembly/attack_hand(mob/user as mob)
return //it's a converted watertank, no you cannot pick it up and put it in your backpack return //it's a converted watertank, no you cannot pick it up and put it in your backpack

3
code/modules/projectiles/targeting/targeting_overlay.dm
View File

@@ -209,7 +209,7 @@
else else
to_chat(owner, "<span class='notice'>You will no longer aim rather than fire.</span>") to_chat(owner, "<span class='notice'>You will no longer aim rather than fire.</span>")
owner.client.remove_gun_icons() owner.client.remove_gun_icons()
owner.gun_setting_icon.icon_state = "gun[active]" owner.gun_setting_icon?.icon_state = "gun[active]"
/obj/aiming_overlay/proc/cancel_aiming(var/no_message = 0) /obj/aiming_overlay/proc/cancel_aiming(var/no_message = 0)
if(!aiming_with || !aiming_at) if(!aiming_with || !aiming_at)
@@ -224,4 +224,3 @@
aiming_at = null aiming_at = null
loc = null loc = null
STOP_PROCESSING(SSobj, src) STOP_PROCESSING(SSobj, src)

2
modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm
View File

@@ -402,7 +402,7 @@
projectile_dispersion = 100 projectile_dispersion = 100
projectile_accuracy = -100 projectile_accuracy = -100
base_attack_cooldown = 0 base_attack_cooldown = 0.01 // Division by zero error if 0
/mob/living/simple_mob/humanoid/eclipse/lunar/ravanger //Tanky boi. Very deadly melee /mob/living/simple_mob/humanoid/eclipse/lunar/ravanger //Tanky boi. Very deadly melee
name = "Lunar Eclipse Ravanger" name = "Lunar Eclipse Ravanger"