cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 15:18:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Large merge resultion. Used remote for map conflicts.

Browse Source
This commit is contained in:
Zuhayr
2014-09-23 21:41:54 +09:30
parent c529e014a7 29c29cd408
commit 0c83a95b90
164 changed files with 8010 additions and 7210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/machine_processing.dm
+1 -1
View File
@@ -62,7 +62,7 @@
dat += "Currently displaying [show_all_ores ? "all ore types" : "only available ore types"]. <A href='?src=\ref[src];toggle_ores=1'>\[[show_all_ores ? "show less" : "show more"]\]</a></br>"
dat += "The ore processor is currently <A href='?src=\ref[src];toggle_power=1'>[(machine.active ? "<font color='green'>processing</font>" : "<font color='red'>disabled</font>")]</a>."
user << browse(dat, "window=processor_console;size=400x500")
onclose(user, "computer")
onclose(user, "processor_console")
return
/obj/machinery/mineral/processing_unit_console/Topic(href, href_list)
code/modules/mining/mine_turfs.dm
+32 -22
View File
@@ -28,8 +28,6 @@
/turf/simulated/mineral/New()
. = ..()
MineralSpread()
spawn(2)
@@ -260,8 +258,23 @@
M.Stun(5)
M.apply_effect(25, IRRADIATE)
var/list/step_overlays = list("n" = NORTH, "s" = SOUTH, "e" = EAST, "w" = WEST)
//Add some rubble, you did just clear out a big chunk of rock.
var/turf/simulated/floor/plating/airless/asteroid/N = ChangeTurf(/turf/simulated/floor/plating/airless/asteroid)
for(var/i=0;i<rand(5);i++) N.overlay_detail = "asteroid[rand(0,9)]" //Add some rubble, you did just clear out a big chunk of rock.
N.overlay_detail = "asteroid[rand(0,9)]"
// Kill and update the space overlays around us.
for(var/direction in step_overlays)
var/turf/space/T = get_step(src, step_overlays[direction])
if(istype(T))
T.overlays.Cut()
for(var/next_direction in step_overlays)
if(istype(get_step(T, step_overlays[next_direction]),/turf/simulated/mineral))
T.overlays += image('icons/turf/walls.dmi', "rock_side_[next_direction]")
// Update the
N.updateMineralOverlays(1)
if(rand(1,500) == 1)
@@ -363,7 +376,7 @@
/turf/simulated/floor/plating/airless/asteroid //floor piece
name = "Asteroid"
name = "asteroid"
icon = 'icons/turf/floors.dmi'
icon_state = "asteroid"
oxygen = 0.01
@@ -376,8 +389,6 @@
/turf/simulated/floor/plating/airless/asteroid/New()
. = ..()
if(prob(20))
overlay_detail = "asteroid[rand(0,9)]"
@@ -459,27 +470,26 @@
/turf/simulated/floor/plating/airless/asteroid/proc/updateMineralOverlays(var/update_neighbors)
spawn(2)
overlays.Cut()
var/list/step_overlays = list("n" = NORTH, "s" = SOUTH, "e" = EAST, "w" = WEST)
for(var/direction in step_overlays)
overlays.Cut()
if(istype(get_step(src, step_overlays[direction]), /turf/space))
overlays += image('icons/turf/floors.dmi', "asteroid_edge_[direction]")
var/list/step_overlays = list("n" = NORTH, "s" = SOUTH, "e" = EAST, "w" = WEST)
for(var/direction in step_overlays)
if(istype(get_step(src, step_overlays[direction]), /turf/simulated/mineral))
overlays += image('icons/turf/walls.dmi', "rock_side_[direction]")
if(istype(get_step(src, step_overlays[direction]), /turf/space))
overlays += image('icons/turf/floors.dmi', "asteroid_edge_[direction]")
if(overlay_detail) overlays += overlay_detail
if(istype(get_step(src, step_overlays[direction]), /turf/simulated/mineral))
overlays += image('icons/turf/walls.dmi', "rock_side_[direction]")
if(update_neighbors)
var/list/all_step_directions = list(NORTH,NORTHEAST,EAST,SOUTHEAST,SOUTH,SOUTHWEST,WEST,NORTHWEST)
if(overlay_detail) overlays += overlay_detail
for(var/direction in all_step_directions)
var/turf/simulated/floor/plating/airless/asteroid/A
if(istype(get_step(src, direction), /turf/simulated/floor/plating/airless/asteroid))
A = get_step(src, direction)
A.updateMineralOverlays()
if(update_neighbors)
var/list/all_step_directions = list(NORTH,NORTHEAST,EAST,SOUTHEAST,SOUTH,SOUTHWEST,WEST,NORTHWEST)
for(var/direction in all_step_directions)
var/turf/simulated/floor/plating/airless/asteroid/A
if(istype(get_step(src, direction), /turf/simulated/floor/plating/airless/asteroid))
A = get_step(src, direction)
A.updateMineralOverlays()
/turf/simulated/floor/plating/airless/asteroid/Entered(atom/movable/M as mob|obj)
..()
code/modules/mining/satchel_ore_boxdm.dm
+21 -75
View File
@@ -4,19 +4,11 @@
/obj/structure/ore_box
icon = 'icons/obj/mining.dmi'
icon_state = "orebox0"
name = "Ore Box"
name = "ore box"
desc = "A heavy box used for storing ore."
density = 1
var/amt_gold = 0
var/amt_silver = 0
var/amt_diamond = 0
var/amt_glass = 0
var/amt_iron = 0
var/amt_phoron = 0
var/amt_uranium = 0
var/amt_clown = 0
var/amt_strange = 0
var/last_update = 0
var/list/stored_ore = list()
/obj/structure/ore_box/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/ore))
@@ -28,8 +20,22 @@
for(var/obj/item/weapon/ore/O in S.contents)
S.remove_from_storage(O, src) //This will move the item to this item's contents
user << "\blue You empty the satchel into the box."
update_ore_count()
return
/obj/structure/ore_box/proc/update_ore_count()
stored_ore = list()
for(var/obj/item/weapon/ore/O in contents)
if(stored_ore[O.name])
stored_ore[O.name]++
else
stored_ore[O.name] = 1
/obj/structure/ore_box/examine()
set name = "Examine"
set category = "IC"
@@ -48,34 +54,17 @@
add_fingerprint(usr)
if(contents.len < 1)
if(!contents.len)
usr << "It is empty."
return
if(world.time > last_update + 10)
update_orecount()
update_ore_count()
last_update = world.time
var/dat = text("<b>The contents of the ore box reveal...</b>")
if (amt_iron)
dat += text("<br>Metal ore: [amt_iron]")
if (amt_glass)
dat += text("<br>Sand: [amt_glass]")
if (amt_phoron)
dat += text("<br>Phoron ore: [amt_phoron]")
if (amt_uranium)
dat += text("<br>Uranium ore: [amt_uranium]")
if (amt_silver)
dat += text("<br>Silver ore: [amt_silver]")
if (amt_gold)
dat += text("<br>Gold ore: [amt_gold]")
if (amt_diamond)
dat += text("<br>Diamond ore: [amt_diamond]")
if (amt_strange)
dat += text("<br>Strange rocks: [amt_strange]")
usr << dat
usr << "It holds:"
for(var/ore in stored_ore)
usr << "- [stored_ore[ore]] [ore]"
return
@@ -106,47 +95,4 @@
O.loc = src.loc
usr << "\blue You empty the ore box"
return
// Updates ore tally
/obj/structure/ore_box/proc/update_orecount()
amt_iron = 0
amt_glass = 0
amt_phoron = 0
amt_uranium = 0
amt_silver = 0
amt_gold = 0
amt_diamond = 0
amt_strange = 0
amt_clown = 0
for(var/obj/item/weapon/ore/O in contents)
if(!istype(O))
continue
if (istype(O, /obj/item/weapon/ore/iron))
amt_iron++
continue
if (istype(O, /obj/item/weapon/ore/glass))
amt_glass++
continue
if (istype(O, /obj/item/weapon/ore/phoron))
amt_phoron++
continue
if (istype(O, /obj/item/weapon/ore/uranium))
amt_uranium++
continue
if (istype(O, /obj/item/weapon/ore/silver))
amt_silver++
continue
if (istype(O, /obj/item/weapon/ore/gold))
amt_gold++
continue
if (istype(O, /obj/item/weapon/ore/diamond))
amt_diamond++
continue
if (istype(O, /obj/item/weapon/ore/strangerock))
amt_strange++
continue
return