mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
[MIRROR] just some init fixes (#9794)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
6a62e578ab
commit
4d0df72be2
@@ -45,9 +45,8 @@
|
||||
can_pain_emote = FALSE // CHOMPEdit: Sanity/safety, if bots ever get emotes later, undo this
|
||||
allow_mind_transfer = TRUE
|
||||
|
||||
/mob/living/bot/New()
|
||||
..()
|
||||
//update_icons() //VOREstation edit: moved to Init
|
||||
/mob/living/bot/Initialize()
|
||||
. = ..()
|
||||
|
||||
//default_language = GLOB.all_languages[LANGUAGE_GALCOM] //VOREstation edit: moved to Init
|
||||
|
||||
@@ -61,9 +60,6 @@
|
||||
if(!using_map.bot_patrolling)
|
||||
will_patrol = FALSE
|
||||
|
||||
// Make sure mapped in units start turned on.
|
||||
/mob/living/bot/Initialize()
|
||||
. = ..()
|
||||
if(on)
|
||||
turn_on() // Update lights and other stuff
|
||||
update_icons() //VOREstation edit - overlay runtime fix
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
var/blood = 1
|
||||
var/list/target_types = list()
|
||||
|
||||
/mob/living/bot/cleanbot/New()
|
||||
..()
|
||||
/mob/living/bot/cleanbot/Initialize()
|
||||
. = ..()
|
||||
get_targets()
|
||||
|
||||
/mob/living/bot/cleanbot/Destroy()
|
||||
|
||||
@@ -23,8 +23,8 @@
|
||||
var/obj/structure/reagent_dispensers/watertank/tank
|
||||
|
||||
|
||||
/mob/living/bot/farmbot/New(var/newloc, var/newTank)
|
||||
..(newloc)
|
||||
/mob/living/bot/farmbot/Initialize(var/newloc, var/newTank)
|
||||
. = ..(newloc)
|
||||
if(!newTank)
|
||||
newTank = new /obj/structure/reagent_dispensers/watertank(src)
|
||||
tank = newTank
|
||||
|
||||
@@ -36,8 +36,8 @@
|
||||
|
||||
var/global/amount = 0
|
||||
|
||||
/mob/living/bot/mulebot/New()
|
||||
..()
|
||||
/mob/living/bot/mulebot/Initialize()
|
||||
. = ..()
|
||||
|
||||
var/turf/T = get_turf(loc)
|
||||
var/obj/machinery/navbeacon/N = locate() in T
|
||||
|
||||
@@ -59,10 +59,10 @@
|
||||
//-------------------------------------------
|
||||
// Standard procs
|
||||
//-------------------------------------------
|
||||
/obj/vehicle/train/security/engine/New()
|
||||
..()
|
||||
/obj/vehicle/train/security/engine/Initialize()
|
||||
cell = new /obj/item/cell/high(src)
|
||||
key = new key_type(src)
|
||||
. = ..()
|
||||
var/image/I = new(icon = 'icons/obj/vehicles.dmi', icon_state = "cargo_engine_overlay", layer = src.layer + 0.2) //over mobs
|
||||
add_overlay(I)
|
||||
turn_off() //so engine verbs are correctly set
|
||||
|
||||
@@ -216,8 +216,8 @@
|
||||
return 1
|
||||
return 0
|
||||
|
||||
/obj/vehicle/train/trolley/trailer/New()
|
||||
..()
|
||||
/obj/vehicle/train/trolley/trailer/Initialize()
|
||||
. = ..()
|
||||
update_icon()
|
||||
|
||||
/obj/vehicle/train/trolley/trailer/Moved(atom/old_loc, direction, forced = FALSE)
|
||||
|
||||
@@ -61,10 +61,10 @@
|
||||
//-------------------------------------------
|
||||
// Standard procs
|
||||
//-------------------------------------------
|
||||
/obj/vehicle/train/rover/engine/New()
|
||||
..()
|
||||
/obj/vehicle/train/rover/engine/Initialize()
|
||||
cell = new /obj/item/cell/high(src)
|
||||
key = new(src)
|
||||
. = ..()
|
||||
turn_off() //so engine verbs are correctly set
|
||||
|
||||
/obj/vehicle/train/rover/engine/Move(var/turf/destination)
|
||||
|
||||
@@ -1569,8 +1569,8 @@ End CHOMP Removal*/
|
||||
icon_state = "ceph_d6[result]"
|
||||
|
||||
/obj/item/dice/loaded/ceph/Initialize()
|
||||
icon_state = "ceph_d6[rand(1,sides)]"
|
||||
. = ..()
|
||||
icon_state = "ceph_d6[rand(1,sides)]"
|
||||
|
||||
|
||||
//abc123: Mira Nesyne
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
idle_power_usage = 1000
|
||||
|
||||
/obj/machinery/auto_cloner/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
time_per_spawn = rand(1200,3600)
|
||||
|
||||
@@ -37,7 +38,6 @@
|
||||
/mob/living/simple_mob/animal/passive/crab,
|
||||
/mob/living/simple_mob/animal/passive/mouse,
|
||||
/mob/living/simple_mob/animal/goat)
|
||||
. = ..()
|
||||
|
||||
//todo: how the hell is the asteroid permanently powered?
|
||||
/obj/machinery/auto_cloner/process()
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
density = TRUE
|
||||
|
||||
/obj/structure/crystal/Initialize()
|
||||
. = ..()
|
||||
|
||||
icon_state = pick("ano70","ano80")
|
||||
|
||||
@@ -14,7 +15,6 @@
|
||||
"It seems to draw you inward as you look it at.",
|
||||
"Something twinkles faintly as you look at it.",
|
||||
"It's mesmerizing to behold.")
|
||||
. = ..()
|
||||
|
||||
/obj/structure/crystal/Destroy()
|
||||
src.visible_message(span_bolddanger("[src] shatters!"))
|
||||
|
||||
@@ -12,9 +12,9 @@
|
||||
var/last_act = 0
|
||||
|
||||
/obj/structure/boulder/Initialize()
|
||||
. = ..()
|
||||
icon_state = "boulder[rand(1,4)]"
|
||||
excavation_level = rand(5, 50)
|
||||
. = ..()
|
||||
|
||||
/obj/structure/boulder/attackby(var/obj/item/I, var/mob/user)
|
||||
if(istype(I, /obj/item/core_sampler))
|
||||
|
||||
@@ -9,9 +9,9 @@
|
||||
var/datum/geosample/geological_data
|
||||
|
||||
/obj/item/rocksliver/Initialize()
|
||||
. = ..()
|
||||
icon_state = "sliver[rand(1, 3)]"
|
||||
randpixel_xy()
|
||||
. = ..()
|
||||
|
||||
/datum/geosample
|
||||
var/age = 0
|
||||
|
||||
@@ -167,6 +167,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor)
|
||||
name = "bluespace"
|
||||
icon = 'icons/turf/space_vr.dmi'
|
||||
icon_state = "bluespace"
|
||||
|
||||
/turf/space/bluespace/Initialize()
|
||||
icon = 'icons/turf/space_vr.dmi'
|
||||
icon_state = "bluespace"
|
||||
@@ -177,9 +178,10 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor)
|
||||
name = "sand transit"
|
||||
icon = 'icons/turf/transit_vr.dmi'
|
||||
icon_state = "desert_ns"
|
||||
|
||||
/turf/space/sandyscroll/Initialize()
|
||||
icon_state = "desert_ns"
|
||||
. = ..()
|
||||
icon_state = "desert_ns"
|
||||
|
||||
//Sky stuff!
|
||||
// A simple turf to fake the appearance of flying.
|
||||
|
||||
Reference in New Issue
Block a user