From 4adfbb57f41a72fd053ebed24bccfbb91f8ee238 Mon Sep 17 00:00:00 2001
From: DHA <isthisavailablenow1@hotmail.com>
Date: Wed, 12 Feb 2020 06:41:04 -0800
Subject: [PATCH] Boxing Ring files & Icons

Currently uses procs from window.dm. Might change in the future.
---
 .../game/objects/structures/boxing_rope_ch.dm |  32 ++++++++++++++++++
 .../game/turfs/flooring/flooring_ch - copy.dm |   8 +++++
 code/game/turfs/flooring/flooring_ch.dm       |   8 +++++
 icons/obj/boxing_rope_ch.dmi                  | Bin 0 -> 513 bytes
 icons/turf/gym_ch.dmi                         | Bin 0 -> 1141 bytes
 5 files changed, 48 insertions(+)
 create mode 100644 code/game/objects/structures/boxing_rope_ch.dm
 create mode 100644 code/game/turfs/flooring/flooring_ch - copy.dm
 create mode 100644 code/game/turfs/flooring/flooring_ch.dm
 create mode 100644 icons/obj/boxing_rope_ch.dmi
 create mode 100644 icons/turf/gym_ch.dmi

diff --git a/code/game/objects/structures/boxing_rope_ch.dm b/code/game/objects/structures/boxing_rope_ch.dm
new file mode 100644
index 0000000000..42f9a5b73e
--- /dev/null
+++ b/code/game/objects/structures/boxing_rope_ch.dm
@@ -0,0 +1,32 @@
+/obj/structure/boxingrope
+	name = "Boxing Ropes"
+	desc = "Do not exit the ring."
+	density = 1
+	anchored = 1
+	icon = 'icons/obj/boxing_rope_ch.dmi'
+	icon_state = "ringrope"
+	layer = OBJ_LAYER
+
+/obj/structure/boxingrope/CanPass(atom/movable/mover, turf/target) //Taken from window.dm
+	if(istype(mover) && mover.checkpass(PASSGLASS))
+		return TRUE
+	if((get_dir(loc, target) & dir) || (get_dir(mover, target) == turn(dir, 180)))
+		return !density
+	else
+		return TRUE
+
+/obj/structure/boxingrope/CheckExit(atom/movable/O as mob|obj, target as turf)
+	if(istype(O) && O.checkpass(PASSGLASS))
+		return 1
+	if(get_dir(O.loc, target) == dir)
+		return 0
+	return 1
+
+/obj/structure/boxingropeenter
+	name = "Ring entrance"
+	desc = "Do not exit the ring."
+	density = 0
+	anchored = 1
+	icon = 'icons/obj/boxing_rope_ch.dmi'
+	icon_state = "ringrope"
+	layer = OBJ_LAYER
diff --git a/code/game/turfs/flooring/flooring_ch - copy.dm b/code/game/turfs/flooring/flooring_ch - copy.dm
new file mode 100644
index 0000000000..6b81bcd8a7
--- /dev/null
+++ b/code/game/turfs/flooring/flooring_ch - copy.dm	
@@ -0,0 +1,8 @@
+/turf/simulated/floor/boxing
+	name = "boxing mat"
+	icon = 'icons/turf/gym_ch.dmi'
+	icon_state = "boxing"
+
+/turf/simulated/floor/boxing/gym
+	name = "gym mat"
+	icon_state = "gym_mat"
\ No newline at end of file
diff --git a/code/game/turfs/flooring/flooring_ch.dm b/code/game/turfs/flooring/flooring_ch.dm
new file mode 100644
index 0000000000..6b81bcd8a7
--- /dev/null
+++ b/code/game/turfs/flooring/flooring_ch.dm
@@ -0,0 +1,8 @@
+/turf/simulated/floor/boxing
+	name = "boxing mat"
+	icon = 'icons/turf/gym_ch.dmi'
+	icon_state = "boxing"
+
+/turf/simulated/floor/boxing/gym
+	name = "gym mat"
+	icon_state = "gym_mat"
\ No newline at end of file
diff --git a/icons/obj/boxing_rope_ch.dmi b/icons/obj/boxing_rope_ch.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..6cd219fd3b99d067771b0ac97fa6e2cef5de39bc
GIT binary patch
literal 513
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy$=1AIbU4;(mf@#4k*|NlRG_Uu0c
z!*&J+W8?n}olgS-0*s7|goTBztgHe917l)hYHMqCb#=YGyntGwqoZA2U6YfOA6Cus
z0vg3w666=m;PC858jzD$6%tY6l3JWxlvz-cnV-kNP%$Sste~j$`<LK?k6)i?dFyJO
zJ99pGL#V+;;|Gs)&iiPdWGL$C-C<!IWPI7!OJUBVNk=AyC<L$6FxKCzv0ovyv)fp8
z^9l)#l!HfShE16<n=47WNK<>qubmCPYz*@*Nmp#G|GXJ!^EXcy$B>N1w>Qu79Wvly
zey~wqA~{+3!@u*Vs!m*;7PM-`6}#}iOTGzd$A%kCuhXd7&%kKUbnHw(!YLlsE;k2d
zhxw9RJTn(MT;#}L*^$=9wEaxLf(#ZDCLiT_HVMyuZ?d_@JMSdpyw`P1n;94{GQ47A
zJMixS!xdhhhQEq`I$2B@7UU%`yy53@xO;%%hWw%V9uCYHivBP*Y?6J>`upMjhNoZs
z4*U^RP>^ugyqEFaUq`N4Z+Q#e^GCe;!OZxP0m2Eokdxm~U4J0xxI9M(JA^Z#DXp6M
k&Tr;vR{tCvEIzPG9oPG|{k?rRFa#JpUHx3vIVCg!05VV1hX4Qo

literal 0
HcmV?d00001

diff --git a/icons/turf/gym_ch.dmi b/icons/turf/gym_ch.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..821ac2c4544c67d06f6f5e85ef68892f7d2df725
GIT binary patch
literal 1141
zcmV-*1d98KP)<h;3K|Lk000e1NJLTq002M$001Be0{{R3l|zoU0001rP)t-sWu3Nx
zEjDbUyK17kWSzEWpSWe7w`rleXrQ@_FgJ%THes2wW1O{nEH!PTyKJJmZlt_wpt)_L
zx@(}hY@xbuq`YaMxoV-hYofYqp}K0HxM`lZX`i@ao3&`4xM-fYXP&oVnzU%0wqTjF
zWSq5SoV912wqKdEWSg~ToV8t-v1OaJUYN3Lqq{I}KhOXG0Cjp)Sad{Xb7OL8aCB*J
zZU6vyoKseCa&`CgQ*iP1<SI)oD$dN$Q?OMq(KF!UEYD0S$pCVUjkq{7QZv&tN+6u#
zlEji!AX6zRzald)U5Se`C9|j)C}7CNnO2mTn+jpWm8Dna#^)xM;8Lfo;OgfBwjThX
zYbG8kdhMA200SjSL_t(YiOrRLliDB<#vuuLGcVQT)C4$^AVII*_y2m`1)_F3?M?q`
zQO6;Z{jvK1&l2**pkIuy;{O34ij$b7EX}f<W%;jwqM$`d;o}AXc8ullYMjM!p65Ff
zF_u*+t8xYyMo8`7EXtyQznT^<%mJteq-oQ(P1Ag9AQk{AYxak(e>?PtGz9=I8ioT<
zgq3dYO4uc7dpx!0b2OZi1OOH5$Bs8mE7~dm$^f7=07`sP27pZV@5kXd3_?^A07)_m
z!JDB|t@MCL1s>qa$LR);6A|KF2&LqVB~%Mnycf&T>&gRyVkNDg0Q}VsFwYmGrd6$k
zSdAjiMl9VZj1W=+pmsR`1=dFZ=-_FXkpt+fnFv`8G1g)R+VJHdxEZ;$8^CX&15gAM
z9#99sI<2t&2Cz3SdT!QnksrSY&?mr}RY3xixdgznjDmmXP{J#qd;qozo&co?<Y2Bd
z0+Kslu>x@$btoZ7@BmO(0WE6>&~}zHey!CAsO+p0ZSUGj>qV@o`?`UEZASerSS_VS
z0>%RXCQ{nF1&*CV36B^Lpc}6KFR$}o10tv$^t)RrXDuVL15uo;C=KjF@ho?fFeu_4
z006YM`ffq_*;WyX3i|ntu^IsMq4^77+ZY5`J>G=j;;{02f`IvI)^#FE8QcZPz#9<U
z<82eEzhEJQ4=LQa8<)kV2(TA8l`Bze00i^#enfvhnI5o=tAYE=ZvkLHJIG<Z>J31h
zi_n)0UI13|5i3}@(Hj5~Ad`6klz#w7D8Y!aTZEZeghw0JSL>wAWk!H^1Mes02Jmj+
z0hR8T1@5onONANCQYq(9WI{uMkRmt`gt&ve`I9%4D3z`1h6Zl$nBXqRN{9hG^7y__
z902cL@dRK-=%{760V?p{rs3V#Gdu@LavGxZxjh}*GzkD_>F6R3u$g=j04a2Ux4t{<
z8-^t?7D10_uvuVVC_;ei2Hs8{eZm7=2g)m!RvAMPp+CjYr!s6<(3y&0KBc#J=SQIe
z-`b)aUd=M-h77tQ03i1BGyaV8ILk5z2#P^;fq>9wf(kzXwF+21Dtb5r00000NkvXX
Hu0mjfZ1V!y

literal 0
HcmV?d00001