fix bees, roaches and lights on test tiny (#29335)

This commit is contained in:
DeityLink
2021-04-26 17:50:55 +02:00
committed by GitHub
parent 4caf73688e
commit eebcefb1b8
7 changed files with 21 additions and 13 deletions

View File

@@ -16,7 +16,8 @@
/obj/machinery/light_switch/initialize() /obj/machinery/light_switch/initialize()
add_self_to_holomap() add_self_to_holomap()
toggle_switch(newstate = 0) if (!map.lights_always_ok)
toggle_switch(newstate = 0)
/obj/machinery/light_switch/New(var/loc, var/ndir, var/building = 2) /obj/machinery/light_switch/New(var/loc, var/ndir, var/building = 2)
..() ..()

View File

@@ -84,7 +84,7 @@ var/bee_mobs_count = 0
can_butcher = 0 can_butcher = 0
var/updateState = 0//if set to 1, the bee mob will check if it should split based on its bee datums' intents var/updateState = 0//if set to 1, the bee mob will check if it should split based on its bee datums' intents
var/state = BEE_ROAMING var/state = BEE_ROAMING//this controls the bee's current behaviour
var/atom/destination = null var/atom/destination = null
var/list/bees = list() var/list/bees = list()
var/mob/target = null var/mob/target = null
@@ -646,9 +646,6 @@ var/bee_mobs_count = 0
wander = 0 wander = 0
var/turf/target_turf = get_turf(home) var/turf/target_turf = get_turf(home)
if(target_turf) if(target_turf)
if (calmed <= 0)
step_to(src, target_turf)
if(src.loc == target_turf) if(src.loc == target_turf)
if (!home.species || bee_species == home.species) if (!home.species || bee_species == home.species)
for(var/datum/bee/B in bees) for(var/datum/bee/B in bees)
@@ -658,6 +655,8 @@ var/bee_mobs_count = 0
visible_message("<span class='notice'>A swarm has lost its way.</span>") visible_message("<span class='notice'>A swarm has lost its way.</span>")
home = null home = null
mood_change(BEE_ROAMING) mood_change(BEE_ROAMING)
if (calmed <= 0)
step_to(src, target_turf)
else else
visible_message("<span class='notice'>A swarm has lost its way.</span>") visible_message("<span class='notice'>A swarm has lost its way.</span>")
home = null home = null

View File

@@ -257,6 +257,8 @@
/mob/New() /mob/New()
. = ..() . = ..()
original_density = density
mob_list += src mob_list += src
if(DEAD == stat) if(DEAD == stat)
@@ -1550,7 +1552,7 @@ Use this proc preferably at the end of an equipment loadout
setDensity(FALSE) setDensity(FALSE)
drop_hands() drop_hands()
else else
setDensity(TRUE) setDensity(original_density)
//Temporarily moved here from the various life() procs //Temporarily moved here from the various life() procs
//I'm fixing stuff incrementally so this will likely find a better home. //I'm fixing stuff incrementally so this will likely find a better home.

View File

@@ -286,6 +286,7 @@
var/mob/transmogged_to //holds a reference to the mob which holds a reference to this mob in its transmogged_from var var/mob/transmogged_to //holds a reference to the mob which holds a reference to this mob in its transmogged_from var
var/forced_density = 0 // If the mob was made non-dense by an admin. var/forced_density = 0 // If the mob was made non-dense by an admin.
var/original_density = 1
var/old_assigned_role // If they ghosted, what role did they have? var/old_assigned_role // If they ghosted, what role did they have?
var/list/crit_rampup = list() // Of the form timestamp/damage var/list/crit_rampup = list() // Of the form timestamp/damage

View File

@@ -142,13 +142,14 @@ var/global/list/obj/machinery/light/alllights = list()
if(A && !A.requires_power) if(A && !A.requires_power)
on = 1 on = 1
switch(fitting) if (!map.lights_always_ok)
if("tube") switch(fitting)
if(prob(2)) if("tube")
broken(1) if(prob(2))
if("bulb") broken(1)
if(prob(5)) if("bulb")
broken(1) if(prob(5))
broken(1)
spawn(1) spawn(1)
update(0) update(0)

View File

@@ -103,6 +103,8 @@
var/datum/climate/climate = null //use for weather cycle var/datum/climate/climate = null //use for weather cycle
var/has_engines = FALSE // Is the map a space ship with big engines? var/has_engines = FALSE // Is the map a space ship with big engines?
var/lights_always_ok = FALSE //should all lights be on and working at roundstart
var/list/holodeck_rooms = list( var/list/holodeck_rooms = list(
"Basketball Court", "Basketball Court",
"Beach", "Beach",

View File

@@ -16,6 +16,8 @@
load_map_elements = list(/datum/map_element/dungeon/holodeck) load_map_elements = list(/datum/map_element/dungeon/holodeck)
lights_always_ok = TRUE
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
#include "test_tiny.dmm" #include "test_tiny.dmm"
#endif #endif