From bdc75e654fc95e903a5a0c48e3a07c18ea061b24 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sat, 18 Apr 2020 23:16:00 -0400 Subject: [PATCH] Adds 2 new bedsheets --- .../objects/structures/bedsheet_bin_vr.dm | 15 +++++++++++++++ icons/obj/items_vr.dmi | Bin 1649 -> 5259 bytes maps/tether/submaps/admin_use/mercbase.dmm | 4 ++-- vorestation.dme | 1 + 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 code/game/objects/structures/bedsheet_bin_vr.dm diff --git a/code/game/objects/structures/bedsheet_bin_vr.dm b/code/game/objects/structures/bedsheet_bin_vr.dm new file mode 100644 index 00000000000..e62ea515572 --- /dev/null +++ b/code/game/objects/structures/bedsheet_bin_vr.dm @@ -0,0 +1,15 @@ +/obj/item/weapon/bedsheet/cosmos + icon = 'icons/obj/items_vr.dmi' + icon_state = "sheetcosmos" + +/obj/item/weapon/bedsheet/cosmosdouble + icon = 'icons/obj/items_vr.dmi' + icon_state = "doublesheetcosmos" + +/obj/item/weapon/bedsheet/pirate + icon = 'icons/obj/items_vr.dmi' + icon_state = "sheetpirate" + +/obj/item/weapon/bedsheet/piratedouble + icon = 'icons/obj/items_vr.dmi' + icon_state = "doublesheetpirate" diff --git a/icons/obj/items_vr.dmi b/icons/obj/items_vr.dmi index 46276e7f7cf9743a161781b832c09db56dd4e5b7..ca82649d88380c434e50a0941c6be35a551134d5 100644 GIT binary patch literal 5259 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 literal 1649 zcmV-%29EiOP)V=-0C=2*%DoDMFcgO2Ik}1t-An)0EF~ft^d3TUVh&n`BpT|~cM!UjZtn|E zjYrd(9=bDfqnLP^p>RK)r6}xjfWqx6MIatRJ|<gpaT@dJWwf`2h}IH%^e$A432D1)fPnK~#90?V4Rk zTW1``eU3j&T!amfZf;;z-|NV#*P4X8(=qf1hCrxyWz~`;r`xUqoKZ@$4{OB(0A^f zuqjp*5bFwXy1m^<_weqvyj!z}LgWX(#LN?KMtybpc=!Z^@Ggfk1%y`FRvY;pxHx ze!m}w!+|Wz%shOE-|wfZtIN1}@nTl*&bbCmPE7$T5%bp3qq$DGCPJYQPN$QKiVFOG zKg-L@EG;c@WdUX?8)-P^;*C?UaqrLH_s>p905sIsTb*)4 z1cO1Us;Ur0kv)6%pePEOrlIRP;c%FRg#`@5D2xCXZq68Qx1R+dr0DE>^90v_{E`no z{Mh*Ri%;@W1Wf^&nwpShnNv*>zPh7udasiU|EN?~SL5^fvYywH025b!LUf1#+@BZ+ zVEV7?$V-b>rpp+*uA^xhf*_#D0p5K{K@XOr>pG$+QdU+*C=|+S&a4Ia{MSE>vjg7% z@YuJ^{^nx<-29~xfcB5h8N;9U<|PVrT}M$A-rE%>9E$M6jDz=g`DuT(lHq&0r8#rz z0u3)#=kmBEXqtu=3UcX=O6Tq{!}lxD!!o*Vg8+qws;WdH5x$>wQeIxpyc|Xl1ipJz zNhA`;C^9=WbO2ky8YS&ce08d|}(C zfMDgj!Oq^#;)f2;*S-S4($nbKK)&_?`GO?@wi32|3T%4;Y+nkuw6xgz{%s!tI|A5k zfZf>k0&G|W-BoS_ptZj>;|WLmMgi~!yd|+9T2la%I5(o>(Z11)2)V1=1~-6aaR2Q# zXfA#sR;56kM2tu_@CLjB%?Z!mND#9~kt9H(2Z1<|Y`mBxLJ1%)K%6|Rc+g@9$3FGogiKG+7*(z971XD>$lElc! zh)^maoh{Pt1)C_7of$31CKmBuQl34T>FU1xW1#k|f28 zYYr6&5_*A$CZgt$^%)e)toSbBOdOGQ{DMoj9x8ZWRfEfAL6K=Aw ztu7?itpSOhXOyPSTu*uCBZ z(Qx-3@Ct6VIEkBBGXmn?PxR(|?Bbm?-kggahY|an1L`)}>Pwt}mVB+Cs9T|JG vSi^lStSf*?!rh#?H%k#|+u&9torwPdkp87<2F+;C00000NkvXXu0mjfoiiWd diff --git a/maps/tether/submaps/admin_use/mercbase.dmm b/maps/tether/submaps/admin_use/mercbase.dmm index bac8c22541e..a03f0144787 100644 --- a/maps/tether/submaps/admin_use/mercbase.dmm +++ b/maps/tether/submaps/admin_use/mercbase.dmm @@ -488,10 +488,10 @@ /area/antag/antag_base) "aN" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hos, /obj/effect/landmark{ name = "Syndicate-Spawn" }, +/obj/item/weapon/bedsheet/pirate, /turf/unsimulated/floor{ icon_state = "lino" }, @@ -647,7 +647,6 @@ /area/antag/antag_base) "aZ" = ( /obj/structure/bed/padded, -/obj/item/weapon/bedsheet/hos, /obj/machinery/computer/security/telescreen/entertainment{ icon_state = "frame"; pixel_w = 0; @@ -657,6 +656,7 @@ /obj/effect/landmark{ name = "Syndicate-Spawn" }, +/obj/item/weapon/bedsheet/pirate, /turf/unsimulated/floor{ icon_state = "lino" }, diff --git a/vorestation.dme b/vorestation.dme index a7b4957d8b4..9f6a5960405 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1312,6 +1312,7 @@ #include "code\game\objects\random\unidentified\medicine.dm" #include "code\game\objects\structures\barsign.dm" #include "code\game\objects\structures\bedsheet_bin.dm" +#include "code\game\objects\structures\bedsheet_bin_vr.dm" #include "code\game\objects\structures\bonfire.dm" #include "code\game\objects\structures\catwalk.dm" #include "code\game\objects\structures\cliff.dm"