From 1202538dc5b5bd019350ebcb94b9a21e86bac3df Mon Sep 17 00:00:00 2001 From: DZD Date: Thu, 9 Jul 2015 19:26:41 -0400 Subject: [PATCH] Actually compiles --- _maps/map_files/cyberiad/cyberiad.dmm | 2 +- _maps/map_files/cyberiad/z5.dmm | 6 +++--- _maps/map_files/cyberiad/z6.dmm | 8 +++---- code/modules/mining/mine_turfs.dm | 21 +++++++++++++++++++ code/modules/mining/ore.dm | 7 +++++++ .../artifact/artifact_gigadrill.dm | 2 +- .../research/xenoarchaeology/geosample.dm | 10 +++++++-- .../tools/tools_depthscanner.dm | 2 +- 8 files changed, 46 insertions(+), 12 deletions(-) diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 44a7bb9f455..1752223b3aa 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -1123,7 +1123,7 @@ "avE" = (/obj/machinery/power/apc{cell_type = 5000; dir = 1; name = "Barber Shop APC"; pixel_y = 24},/obj/structure/stool/bed/chair/barber{dir = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{dir = 2; icon_state = "barber"},/area/civilian/barber) "avF" = (/obj/structure/table/reinforced,/obj/structure/mirror{pixel_x = 28},/obj/item/weapon/razor,/turf/simulated/floor{dir = 2; icon_state = "barber"},/area/civilian/barber) "avG" = (/obj/structure/table/woodentable,/obj/item/seeds/bananaseed,/turf/simulated/floor/wood,/area/clownoffice) -"avH" = (/obj/structure/table/woodentable,/obj/item/weapon/ore/clown,/obj/item/weapon/stamp/clown,/turf/simulated/floor/wood,/area/clownoffice) +"avH" = (/obj/structure/table/woodentable,/obj/item/weapon/ore/bananium,/obj/item/weapon/stamp/clown,/turf/simulated/floor/wood,/area/clownoffice) "avI" = (/turf/simulated/floor/wood,/area/clownoffice) "avJ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/wood,/area/clownoffice) "avK" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/light_switch{pixel_x = 0; pixel_y = 25},/turf/simulated/floor/wood,/area/clownoffice) diff --git a/_maps/map_files/cyberiad/z5.dmm b/_maps/map_files/cyberiad/z5.dmm index e011a78faa9..23c1efb335f 100644 --- a/_maps/map_files/cyberiad/z5.dmm +++ b/_maps/map_files/cyberiad/z5.dmm @@ -1178,7 +1178,7 @@ "wK" = (/obj/machinery/door/airlock{id_tag = "miningdorm2"; name = "Room 2"},/obj/machinery/door/firedoor{dir = 4; layer = 2.6; name = "Firelock"},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/mine/living_quarters) "wM" = (/obj/machinery/light{tag = "icon-tube1 (NORTH)"; icon_state = "tube1"; dir = 1},/obj/structure/table/reinforced,/obj/item/weapon/wrench,/obj/item/weapon/screwdriver,/obj/item/weapon/crowbar,/turf/simulated/floor/airless{icon_state = "asteroidwarning"; dir = 9},/area/mine/explored) "wN" = (/obj/machinery/camera{c_tag = "Mining Outpost Construction Area"; network = list("Mining Outpost")},/turf/simulated/floor/airless{icon_state = "asteroidwarning"; dir = 1},/area/mine/explored) -"wO" = (/obj/machinery/mining/drill,/turf/simulated/floor/airless{icon_state = "asteroidwarning"; dir = 1},/area/mine/explored) +"wO" = (/turf/simulated/floor/airless{icon_state = "asteroidwarning"; dir = 1},/area/mine/explored) "wP" = (/obj/machinery/light{tag = "icon-tube1 (NORTH)"; icon_state = "tube1"; dir = 1},/turf/simulated/floor/airless{icon_state = "asteroidwarning"; dir = 5},/area/mine/explored) "wQ" = (/obj/machinery/mech_bay_recharge_port,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/airless{dir = 5; icon_state = "asteroidfloor"; tag = "icon-asteroidfloor"},/area/mine/west_outpost) "wR" = (/obj/machinery/camera{c_tag = "Mining Outpost West Outpost Mech Recharge Station"; dir = 1; network = list("Mining Outpost")},/turf/simulated/floor/mech_bay_recharge_floor{icon_state = "recharge_floor_asteroid"},/area/mine/west_outpost) @@ -1186,7 +1186,7 @@ "wT" = (/obj/structure/disposalpipe/segment,/obj/structure/sign/deathsposal,/turf/simulated/wall,/area/mine/living_quarters) "wV" = (/obj/structure/table/reinforced,/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor/airless{icon_state = "asteroidwarning"; dir = 8},/area/mine/explored) "wW" = (/turf/simulated/floor/airless{dir = 5; icon_state = "asteroidfloor"},/area/mine/explored) -"wX" = (/obj/machinery/mining/brace,/turf/simulated/floor/airless{dir = 5; icon_state = "asteroidfloor"},/area/mine/explored) +"wX" = (/turf/simulated/floor/airless{dir = 5; icon_state = "asteroidfloor"},/area/mine/explored) "wY" = (/turf/simulated/floor/airless{icon_state = "asteroidwarning"; dir = 4},/area/mine/explored) "wZ" = (/turf/simulated/wall,/area/mine/west_outpost) "xd" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor{icon_state = "bar"},/area/mine/living_quarters) @@ -1196,7 +1196,7 @@ "xh" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden,/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/mine/living_quarters) "xl" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/turf/simulated/floor/airless{icon_state = "asteroidwarning"; dir = 10},/area/mine/explored) "xm" = (/turf/simulated/floor/airless{icon_state = "asteroidwarning"; dir = 2},/area/mine/explored) -"xn" = (/obj/machinery/mining/brace,/turf/simulated/floor/airless{icon_state = "asteroidwarning"; dir = 2},/area/mine/explored) +"xn" = (/turf/simulated/floor/airless{icon_state = "asteroidwarning"; dir = 2},/area/mine/explored) "xo" = (/turf/simulated/floor/airless{icon_state = "asteroidwarning"; dir = 6},/area/mine/explored) "xp" = (/obj/structure/table,/obj/item/weapon/pickaxe,/turf/simulated/floor,/area/mine/west_outpost) "xq" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor,/area/mine/west_outpost) diff --git a/_maps/map_files/cyberiad/z6.dmm b/_maps/map_files/cyberiad/z6.dmm index 8be2571bced..69427fdd744 100644 --- a/_maps/map_files/cyberiad/z6.dmm +++ b/_maps/map_files/cyberiad/z6.dmm @@ -663,12 +663,12 @@ "mV" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s10"; icon_state = "swall_s10"; dir = 2},/area/space) "mW" = (/turf/simulated/floor/plating/airless/asteroid,/turf/simulated/shuttle/wall{tag = "icon-swall_f9"; icon_state = "swall_f9"; dir = 2},/area/space) "mX" = (/obj/effect/landmark/corpse/clown,/turf/simulated/floor/airless,/area/space) -"mY" = (/obj/structure/closet/crate,/obj/item/weapon/ore/clown,/obj/item/weapon/ore/clown,/obj/item/weapon/ore/clown,/obj/item/weapon/ore/clown,/obj/item/weapon/ore/clown,/turf/simulated/floor/airless,/area/space) -"mZ" = (/obj/structure/closet/crate{icon_state = "crateopen"; opened = 1},/obj/item/weapon/ore/clown,/obj/item/weapon/grenade/bananade,/turf/simulated/floor/airless,/area/space) +"mY" = (/obj/structure/closet/crate,/obj/item/weapon/ore/bananium,/obj/item/weapon/ore/bananium,/obj/item/weapon/ore/bananium,/obj/item/weapon/ore/bananium,/obj/item/weapon/ore/bananium,/turf/simulated/floor/airless,/area/space) +"mZ" = (/obj/structure/closet/crate{icon_state = "crateopen"; opened = 1},/obj/item/weapon/ore/bananium,/obj/item/weapon/grenade/bananade,/turf/simulated/floor/airless,/area/space) "na" = (/obj/structure/shuttle/engine/heater{tag = "icon-heater (EAST)"; icon_state = "heater"; dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/space) "nb" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion_l (WEST)"; icon_state = "propulsion_l"; dir = 8},/obj/structure/shuttle/engine/propulsion{tag = "icon-burst_r (WEST)"; icon_state = "burst_r"; dir = 8},/turf/space,/area/space) "nc" = (/obj/item/weapon/shard{icon_state = "small"},/turf/simulated/floor/plating/airless/asteroid,/area/space) -"nd" = (/obj/item/weapon/ore/clown,/turf/simulated/floor/airless,/area/space) +"nd" = (/obj/item/weapon/ore/bananium,/turf/simulated/floor/airless,/area/space) "ne" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion_l (WEST)"; icon_state = "propulsion_l"; dir = 8},/turf/space,/area/space) "nf" = (/obj/structure/computerframe/HONKputer,/turf/simulated/floor/airless,/area/space) "ng" = (/obj/item/weapon/shard{icon_state = "medium"},/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor/plating/airless/asteroid,/area/space) @@ -680,7 +680,7 @@ "nm" = (/turf/space,/turf/simulated/shuttle/wall{tag = "icon-swall_f5"; icon_state = "swall_f5"; dir = 2},/area/space) "nn" = (/turf/simulated/floor/airless,/turf/simulated/shuttle/wall{tag = "icon-swall_f10"; icon_state = "swall_f10"; dir = 2},/area/space) "no" = (/obj/item/weapon/pickaxe,/turf/simulated/floor/airless,/area/space) -"np" = (/obj/structure/closet/crate,/obj/item/weapon/ore/clown,/obj/item/weapon/ore/clown,/obj/item/weapon/ore/clown,/obj/item/weapon/ore/clown,/turf/simulated/floor/airless,/area/space) +"np" = (/obj/structure/closet/crate,/obj/item/weapon/ore/bananium,/obj/item/weapon/ore/bananium,/obj/item/weapon/ore/bananium,/obj/item/weapon/ore/bananium,/turf/simulated/floor/airless,/area/space) "nq" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion_l (WEST)"; icon_state = "propulsion_l"; dir = 8},/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion_l (WEST)"; icon_state = "propulsion_l"; dir = 8},/turf/space,/area/space) "nr" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s5"; icon_state = "swall_s5"; dir = 2},/area/space) "ns" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s9"; icon_state = "swall_s9"; dir = 2},/area/space) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index bf758e788aa..7de2cb4adc7 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -18,12 +18,24 @@ var/global/list/rockTurfEdgeCache temperature = TCMB var/mineralType = null var/mineralAmt = 3 + var/mineralName = null var/spread = 0 //will the seam spread? var/spreadChance = 0 //the percentual chance of an ore spreading to the neighbouring tiles var/last_act = 0 var/scan_state = null //Holder for the image we display when we're pinged by a mining scanner var/hidden = 1 + //start xenoarch vars + var/datum/geosample/geologic_data + var/excavation_level = 0 + var/list/finds + var/next_rock = 0 + var/archaeo_overlay = "" + var/excav_overlay = "" + var/obj/item/weapon/last_find + var/datum/artifact_find/artifact_find + //end xenaorch vars + /turf/simulated/mineral/ex_act(severity, target) ..() switch(severity) @@ -164,6 +176,7 @@ var/global/list/rockTurfEdgeCache name = "iron deposit" icon_state = "rock_Iron" mineralType = /obj/item/weapon/ore/iron + mineralName = "Iron" spreadChance = 20 spread = 1 hidden = 0 @@ -171,6 +184,7 @@ var/global/list/rockTurfEdgeCache /turf/simulated/mineral/uranium name = "uranium deposit" mineralType = /obj/item/weapon/ore/uranium + mineralName = "Uranium" spreadChance = 5 spread = 1 hidden = 1 @@ -179,6 +193,7 @@ var/global/list/rockTurfEdgeCache /turf/simulated/mineral/diamond name = "diamond deposit" mineralType = /obj/item/weapon/ore/diamond + mineralName = "Diamond" spreadChance = 0 spread = 1 hidden = 1 @@ -187,6 +202,7 @@ var/global/list/rockTurfEdgeCache /turf/simulated/mineral/gold name = "gold deposit" mineralType = /obj/item/weapon/ore/gold + mineralName = "Gold" spreadChance = 5 spread = 1 hidden = 1 @@ -195,6 +211,7 @@ var/global/list/rockTurfEdgeCache /turf/simulated/mineral/silver name = "silver deposit" mineralType = /obj/item/weapon/ore/silver + mineralName = "Silver" spreadChance = 5 spread = 1 hidden = 1 @@ -204,6 +221,7 @@ var/global/list/rockTurfEdgeCache name = "plasma deposit" icon_state = "rock_Plasma" mineralType = /obj/item/weapon/ore/plasma + mineralName = "Plasma" spreadChance = 8 spread = 1 hidden = 1 @@ -213,6 +231,7 @@ var/global/list/rockTurfEdgeCache name = "bananium deposit" icon_state = "rock_Clown" mineralType = /obj/item/weapon/ore/bananium + mineralName = "Bananium" mineralAmt = 3 spreadChance = 0 spread = 0 @@ -222,6 +241,7 @@ var/global/list/rockTurfEdgeCache name = "bluespace crystal deposit" icon_state = "rock_BScrystal" mineralType = /obj/item/bluespace_crystal + mineralName = "Bluespace crystal" mineralAmt = 1 spreadChance = 0 spread = 0 @@ -233,6 +253,7 @@ var/global/list/rockTurfEdgeCache name = "gibtonite deposit" icon_state = "rock_Gibtonite" mineralAmt = 1 + mineralName = "Gibtonite" spreadChance = 0 spread = 0 hidden = 1 diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm index 8deb5867259..2a12c173337 100644 --- a/code/modules/mining/ore.dm +++ b/code/modules/mining/ore.dm @@ -201,3 +201,10 @@ /obj/item/weapon/ore/ex_act() return + +/obj/item/weapon/ore/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W,/obj/item/device/core_sampler)) + var/obj/item/device/core_sampler/C = W + C.sample_item(src, user) + else + return ..() diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm b/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm index c9d14ce2379..9d52c9c2dc0 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm @@ -29,7 +29,7 @@ anchored = 1 spawn(drill_time) if(get_turf(src) == drilling_turf && active) - M.GetDrilled() + M.gets_drilled() src.loc = M drilling_turf = null anchored = 0 diff --git a/code/modules/research/xenoarchaeology/geosample.dm b/code/modules/research/xenoarchaeology/geosample.dm index 47036f16def..e4aaa4a554b 100644 --- a/code/modules/research/xenoarchaeology/geosample.dm +++ b/code/modules/research/xenoarchaeology/geosample.dm @@ -58,8 +58,8 @@ age = rand(1,999) - if(container.mineral) - switch(container.mineral.name) + if(container.mineralName) + switch(container.mineralName) if("Uranium") age_million = rand(1, 704) age_thousand = rand(1,999) @@ -97,6 +97,12 @@ age_thousand = rand(-1,-999) find_presence["plasma"] = rand(1,1000) / 100 source_mineral = "plasma" + if("Bluespace crystal") + age_thousand = rand(1,999) + find_presence["plasma"] = rand(1,1000) / 100 + if("Gibtonite") + age_thousand = rand(1, 50) + find_presence["plasma"] = rand(1,1000) / 100 if(prob(75)) find_presence["phosphorus"] = rand(1,500) / 100 diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm index 7c55b81004a..66870f9df7f 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm @@ -34,7 +34,7 @@ D.coords = "[M.x].[rand(0,9)]:[M.y].[rand(0,9)]:[10 * M.z].[rand(0,9)]" D.time = worldtime2text() D.record_index = positive_locations.len + 1 - D.material = M.mineral ? M.mineral.display_name : "Rock" + D.material = M.mineralName ? M.mineralName : "Rock" //find the first artifact and store it if(M.finds.len)