mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
archaeo item updates/additions, map fixes, fix for ore box icon
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
@@ -1157,6 +1157,7 @@
|
||||
#include "code\modules\research\server.dm"
|
||||
#include "code\modules\research\xenoarchaeology\archaeo_analysis.dm"
|
||||
#include "code\modules\research\xenoarchaeology\archaeo_excavate.dm"
|
||||
#include "code\modules\research\xenoarchaeology\archaeo_tools.dm"
|
||||
#include "code\modules\research\xenoarchaeology\artifact_analysis.dm"
|
||||
#include "code\modules\research\xenoarchaeology\artifact_archaeo.dm"
|
||||
#include "code\modules\research\xenoarchaeology\artifact_db.dm"
|
||||
|
||||
@@ -187,12 +187,6 @@ proc/move_mining_shuttle()
|
||||
var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
|
||||
origin_tech = "materials=1;engineering=1"
|
||||
|
||||
excavationtool
|
||||
name = "Excavation Tool"
|
||||
icon_state = "excavation"
|
||||
digspeed = 50
|
||||
desc = "A carefully calibrated, archaeological excavation tool."
|
||||
|
||||
hammer
|
||||
name = "Mining Sledge Hammer"
|
||||
//icon_state = "sledgehammer" Waiting on sprite
|
||||
|
||||
@@ -232,7 +232,7 @@
|
||||
*/
|
||||
//Watch your tabbing, microwave. --NEO
|
||||
|
||||
if(istype(W, /obj/item/weapon/pickaxe/excavationtool))
|
||||
if(istype(W, /obj/item/weapon/pickaxe/hand_pick) || istype(W, /obj/item/weapon/pickaxe/mini_pick))
|
||||
user << "\red You carefully start clearing away the rock."
|
||||
playsound(user, 'Genhit.ogg', 20, 1)
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
/**********************Ore box**************************/
|
||||
|
||||
/obj/structure/ore_box
|
||||
//icon = 'mining.dmi'
|
||||
icon = 'mining.dmi'
|
||||
icon_state = "orebox0"
|
||||
name = "Ore Box"
|
||||
desc = "It's heavy"
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
obj/machinery/gas_chromatography
|
||||
name = "Gas Chromatography Spectrometer"
|
||||
desc = "A specialised mass spectrometer."
|
||||
icon = 'virology.dmi'
|
||||
icon_state = "analyser"
|
||||
|
||||
obj/machinery/gas_chromatography/Topic(href, href_list)
|
||||
if(href_list["close"])
|
||||
@@ -21,6 +24,9 @@ obj/machinery/gas_chromatography/attack_hand(var/mob/user as mob)
|
||||
|
||||
obj/machinery/accelerator
|
||||
name = "Accelerator Spectrometer"
|
||||
desc = "A specialised mass spectrometer."
|
||||
icon = 'virology.dmi'
|
||||
icon_state = "analyser"
|
||||
|
||||
obj/machinery/accelerator/Topic(href, href_list)
|
||||
if(href_list["close"])
|
||||
@@ -41,7 +47,10 @@ obj/machinery/accelerator/attack_hand(var/mob/user as mob)
|
||||
onclose(user, "artanalyser")
|
||||
|
||||
obj/machinery/fourier_transform
|
||||
name = "Fourier Transform Spectroscope "
|
||||
name = "Fourier Transform Spectroscope"
|
||||
desc = "A specialised geochemical analysis device."
|
||||
icon = 'virology.dmi'
|
||||
icon_state = "analyser"
|
||||
|
||||
obj/machinery/fourier_transform/Topic(href, href_list)
|
||||
if(href_list["close"])
|
||||
@@ -63,6 +72,9 @@ obj/machinery/fourier_transform/attack_hand(var/mob/user as mob)
|
||||
|
||||
obj/machinery/radiometric
|
||||
name = "Radiometric Exposure Spectrometer"
|
||||
desc = "A specialised mass spectrometer, able to radiometrically date inserted materials."
|
||||
icon = 'virology.dmi'
|
||||
icon_state = "analyser"
|
||||
|
||||
obj/machinery/radiometric/Topic(href, href_list)
|
||||
if(href_list["close"])
|
||||
@@ -83,7 +95,10 @@ obj/machinery/radiometric/attack_hand(var/mob/user as mob)
|
||||
onclose(user, "artanalyser")
|
||||
|
||||
obj/machinery/ion_mobility
|
||||
name = "Ion Mobility Spectrometer "
|
||||
name = "Ion Mobility Spectrometer"
|
||||
desc = "A specialised mass spectrometer."
|
||||
icon = 'virology.dmi'
|
||||
icon_state = "analyser"
|
||||
|
||||
obj/machinery/ion_mobility/Topic(href, href_list)
|
||||
if(href_list["close"])
|
||||
|
||||
40
code/modules/research/xenoarchaeology/archaeo_tools.dm
Normal file
40
code/modules/research/xenoarchaeology/archaeo_tools.dm
Normal file
@@ -0,0 +1,40 @@
|
||||
/obj/item/device/depth_scanner
|
||||
name = "depth analysis scanner"
|
||||
desc = "Used to check mass spatial depth and density."
|
||||
icon = 'pda.dmi'
|
||||
icon_state = "crap"
|
||||
item_state = "analyzer"
|
||||
w_class = 1.0
|
||||
flags = FPRINT | TABLEPASS
|
||||
slot_flags = SLOT_BELT
|
||||
|
||||
/obj/item/weapon/pickaxe/hand_pick
|
||||
name = "hand pick"
|
||||
icon_state = "excavation"
|
||||
item_state = "minipick"
|
||||
digspeed = 50
|
||||
desc = "A smaller, more precise version of the pickaxe."
|
||||
|
||||
/obj/item/weapon/pickaxe/mini_pick
|
||||
name = "mini pick"
|
||||
icon_state = "excavation"
|
||||
item_state = "minipick"
|
||||
digspeed = 60
|
||||
desc = "A miniature excavation tool for precise digging around delicate finds."
|
||||
|
||||
/obj/item/device/core_sampler
|
||||
name = "core sampler"
|
||||
desc = "Used to extract cores from geological samples."
|
||||
icon = 'device.dmi'
|
||||
icon_state = "core_sampler"
|
||||
item_state = "screwdriver_brown"
|
||||
w_class = 1.0
|
||||
flags = FPRINT | TABLEPASS
|
||||
slot_flags = SLOT_BELT
|
||||
|
||||
/obj/item/device/beacon_locator
|
||||
name = "locater device"
|
||||
desc = "Used to scan and locate signals on a particular frequency."
|
||||
icon = 'device.dmi'
|
||||
icon_state = "pinoff" //pinonfar, pinonmedium, pinonclose, pinondirect, pinonnull
|
||||
item_state = "electronic"
|
||||
@@ -6,7 +6,7 @@
|
||||
item_state = "engspace_suit"
|
||||
heat_transfer_coefficient = 0.02
|
||||
protective_temperature = 1000
|
||||
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/pickaxe/excavationtool)
|
||||
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/pickaxe/hand_pick)
|
||||
|
||||
/obj/item/clothing/head/bio_hood/anomaly
|
||||
name = "Anomaly Hood"
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 131 KiB After Width: | Height: | Size: 131 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 135 KiB After Width: | Height: | Size: 135 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 37 KiB |
16232
maps/tgstation.2.0.8.dmm
16232
maps/tgstation.2.0.8.dmm
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user