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

fixed xenoarch chemical analysis, added icons for excavation picks, various misc tweaks

Browse Source 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2013-02-14 21:59:50 +10:00
parent 7fba00ce55
commit f0de14d0d4
12 changed files with 85 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/research/xenoarchaeology/analysis/analysis.dm
View File

@@ -29,7 +29,7 @@
D = M
break
S.reagents.add_reagent("analysis_sample", 1, D.geological_data)
S.reagents.add_reagent("chlorine", 1, D.geological_data)
S.reagents.add_reagent("calcium", 1, D.geological_data)
/obj/machinery/anomaly/process()
//not sure if everything needs to heat up, or just the GLPC

4
code/modules/research/xenoarchaeology/chemistry.dm
View File

@@ -51,9 +51,9 @@ datum
//todo: make this brown
density_separated_sample
name = "Analysis liquid"
name = "Density separated sample"
id = "density_separated_sample"
description = "A watery paste used in chemical analysis."
description = "A watery paste used in chemical analysis, this one has some chunks floating in it."
reagent_state = LIQUID
color = "#C81040" //rgb: 200, 16, 64
//todo: make this browny-white

4
code/modules/research/xenoarchaeology/finds/finds.dm
View File

@@ -382,12 +382,14 @@
//fossil bone/skull
new_item = new /obj/item/weapon/fossil/base(src.loc)
apply_prefix = 0
additional_desc = "A fossilised part of an alien, long dead."
apply_image_decorations = 0
apply_material_decorations = 0
if(30)
//fossil shell
new_item = new /obj/item/weapon/fossil/shell(src.loc)
apply_prefix = 0
additional_desc = "A fossilised, pre-Stygian alien crustacean."
apply_image_decorations = 0
apply_material_decorations = 0
if(prob(10))
@@ -395,6 +397,8 @@
if(31)
//fossil plant
new_item = new /obj/item/weapon/fossil/plant(src.loc)
item_type = new_item.name
additional_desc = "A fossilised shred of alien plant matter."
apply_image_decorations = 0
apply_material_decorations = 0
apply_prefix = 0

2
code/modules/research/xenoarchaeology/finds/finds_defines.dm
View File

@@ -63,6 +63,8 @@
return "aluminium"
if(ARCHAEO_COIN)
return "silicon"
if(ARCHAEO_KNIFE)
return "silicon"
if(ARCHAEO_HANDCUFFS)
return "aluminium"
if(ARCHAEO_BEARTRAP)

1
code/modules/research/xenoarchaeology/tools/bunsen_burner.dm
View File

@@ -39,6 +39,7 @@
user << "\red There is nothing on the [src]."
/obj/machinery/bunsen_burner/proc/try_heating()
src.visible_message("\blue \icon[src] [src] bubbles.")
if(held_container && heating)
heated = 1
held_container.reagents.handle_reactions()

2
code/modules/research/xenoarchaeology/tools/tools.dm
View File

@@ -11,7 +11,7 @@
/obj/item/device/gps/attack_self(var/mob/user as mob)
var/turf/T = get_turf(src)
user << "\blue \icon[src] [src] flashes <i>[10 * T.x].[rand(0,9)]:[10 * T.y].[rand(0,9)]:[10 * T.z].[rand(0,9)]</i>."
user << "\blue \icon[src] [src] flashes <i>[T.x].[rand(0,9)]:[T.y].[rand(0,9)]:[T.z].[rand(0,9)]</i>."
/obj/item/device/measuring_tape
name = "measuring tape"

2
code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
View File

@@ -31,7 +31,7 @@
//create a new scanlog entry
var/datum/depth_scan/D = new()
D.coords = "[10 * M.x + rand(0,9)]:[10 * M.y + rand(0,9)]:[10 * M.z + rand(0,9)]"
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

22
code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
View File

@@ -4,6 +4,7 @@
/obj/item/weapon/pickaxe/brush
name = "brush"
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick_brush"
item_state = "syringe_0"
digspeed = 50
@@ -14,7 +15,8 @@
/obj/item/weapon/pickaxe/one_pick
name = "1/6 pick"
//icon_state = "excavation"
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick1"
item_state = "syringe_0"
digspeed = 50
desc = "A miniature excavation tool for precise digging (2 centimetre excavation depth)."
@@ -24,7 +26,8 @@
/obj/item/weapon/pickaxe/two_pick
name = "1/3 pick"
//icon_state = "excavation"
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick2"
item_state = "syringe_0"
digspeed = 50
desc = "A miniature excavation tool for precise digging (4 centimetre excavation depth)."
@@ -34,7 +37,8 @@
/obj/item/weapon/pickaxe/three_pick
name = "1/2 pick"
//icon_state = "excavation"
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick3"
item_state = "syringe_0"
digspeed = 50
desc = "A miniature excavation tool for precise digging (6 centimetre excavation depth)."
@@ -44,7 +48,8 @@
/obj/item/weapon/pickaxe/four_pick
name = "2/3 pick"
//icon_state = "excavation"
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick4"
item_state = "syringe_0"
digspeed = 50
desc = "A miniature excavation tool for precise digging (8 centimetre excavation depth)."
@@ -54,7 +59,8 @@
/obj/item/weapon/pickaxe/five_pick
name = "5/6 pick"
//icon_state = "excavation"
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick5"
item_state = "syringe_0"
digspeed = 50
desc = "A miniature excavation tool for precise digging (10 centimetre excavation depth)."
@@ -64,7 +70,8 @@
/obj/item/weapon/pickaxe/six_pick
name = "1/1 pick"
//icon_state = "excavation"
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick6"
item_state = "syringe_0"
digspeed = 50
desc = "A miniature excavation tool for precise digging (12 centimetre excavation depth)."
@@ -74,7 +81,8 @@
/obj/item/weapon/pickaxe/hand
name = "hand pickaxe"
//icon_state = "excavation"
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "pick_hand"
item_state = "syringe_0"
digspeed = 50
desc = "A smaller, more precise version of the pickaxe (30 centimetre excavation depth)."