From f2e0342ca9117d7724ec405865892389e0c487b5 Mon Sep 17 00:00:00 2001 From: LatD Date: Sat, 4 Jun 2016 18:52:00 +0300 Subject: [PATCH 01/12] Add machine prototype to cargo --- code/modules/cargo/packs.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 421fca230ba..553cf52112e 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -789,7 +789,6 @@ crate_name = "shield generators crate" crate_type = /obj/structure/closet/crate/secure - /datum/supply_pack/science/transfer_valves name = "Tank Transfer Valves Crate" cost = 6000 @@ -800,6 +799,14 @@ crate_type = /obj/structure/closet/crate/secure dangerous = TRUE +/datum/supply_pack/science/research + name = "Machine Prototype Crate" + cost = 5000 + access = access_research + contains = list(/obj/item/device/machineprototype) + crate_name = "machine prototype crate" + crate_type = /obj/structure/closet/crate/secure + ////////////////////////////////////////////////////////////////////////////// //////////////////////////// Organic ///////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// From 1a3e75dfbb9d6cc333542f376b4c596bf76c5062 Mon Sep 17 00:00:00 2001 From: LatD Date: Sat, 4 Jun 2016 18:53:06 +0300 Subject: [PATCH 02/12] Add machine prototype item --- code/game/objects/items/devices/machineprototype | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 code/game/objects/items/devices/machineprototype diff --git a/code/game/objects/items/devices/machineprototype b/code/game/objects/items/devices/machineprototype new file mode 100644 index 00000000000..1e0349e03b6 --- /dev/null +++ b/code/game/objects/items/devices/machineprototype @@ -0,0 +1,6 @@ +/obj/item/device/machineprototype + name = "machine prototype" + desc = "A complicated machine prototype. You have no idea how it works." + //icon = 'beep boop.dmi' + materials = list(MAT_METAL=1000, MAT_GLASS=500) + origin_tech = "engineering=7" From 34c362e9934547a34f01cf7398d2510f64e6611d Mon Sep 17 00:00:00 2001 From: LatD Date: Sat, 4 Jun 2016 19:19:15 +0300 Subject: [PATCH 03/12] File name was wrong --- .../items/devices/{machineprototype => machineprototype.dm} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename code/game/objects/items/devices/{machineprototype => machineprototype.dm} (100%) diff --git a/code/game/objects/items/devices/machineprototype b/code/game/objects/items/devices/machineprototype.dm similarity index 100% rename from code/game/objects/items/devices/machineprototype rename to code/game/objects/items/devices/machineprototype.dm From 15fa5333369180e0b96edb8c48db8825faa47e61 Mon Sep 17 00:00:00 2001 From: LatD Date: Sat, 4 Jun 2016 19:20:34 +0300 Subject: [PATCH 04/12] Add new file to .dme --- tgstation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/tgstation.dme b/tgstation.dme index 7de1ddbe7e3..5a33c5ea184 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -588,6 +588,7 @@ #include "code\game\objects\items\devices\instruments.dm" #include "code\game\objects\items\devices\laserpointer.dm" #include "code\game\objects\items\devices\lightreplacer.dm" +#include "code\game\objects\items\devices\machineprototype.dm" #include "code\game\objects\items\devices\megaphone.dm" #include "code\game\objects\items\devices\modificationkit.dm" #include "code\game\objects\items\devices\multitool.dm" From dbe738f9e0130ccdbc35bb77529ff6763bb0c2b6 Mon Sep 17 00:00:00 2001 From: LatD Date: Fri, 10 Jun 2016 22:00:07 +0300 Subject: [PATCH 05/12] Sprite --- Machineprototype.png | Bin 0 -> 435 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Machineprototype.png diff --git a/Machineprototype.png b/Machineprototype.png new file mode 100644 index 0000000000000000000000000000000000000000..daa42627f5925c078637b4fe0bd25ad1d81a1a90 GIT binary patch literal 435 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!1`kgc$B+p3qf@N&4jTx#luk5x8MO42V$jmU z*IFk;gPyQ3)_6Kk7YH$waaCS(-Px$G!?ZD-(>de$#r=v)OTtqmI(d{QCaM_SIeq=7 zar~Eg?rqgOyAOOQI5++N@8{DGm)&=2n^!0!{IUATv@%hLmp13G7F~#KP2LPd&Gv#o&P0<~!-x6JtbnMjn{XpfgoFFiAYsAujxAO69@B{r>B@ zH?Y@PtmKS%v+86H)8&V{zVDBl%-tt0Xn!GSvP8dp>MW+6GD2YsOgx??*seSzHrcyz zDmSCy3by&56V8iG_GRe4-)t-2c>L7D)0;W}Oby#<%d#Q0YxRQAfZNCK(J` z`Qh_hB?pTe+#mKkT?}oA=$v(6?Nf&~u6@!wzPobSU3Y3z)wm!m>85np1Mc}AWnO#J X!U&rH8v$KlKr?u{`njxgN@xNADxs|Z literal 0 HcmV?d00001 From 43d71755e07afc78141b15a47d9ae0cb1976e08c Mon Sep 17 00:00:00 2001 From: LatD Date: Fri, 10 Jun 2016 22:28:05 +0300 Subject: [PATCH 06/12] Correct sprite --- icons/obj/machineprototype.dmi | Bin 0 -> 418 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 icons/obj/machineprototype.dmi diff --git a/icons/obj/machineprototype.dmi b/icons/obj/machineprototype.dmi new file mode 100644 index 0000000000000000000000000000000000000000..f5312bdba60f67ecb1774505c91d53e3c22747fc GIT binary patch literal 418 zcmV;T0bTxyP)|^ZP@w@^KfCsurE(2R+fOaZeACd=IDWyT-c9(RJlMYt6oIyFHD8rFo zEx=fjQyt1&E|MV>kgMvHwtz}&t*s!>6WH;oeh96ZCk0aS`M>{;CjhfJk8qyossI20 M07*qoM6N<$f*k3rVgLXD literal 0 HcmV?d00001 From feb1a338b9d57eff3b3033a5b0d95a43290b2c3e Mon Sep 17 00:00:00 2001 From: LatD Date: Fri, 10 Jun 2016 22:32:36 +0300 Subject: [PATCH 07/12] Delete wrong sprite --- Machineprototype.png | Bin 435 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Machineprototype.png diff --git a/Machineprototype.png b/Machineprototype.png deleted file mode 100644 index daa42627f5925c078637b4fe0bd25ad1d81a1a90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 435 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!1`kgc$B+p3qf@N&4jTx#luk5x8MO42V$jmU z*IFk;gPyQ3)_6Kk7YH$waaCS(-Px$G!?ZD-(>de$#r=v)OTtqmI(d{QCaM_SIeq=7 zar~Eg?rqgOyAOOQI5++N@8{DGm)&=2n^!0!{IUATv@%hLmp13G7F~#KP2LPd&Gv#o&P0<~!-x6JtbnMjn{XpfgoFFiAYsAujxAO69@B{r>B@ zH?Y@PtmKS%v+86H)8&V{zVDBl%-tt0Xn!GSvP8dp>MW+6GD2YsOgx??*seSzHrcyz zDmSCy3by&56V8iG_GRe4-)t-2c>L7D)0;W}Oby#<%d#Q0YxRQAfZNCK(J` z`Qh_hB?pTe+#mKkT?}oA=$v(6?Nf&~u6@!wzPobSU3Y3z)wm!m>85np1Mc}AWnO#J X!U&rH8v$KlKr?u{`njxgN@xNADxs|Z From 40590d2b6a0ac21ed419be88a1eea030b73149fa Mon Sep 17 00:00:00 2001 From: LatD Date: Fri, 10 Jun 2016 22:44:02 +0300 Subject: [PATCH 08/12] Add filepath --- code/game/objects/items/devices/machineprototype.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/machineprototype.dm b/code/game/objects/items/devices/machineprototype.dm index 1e0349e03b6..011569b645a 100644 --- a/code/game/objects/items/devices/machineprototype.dm +++ b/code/game/objects/items/devices/machineprototype.dm @@ -1,6 +1,6 @@ /obj/item/device/machineprototype name = "machine prototype" desc = "A complicated machine prototype. You have no idea how it works." - //icon = 'beep boop.dmi' + icon = 'icons/obj/machineprototype.dmi' materials = list(MAT_METAL=1000, MAT_GLASS=500) origin_tech = "engineering=7" From fa22cf444977deac2f0b797d3ed8f6d5cb0d7558 Mon Sep 17 00:00:00 2001 From: LatD Date: Fri, 10 Jun 2016 23:03:57 +0300 Subject: [PATCH 09/12] Add icon state --- code/game/objects/items/devices/machineprototype.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/devices/machineprototype.dm b/code/game/objects/items/devices/machineprototype.dm index 011569b645a..1ac6419131a 100644 --- a/code/game/objects/items/devices/machineprototype.dm +++ b/code/game/objects/items/devices/machineprototype.dm @@ -2,5 +2,6 @@ name = "machine prototype" desc = "A complicated machine prototype. You have no idea how it works." icon = 'icons/obj/machineprototype.dmi' + icon_state = "megaphone" materials = list(MAT_METAL=1000, MAT_GLASS=500) origin_tech = "engineering=7" From d95a6abd29f99d3acd75dd5640e428f41d7dc584 Mon Sep 17 00:00:00 2001 From: LatD Date: Fri, 10 Jun 2016 23:04:35 +0300 Subject: [PATCH 10/12] Correct icon state --- code/game/objects/items/devices/machineprototype.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/machineprototype.dm b/code/game/objects/items/devices/machineprototype.dm index 1ac6419131a..18c04bc39a5 100644 --- a/code/game/objects/items/devices/machineprototype.dm +++ b/code/game/objects/items/devices/machineprototype.dm @@ -2,6 +2,6 @@ name = "machine prototype" desc = "A complicated machine prototype. You have no idea how it works." icon = 'icons/obj/machineprototype.dmi' - icon_state = "megaphone" + icon_state = "machineprototype" materials = list(MAT_METAL=1000, MAT_GLASS=500) origin_tech = "engineering=7" From 82e100ba431a60bfbbf84c9aff172da5999646ca Mon Sep 17 00:00:00 2001 From: LatD Date: Fri, 10 Jun 2016 23:05:05 +0300 Subject: [PATCH 11/12] Fix origin tech --- code/game/objects/items/devices/machineprototype.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/machineprototype.dm b/code/game/objects/items/devices/machineprototype.dm index 18c04bc39a5..e6574d0e55a 100644 --- a/code/game/objects/items/devices/machineprototype.dm +++ b/code/game/objects/items/devices/machineprototype.dm @@ -4,4 +4,4 @@ icon = 'icons/obj/machineprototype.dmi' icon_state = "machineprototype" materials = list(MAT_METAL=1000, MAT_GLASS=500) - origin_tech = "engineering=7" + origin_tech = "engineering=6" From 5ecf4f272580aa8a07e62818d60be376d2eabc32 Mon Sep 17 00:00:00 2001 From: LatD Date: Sat, 11 Jun 2016 17:51:40 +0300 Subject: [PATCH 12/12] Raise the cost for now --- code/modules/cargo/packs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 553cf52112e..dbf7051b9cb 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -801,7 +801,7 @@ /datum/supply_pack/science/research name = "Machine Prototype Crate" - cost = 5000 + cost = 8000 access = access_research contains = list(/obj/item/device/machineprototype) crate_name = "machine prototype crate"