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

In response to the problems of miner inactivity and a suspicion of the steel change affecting robotics in that mechs, specifically ripleys will no longer be built, I have included some stats logging about mecha construction and mineral production.

Browse Source 
Also made steel and reinforced glass correctly decrease ore amounts.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2631 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz@gmail.com
2011-12-06 22:33:23 +00:00
parent 803a7465a7
commit 8636f28d7d
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/game/mecha/mecha_construction_paths.dm
View File

@@ -84,6 +84,7 @@
const_holder.density = 1
spawn()
del src
feedback_inc("mecha_ripley_created",1)
return
@@ -261,6 +262,7 @@
const_holder.density = 1
spawn()
del src
feedback_inc("mecha_gygax_created",1)
return
@@ -497,6 +499,7 @@
const_holder.density = 1
spawn()
del src
feedback_inc("mecha_firefighter_created",1)
return
@@ -586,6 +589,7 @@
const_holder.density = 1
spawn()
del src
feedback_inc("mecha_honker_created",1)
return
@@ -661,6 +665,7 @@
const_holder.density = 1
spawn()
del src
feedback_inc("mecha_durand_created",1)
return
/datum/construction/mecha/durand

17
code/modules/mining/machine_processing.dm
View File

@@ -238,13 +238,16 @@
if (ore_glass > 0)
ore_glass--;
new /obj/item/stack/sheet/glass(output.loc)
feedback_inc("mining_glass_produced",1)
else
on = 0
continue
if (selected_glass == 1 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_adamantine == 0)
if (ore_glass > 0)
if (ore_glass > 0 && ore_iron > 0)
ore_glass--;
ore_iron--;
new /obj/item/stack/sheet/rglass(output.loc)
feedback_inc("mining_rglass_produced",1)
else
on = 0
continue
@@ -252,6 +255,7 @@
if (ore_gold > 0)
ore_gold--;
new /obj/item/stack/sheet/gold(output.loc)
feedback_inc("mining_gold_produced",1)
else
on = 0
continue
@@ -259,6 +263,7 @@
if (ore_silver > 0)
ore_silver--;
new /obj/item/stack/sheet/silver(output.loc)
feedback_inc("mining_silver_produced",1)
else
on = 0
continue
@@ -266,6 +271,7 @@
if (ore_diamond > 0)
ore_diamond--;
new /obj/item/stack/sheet/diamond(output.loc)
feedback_inc("mining_diamond_produced",1)
else
on = 0
continue
@@ -273,6 +279,7 @@
if (ore_plasma > 0)
ore_plasma--;
new /obj/item/stack/sheet/plasma(output.loc)
feedback_inc("mining_plasma_produced",1)
else
on = 0
continue
@@ -280,6 +287,7 @@
if (ore_uranium > 0)
ore_uranium--;
new /obj/item/stack/sheet/uranium(output.loc)
feedback_inc("mining_uranium_produced",1)
else
on = 0
continue
@@ -287,13 +295,16 @@
if (ore_iron > 0)
ore_iron--;
new /obj/item/stack/sheet/metal(output.loc)
feedback_inc("mining_iron_produced",1)
else
on = 0
continue
if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_adamantine == 0)
if (ore_iron > 0)
if (ore_iron > 0 && ore_plasma > 0)
ore_iron--;
ore_plasma--;
new /obj/item/stack/sheet/r_metal(output.loc)
feedback_inc("mining_steel_produced",1)
else
on = 0
continue
@@ -301,6 +312,7 @@
if (ore_clown > 0)
ore_clown--;
new /obj/item/stack/sheet/clown(output.loc)
feedback_inc("mining_clown_produced",1)
else
on = 0
continue
@@ -308,6 +320,7 @@
if (ore_adamantine > 0)
ore_adamantine--;
new /obj/item/stack/sheet/adamantine(output.loc)
feedback_inc("mining_adamantine_produced",1)
else
on = 0
continue

6
maps/tgstation.2.0.8.dmm
View File

@@ -2653,7 +2653,7 @@
"aZa" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "arrival"; dir = 8},/area/quartermaster/sorting)
"aZb" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor,/area/quartermaster/sorting)
"aZc" = (/obj/structure/stool/chair{dir = 1},/obj/effect/landmark/start{name = "Captain"},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
"aZd" = (/obj/item/weapon/paper{info = "With Mr. Deempisi's death, we've decided to take your monkey. Thanks. <br><br>--The Food and Drink Coalition"; name = "Memo"},/obj/item/weapon/book/manual/security_space_law,/obj/structure/table/woodentable,/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
"aZd" = (/obj/item/weapon/paper{info = "With Mr. Deempisi's death, we've decided to take your monkey. Thanks. <br><br>--The Food and Drink Coalition"; name = "Memo"},/obj/item/weapon/book/manual/security_space_law,/obj/structure/table/woodentable,/obj/item/weapon/paper{info = "A new alloy of iron and plasma has been discovered. This alloy is very strong and can be mass-produced by miners in their furnace. To produce it, miners have to smelt iron and plasma ore.<br><br>--Nanotrasen Metallurgy Research (Space Station 11)"; name = "Scientific Advance"},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/captain)
"aZe" = (/obj/machinery/light/small{dir = 8},/obj/machinery/turret{dir = 4},/turf/simulated/floor/grid,/area/turret_protected/ai)
"aZf" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor,/area/turret_protected/ai)
"aZg" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor/grid,/area/turret_protected/ai)
@@ -4184,7 +4184,7 @@
"bCx" = (/obj/structure/ore_box,/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/floor,/area/shuttle/mining/station)
"bCy" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/miningdock)
"bCz" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/turf/simulated/floor,/area/quartermaster/miningdock)
"bCA" = (/obj/structure/table,/obj/machinery/light,/turf/simulated/floor,/area/quartermaster/miningdock)
"bCA" = (/obj/structure/table,/obj/machinery/light,/obj/item/weapon/paper{info = "A new alloy of iron and plasma has been discovered. This alloy is very strong and can be mass-produced by miners in their furnace. To produce it, miners have to smelt iron and plasma ore.<br><br>--Nanotrasen Metallurgy Research (Space Station 11)"; name = "Scientific Advance"},/turf/simulated/floor,/area/quartermaster/miningdock)
"bCB" = (/obj/structure/table,/obj/machinery/camera{c_tag = "Mining Dock"; dir = 1},/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/turf/simulated/floor,/area/quartermaster/miningdock)
"bCC" = (/obj/machinery/computer/security/mining,/turf/simulated/floor,/area/quartermaster/miningdock)
"bCD" = (/obj/structure/closet/secure_closet/miner,/turf/simulated/floor,/area/quartermaster/miningdock)
@@ -7880,7 +7880,7 @@
"cVB" = (/obj/machinery/door/window/westright{name = "Production Area"; req_access_txt = "48"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/mine/production)
"cVC" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor,/area/mine/production)
"cVD" = (/turf/simulated/floor,/area/mine/production)
"cVE" = (/obj/machinery/atmospherics/pipe/simple,/obj/machinery/camera{c_tag = "Production Room"; dir = 8; network = "MINE"},/turf/simulated/floor,/area/mine/production)
"cVE" = (/obj/machinery/atmospherics/pipe/simple,/obj/machinery/camera{c_tag = "Production Room"; dir = 8; network = "MINE"},/obj/item/weapon/paper{info = "A new alloy of iron and plasma has been discovered. This alloy is very strong and can be mass-produced by miners in their furnace. To produce it, miners have to smelt iron and plasma ore.<br><br>--Nanotrasen Metallurgy Research (Space Station 11)"; name = "Scientific Advance"},/turf/simulated/floor,/area/mine/production)
"cVF" = (/obj/machinery/mineral/input,/turf/simulated/floor{icon_state = "loadingarea"; tag = "loading"},/area/mine/production)
"cVG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/mine/lobby)
"cVH" = (/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/mine/lobby)