From d0bd75a0a4f833a2ba374b2404354fc079e65aee Mon Sep 17 00:00:00 2001 From: DJPantheris Date: Wed, 9 Sep 2015 17:29:51 -0400 Subject: [PATCH 1/4] Putting in Turbidium --- code/modules/materials/material_sheets.dm | 8 +++++++- code/modules/materials/materials.dm | 19 +++++++++++++++---- code/modules/mining/ore.dm | 6 ++++++ code/modules/mining/ore_datum.dm | 9 +++++++++ 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm index 055195fc9c78e..c1b820fb1a27f 100644 --- a/code/modules/materials/material_sheets.dm +++ b/code/modules/materials/material_sheets.dm @@ -45,7 +45,7 @@ /obj/item/stack/material/proc/update_strings() // Update from material datum. singular_name = material.sheet_singular_name - + if(amount>1) name = "[material.use_name] [material.sheet_plural_name]" desc = "A stack of [material.use_name] [material.sheet_plural_name]." @@ -209,3 +209,9 @@ name = "reinforced phoron glass" icon_state = "sheet-phoronrglass" default_type = "rphglass" + +/obj/item/stack/material/turbidium + name = "Turbidium" + icon_state = "sheet-plasteel" + item_state = "sheet-metal" + default_type = "turbidium" \ No newline at end of file diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm index 94221cddc2273..3e2706dd73e8a 100644 --- a/code/modules/materials/materials.dm +++ b/code/modules/materials/materials.dm @@ -362,12 +362,12 @@ var/list/name_to_material icon_reinf = "reinf_over" melting_point = 3700 stack_origin_tech = "materials=6" - cut_delay = 60 + cut_delay = 60 explosion_resistance = 30 integrity = 600 hardness = 90 weight = 25 - + /material/glass name = "glass" stack_type = /obj/item/stack/material/glass @@ -494,7 +494,7 @@ var/list/name_to_material /material/glass/phoron/reinforced name = "rphglass" display_name = "reinforced phoron glass" - icon_colour = "#d60db4" + icon_colour = "#d60db4" stack_type = /obj/item/stack/material/glass/phoronrglass stack_origin_tech = "materials=4;phorontech=2" composite_material = list() //todo @@ -554,7 +554,7 @@ var/list/name_to_material stack_origin_tech = "materials=2" sheet_singular_name = "ingot" sheet_plural_name = "ingots" - + /material/iron name = "iron" stack_type = /obj/item/stack/material/iron @@ -565,6 +565,17 @@ var/list/name_to_material sheet_singular_name = "ingot" sheet_plural_name = "ingots" +/material/turbidium + name = "turbidium" + stack_type = obj/item/stack/material/turbidium + icon_color = "#00aaaa" + integrity = 1800 + melting_point = 30000 + weight = 20 + stack_per_sheet = 3500 + sheet_singular_name = "sheet" + sheet_plural_name = "sheets" + // Adminspawn only, do not let anyone get this. /material/voxalloy name = "voxalloy" diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm index 431cfe1114734..dacc39e1bf964 100644 --- a/code/modules/mining/ore.dm +++ b/code/modules/mining/ore.dm @@ -69,6 +69,12 @@ icon_state = "ore_hydrogen" material = "mhydrogen" +/obj/item/weapon/ore/crystarium + name = "Unrefined Crystal" + icon_state = "ore_crystarium" + material = "turbidium" + desc = "That's a raw crystal, and it was a PAIN to get." + /obj/item/weapon/ore/slag name = "Slag" desc = "Someone screwed up..." diff --git a/code/modules/mining/ore_datum.dm b/code/modules/mining/ore_datum.dm index 82a446fb0bb3d..3648ea0e6f216 100644 --- a/code/modules/mining/ore_datum.dm +++ b/code/modules/mining/ore_datum.dm @@ -139,4 +139,13 @@ var/global/list/ore_data = list() display_name = "metallic hydrogen" smelts_to = "tritium" compresses_to = "mhydrogen" + scan_icon = "mineral_rare" + +/ore/crystarium + name = "crystarium" + display_name = "Strange Crystal" + alloy = 1 + result_amount = 3 + spread_chance = 10 + ore = obj/item/weapon/ore/crystarium scan_icon = "mineral_rare" \ No newline at end of file From a26988d1d5239a9741a3a11247d76985f27e1a8f Mon Sep 17 00:00:00 2001 From: DJPantheris Date: Wed, 9 Sep 2015 20:08:34 -0400 Subject: [PATCH 2/4] Ready to test turbidium when sprites arrive. --- baystation12.dme | 62 +++++++++++++++++++++++++++++ code/modules/materials/materials.dm | 9 +++-- code/modules/mining/alloys.dm | 12 +++++- code/modules/mining/ore_datum.dm | 2 +- 4 files changed, 79 insertions(+), 6 deletions(-) diff --git a/baystation12.dme b/baystation12.dme index d1d23b6fed1c8..979ef25839a4b 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -5,6 +5,68 @@ // END_INTERNALS // BEGIN_FILE_DIR #define FILE_DIR . +#define FILE_DIR "html" +#define FILE_DIR "html/images" +#define FILE_DIR "icons" +#define FILE_DIR "icons/48x48" +#define FILE_DIR "icons/atmos" +#define FILE_DIR "icons/effects" +#define FILE_DIR "icons/mecha" +#define FILE_DIR "icons/misc" +#define FILE_DIR "icons/mob" +#define FILE_DIR "icons/mob/human_races" +#define FILE_DIR "icons/mob/human_races/cyberlimbs" +#define FILE_DIR "icons/mob/human_races/masks" +#define FILE_DIR "icons/mob/human_races/monkeys" +#define FILE_DIR "icons/mob/human_races/xenos" +#define FILE_DIR "icons/mob/items" +#define FILE_DIR "icons/mob/species" +#define FILE_DIR "icons/mob/species/skrell" +#define FILE_DIR "icons/mob/species/tajaran" +#define FILE_DIR "icons/mob/species/unathi" +#define FILE_DIR "icons/mob/species/vox" +#define FILE_DIR "icons/NTOS" +#define FILE_DIR "icons/NTOS/battery_icons" +#define FILE_DIR "icons/obj" +#define FILE_DIR "icons/obj/assemblies" +#define FILE_DIR "icons/obj/atmospherics" +#define FILE_DIR "icons/obj/clothing" +#define FILE_DIR "icons/obj/clothing/species" +#define FILE_DIR "icons/obj/clothing/species/skrell" +#define FILE_DIR "icons/obj/clothing/species/tajaran" +#define FILE_DIR "icons/obj/clothing/species/unathi" +#define FILE_DIR "icons/obj/doors" +#define FILE_DIR "icons/obj/flora" +#define FILE_DIR "icons/obj/machines" +#define FILE_DIR "icons/obj/pipes" +#define FILE_DIR "icons/pda_icons" +#define FILE_DIR "icons/spideros_icons" +#define FILE_DIR "icons/Testing" +#define FILE_DIR "icons/turf" +#define FILE_DIR "icons/vending_icons" +#define FILE_DIR "maps" +#define FILE_DIR "maps/overmap" +#define FILE_DIR "maps/overmap/bearcat" +#define FILE_DIR "nano" +#define FILE_DIR "nano/images" +#define FILE_DIR "sound" +#define FILE_DIR "sound/AI" +#define FILE_DIR "sound/ambience" +#define FILE_DIR "sound/effects" +#define FILE_DIR "sound/effects/turret" +#define FILE_DIR "sound/effects/wind" +#define FILE_DIR "sound/hallucinations" +#define FILE_DIR "sound/items" +#define FILE_DIR "sound/machines" +#define FILE_DIR "sound/mecha" +#define FILE_DIR "sound/misc" +#define FILE_DIR "sound/music" +#define FILE_DIR "sound/piano" +#define FILE_DIR "sound/violin" +#define FILE_DIR "sound/voice" +#define FILE_DIR "sound/voice/complionator" +#define FILE_DIR "sound/voice/Serithi" +#define FILE_DIR "sound/weapons" // END_FILE_DIR // BEGIN_PREFERENCES #define DEBUG diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm index 3e2706dd73e8a..41dc2c7c6b530 100644 --- a/code/modules/materials/materials.dm +++ b/code/modules/materials/materials.dm @@ -567,11 +567,12 @@ var/list/name_to_material /material/turbidium name = "turbidium" - stack_type = obj/item/stack/material/turbidium - icon_color = "#00aaaa" - integrity = 1800 - melting_point = 30000 + stack_type = /obj/item/stack/material/turbidium + icon_colour = "#00aaaa" + integrity = 3000 + melting_point = 35000 weight = 20 + hardness = 100 stack_per_sheet = 3500 sheet_singular_name = "sheet" sheet_plural_name = "sheets" diff --git a/code/modules/mining/alloys.dm b/code/modules/mining/alloys.dm index dac05badd02df..627e815a20e85 100644 --- a/code/modules/mining/alloys.dm +++ b/code/modules/mining/alloys.dm @@ -24,4 +24,14 @@ "carbon" = 1, "hematite" = 1 ) - product = /obj/item/stack/material/steel \ No newline at end of file + product = /obj/item/stack/material/steel + +/datum/alloy/turbidium + metaltag = "turbidium" + requires = list( + "crystarium" = 1, + "phoron" = 1, + "platinum" = 1 + ) + product_mod = 0.3 + product = /obj/item/stack/material/turbidium \ No newline at end of file diff --git a/code/modules/mining/ore_datum.dm b/code/modules/mining/ore_datum.dm index 3648ea0e6f216..61cb8b764517d 100644 --- a/code/modules/mining/ore_datum.dm +++ b/code/modules/mining/ore_datum.dm @@ -147,5 +147,5 @@ var/global/list/ore_data = list() alloy = 1 result_amount = 3 spread_chance = 10 - ore = obj/item/weapon/ore/crystarium + ore = /obj/item/weapon/ore/crystarium scan_icon = "mineral_rare" \ No newline at end of file From 6997f7477f21be95a9253a8fa003c56bb7f142d9 Mon Sep 17 00:00:00 2001 From: superballs69 Date: Mon, 14 Sep 2015 01:07:47 -0500 Subject: [PATCH 3/4] Added turbidium and crystarium icons. --- icons/obj/crystalsci.dmi | Bin 0 -> 2714 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 icons/obj/crystalsci.dmi diff --git a/icons/obj/crystalsci.dmi b/icons/obj/crystalsci.dmi new file mode 100644 index 0000000000000000000000000000000000000000..521f1837452e033b46e652d349eeb8aba2da2bea GIT binary patch literal 2714 zcmZuzcTkgw68}O1lF&Oymuf+c6e*zxBuFocAc9C&3{6BJ5Rp^E(GCOzLQy<*hv@w06ZuQqytN0S>(yd z!Qw+vQ7D%980F*=j`Rt;6B-a49)P|N0Fn62ZhhDjBYt*j)UNQ8np4cyQ=herp`!D! z%8+(#CJkthdmS8WP?+v@k32qN6WbL#*-uy$lOH}wK4VlO%VTg@KWOx}x@h~51 zSLnyb7tM7&(ytls7q+%B)gluUSvtDOK=mNtQ>ldARJJ7GVGYphYO8u~Q^| zH6Lx~G$PSfxE${(1||xp@iRXgd*vlbTpAFk`M3UK$|LV6Qk=FA@lk)1iLKwGuY(eih=P-uE|)XQ*nwWH(kEG_IZqtmGf)(y>o3U>_YT~ z$<0GZ-O3?;YIkh6AZ$(N#H*ZyC&eDh@1}qhQZSeybsxy5@Dzm+LE*fYvE8#Ay*icL zz2gzZHt(JWV&!LMT@0Ohm~65jB^qy3Jfwp zt;uN$=T8tSk_^IB(h|#l%ztVOJ@_VqRfki#O#VCLNkI3Rq|w6vU%>wu4aZ2AIv1FF zr{ju6h#$FpXfg;;wB#Xq)a2Py4sY4ymYx%7&vWzj6RQYi1_p4=X~zZh z+rLSDbpN&FrMt)7g)fg{uptTZ+S;4|O~`SMqENgB0vxv*>`jx0lKcLK_BA)lH%rgl zT>h@2{40C4c9`Ew_(OBI%}g!eB2)FALz=v{s-m|gV~a?4p(s+`ESLXmxX*HVY6#!o z2V}kv)APy1}K5eYCAu z;r14>RNL|)Y|~fek7#RUs~p7G>W>K<6~e?l?QmwUM-;15``)EV{oq=tO9tPUdP!o# zTcSt#@ekMD-8O%YbXWZtc;#f3qAYa*%#dl6Ln^yn_Z3j%mH4yeES9@f0i(O8&`TCm0Lu)%nlST|DlQO9@qk>6a~S!v6ghx)U_9W9jPm zOZ~td37SBYwH&*(q-Siba!z4k$BWj)7D0LC)A@N#Cvr8L=4=fu0cyq*S@?{n4l!Vp zSf?Z8uMvRV-_KE0{ib?$ANb%sfbRGfUggl0o8})X4jyKznHmoc76N$3gf>&4l)T#dAdgruy{aoO=69Q-QBzJ7=9shyfF zM@Lqd7z|VIa}sbU#I?VY{5UDrc%o2}MLfG-SDvtv{xQL2RM2-2{++0c77Ze|v(aG#azT zxl(i9b0~kv&RyCX0A3YCpQ9q2VZYL*K)*60EH1i9wTe5S5YF+)S1OM>-dDIw^GAhv zFWi6iJraJSv5&QfLBi_kF2#DB^MvHIARmCv|LY{z7`)k!o!|D&%kvLONdSaP1=OJ*2sFv zpoYfawW8M_kk{PIuh#Ev7L5kE&%I`g)NE4UoF}Hw4D}^2oR>jO+w%ct#EtRJ`xOed zN8fy&ZX8G^zMxAj2W}iwV8ACd&S};xn1q414q%h8Gj{KA)|!BVsd-RbNb<|Fn7A|@wY4~ zS_O#31v4~aJ{5QDURw&FJ%;u|->`7Rorn@QT&XWW-6=21PH5~;1%T3Vsl=0V_6$_) zEOqw%t66~$h@7(kg+lHjm&se&DRz8d80R3QZN&-*UfxqXob_{+_TOkvC#voa^sz=$eGddFdO=^GY(qRz z6{#!d!p6;E%1;G|TUZ-)k_JaE)_y(FZEsa`&$!0UwaU70f-LfzQv4Vj8&EB1mC)*_ zIKzV&n&Z|`gT5Yq`SDn~Dg7_5x2op^&cLoF ztgT&TtTiUkuGer0$?pSmU2-8x!L|{&6%N#_l_{nE-N2kpR8;qdH=#Fj(U#!dDZxxe z;>2AkXmHYYts5-08~5SJO^A z?Cc!o+SZR31J(r2*PYFX5Mr5A|3^d!(?se$fxZmF6rsS}(eXbNTzjZ(t&R1}CY zf9%YJysb>iYvRh)Xv*2(YN3`-h<`dYdapzNeOUI@6i0iPQ&QTb>x1QXLZzs zaO;4(>AP+-4>|6}2AcrfG6nL&eANJ3!c%l&Pz$Sk0fcXAX5k Date: Thu, 8 Oct 2015 11:49:03 -0400 Subject: [PATCH 4/4] Updated README.md to change info --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4267a3e0f088f..6abbf9ba7e3db 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,16 @@ # Aphelion Project -![Travis Build Status](https://travis-ci.org/sshado/Aphelion-Code.svg) -[![Join the chat at https://gitter.im/sshado/Aphelion-Code](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/sshado/Aphelion-Code?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +![Travis Build Status](https://travis-ci.org/DJPantheris/Aphelion-Code.svg?branch=master) +[![Join the chat at https://gitter.im/sshado/Aphelion-Code](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/sshado/Aphelion-Code?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [Website](hhttp://aphelion-project.xyz/) - [Code](https://github.com/sshado/Aphelion-Code) --- +This is a branch of the Aphelion Project began by Sshado. + +--- + ### LICENSE Baystation12 is licensed under the GNU Affero General Public License version 3, which can be found in full in LICENSE-AGPL3.txt.