diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 56e372e9eba..d2ef16a903a 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -401,6 +401,11 @@ to destroy them and players will be able to make replacements. build_path = "/obj/machinery/power/port_gen/pacman/super" origin_tech = "programming=3;powerstorage=4;engineering=4" +/obj/item/weapon/circuitboard/pacman/mrs + name = "Circuit Board (MRSPACMAN-type Generator)" + build_path = "/obj/machinery/power/port_gen/pacman/mrs" + origin_tech = "programming=3;powerstorage=5;engineering=5" + obj/item/weapon/circuitboard/rdserver name = "Circuit Board (R&D Server)" build_path = "/obj/machinery/r_n_d/server" diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 77905fdd354..1aec90c414f 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -499,15 +499,15 @@ return /obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma - equip_cooldown = 8 + equip_cooldown = 20 name = "217-D Heavy Plasma Cutter" desc = "A device that shoots resonant plasma bursts at extreme velocity. The blasts are capable of crushing rock and demloishing solid obstacles." icon_state = "mecha_plasmacutter" item_state = "plasmacutter" - energy_drain = 45 + energy_drain = 60 origin_tech = "materials=3;combat=2;powerstorage=3;plasma=3" projectile = /obj/item/projectile/plasma/adv/mech - fire_sound = 'sound/weapons/pulse.ogg' + fire_sound = 'sound/weapons/laser.ogg' /obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma/can_attach(obj/mecha/M as obj) if(istype(M, /obj/mecha/working)) diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index d03f610475b..9ca809c13c4 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -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, diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 1dcea4f056d..eaf2dfe384f 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -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) diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 62837b8980f..bbac35b1433 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -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) \ No newline at end of file diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index e4fcc1829f1..787c77f929a 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -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 diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm index e662e0ab60f..ec67de5717a 100644 --- a/code/modules/research/designs/power_designs.dm +++ b/code/modules/research/designs/power_designs.dm @@ -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." diff --git a/code/modules/shuttles/departmental.dm b/code/modules/shuttles/departmental.dm index 46eea928fb9..e6cfb06c910 100644 --- a/code/modules/shuttles/departmental.dm +++ b/code/modules/shuttles/departmental.dm @@ -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))