This commit is contained in:
Geeves
2021-03-01 17:40:59 +02:00
committed by GitHub
parent 0d5ada01c8
commit 714448e714
42 changed files with 307 additions and 497 deletions
@@ -41,7 +41,8 @@
var/datum/artifact_find/artifact_find
var/last_act = 0
/obj/structure/boulder/New()
/obj/structure/boulder/Initialize(mapload)
. = ..()
icon_state = "boulder[rand(1,4)]"
excavation_level = rand(5,50)
@@ -32,12 +32,12 @@
var/method = 0// 0 = fire, 1 = brush, 2 = pick
origin_tech = list(TECH_MATERIAL = 5)
/obj/item/ore/strangerock/New(loc, var/inside_item_type = 0)
..(loc)
/obj/item/ore/strangerock/Initialize(mapload, var/inside_item_type = 0)
. = ..()
//method = rand(0,2)
if(inside_item_type)
inside = new/obj/item/archaeological_find(src, new_item_type = inside_item_type)
inside = new /obj/item/archaeological_find(src, inside_item_type)
if(!inside)
inside = locate() in contents
@@ -84,7 +84,8 @@
icon_state = "ano01"
var/find_type = 0
/obj/item/archaeological_find/New(loc, var/new_item_type)
/obj/item/archaeological_find/Initialize(mapload, var/new_item_type)
. = ..()
if(new_item_type)
find_type = new_item_type
else
@@ -553,7 +554,7 @@
if(talkative)
new_item.talking_atom = new(new_item)
qdel(src)
return INITIALIZE_HINT_QDEL
else if(talkative)
src.talking_atom = new(src)
src.talking_atom = new(src)
@@ -9,15 +9,16 @@
desc = "It's a fossil."
var/animal = 1
/obj/item/fossil/base/New()
var/list/l = list("/obj/item/fossil/bone"=9,"/obj/item/fossil/skull"=3,
"/obj/item/fossil/skull/horned"=2)
var/t = pickweight(l)
var/obj/item/W = new t(src.loc)
/obj/item/fossil/base/Initialize()
..()
var/list/possible_fossils = list(/obj/item/fossil/bone = 9, /obj/item/fossil/skull = 3, /obj/item/fossil/skull/horned = 2)
var/fossil_path = pickweight(possible_fossils)
var/obj/item/fossil = new fossil_path(src.loc)
var/turf/T = get_turf(src)
if(istype(T, /turf/simulated/mineral))
T:last_find = W
qdel(src)
var/turf/simulated/mineral/M = T
M.last_find = fossil
return INITIALIZE_HINT_QDEL
/obj/item/fossil/bone
name = "Fossilised bone"
@@ -53,7 +54,8 @@
var/bstate = 0
var/plaque_contents = "Unnamed alien creature"
/obj/skeleton/New()
/obj/skeleton/Initialize(mapload, ...)
. = ..()
src.breq = rand(6)+3
src.desc = "An incomplete skeleton, looks like it could use [src.breq-src.bnum] more bones."
@@ -100,5 +102,6 @@
desc = "It's fossilised plant remains."
animal = 0
/obj/item/fossil/plant/New()
icon_state = "plant[rand(1,4)]"
/obj/item/fossil/plant/Initialize()
. = ..()
icon_state = "plant[rand(1,4)]"
@@ -64,8 +64,8 @@
var/wight_check_index = 1
var/list/shadow_wights = list()
/obj/item/vampiric/New()
..()
/obj/item/vampiric/Initialize()
. = ..()
START_PROCESSING(SSprocessing, src)
listening_objects += src
@@ -157,8 +157,8 @@
var/turf/target_turf
var/loc_last_process
/obj/effect/decal/cleanable/blood/splatter/animated/New()
..()
/obj/effect/decal/cleanable/blood/splatter/animated/Initialize(mapload)
. = ..()
START_PROCESSING(SSprocessing, src)
loc_last_process = src.loc
@@ -192,7 +192,8 @@
icon_state = "shade"
density = 1
/obj/effect/shadow_wight/New()
/obj/effect/shadow_wight/Initialize(mapload, ...)
. = ..()
START_PROCESSING(SSprocessing, src)
/obj/effect/shadow_wight/Destroy()
@@ -26,11 +26,12 @@
var/source_rock = "/turf/simulated/mineral/"
var/datum/geosample/geological_data
/obj/item/rocksliver/New()
/obj/item/rocksliver/Initialize()
. = ..()
icon_state = "sliver[rand(1,3)]"
randpixel_xy()
create_reagents(50)
reagents.add_reagent(/decl/reagent/stone_dust,50)
reagents.add_reagent(/decl/reagent/stone_dust, 50)
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Geosample datum
@@ -5,7 +5,9 @@
notices = 5
icon_state = "nboard05"
/obj/structure/noticeboard/anomaly/New()
/obj/structure/noticeboard/anomaly/Initialize()
. = ..()
//add some memos
var/obj/item/paper/P = new()
P.name = "Memo RE: proper analysis procedure"
@@ -8,8 +8,9 @@
var/stored_charge = 0
var/effect_id = ""
/obj/item/anobattery/New()
battery_effect = new()
/obj/item/anobattery/Initialize()
. = ..()
battery_effect = new /datum/artifact_effect()
/obj/item/anobattery/proc/UpdateSprite()
var/p = (stored_charge/capacity)*100