From ff8aba4f962c8b831acd4e43d636f18371c3ae28 Mon Sep 17 00:00:00 2001 From: MaxxOrion <48482272+bryan-hub@users.noreply.github.com> Date: Sat, 2 Nov 2024 09:19:32 -0400 Subject: [PATCH] Tile Additions (#652) --- .../Prototypes/_Nuclear14/Tiles/floors.yml | 56 ++++++++++++++++++ .../_Nuclear14/Tiles/attributions.yml | 5 ++ .../Tiles/roadinnermiddlewithtop.png | Bin 0 -> 972 bytes .../_Nuclear14/Tiles/roadouterturnstop.png | Bin 0 -> 1066 bytes .../_Nuclear14/Tiles/roadouterturnwtop.png | Bin 0 -> 1100 bytes .../Textures/_Nuclear14/Tiles/swampland.png | Bin 0 -> 1904 bytes 6 files changed, 61 insertions(+) create mode 100644 Resources/Textures/_Nuclear14/Tiles/roadinnermiddlewithtop.png create mode 100644 Resources/Textures/_Nuclear14/Tiles/roadouterturnstop.png create mode 100644 Resources/Textures/_Nuclear14/Tiles/roadouterturnwtop.png create mode 100644 Resources/Textures/_Nuclear14/Tiles/swampland.png diff --git a/Resources/Prototypes/_Nuclear14/Tiles/floors.yml b/Resources/Prototypes/_Nuclear14/Tiles/floors.yml index 917c4999aaa..052a5d7903c 100644 --- a/Resources/Prototypes/_Nuclear14/Tiles/floors.yml +++ b/Resources/Prototypes/_Nuclear14/Tiles/floors.yml @@ -1701,6 +1701,45 @@ heatCapacity: 10000 weather: true +- type: tile + id: N14FloorRoadInnerMiddleWithTop + name: road inner middle with top + sprite: /Textures/_Nuclear14/Tiles/roadinnermiddlewithtop.png + baseTurf: FloorWasteland + isSubfloor: true + footstepSounds: + collection: FootstepFloor + friction: 0.30 + thermalConductivity: 0.04 + heatCapacity: 10000 + weather: true + +- type: tile + id: N14FloorRoadOuterTurnSouthTop + name: road outer turn south top + sprite: /Textures/_Nuclear14/Tiles/roadouterturnstop.png + baseTurf: FloorWasteland + isSubfloor: true + footstepSounds: + collection: FootstepFloor + friction: 0.30 + thermalConductivity: 0.04 + heatCapacity: 10000 + weather: true + +- type: tile + id: N14FloorRoadOuterTurnWestTop + name: road outer turn west top + sprite: /Textures/_Nuclear14/Tiles/roadouterturnwtop.png + baseTurf: FloorWasteland + isSubfloor: true + footstepSounds: + collection: FootstepFloor + friction: 0.30 + thermalConductivity: 0.04 + heatCapacity: 10000 + weather: true + # Wasteland - type: tile id: FloorWasteland @@ -1865,4 +1904,21 @@ thermalConductivity: 0.4 heatCapacity: 700000 weather: true + indestructible: true + + # Swampland +- type: tile + id: FloorSwampland + name: swampland + sprite: /Textures/_Nuclear14/Tiles/swampland.png + variants: 4 + placementVariants: [0, 1, 2, 3] + baseTurf: space + isSubfloor: true + footstepSounds: + collection: N14FootstepWater + friction: 0.30 + thermalConductivity: 0.04 + heatCapacity: 10000 + weather: true indestructible: true \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Tiles/attributions.yml b/Resources/Textures/_Nuclear14/Tiles/attributions.yml index 9dabf79c982..68558b3e7a6 100644 --- a/Resources/Textures/_Nuclear14/Tiles/attributions.yml +++ b/Resources/Textures/_Nuclear14/Tiles/attributions.yml @@ -36,3 +36,8 @@ license: "CC-BY-NC-SA-3.0" copyright: "Taken from goonstation at commit https://github.com/goonstation/goonstation/commit/ddd7f6a0b7a1b2758c0f9dfff09974854e3ef7ed" source: "https://github.com/goonstation/goonstation" + +- files: ["swampland.png", "roadinnermiddlewithtop", "roadouterturnstop", "roadouterturnwtop"] + license: "CC-BY-NC-SA-3.0" + copyright: "Taken from wasteland at commit 6d346b9a8a1821fbe0a8bb3ac8d358ebcb266e53, swampland, roadinnermiddlewithtop, roadouterturnstop, roadouterturnwtop by maxxorion" + source: "https://github.com/Vault-Overseers/nuclear-14" \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Tiles/roadinnermiddlewithtop.png b/Resources/Textures/_Nuclear14/Tiles/roadinnermiddlewithtop.png new file mode 100644 index 0000000000000000000000000000000000000000..d2c497d50804366ef5ef0da47e21335fbdd6d7e5 GIT binary patch literal 972 zcmV;-12g=IP)Px&hDk(0R9J<@mqAnOFbss(irthM${*#2bB6}l2mK`bKlq3 zmoAsfpWjQ;^?KF$eBSMsG(XGd^I4@7wbu5?a@OnXt0F=vCAHRcI-S&e*BC>~vS^GU z&P!5jO(`X9+a^hh2)(?#XpD!>Q%ZV!dz&^(DGClm#B?4JiU@7nre#?spw`;X7;8jm zjG@+=YOUI~ZSLbd_H)i!mSqCXr4&VkdhZiJN@*GfDNn6+2N35eC9Uf^nc!?hDCayK z0t}lWX?}sBl#<36>b+~*Hf`Ic-up}wEBkm`Yx9f;!!yR1fCwP7srN2V2lOw?qWk^6 z0~ZmhweEm={`tO?vI{OE)LNTC<(w5z0+pU4#0QknqlZ@SJDj9gUMrziPSf{ z(m@Y^iT-Cl`_^@xB6P}^Wtlpo0pTx$hzM|qIH4LAh?A%Q~}WfD5W&%#0Jjp_xmhYXP~vF zWm!~8`PD%0eYR4f@4e5%fWU!^>ZlLsMP#r>7v&s(2W0_mQ~}Ysm|@t(>rW81 zE0xD{O8bQouXXRFu)#SrMu|ELV~hs?pJ3>~`}VOcoi!IFK)p->Bx%kH*H6@1cbhsp)H6_ipwf4*C@jl?a`Z)h@x7(x^W{&GIl`cw8H_U~%SSa^l%3%mm&mYnl+LS>K^Mm1~@soU|Zo7X=9@Oef9po2o3 zy6|x1VsnrLL+Sb*z$*Y7wN?eq2FIQ^*9QL+y{CvLXubW{3(GtF2YV?3(BbK}(@ zY1fE63MvBzYpwHI=EC(GmJ6IUyaavN_$B~3NT@}`r_<@byP&6OUO;{XZ8Ib$Js<~! zUp6TZ5fREn$3@|GyD1`c uyWM8z^ZC#30@ny)11t>-C*CcOUGg7bH<8wP`XHbH0000Px&pC-yG3tK5D}?aFX76346lIK`1G!$Wy5H}*UatqJC8@QhQp$9KLjvJCP7yK^!k3k=c)WJ^FHgb61$aJFsRY*$C1wWgHPoR%3V z86;%yiboJQa8jN50lbh5)KF3G@pGgtfQ{Nwnkg8+v%#=`9C{Dh%L6$HdfIeJb+Vy= z-h$p8&Tf}mKEMpQNyN)L#!#lE92$qzOXL0RHKz;6&dFSBok;k+nWXjU1yfmGQ{)#! zyw_bxL4$h)NQ*iOV~j@tKEdFD>-M=V9W^H*!-8~#3Qt$ibUeh;`-pXdL&t`pk%qB-s7Qo0s+xj`vOExQ1>Cl6GS}z4L&^>s-Z|J|@Gvd$0jfxKh69iTM;LYD0jZOXAi3|V z>TduiI6>7~6%iX8d)=HH{LVwg%ZA+goQHTQZ3tn0Ljs*K#-j_)uUQUBItY>XF`WT| zlNWyal~X9*FyzUEo84Ae@A>nwJYb0FCn? z@-pEZM41g4!z@VR--NuTPRw(boZ;`x{IhKHV9hx{#xb8UhSqge?_KM<{*f1m5kw** kf2yzRdT2pcOM>Cvf4-W`ND>B!aR2}S07*qoM6N<$f}?2z9smFU literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Tiles/roadouterturnwtop.png b/Resources/Textures/_Nuclear14/Tiles/roadouterturnwtop.png new file mode 100644 index 0000000000000000000000000000000000000000..97c178fa3d56a2882073da43e23319233edcb443 GIT binary patch literal 1100 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