cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 20:15:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

some fixes

Browse Source
This commit is contained in:
paprka
2015-02-13 21:44:04 -08:00
parent 88760896ad
commit ab3ff729ce
3 changed files with 49 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/mine_items.dm
+4 -4
View File
@@ -85,7 +85,7 @@
hitsound = 'sound/weapons/drill.ogg'
origin_tech = "materials=2;powerstorage=3;engineering=2"
desc = "An electric mining drill for the especially scrawny."
var/drillcost = 125
var/drillcost = 125 //80 mineral walls by default
var/obj/item/weapon/stock_parts/cell/high/bcell = null
powered = 0
@@ -144,10 +144,10 @@
/obj/item/weapon/pickaxe/drill/diamonddrill
name = "diamond-tipped mining drill"
icon_state = "diamonddrill"
digspeed = 10
digspeed = 10 //it's a fast drill with a relatively low power cost. what more could you ask for?
origin_tech = "materials=6;powerstorage=4;engineering=5"
desc = "Yours is the drill that will pierce the heavens!"
drillcost = 150
drillcost = 150 //66 mineral walls by default, but very quickly
/obj/item/weapon/pickaxe/drill/jackhammer
name = "sonic jackhammer"
@@ -167,7 +167,7 @@
w_class = 3 //it is smaller than the pickaxe
damtype = "fire"
throwforce = 8
digspeed = 30 //Mines slightly faster than a normal pickaxe, but doubles as an unlimited-ammo welding tool.
digspeed = 30 //Mines slightly faster than a normal pickaxe, but doubles as an unlimited-ammo welding tool in some cases such as wall deconstruction
digsound = list('sound/weapons/plasma_cutter.ogg')
hitsound = 'sound/weapons/plasma_cutter.ogg'
origin_tech = "materials=4;plasmatech=3;engineering=3"
code/modules/mining/mine_turfs.dm
+34 -35
View File
@@ -22,10 +22,10 @@
..()
switch(severity)
if(3.0)
if(prob(75))
if (prob(75))
src.gets_drilled(null, 1)
if(2.0)
if(prob(90))
if (prob(90))
src.gets_drilled(null, 1)
if(1.0)
src.gets_drilled(null, 1)
@@ -37,22 +37,22 @@
var/turf/T
if((istype(get_step(src, NORTH), /turf/simulated/floor)) || (istype(get_step(src, NORTH), /turf/space)) || (istype(get_step(src, NORTH), /turf/simulated/shuttle/floor)))
T = get_step(src, NORTH)
if(T)
if (T)
T.overlays += image('icons/turf/walls.dmi', "rock_side_s")
if((istype(get_step(src, SOUTH), /turf/simulated/floor)) || (istype(get_step(src, SOUTH), /turf/space)) || (istype(get_step(src, SOUTH), /turf/simulated/shuttle/floor)))
T = get_step(src, SOUTH)
if(T)
if (T)
T.overlays += image('icons/turf/walls.dmi', "rock_side_n", layer=6)
if((istype(get_step(src, EAST), /turf/simulated/floor)) || (istype(get_step(src, EAST), /turf/space)) || (istype(get_step(src, EAST), /turf/simulated/shuttle/floor)))
T = get_step(src, EAST)
if(T)
if (T)
T.overlays += image('icons/turf/walls.dmi', "rock_side_w", layer=6)
if((istype(get_step(src, WEST), /turf/simulated/floor)) || (istype(get_step(src, WEST), /turf/space)) || (istype(get_step(src, WEST), /turf/simulated/shuttle/floor)))
T = get_step(src, WEST)
if(T)
if (T)
T.overlays += image('icons/turf/walls.dmi', "rock_side_e", layer=6)
if(mineralName && mineralAmt && spread && spreadChance)
if (mineralName && mineralAmt && spread && spreadChance)
for(var/dir in cardinal)
if(prob(spreadChance))
var/turf/T = get_step(src, dir)
@@ -78,10 +78,10 @@
/turf/simulated/mineral/random/New()
..()
if(prob(mineralChance))
if (prob(mineralChance))
var/mName = pickweight(mineralSpawnChanceList) //temp mineral name
if(mName)
if (mName)
var/turf/simulated/mineral/M
switch(mName)
if("Uranium")
@@ -383,22 +383,21 @@
/turf/simulated/mineral/attackby(var/obj/item/weapon/pickaxe/P as obj, mob/user as mob)
if(!user.IsAdvancedToolUser())
if (!user.IsAdvancedToolUser())
usr << "<span class='danger'>You don't have the dexterity to do this!</span>"
return
if(istype(P, /obj/item/weapon/pickaxe))
if (istype(P, /obj/item/weapon/pickaxe))
var/turf/T = user.loc
if(!( istype(T, /turf) ))
if (!( istype(T, /turf) ))
return
if(!P.powered)
return
if(!P.powered)
return
/*
if(istype(W, /obj/item/weapon/pickaxe/radius))
if (istype(W, /obj/item/weapon/pickaxe/radius))
var/turf/T = user.loc
if(!( istype(T, /turf) ))
if (!( istype(T, /turf) ))
return
*/
//Watch your tabbing, microwave. --NEO
@@ -431,22 +430,22 @@
return
/turf/simulated/mineral/proc/gets_drilled()
if((src.mineralName != "") && (src.mineralAmt > 0) && (src.mineralAmt < 11))
if ((src.mineralName != "") && (src.mineralAmt > 0) && (src.mineralAmt < 11))
var/i
for (i=0;i<mineralAmt;i++)
if(src.mineralName == "Uranium")
if (src.mineralName == "Uranium")
new /obj/item/weapon/ore/uranium(src)
if(src.mineralName == "Iron")
if (src.mineralName == "Iron")
new /obj/item/weapon/ore/iron(src)
if(src.mineralName == "Gold")
if (src.mineralName == "Gold")
new /obj/item/weapon/ore/gold(src)
if(src.mineralName == "Silver")
if (src.mineralName == "Silver")
new /obj/item/weapon/ore/silver(src)
if(src.mineralName == "Plasma")
if (src.mineralName == "Plasma")
new /obj/item/weapon/ore/plasma(src)
if(src.mineralName == "Diamond")
if (src.mineralName == "Diamond")
new /obj/item/weapon/ore/diamond(src)
if(src.mineralName == "Bananium")
if (src.mineralName == "Bananium")
new /obj/item/weapon/ore/bananium(src)
var/turf/simulated/floor/plating/asteroid/airless/N = ChangeTurf(/turf/simulated/floor/plating/asteroid/airless)
playsound(src, 'sound/effects/break_stone.ogg', 50, 1) //beautiful destruction
@@ -461,14 +460,14 @@
/*
/turf/simulated/mineral/proc/setRandomMinerals()
var/s = pickweight(list("uranium" = 5, "iron" = 50, "gold" = 5, "silver" = 5, "plasma" = 50, "diamond" = 1))
if(s)
if (s)
mineralName = s
var/N = text2path("/turf/simulated/mineral/[s]")
if(N)
if (N)
var/turf/simulated/mineral/M = new N
src = M
if(src.mineralName)
if (src.mineralName)
mineralAmt = 5
return*/
@@ -514,7 +513,7 @@
var/proper_name = name
..()
name = proper_name
//if(prob(50))
//if (prob(50))
// seedName = pick(list("1","2","3","4"))
// seedAmt = rand(1,4)
if(prob(20))
@@ -531,7 +530,7 @@
if(3.0)
return
if(2.0)
if(prob(20))
if (prob(20))
src.gets_dug()
if(1.0)
src.gets_dug()
@@ -542,20 +541,20 @@
if(!W || !user)
return 0
if((istype(W, /obj/item/weapon/shovel)))
if ((istype(W, /obj/item/weapon/shovel)))
var/turf/T = user.loc
if(!( istype(T, /turf) ))
if (!( istype(T, /turf) ))
return
if(dug)
if (dug)
user << "<span class='danger'>This area has already been dug.</span>"
return
user << "<span class='danger'>You start digging.</span>"
playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1) //FUCK YO RUSTLE I GOT'S THE DIGS SOUND HERE
sleep(15)
if((user.loc == T && user.get_active_hand() == W))
sleep(20)
if ((user.loc == T && user.get_active_hand() == W))
user << "<span class='notice'>You dug a hole.</span>"
gets_dug()
return