From c73526334c2b99ba7e8d03c531150684d5aa445c Mon Sep 17 00:00:00 2001 From: AnturK Date: Mon, 5 Oct 2015 12:12:41 +0200 Subject: [PATCH] Rough Metal Wall --- code/game/objects/structures/false_walls.dm | 9 +++++ code/game/objects/structures/girders.dm | 36 +++++++++++++++++++- code/game/turfs/simulated/walls_mineral.dm | 24 ++++++++++--- icons/turf/walls/iron_wall.dmi | Bin 941 -> 1381 bytes 4 files changed, 63 insertions(+), 6 deletions(-) diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 188911cc2a0..23c6db2d478 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -261,3 +261,12 @@ mineral = "wood" walltype = "wood" canSmoothWith = list(/obj/structure/falsewall/wood, /turf/simulated/wall/mineral/wood) + +/obj/structure/falsewall/iron + name = "rough metal wall" + desc = "A wall with rough metal plating." + icon = 'icons/turf/walls/iron_wall.dmi' + icon_state = "" + mineral = "metal" + walltype = "iron" + canSmoothWith = list(/obj/structure/falsewall/iron, /turf/simulated/wall/mineral/iron) diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 28a1970eb95..5b1b6e07594 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -84,7 +84,7 @@ transfer_fingerprints_to(G) qdel(src) - else if(istype(W, /obj/item/stack/sheet)) + else if(istype(W, /obj/item/stack)) if (istype(src.loc, /turf/simulated/wall)) user << "There is already a wall present!" return @@ -95,6 +95,40 @@ user << "There is already a false wall present!" return + if(istype(W,/obj/item/stack/rods)) + var/obj/item/stack/rods/S = W + if(state == GIRDER_DISPLACED) + if(S.amount < 2) + user << "You need at least two rods to create a false wall!" + return + user << "You start building a reinforced false wall..." + if(do_after(user, 20, target = src)) + if(!src.loc || !S || S.amount < 2) + return + S.use(2) + user << "You create a false wall. Push on it to open or close the passage." + var/obj/structure/falsewall/iron/FW = new (loc) + transfer_fingerprints_to(FW) + qdel(src) + else + if(S.amount < 5) + user << "You need at least five rods to add plating!" + return + user << "You start adding plating..." + if (do_after(user, 40, target = src)) + if(!src.loc || !S || S.amount < 5) + return + S.use(5) + user << "You add the plating." + var/turf/T = get_turf(src) + T.ChangeTurf(/turf/simulated/wall/mineral/iron) + transfer_fingerprints_to(T) + qdel(src) + return + + if(!istype(W,/obj/item/stack/sheet)) + return + var/obj/item/stack/sheet/S = W switch(S.type) diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index 84aae77504d..87e8894721d 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -7,10 +7,6 @@ canSmoothWith = null smooth = SMOOTH_TRUE -/turf/simulated/wall/mineral/New() - sheet_type = text2path("/obj/item/stack/sheet/mineral/[mineral]") - ..() - /turf/simulated/wall/mineral/gold name = "gold wall" desc = "A wall with gold plating. Swag!" @@ -18,6 +14,7 @@ icon_state = "gold" walltype = "gold" mineral = "gold" + sheet_type = /obj/item/stack/sheet/mineral/gold //var/electro = 1 //var/shocked = null explosion_block = 0 //gold is a soft metal you dingus. @@ -30,6 +27,7 @@ icon_state = "silver" walltype = "silver" mineral = "silver" + sheet_type = /obj/item/stack/sheet/mineral/silver //var/electro = 0.75 //var/shocked = null canSmoothWith = list(/turf/simulated/wall/mineral/silver, /obj/structure/falsewall/silver) @@ -41,6 +39,7 @@ icon_state = "diamond" walltype = "diamond" mineral = "diamond" + sheet_type = /obj/item/stack/sheet/mineral/diamond slicing_duration = 200 //diamond wall takes twice as much time to slice explosion_block = 3 canSmoothWith = list(/turf/simulated/wall/mineral/diamond, /obj/structure/falsewall/diamond) @@ -55,6 +54,7 @@ icon_state = "bananium" walltype = "bananium" mineral = "bananium" + sheet_type = /obj/item/stack/sheet/mineral/bananium canSmoothWith = list(/turf/simulated/wall/mineral/clown, /obj/structure/falsewall/clown) /turf/simulated/wall/mineral/sandstone @@ -64,6 +64,7 @@ icon_state = "sandstone" walltype = "sandstone" mineral = "sandstone" + sheet_type = /obj/item/stack/sheet/mineral/sandstone explosion_block = 0 canSmoothWith = list(/turf/simulated/wall/mineral/sandstone, /obj/structure/falsewall/sandstone) @@ -74,6 +75,7 @@ icon_state = "uranium" walltype = "uranium" mineral = "uranium" + sheet_type = /obj/item/stack/sheet/mineral/uranium canSmoothWith = list(/turf/simulated/wall/mineral/uranium, /obj/structure/falsewall/uranium) /turf/simulated/wall/mineral/uranium/proc/radiate() @@ -107,6 +109,7 @@ icon_state = "plasma" walltype = "plasma" mineral = "plasma" + sheet_type = /obj/item/stack/sheet/mineral/plasma thermal_conductivity = 0.04 canSmoothWith = list(/turf/simulated/wall/mineral/plasma, /obj/structure/falsewall/plasma) @@ -161,6 +164,17 @@ icon_state = "wood" walltype = "wood" mineral = "wood" + sheet_type = /obj/item/stack/sheet/mineral/wood hardness = 70 explosion_block = 0 - canSmoothWith = list(/turf/simulated/wall/mineral/wood, /obj/structure/falsewall/wood) \ No newline at end of file + canSmoothWith = list(/turf/simulated/wall/mineral/wood, /obj/structure/falsewall/wood) + +/turf/simulated/wall/mineral/iron + name = "rough metal wall" + desc = "A wall with rough metal plating." + icon = 'icons/turf/walls/iron_wall.dmi' + icon_state = "iron" + walltype = "iron" + mineral = "rods" + sheet_type = /obj/item/stack/rods + canSmoothWith = list(/turf/simulated/wall/mineral/iron, /obj/structure/falsewall/iron) \ No newline at end of file diff --git a/icons/turf/walls/iron_wall.dmi b/icons/turf/walls/iron_wall.dmi index 6fa4202373d469ab2f15bb802c8f26575785ce00..86bed015f15285517159ddfa44c95038c074c100 100644 GIT binary patch delta 1342 zcmV-E1;P5Q2jvPOiBL{Q4GJ0x0000DNk~Le0002M0002M1Oos70HE@5G?5`Xf6sbU zSad{Xb7OL8aCB*JZU6vyoRyP73&J26hR^ydWV>eMv}2dph#lHr2x+bfrlHd4-)Aj4 zMBq2PeDBA@%Y$f1_RXQ~NPTSaUHPD$B|9S48;mC1$1w$7VKgdz8RHy6lu@OzU{n_v z_1cG&7)FDaS2fRHrUEb=zz6`tf2alcEhR@(*N~q%kLVQ%g{7FaPOn+A1R-ul4G4ehbdVg=GaLX}bFTt)CwB z2`YRn8)yIk1R6<1K~#90?U})D;~)@*{RoQ>>9s~mdyZ1|1(KEaT*VKNf9_$=?KA9y zubto;{}}%y!=!H4BUQpc{TaeA|3G0IE1SOptf{N)NIjYzuzp{R`&}NbnO55c&xR++vC(n;|vncAf$d1tee)P#k|gpo{}X>*ohB(?49pe_Lm%^%vXTS!(^o zRy#|rzu2s^)cOUm02BZ;&y{|FIEDHT04&d){|M#|pxe3B4`@J=j(~<#DS(Os`HxIw zjoc3yVD3{y#j!e|oCZ`3Ks~vd29#oed7lD2W{7BZ3XpIE!U1n_z+DD_F{?P>$n`%3 zH2cxt7~ofe{-=O;e@l%4QuIFsv_T=(Aw~Zu{K%xk0$2c_4^V%>0$2e00O@v4O&XA> zNkb|%sVJZ(l{E4quW0g z0MOnS(*WIdZ+E@B+gS5sqTMSd15Ov#-39eN1Pt1}Vj7^ka<}e^{jk9)8n%1Ibim8` zzt%B;-|iK!05sln*qAuL80!@i0q#60Is#~yjX-^hZU8U`Sf<$S6jZ!-;P5FDhD;6+27L;U$`%Tc3NH>2N=FLl zzwbKns}BINjc>pg1^}oC#Jf5G)x3dU5r5Q?XY4=B4q#CgxDJD589ZZu$PU0Q3iPDF zvG5uDV|IXQ-oRdfTSM@S{V_X0HNS=33^%vn8T(^)e}HO!5Bo80&-je}gX{p+d<_u= z0}MW6{~$YPm#nYm*ANpiMB+2{$M>Bod?krNmjSRpzRy+kj)B4lbx@#-paS1_s}Xz$ zfbsspUv`)e1o;6};QPMO6fJ&0MxYE(-R#u2YxRJm9x~N~zPfBt7hd|(@yn}gOc*es zD5Rzif54;-lR7Z~(@soFvjIBSz{FY%z|0001>1Oos70D0kh9+4qBf3A8| zSad{Xb7OL8aCB*JZU6vyoQ>153d0}}#_?I7LXz1MqidIvP%<>{5QwP`QShXB{YV4d zir;nzKaM|wt$2*jX%@q4;vbvH#~|*)+&azKljExWzupXmXk0b>B8WB_{Ve@06Jdg?~W1L(0pPyLPo?v(dIf&x-RND?7U8<12t z8ZZVhw8xm;Kh}zI9=?C&1o4d6qs#dChX4QqgGod|RA_S6}~2`8~+WS)j>Y|%_4qv7E2g z+v{;!U=4t-6S#6G32=X!BN*7u`&j~<&vD>xM+2RUfPQztmb{o(f*Jbd=PD>3*v4Lt z0${l9t4&Zmu#K&J1!m3xuHTxbi3f(z$14K}^DqROM81Vk6M&NcVHCIkpX`CM#CEzF z!aV%VCEoy;pNEt{o((U^e+N-BmClg2?J!Jyv!?9c-d3;9#+mGH{%6`#Kk!^u) zAPeCBGDk_90RZ-m5#mM&0PI^g#H|_-*fp1kn@M7w+h4@(SS|_RsX<5FkQ3|NLR3pz zhEl+72edhw9{_C<+ud-6QvllJ;iQ&a@=ypg-5kufFY^u7yad=6Df2RFUg*uO$i2I- YZ^hTc*eKp>+yDRo07*qoM6N<$f+=a3A^-pY