cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 05:51:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactors , resprites and rebrands RCDs (#6985)

Browse Source
This commit is contained in:
alsoandanswer
2019-09-24 01:07:11 +04:00
committed by Werner
parent cddf986248
commit 9553d94bad
48 changed files with 707 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/machine_vending.dm
+3 -3
View File
@@ -17,7 +17,7 @@ var/global/list/minevendor_list = list( //keep in order of price
new /datum/data/mining_equipment("Lantern", /obj/item/device/flashlight/lantern, 10, 75),
new /datum/data/mining_equipment("Shovel", /obj/item/weapon/shovel, 15, 100),
new /datum/data/mining_equipment("Pickaxe", /obj/item/weapon/pickaxe, 10, 100),
new /datum/data/mining_equipment("Compressed rail cartridge", /obj/item/weapon/rrf_ammo, 50, 100),
new /datum/data/mining_equipment("Compressed matter cartridge", /obj/item/weapon/rfd_ammo, 50, 100),
new /datum/data/mining_equipment("Class E Kinetic Accelerator", /obj/item/weapon/gun/custom_ka/frame01/prebuilt, 12, 200),
new /datum/data/mining_equipment("Ore Box", /obj/structure/ore_box, -1, 150, 1),
new /datum/data/mining_equipment("Emergency Floodlight", /obj/item/weapon/floodlight_diy, -1, 150, 1),
@@ -39,8 +39,8 @@ var/global/list/minevendor_list = list( //keep in order of price
new /datum/data/mining_equipment("Explorer's Belt", /obj/item/weapon/storage/belt/mining, 10, 500),
new /datum/data/mining_equipment("Item-Warp Beacon", /obj/item/warp_core, 25, 500),
new /datum/data/mining_equipment("Item-Warp Pack", /obj/item/weapon/extraction_pack, 25, 600),
new /datum/data/mining_equipment("Drone Health Upgrade", /obj/item/device/mine_bot_ugprade/health, 20, 600),
new /datum/data/mining_equipment("Rapid-Railway-Fabricator", /obj/item/weapon/rrf, 10, 600),
new /datum/data/mining_equipment("Drone Health Upgrade", /obj/item/device/mine_bot_ugprade/health, 20, 600),
new /datum/data/mining_equipment("RFD M-Class", /obj/item/weapon/rfd/mining, 10, 600),
new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/weapon/storage/firstaid/brute, 30, 600),
new /datum/data/mining_equipment("Ore Magnet", /obj/item/weapon/oremagnet, 10, 600),
new /datum/data/mining_equipment("Minecart", /obj/vehicle/train/cargo/trolley/mining, -1, 600, 1),
code/modules/mining/mine_items.dm
+1 -87
View File
@@ -432,94 +432,8 @@
src.use(1)
/**********************Miner Carts***********************/
/obj/item/weapon/rrf_ammo
name = "compressed railway cartridge"
desc = "Highly compressed matter for the RRF."
icon = 'icons/obj/ammo.dmi'
icon_state = "rcd"
item_state = "rcdammo"
w_class = 2
origin_tech = list(TECH_MATERIAL = 2)
matter = list(DEFAULT_WALL_MATERIAL = 15000,"glass" = 7500)
/obj/item/weapon/rrf
name = "\improper Rapid-Railway-Fabricator"
desc = "A device used to rapidly deploy mine tracks."
icon = 'icons/obj/tools.dmi'
icon_state = "rcd"
opacity = 0
density = 0
anchored = 0.0
var/stored_matter = 30
w_class = 3.0
/obj/item/weapon/rrf/examine(mob/user)
if(..(user, 0))
to_chat(user, "It currently holds [stored_matter]/30 fabrication-units.")
/obj/item/weapon/rrf/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
if (istype(W, /obj/item/weapon/rcd_ammo))
if ((stored_matter + 30) > 30)
to_chat(user, "The RRF can't hold any more matter.")
return
qdel(W)
stored_matter += 30
playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
to_chat(user, "The RRF now holds [stored_matter]/30 fabrication-units.")
return
if (istype(W, /obj/item/weapon/rrf_ammo))
if ((stored_matter + 15) > 30)
to_chat(user, "The RRF can't hold any more matter.")
return
qdel(W)
stored_matter += 15
playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
to_chat(user, "The RRF now holds [stored_matter]/30 fabrication-units.")
return
/obj/item/weapon/rrf/afterattack(atom/A, mob/user as mob, proximity)
if(!proximity) return
if(istype(user,/mob/living/silicon/robot))
var/mob/living/silicon/robot/R = user
if(R.stat || !R.cell || R.cell.charge <= 0)
return
else
if(stored_matter <= 0)
return
if(!istype(A, /turf/simulated/floor) && !istype(A, /turf/unsimulated/floor))
return
if(locate(/obj/structure/track) in A)
return
playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
var/used_energy = 0
used_energy = 10
new /obj/structure/track(get_turf(A))
to_chat(user, "Dispensing track...")
if(isrobot(user))
var/mob/living/silicon/robot/R = user
if(R.cell)
R.cell.use(used_energy)
else
stored_matter--
to_chat(user, "The RRF now holds [stored_matter]/30 fabrication-units.")
// RRF refactored into RFD-M, found in RFD.dm
/obj/structure/track
name = "mine track"