@V
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
EH!Z-Vn*aa+
literal 3618
zcma)9c{tSXyZ(%I#E@+;5m}P5mSrq4N=1APM%l?1*=3n141*}^P_l%O?2L-BFOy=(
znyu_bw(K&N8O)ikbN>9DbDcll=l`!&|Xy%YRXFbzSnJW?b
zO_*3JVoW;n3+pzC6LIgxhxQEvIqG)oRZK=+hUPn2%UFMH2M1<(D>!v_V2l#zG0LB$IHprTYl!V
zE0wDl?t|;EBq!dyQfG|n+AR3m>v)mP$z8Cg-SPz2VWP^+_fV>>ET0Ic6dr}p$w?aM
z>6$;vUe5{l44cAu)W-KU~{@24zNTwtQ?eR}d
z7kVU6qeP!%Oy-h#S!3*S+U#ClQJir9v$&(Ku9_5-1h>3_U%Qkft0Y37^Ldjql{9U?
z=d&;06cnN}w6A?dXk$iuk7_@&e>}CX+WWQOmhQQ9p>AV9s=Q_t>}
zzhn=p{P4kyZ?E&r14YxK*x%A74z(Zvd!_{p2sTXNdK>;I`ZqZ6EzQ%81OVTKFZ@1Z
z6;@>@JVjC3fO$2pT&7&#!Tp3^2mmq?LIL7Xp`ntZA|E*S%B`mn5$BY>k41pIZX>6R(++rim#;|GB^l&On^M}Q{$&K3@9qOT@$moo1)m
z-MmkJFiw(thS35595>s5fPvP>r=zWdWb2aR^p;(VU9paW2{_!-Q6!Xp--FRj8Ma3G
zBo1gxB=^==yY8^7r8Pg%i+Ce17O>GwTw0qay{Ew$2oBFk^PptzfI0D%TjF?1uhF9x
zd!i-`EGpZ=`&f-7)FC6YY?WoD2Vrnh-~qCXiHM!wTHQszi=5c}-G+VtksZ5qK6rY<
z%}0cnZFoPaeSZ7)Z|Q30XXk0AL7+>@uqhR#2!WxYNF&97K!55-=T%ZQb8^(s(Ir*H
z9TzDh+wUrD2@reYcgr0Q-Da|ljwTb16wfx0i1@yiR5f2z%vX45;RR6B9TZj(6jYWPb&%6fXH@gTiF^?
zoPQqu+v08X*=BZ?9LX)qTx=!)T4rOyu%ZTpFZy8+ZP?c#omGukVJBkIxV4
zXt_l}BeGWxOZ{a~G3XY_Q+<4x+ezSBOwXkk(Z}4J(=`!Ku@1wj(&B7@7p20kQ0Pyj
zXqX^av-)3V;Kzc_W@pbT#xdHDa-3zfU|IhTtQol3ku)6w0v@ZYvkiyS23-%<3tDAd
z_ZuE4YRpZ(O(_A1<%Y|=>DH0hx5bWnEX0INig*4DDrnyMa_P}_hd};fQua#T0IE;>
zY`UD|c30aPG><+`U++p2>YV;j!w_OEPF(7MR2p)**0(*MMNHTO_&
zJV7gL_gNX2+lBYM&e)tWm#GgoTmWqQhG7|a7rMkeo%>3R02ah597(LZj^1(0osuVb
znF^`s#&IhG4hPbP7&*jD^Pz9kw4e~o99elRdjO4j4%6pk__Nq|t9V{HIA%>^@fT4$=_Pg8pZ{m+aTlXf!E7N=geroE}8Bu_6ba<;-rt(0(&$|{V9DaQ!0rp
zb(iZ9nroe}@02%CXQywmCi-0)D;hLGfg#+%ayH7$hZu}mMk%&G$+ASs(
zjZanf<^)`SP+MMSF54tS{_GomrToLnF=Hw`LuMigpvSz`Ei+%>`aK16h1Wqf|~iwImX&;q7-DY4C_U;+Wb9M5+7?OTgbRPkn#rY6nUrCWDZ{c9btPUk#kkAVCClaQyl$*%6&lYxy^x0`9KzNY>3d(TKoH914SkXuFN1a{EOj5pO1cGRAr&(
z1Fg@8)(&sKz03)M1%!VNYs#Ze%$vL6xM6L%eK$iYt4#|?Tb?4AwQl+r2Y
zw_XA42dAQ{Vq-^^SVKHkir;`zq0JNLQ!vQzfZTrTgw?rHQJ>U-Rkez;30VoqbINc&
zd-Ao?`B8j+`~3!)846Fd!jP+6=fh?;$sxYG;TkYRlYh^PHyzKpUSkY@SLu@q-Hi<}
z&HT7OGnA>@rX4M=0js1V+NF=(Lo3$4%OFB=reW
z?w@Kq`OS4QQawRT1buQ?D+om!4;tD<;hFO!)6BD3%y_{6{kZv$HW`1BW0r=MkG@)y
zl;oda_}?vk2912%UtA5HM*;UdS16wPmW^BWW=tX-OY>Io+cNp~88vQ&HPMbI10h!N
zes=GB{5H)gZ@K-XOv-*R|6D=wY2e=UCDNTUPq7cWMHg6ThAC7KQ1q^30ZOV=_FvQe
zkPB2#tA-92cgU0c@$FNqI8>LlQ7!|PMp3dcv_M^teV&@EYst73?VyFM(?1Xa;&vPT
zKj!Q4tvqyTzaG!vbYbSqKvv?n@~TP-`|y|t)=;?a`+{ZvYCv#+!tj{&1tVU1?7EXd
z_3GQB_fpR(PfC?L?XC|)Sh62({v|fiZJqGY$j0-W10(21v*&Wf*5I3W<1ZhhZ=31Z
zeq?O5mM2?XG+G?LD$ecAj@wFt$^BSG9lnx&Qm(j9v0>Jp(fHdb#(Q+J^FH+^Vn#5}
z<^iST`$EPJ5Y1D6D!{?18dH#}y}}jsOAEr`(HXznc)8SiWitpD9rGu;iV5Go_KQlf
z{Bf}tb5g_q4mzwf!Tc;%ndK1+SUd9zy|=`^y(P=|6;vy3p=ulBUBPxr`S>ESh5+^D
zUu^Zxac@INi!j|jN8rq3&V#5CJ}e?fKnS|r>U2TBRjP^1(=#vGT^DI@P17m72!5d=
z=H*q}M#L?SV%V<6DEI^!PUmt5$g{&{$fQRes%wW%x7(kD1~20V`D)Yf=jrNS0sdB&V%uq(
zxs33hc03&P!9|4|R
fhamnl&={x1`Tbcjk1Ob(KEU9Hu^#@~y~zIpZ%)Ol
From d90ba95244d586eb5e961cac048ac422cfa288f5 Mon Sep 17 00:00:00 2001
From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com>
Date: Mon, 30 Sep 2019 20:27:58 -0700
Subject: [PATCH 2/9] makes medkit mounts buildable in auto and protolathes
---
.../autolathe_designs_medical_and_dinnerware.dm | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm
index 27852b27..85539374 100644
--- a/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm
+++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm
@@ -65,6 +65,15 @@
///Medical//
////////////
+
+/datum/design/medkit
+ name = "Medkit Cabinent"
+ id = "medkit_cabinent"
+ build_type = AUTOLATHE | PROTOLATHE
+ materials = list(MAT_METAL = 4000)
+ build_path = /obj/item/wallframe/medkit_cabinet
+ category = list("initial", "Medical")
+
/datum/design/scalpel
name = "Scalpel"
id = "scalpel"
From 113a875bba077207522498cbcb5460e981e94911 Mon Sep 17 00:00:00 2001
From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com>
Date: Mon, 30 Sep 2019 20:28:11 -0700
Subject: [PATCH 3/9] makes medkit mounts roundstart technology
---
code/modules/research/techweb/all_nodes.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 389a5650..662036da 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -11,7 +11,7 @@
design_ids = list("basic_matter_bin", "basic_cell", "basic_scanning", "basic_capacitor", "basic_micro_laser", "micro_mani",
"destructive_analyzer", "circuit_imprinter", "experimentor", "rdconsole", "design_disk", "tech_disk", "rdserver", "rdservercontrol", "mechfab",
"space_heater", "xlarge_beaker", "sec_rshot", "sec_bshot", "sec_slug", "sec_Islug", "sec_dart", "sec_38", "sec_38lethal",
- "rglass","plasteel","plastitanium","plasmaglass","plasmareinforcedglass","titaniumglass","plastitaniumglass","chem_pack")
+ "rglass","plasteel","plastitanium","plasmaglass","plasmareinforcedglass","titaniumglass","plastitaniumglass","chem_pack","medkit_cabinent")
/datum/techweb_node/mmi
id = "mmi"
From c86877f07aec9604641f3497e1355fa385cf9242 Mon Sep 17 00:00:00 2001
From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com>
Date: Mon, 30 Sep 2019 20:28:57 -0700
Subject: [PATCH 4/9] adds medkit to compiler
---
tgstation.dme | 1 +
1 file changed, 1 insertion(+)
diff --git a/tgstation.dme b/tgstation.dme
index c80bb0fb..6d9a2168 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -994,6 +994,7 @@
#include "code\game\objects\structures\life_candle.dm"
#include "code\game\objects\structures\loom.dm"
#include "code\game\objects\structures\manned_turret.dm"
+#include "code\game\objects\structures\medkit.dm"
#include "code\game\objects\structures\memorial.dm"
#include "code\game\objects\structures\mineral_doors.dm"
#include "code\game\objects\structures\mirror.dm"
From 4f2e6234d0f542ea7079bcb67c9ed3eb649af193 Mon Sep 17 00:00:00 2001
From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com>
Date: Mon, 30 Sep 2019 22:37:36 -0700
Subject: [PATCH 5/9] spelling
---
code/modules/research/techweb/all_nodes.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 662036da..c82f46fe 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -11,7 +11,7 @@
design_ids = list("basic_matter_bin", "basic_cell", "basic_scanning", "basic_capacitor", "basic_micro_laser", "micro_mani",
"destructive_analyzer", "circuit_imprinter", "experimentor", "rdconsole", "design_disk", "tech_disk", "rdserver", "rdservercontrol", "mechfab",
"space_heater", "xlarge_beaker", "sec_rshot", "sec_bshot", "sec_slug", "sec_Islug", "sec_dart", "sec_38", "sec_38lethal",
- "rglass","plasteel","plastitanium","plasmaglass","plasmareinforcedglass","titaniumglass","plastitaniumglass","chem_pack","medkit_cabinent")
+ "rglass","plasteel","plastitanium","plasmaglass","plasmareinforcedglass","titaniumglass","plastitaniumglass","chem_pack","medkit_cabinet")
/datum/techweb_node/mmi
id = "mmi"
From 32521c3a5075cc4e3b58372fa246586c5dc4b626 Mon Sep 17 00:00:00 2001
From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com>
Date: Mon, 30 Sep 2019 22:37:43 -0700
Subject: [PATCH 6/9] spelling again
---
.../autolathe_designs_medical_and_dinnerware.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm
index 85539374..273ff526 100644
--- a/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm
+++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm
@@ -68,7 +68,7 @@
/datum/design/medkit
name = "Medkit Cabinent"
- id = "medkit_cabinent"
+ id = "medkit_cabinet"
build_type = AUTOLATHE | PROTOLATHE
materials = list(MAT_METAL = 4000)
build_path = /obj/item/wallframe/medkit_cabinet
From 11780a90d8f8103e993e87b047e92314f53dd457 Mon Sep 17 00:00:00 2001
From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com>
Date: Mon, 30 Sep 2019 22:39:02 -0700
Subject: [PATCH 7/9] Made it so explosions effect contents
---
code/game/objects/structures/medkit.dm | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/code/game/objects/structures/medkit.dm b/code/game/objects/structures/medkit.dm
index a05f0983..4d063031 100644
--- a/code/game/objects/structures/medkit.dm
+++ b/code/game/objects/structures/medkit.dm
@@ -1,3 +1,6 @@
+///Reuses fire extinguisher cabinet wall mount code to create an equivalent for medkits. Honestly not sure how most of this works beyond that it does work.
+
+//structure code
/obj/structure/medkit_cabinet
name = "Medkit Cabinet"
desc = "A small wall mounted cabinet designed to hold a medical kit."
@@ -10,6 +13,7 @@
var/obj/item/storage/firstaid/regular/stored_medkit
var/opened = FALSE
+//initilization stuff for when map is loading, think it spawns medkits possibly. Honestly not sure what it does.
/obj/structure/medkit_cabinet/Initialize(mapload, ndir, building)
. = ..()
if(building)
@@ -31,15 +35,17 @@
stored_medkit = null
return ..()
-//obj/structure/medkit_cabinet/contents_explosion(severity, target)
- //if(stored_medkit)
- //stored_medkit.ex_act(severity, target)
+//code from fire extinguishers, doesn't apply here so far as I can tell so commented out.
+obj/structure/medkit_cabinet/contents_explosion(severity, target)
+ if(stored_medkit)
+ stored_medkit.ex_act(severity, target)
/obj/structure/medkit_cabinet/handle_atom_del(atom/A)
if(A == stored_medkit)
stored_medkit = null
update_icon()
+//disassembly code
/obj/structure/medkit_cabinet/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/wrench) && !stored_medkit)
to_chat(user, "You start unsecuring [name]...")
@@ -67,7 +73,7 @@
else
return ..()
-
+//storing and removing medkits.
/obj/structure/medkit_cabinet/attack_hand(mob/user)
. = ..()
if(.)
@@ -101,6 +107,7 @@
/obj/structure/medkit_cabinet/attack_paw(mob/user)
return attack_hand(user)
+//closes it
/obj/structure/medkit_cabinet/AltClick(mob/living/user)
if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
return
@@ -114,18 +121,20 @@
opened = !opened
update_icon()
+//sprite code
/obj/structure/medkit_cabinet/update_icon()
if(!opened)
icon_state = "medkit_closed"
return
if(stored_medkit)
- if(istype(stored_medkit, /obj/item/storage/hypospraykit))
+ if(istype(stored_medkit, /obj/item/storage/firstaid))
icon_state = "medkit_white"
else
icon_state = "medkit_white"
else
icon_state = "medkit_empty"
+//drops medkit when busted
/obj/structure/medkit_cabinet/obj_break(damage_flag)
if(!broken && !(flags_1 & NODECONSTRUCT_1))
broken = 1
@@ -135,7 +144,7 @@
stored_medkit = null
update_icon()
-
+//I think this is the code to determine mats you get out of it?
/obj/structure/medkit_cabinet/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1))
if(disassembled)
@@ -147,6 +156,7 @@
stored_medkit = null
qdel(src)
+//wall mount to put it on a wall
/obj/item/wallframe/medkit_cabinet
name = "Medkit wall frame."
desc = "Used for building wall-mounted medkit cabinets."
From 1f24fc7abab166827fbf531d9e165a7c4577b967 Mon Sep 17 00:00:00 2001
From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com>
Date: Mon, 30 Sep 2019 22:39:52 -0700
Subject: [PATCH 8/9] fixes duplicate sprite
---
icons/obj/wallframe.dmi | Bin 1230 -> 1138 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/icons/obj/wallframe.dmi b/icons/obj/wallframe.dmi
index 99b904fca87398aea638fa31feaafba4ce56385b..58170d0cd1e6daf39edda1f2e62ea243d3dd0b4d 100644
GIT binary patch
delta 915
zcmV;E18n@x3GxV#7Y;xO0{{R3(&~ad0002hktNxGJ-E7P00001bW%=J06^y0W&i*H
zmwHrKbVOxyV{&P5bZKvH004NLjnJ_Q!Y~wt;W>GV(C(tu)kRvQgMEjXT$_s|DY>_{
zk8iNxCUHAIeAB7brMvcnYHz)KK_ZMnoz-c#mtsN7F2}Kv!U2wsw;n>sfxo!`@gjvsnEMJiE=K~%r$Ue!f?NqC
zMX4%Pf-JKH`4T9SB-Uy*v8JkW1rmhhOi-nQx~4$_0iDQ~AQ0%iTD(23R19Tq{mY&^FDE_s0}}
zXo&(Ibpuctp>nJcZOex((7z-KxNgs<%awaQ`&`fu=%gn|5Eup#3>6XjcB;lM{63y=TeferZt{-&RF#KEJ!P$0p760A-F11Pe)WED9Sz^$FN
z-lPc#Te?EG;5v;7pac=Y3P`Ye+wI>H1=qYP!tNSwukonVumOsE1z~rc&|X`{+S+(nt6YK#tG%{X
ptM%c}VZF*X{uSJN%Pc6!$zN*@mm0jhQI-Gz002ovPDHLkV1k&cpLPHM
delta 1008
zcmVV=-0C=3GkiiPVFc3t~$ybE-E?T{MkrwH}{zFXGW|1T%
zyS4p%g9Wb8h3{0&q-L)T7d+X&35@8JLtWLYV6bo8*8IFw<4sdk50kLMtvC@;N
zq_CKODAPfTN75d){B`a#a|}fdR>m;SNDfj__F$jLMJ>QWMic+gh#^}h`ah>@)eY_E
z$~S8uVM^M7hmQaN0{=-wK~!jg?U-$QnlKcG1q>)kWzJ3KP$p`-+F22+4qvLB+y4Jg
zS|R~a4~Zgt*v4(I(hoKF_2dL{LN52uAe@qav_O>dVI(ne0TN}3h%o621R+KO#iKwd
zas;swD5_dgON3&PCy19oRTQ~gF3V+2D;6L@K+FUsD!8juAc2Gq#7p1{^vXL85QtSj
zfcHnzg7-DKR%7379|B;38VEjuf_l9!G(LrC90}+$Y&M}q7#7^=pMe@+fh-G+V~zxW
zO~YvIf4G85q(DS%ACyNZe^iL3>A@H1Um^uUyW`Oo@|})#D(L#O*a;#8)hZG6dOgb`
z0w6)RPvHpe;UYhH0?YCQP=fx~$H8D=Jh26Ol;D8~EMIV*pw;a^S_XzK(DZv~iU{l)
z7)G~`N9QKczyvt~Ssmso!t4bXB=`n@3M9)CQE-!?JpOeqc=Cu63^7px5#r>3S^==2
zOawzs*MS<4Il_-oMEB$#{-EnNens`h#|8~bfage(1plFJ;g58sphPJa;d}jPZaVmL
z|XY7n#Y-Fn;&xTxWwg5`7WePTLKQ^zM-OkzV
z@b%}f4O0N#$!r0c`jzdmzrq6A--80?6kYhJVD
Date: Wed, 2 Oct 2019 09:06:16 -0700
Subject: [PATCH 9/9] Stops sleepwalking. (literally just reverting this file
fixed it on my side)
---
code/modules/mob/living/living.dm | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 9bbe7914..e3d2e14a 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -339,7 +339,7 @@
death()
-/mob/living/incapacitated(ignore_restraints, ignore_grab, ignore_stasis)
+/mob/living/incapacitated(ignore_restraints, ignore_grab)
if(stat || IsUnconscious() || IsStun() || IsKnockdown() || recoveringstam || (!ignore_restraints && restrained(ignore_grab))) // CIT CHANGE - adds recoveringstam check here
return TRUE
@@ -603,7 +603,7 @@
..(pressure_difference, direction, pressure_resistance_prob_delta)
/mob/living/can_resist()
- return !((next_move > world.time) || incapacitated(ignore_restraints = TRUE, ignore_stasis= TRUE))
+ return !((next_move > world.time) || incapacitated(ignore_restraints = TRUE))
/mob/living/verb/resist()
set name = "Resist"
@@ -1011,8 +1011,6 @@
var/has_legs = get_num_legs()
var/has_arms = get_num_arms()
var/ignore_legs = get_leg_ignore()
- var/in_stasis = IsInStasis()
- var/canmove = !buckled && (pulledby) && !chokehold && !IsFrozen() && !in_stasis && (has_arms || ignore_legs || has_legs)
var/pinned = resting && pulledby && pulledby.grab_state >= GRAB_AGGRESSIVE // Cit change - adds pinning for aggressive-grabbing people on the ground
if(ko || move_and_fall || IsStun() || chokehold) // Cit change - makes resting not force you to drop everything
drop_all_held_items()