cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 05:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

Browse Source 
-Redid icons to be more optimized at compile by setting icon = 'icons/folder/icon.dmi' instead of just icon = 'icon.dmi', meaning that Dream Maker doesn't have to search through every single file for every single .dmi. This shouldn't lead to any errors because of how I went about it, plus the fact that Dream Maker would have freaked out if I screwed something up. Also moved around 2 icons that weren't sorted well.

r4146 compile time: 1 minute, 40 seconds
r4147 compile time: 45 seconds

[VGTG]

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4147 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
sieve32@gmail.com
2012-07-23 00:48:51 +00:00
parent 68558e91ee
commit 459c558898
410 changed files with 1366 additions and 1325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/machine_input_output_plates.dm
+2 -2
View File
@@ -1,7 +1,7 @@
/**********************Input and output plates**************************/
/obj/machinery/mineral/input
icon = 'screen1.dmi'
icon = 'icons/mob/screen1.dmi'
icon_state = "x2"
name = "Input area"
density = 0
@@ -10,7 +10,7 @@
icon_state = "blank"
/obj/machinery/mineral/output
icon = 'screen1.dmi'
icon = 'icons/mob/screen1.dmi'
icon_state = "x"
name = "Output area"
density = 0
code/modules/mining/machine_processing.dm
+2 -2
View File
@@ -2,7 +2,7 @@
/obj/machinery/mineral/processing_unit_console
name = "production machine console"
icon = 'mining_machines.dmi'
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "console"
density = 1
anchored = 1
@@ -175,7 +175,7 @@
/obj/machinery/mineral/processing_unit
name = "furnace"
icon = 'mining_machines.dmi'
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "furnace"
density = 1
anchored = 1.0
code/modules/mining/machine_stacking.dm
+2 -2
View File
@@ -2,7 +2,7 @@
/obj/machinery/mineral/stacking_unit_console
name = "stacking machine console"
icon = 'mining_machines.dmi'
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "console"
density = 1
anchored = 1
@@ -173,7 +173,7 @@
/obj/machinery/mineral/stacking_machine
name = "stacking machine"
icon = 'mining_machines.dmi'
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "stacker"
density = 1
anchored = 1.0
code/modules/mining/machine_unloading.dm
+1 -1
View File
@@ -3,7 +3,7 @@
/obj/machinery/mineral/unloading_machine
name = "unloading machine"
icon = 'mining_machines.dmi'
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "unloader"
density = 1
anchored = 1.0
code/modules/mining/mine_items.dm
+4 -4
View File
@@ -96,7 +96,7 @@ proc/move_mining_shuttle()
/obj/machinery/computer/mining_shuttle
name = "Mining Shuttle Console"
icon = 'computer.dmi'
icon = 'icons/obj/computer.dmi'
icon_state = "shuttle"
req_access = list(access_mining)
circuit = "/obj/item/weapon/circuitboard/mining_shuttle"
@@ -181,7 +181,7 @@ proc/move_mining_shuttle()
/obj/item/weapon/pickaxe
name = "Miner's pickaxe"
icon = 'items.dmi'
icon = 'icons/obj/items.dmi'
icon_state = "pickaxe"
flags = FPRINT | TABLEPASS| CONDUCT
slot_flags = SLOT_BELT
@@ -268,7 +268,7 @@ proc/move_mining_shuttle()
/obj/item/weapon/shovel
name = "shovel"
desc = "A large tool for digging and moving dirt."
icon = 'items.dmi'
icon = 'icons/obj/items.dmi'
icon_state = "shovel"
flags = FPRINT | TABLEPASS| CONDUCT
slot_flags = SLOT_BELT
@@ -294,7 +294,7 @@ proc/move_mining_shuttle()
/obj/structure/closet/crate/miningcar
desc = "A mining car. This one doesn't work on rails, but has to be dragged."
name = "Mining car (not for rails)"
icon = 'storage.dmi'
icon = 'icons/obj/storage.dmi'
icon_state = "miningcar"
density = 1
icon_opened = "miningcaropen"
code/modules/mining/mine_turfs.dm
+10 -10
View File
@@ -2,7 +2,7 @@
/turf/simulated/mineral //wall piece
name = "Rock"
icon = 'walls.dmi'
icon = 'icons/turf/walls.dmi'
icon_state = "rock"
oxygen = 0
nitrogen = 0
@@ -39,19 +39,19 @@
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)
T.overlays += image('walls.dmi', "rock_side_s")
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)
T.overlays += image('walls.dmi', "rock_side_n", layer=6)
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)
T.overlays += image('walls.dmi', "rock_side_w", layer=6)
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)
T.overlays += image('walls.dmi', "rock_side_e", layer=6)
T.overlays += image('icons/turf/walls.dmi', "rock_side_e", layer=6)
if (mineralName && mineralAmt && spread && spreadChance)
if(prob(spreadChance))
@@ -293,7 +293,7 @@
/turf/simulated/floor/plating/airless/asteroid //floor piece
name = "Asteroid"
icon = 'floors.dmi'
icon = 'icons/turf/floors.dmi'
icon_state = "asteroid"
oxygen = 0.01
nitrogen = 0.01
@@ -409,13 +409,13 @@
src.overlays = null
if(istype(get_step(src, NORTH), /turf/simulated/mineral))
src.overlays += image('walls.dmi', "rock_side_n")
src.overlays += image('icons/turf/walls.dmi', "rock_side_n")
if(istype(get_step(src, SOUTH), /turf/simulated/mineral))
src.overlays += image('walls.dmi', "rock_side_s", layer=6)
src.overlays += image('icons/turf/walls.dmi', "rock_side_s", layer=6)
if(istype(get_step(src, EAST), /turf/simulated/mineral))
src.overlays += image('walls.dmi', "rock_side_e", layer=6)
src.overlays += image('icons/turf/walls.dmi', "rock_side_e", layer=6)
if(istype(get_step(src, WEST), /turf/simulated/mineral))
src.overlays += image('walls.dmi', "rock_side_w", layer=6)
src.overlays += image('icons/turf/walls.dmi', "rock_side_w", layer=6)
/turf/simulated/floor/plating/airless/asteroid/proc/fullUpdateMineralOverlays()
code/modules/mining/mint.dm
+1 -1
View File
@@ -3,7 +3,7 @@
/obj/machinery/mineral/mint
name = "Coin press"
icon = 'stationobjs.dmi'
icon = 'icons/obj/stationobjs.dmi'
icon_state = "coinpress0"
density = 1
anchored = 1.0
code/modules/mining/money_bag.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/*****************************Money bag********************************/
/obj/item/weapon/moneybag
icon = 'storage.dmi'
icon = 'icons/obj/storage.dmi'
name = "Money bag"
icon_state = "moneybag"
flags = FPRINT | TABLEPASS| CONDUCT
code/modules/mining/ores_materials_coins.dm
+3 -3
View File
@@ -2,7 +2,7 @@
/obj/item/weapon/ore
name = "Rock"
icon = 'Mining.dmi'
icon = 'icons/obj/mining.dmi'
icon_state = "ore"
/obj/item/weapon/ore/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -86,7 +86,7 @@
/*****************************Coin********************************/
/obj/item/weapon/coin
icon = 'items.dmi'
icon = 'icons/obj/items.dmi'
name = "Coin"
icon_state = "coin"
flags = FPRINT | TABLEPASS| CONDUCT
@@ -147,7 +147,7 @@
del(CC)
return
overlays += image('items.dmi',"coin_string_overlay")
overlays += image('icons/obj/items.dmi',"coin_string_overlay")
string_attached = 1
user << "\blue You attach a string to the coin."
CC.use(1)
code/modules/mining/satchel_ore_boxdm.dm
+4 -4
View File
@@ -1,7 +1,7 @@
/**********************Satchel**************************/
/obj/item/weapon/satchel
icon = 'mining.dmi'
icon = 'icons/obj/mining.dmi'
icon_state = "satchel"
name = "Mining Satchel"
var/mode = 1; //0 = pick one at a time, 1 = pick all on tile
@@ -36,7 +36,7 @@
usr << "The satchel now picks up one ore at a time."
/obj/item/weapon/satchel/borg
icon = 'mining.dmi'
icon = 'icons/obj/mining.dmi'
icon_state = "satchel"
name = "Cyborg Mining Satchel"
mode = 1; //0 = pick one at a time, 1 = pick all on tile
@@ -45,7 +45,7 @@
/**********************Ore box**************************/
/obj/structure/ore_box
icon = 'mining.dmi'
icon = 'icons/obj/mining.dmi'
icon_state = "orebox"
name = "Ore Box"
desc = "It's heavy"
@@ -126,7 +126,7 @@
//Stolen satchel code, making it a box just wouldn't work well for this -Sieve
/obj/item/weapon/sheetsnatcher
icon = 'mining.dmi'
icon = 'icons/obj/mining.dmi'
icon_state = "sheetsnatcher"
name = "Sheet Snatcher"
desc = "A patented Nanotrasen storage system designed for any kind of mineral sheet."