Fixes based on feedback

This commit is contained in:
DZD
2015-07-29 18:39:54 -04:00
parent ab29813d4c
commit 51eca017ad
8 changed files with 37 additions and 9 deletions
-2
View File
@@ -10,8 +10,6 @@
anchored = 1.0
input_dir = NORTH
output_dir = SOUTH
var/obj/machinery/mineral/input = null
var/obj/machinery/mineral/output = null
req_one_access = list(
access_mining_station,
access_chemistry,
+1
View File
@@ -33,6 +33,7 @@
new /obj/item/device/mining_scanner(src)
new /obj/item/weapon/storage/bag/ore(src)
new /obj/item/device/flashlight/lantern(src)
new /obj/item/weapon/shovel(src)
new /obj/item/weapon/pickaxe(src)
new /obj/item/clothing/glasses/meson(src)
+14 -2
View File
@@ -313,5 +313,17 @@ display round(lastgen) and plasmatank amount
power_gen = 15000
time_per_sheet = 65
board_path = "/obj/item/weapon/circuitboard/pacman/super"
overheat()
explosion(src.loc, 3, 3, 3, -1)
/obj/machinery/power/port_gen/pacman/super/overheat()
explosion(src.loc, 3, 3, 3, -1)
/obj/machinery/power/port_gen/pacman/mrs
name = "M.R.S.P.A.C.M.A.N.-type Portable Generator"
icon_state = "portgen2"
sheet_path = /obj/item/stack/sheet/mineral/diamond
power_gen = 40000
time_per_sheet = 80
board_path = "/obj/item/weapon/circuitboard/pacman/mrs"
/obj/machinery/power/port_gen/pacman/mrs/overheat()
explosion(src.loc, 4, 4, 4, -1)
@@ -302,6 +302,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
modifystate = "plasmacutter"
origin_tech = "combat=1;materials=3;magnets=2;plasmatech=2;engineering=1"
projectile_type = /obj/item/projectile/plasma
fire_sound = 'sound/weapons/laser.ogg'
flags = CONDUCT | OPENCONTAINER
attack_verb = list("attacked", "slashed", "cut", "sliced")
charge_cost = 250
@@ -59,6 +59,17 @@
build_path = /obj/item/weapon/circuitboard/pacman
category = list("Engineering Machinery")
/datum/design/mrspacman
name = "Machine Board (MRSPACMAN-type Generator)"
desc = "The circuit board that for a MRSPACMAN-type portable generator."
id = "mrspacman"
req_tech = list("programming" = 3, "powerstorage" = 5, "engineering" = 5)
build_type = IMPRINTER
reliability_base = 74
materials = list("$glass" = 2000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/pacman/mrs
category = list("Engineering Machinery")
/datum/design/superpacman
name = "Machine Board (SUPERPACMAN-type Generator)"
desc = "The circuit board that for a SUPERPACMAN-type portable generator."
+2 -2
View File
@@ -1,7 +1,7 @@
/obj/machinery/computer/shuttle_control/mining
name = "Mining Shuttle Console"
shuttle_tag = "Mining"
req_access = list(access_mining)
req_access = list()
circuit = /obj/item/weapon/circuitboard/mining_shuttle
/obj/machinery/computer/shuttle_control/engineering
@@ -33,7 +33,7 @@
src.visible_message("\blue Shuttle is already at the outpost.")
return
..()
/obj/machinery/computer/shuttle_control/labor_camp/one_way/force_launch()
var/datum/shuttle/ferry/shuttle = shuttle_controller.shuttles[shuttle_tag]
if (!istype(shuttle))