cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1372 from caelaislinn/master

Browse Source 
anomaly bay tweaks
This commit is contained in:
Albert Iordache
2012-06-23 05:03:11 -07:00
parent 146703b756 2cf1504fc5
commit 7a22acef57
4 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/artifact_analysis.dm
+25 -19
View File
@@ -214,25 +214,31 @@
findarti++
cur_artifact = A
if (findarti == 1)
cur_artifact.anchored = 1
src.working = 1
src.icon_state = "analyser_processing"
var/time = rand(30,50) + max(0, 300 - scan_num * 10)
/*for(var/i = artifact_research.starting_tier, i <= artifact_research.max_tiers, i++)
for(var/datum/artiresearch/R in artifact_research.researched_items[i])
if (R.bonustype == "analyser") time -= R.bonusTime*/
time *= 10
var/message = "<b>[src]</b> states, \"Commencing analysis.\""
src.visible_message(message, message)
spawn(time)
src.working = 0
icon_state = "analyser"
cur_artifact.anchored = 0
if(cur_artifact.loc == pad_turf)
AA_Analyse()
scan_num++
message = "<b>[src]</b> states, \"Analysis complete.\""
src.visible_message(message, message)
if(cur_artifact.being_used)
var/message = "<b>[src]</b> states, \"Cannot analyse. Excess energy drain is disrupting signal.\""
src.visible_message(message, message)
else
cur_artifact.anchored = 1
cur_artifact.being_used = 1
src.working = 1
src.icon_state = "analyser_processing"
var/time = rand(30,50) + max(0, 300 - scan_num * 10)
/*for(var/i = artifact_research.starting_tier, i <= artifact_research.max_tiers, i++)
for(var/datum/artiresearch/R in artifact_research.researched_items[i])
if (R.bonustype == "analyser") time -= R.bonusTime*/
time *= 10
var/message = "<b>[src]</b> states, \"Commencing analysis.\""
src.visible_message(message, message)
spawn(time)
src.working = 0
icon_state = "analyser"
cur_artifact.anchored = 0
cur_artifact.being_used = 0
if(cur_artifact.loc == pad_turf)
AA_Analyse()
scan_num++
message = "<b>[src]</b> states, \"Analysis complete.\""
src.visible_message(message, message)
else if (findarti > 1)
var/message = "<b>[src]</b> states, \"Cannot analyse. Too many artifacts on pad.\""
src.visible_message(message, message)
code/modules/research/artifact_harvester.dm
+6
View File
@@ -43,6 +43,7 @@
inserted_battery.stored_charge = inserted_battery.capacity
harvesting = 0
cur_artifact.anchored = 0
cur_artifact.being_used = 0
src.visible_message("<b>[name]</b> states, \"Battery is full.\"")
icon_state = "incubator"
return
@@ -102,6 +103,9 @@
else if(!articount)
var/message = "<b>[src]</b> states, \"Cannot harvest. No artifact found.\""
src.visible_message(message, message)
else if (cur_artifact.being_used)
var/message = "<b>[src]</b> states, \"Cannot harvest. Too much interferance from energy scan.\""
src.visible_message(message, message)
else
cur_artifact = analysed
//check to see if the battery is compatible
@@ -109,6 +113,7 @@
if(inserted_battery.battery_effect.artifact_id == cur_artifact.my_effect.artifact_id || inserted_battery.stored_charge == 0)
harvesting = 1
cur_artifact.anchored = 1
cur_artifact.being_used = 1
icon_state = "incubator_on"
var/message = "<b>[src]</b> states, \"Beginning artifact energy harvesting.\""
src.visible_message(message, message)
@@ -125,6 +130,7 @@
if(harvesting)
harvesting = 0
cur_artifact.anchored = 0
cur_artifact.being_used = 0
src.visible_message("<b>[name]</b> states, \"Harvesting interrupted.\"")
icon_state = "incubator"
code/modules/research/artifacts.dm
+1
View File
@@ -15,6 +15,7 @@
var/recharge = 5 // How long does it take this artifact to recharge?
var/display_id = "" // Artifact ID to display once successfully scanned
var/datum/artifact_effect/my_effect = null
var/being_used = 0
/obj/machinery/artifact/New()
..()
maps/tgstation.2.0.8.dmm
+1 -1
View File
@@ -3618,7 +3618,7 @@
"brD" = (/obj/structure/rack,/obj/item/clothing/suit/bio_suit/anomaly,/obj/item/clothing/head/bio_hood/anomaly,/obj/item/clothing/gloves/latex,/turf/simulated/floor{dir = 2; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/anomaly)
"brE" = (/obj/structure/rack,/obj/item/clothing/suit/bio_suit/anomaly,/obj/item/clothing/head/bio_hood/anomaly,/obj/item/clothing/gloves/latex,/obj/machinery/light{dir = 1},/turf/simulated/floor{dir = 2; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/anomaly)
"brF" = (/obj/structure/rack,/obj/item/clothing/suit/bio_suit/anomaly,/obj/item/clothing/head/bio_hood/anomaly,/obj/item/clothing/gloves/latex,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 2; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/anomaly)
"brG" = (/obj/structure/noticeboard/anomaly{icon_state = "nboard03"; notices = 3; pixel_x = -32; step_x = 0},/turf/simulated/floor{icon_state = "white"},/area/anomaly)
"brG" = (/obj/structure/noticeboard/anomaly{icon_state = "nboard04"; notices = 4; pixel_x = -32; step_x = 0},/turf/simulated/floor{icon_state = "white"},/area/anomaly)
"brH" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor{icon_state = "white"},/area/anomaly)
"brI" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{dir = 8; icon_state = "warnwhite"},/area/anomaly)
"brJ" = (/obj/machinery/conveyor{dir = 4; id = "QMLoad"},/obj/machinery/door/poddoor{density = 1; icon_state = "pdoor1"; id = "QMLoaddoor"; name = "Supply Dock Loading Door"; opacity = 1},/turf/simulated/floor/plating,/area/quartermaster/storage)