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

Reenables solargrub files

Browse Source
This commit is contained in:
Heroman
2019-04-21 11:42:14 +10:00
parent 054f39d922
commit ebe96f79b2
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm
View File

@@ -25,7 +25,7 @@ List of things solar grubs should be able to do:
melee_damage_lower = 1 melee_damage_lower = 1
melee_damage_upper = 5 melee_damage_upper = 5
speed = 2 movement_cooldown = 8
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat

6
code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm
View File

@@ -26,7 +26,7 @@ var/global/list/grub_machine_overlays = list()
can_pull_mobs = MOB_PULL_NONE can_pull_mobs = MOB_PULL_NONE
density = 0 density = 0
stop_when_pulled = 0 //stop_when_pulled = 0
var/static/list/ignored_machine_types = list( var/static/list/ignored_machine_types = list(
/obj/machinery/atmospherics/unary/vent_pump, /obj/machinery/atmospherics/unary/vent_pump,
@@ -69,7 +69,7 @@ var/global/list/grub_machine_overlays = list()
if(machine_effect && !istype(loc, /obj/machinery)) if(machine_effect && !istype(loc, /obj/machinery))
QDEL_NULL(machine_effect) QDEL_NULL(machine_effect)
if(!. || ai_inactive) if(!.) // || ai_inactive
return return
if(power_drained >= 7 MEGAWATTS && prob(5)) if(power_drained >= 7 MEGAWATTS && prob(5))
@@ -86,7 +86,7 @@ var/global/list/grub_machine_overlays = list()
if(stance == STANCE_IDLE) if(stance == STANCE_IDLE)
if(forced_out) if(forced_out)
forced_out = Clamp(0, forced_out--, forced_out) forced_out = CLAMP(0, forced_out--, forced_out)
return return
if(target_vent) if(target_vent)

2
vorestation.dme
View File

@@ -2425,6 +2425,8 @@
#include "code\modules\mob\living\simple_mob\subtypes\vore\rat.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\rat.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\redpanda.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\redpanda.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\snake.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\snake.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\solargrub.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\solargrub_larva.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\vore.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\vore.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\wolf.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\wolf.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\wolfgirl.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\wolfgirl.dm"