From a1b2a9c142f5b8d1d14ea8c9f6b065601b9c583f Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Sun, 22 May 2022 05:32:08 -0600 Subject: [PATCH] Nuclear Operative Medic (#8274) * Update belts.yml * Add files via upload * Update hypospray.yml * Update hypospray.yml * Update belt.yml * Update belts.yml * Add files via upload * Update misc_startinggear.yml * Update belts.yml * Update misc_startinggear.yml * Update misc_startinggear.yml * Update belt.yml * Update duffelbag.yml * Update duffelbag.yml * Update misc_startinggear.yml * Update belts.yml * Update chemistry-bottles.yml * Update chemistry-bottles.yml * Update belt.yml * Update belt.yml --- .../Catalog/Fills/Backpacks/duffelbag.yml | 24 ++++++++++++++-- .../Prototypes/Catalog/Fills/Items/belt.yml | 17 ++++++++++++ .../Entities/Clothing/Belt/belts.yml | 13 +++++++++ .../Objects/Specific/Medical/hypospray.yml | 21 ++++++++++++++ .../Objects/Specific/chemistry-bottles.yml | 25 +++++++++++++++++ .../Roles/Jobs/Fun/misc_startinggear.yml | 22 +++++++++++++-- .../militarywebbingmed.rsi/equipped-BELT.png | Bin 0 -> 787 bytes .../Belt/militarywebbingmed.rsi/icon.png | Bin 0 -> 397 bytes .../militarywebbingmed.rsi/inhand-left.png | Bin 0 -> 440 bytes .../militarywebbingmed.rsi/inhand-right.png | Bin 0 -> 451 bytes .../Belt/militarywebbingmed.rsi/meta.json | 26 ++++++++++++++++++ .../Specific/Medical/syndihypo.rsi/hypo.png | Bin 0 -> 385 bytes .../Medical/syndihypo.rsi/inhand-left.png | Bin 0 -> 272 bytes .../Medical/syndihypo.rsi/inhand-right.png | Bin 0 -> 272 bytes .../Specific/Medical/syndihypo.rsi/meta.json | 22 +++++++++++++++ 15 files changed, 166 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo.png create mode 100644 Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 41a14c6118..e563bf3a70 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -22,11 +22,11 @@ - type: StorageFill contents: - id: Hemostat - - id: Saw + - id: SawAdvanced - id: Drill - id: Cautery - id: Retractor - - id: Scalpel + - id: ScalpelAdvanced - type: entity parent: ClothingBackpackDuffelSyndicateAmmo @@ -215,3 +215,23 @@ - id: SurvivalKnife - id: PistolClarissa - id: BaseUplinkRadio40TC + + +- type: entity + parent: ClothingBackpackDuffelSyndicateMedical + id: ClothingBackpackDuffelSyndicateOperativeMedic + name: operative medic duffelbag + description: A large duffel bag for holding extra medical supplies. + components: + - type: StorageFill + contents: + - id: Hemostat + - id: SawAdvanced + - id: Drill + - id: Cautery + - id: Retractor + - id: ScalpelAdvanced + - id: BaseUplinkRadio40TC + - id: BoxSurvivalSyndicate + - id: SurvivalKnife + - id: PistolClarissa diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index 115fa4dd9a..899c0e9fda 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -83,3 +83,20 @@ - type: StorageFill contents: - id: CaptainSabre + +- type: entity + id: ClothingBeltMilitaryWebbingMedFilled + parent: ClothingBeltMilitaryWebbingMed + suffix: Filled + components: + - type: StorageFill + contents: + - id: SyndiHypo + - id: EpinephrineChemistryBottle + amount: 2 + - id: EphedrineChemistryBottle + amount: 2 + - id: OmnizineChemistryBottle + amount: 1 + - id: MedkitCombatFilled + diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 092c56abc0..edd6dee035 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -455,6 +455,19 @@ - type: Clothing sprite: Clothing/Belt/militarywebbing.rsi +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltMilitaryWebbingMed + name: medical chest rig + description: A set of tactical webbing worn by Gorlax Marauder medic operatives. + components: + - type: Sprite + sprite: Clothing/Belt/militarywebbingmed.rsi + - type: Clothing + sprite: Clothing/Belt/militarywebbingmed.rsi + - type: Storage + capacity: 60 + - type: entity parent: ClothingBeltBase id: ClothingBeltSuspenders diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index be72c08c9a..7893742e21 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -19,6 +19,27 @@ solution: hypospray - type: Hypospray +- type: entity + name: gorlax hypospray + parent: BaseItem + description: Using reverse engineered designs from NT, Cybersun produced these in limited quantities for gorlax marauder operatives. + id: SyndiHypo + components: + - type: Sprite + sprite: Objects/Specific/Medical/syndihypo.rsi + state: hypo + - type: Item + sprite: Objects/Specific/Medical/syndihypo.rsi + - type: SolutionContainerManager + solutions: + hypospray: + maxVol: 20 + - type: RefillableSolution + solution: hypospray + - type: ExaminableSolution + solution: hypospray + - type: Hypospray + - type: entity name: chemical medipen parent: BaseItem diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml index c47addc495..1b1a1c5eec 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml @@ -154,3 +154,28 @@ - ReagentId: Nocturine Quantity: 30 +- type: entity + id: EphedrineChemistryBottle + name: ephedrine bottle + parent: BaseChemistryEmptyBottle + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Ephedrine + Quantity: 30 + +- type: entity + id: OmnizineChemistryBottle + name: omnizine bottle + parent: BaseChemistryEmptyBottle + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Omnizine + Quantity: 30 diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index 15bd8e6311..36e88d4679 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -95,7 +95,7 @@ id: AgentIDCard pocket1: ExtendedEmergencyOxygenTankFilled belt: ClothingBeltMilitaryWebbing - innerclothingskirt: ClothingUniformJumpsuitOperative + innerclothingskirt: ClothingUniformJumpskirtOperative satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative @@ -114,7 +114,25 @@ id: SyndiPDA pocket1: ExtendedEmergencyOxygenTankFilled belt: ClothingBeltMilitaryWebbing - innerclothingskirt: ClothingUniformJumpsuitOperative + innerclothingskirt: ClothingUniformJumpskirtOperative satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative +- type: startingGear + id: SyndicateOperativeMedicFull + equipment: + jumpsuit: ClothingUniformJumpsuitOperative + back: ClothingBackpackDuffelSyndicateOperativeMedic + mask: ClothingMaskBreathMedical + eyes: ClothingEyesHudMedical + ears: ClothingHeadsetAltSyndicate + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterHardsuitSyndieElite + shoes: ClothingShoesBootsMagSyndie + id: SyndiPDA + pocket1: DoubleEmergencyOxygenTankFilled + pocket2: HandheldHealthAnalyzer + belt: ClothingBeltMilitaryWebbingMedFilled + innerclothingskirt: ClothingUniformJumpskirtOperative + satchel: ClothingBackpackDuffelSyndicateOperativeMedic + duffelbag: ClothingBackpackDuffelSyndicateOperativeMedic diff --git a/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..7db391656ca5408cc96839e4b7684a7b1c846b8c GIT binary patch literal 787 zcmV+u1MK{XP)Px%%}GQ-RCt{2nlY~1Fbsx&7aiYHjb5WM>Jg$d_!gbsF?xUp1n2?Y)Fn44prk|R z+M~0&Lkj{AXlHdu_+Y1QV#$#c1N?x1uq}u*LrR87KoA5$5ClOOj$dCL$0K znx;WjRUJu0`1SH9WV$Gb2#du6P1AH_Yy=K=0I#&m^N%J{tjA>tNl396&_K^BhEk-EMbQ^0;fmbF!{> z1hDS*xScZ#9*1%C>!*Xs-b z-W%h;-$AY$V?4iX(iEIae$T~DK@bE%5ClOG1VIpPNAQVGQ52m6hs|bl(^H|b_5{@i zi=yycALJs)Ee}hrwVn$x{5y5XC8CO>&biDvmsM5ODTPhpjJ7VN)awDQb1q~1LKqw_ z)>_|p(%OD$rBw2i;3#DNXH&9M;ZukRk7bDmpwl#wigtI(lQE;`8|45lmpvb=!kDN_ zl$2`oT4v)8zETd5F3S5+(Xa6SR0~3wq1`` zO5Lniz*_6MJ1n+WIBFN*JmZ(YMM;|b0=P$b^4vGZOtR|F#STFb1VNY~e*rFU4^Jf3 RV{HHc002ovPDHLkV1gA_YkU9z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/icon.png b/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7e6e4b3f35daf322438281be82e53c42b623dbaa GIT binary patch literal 397 zcmV;80doF{P)Px$M@d9MR9J=Wl|N3#Fbu_iAWq=1YdXe9sB$hYz*RU$)f>=^?b-z?EbL_=Rn?E? z5Be5F-()$C{o*(;aN)v*3x5&LxwXch!ozQhiwGfvo3-fg`@T5uQ!N32d75}0M*u#* zeeb}lDk4&qtC~Ov0TJOv^=9p?Gj}7Ps;h{co-+DXbsfjC=o+dBhzQnNmSs65VXeh` zU!3!?h5&%~o~CICA#ClAcGEOf#i61D&bifEyOGG*z*_PevIO>T+ZY4DvMgEKd%x{X z5lIp_o_e0=ZLP#E=|<5E#8Vk#s_h(-9kAA7jA0lCLI@1Q0Kha&Tg;gqqon^VLpC5-<- r>RCDG));qJsA|<;UmJhn!vDn=bu7kVx!r2b00000NkvXXu0mjf;25p$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..dbce144c6084de943654b099a4a588cae4638495 GIT binary patch literal 440 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV669aaSW-L^Y)fuUz39f+k<*@ z6F=uiyBlN|eqsu%ZYXEgf62J*6VtWJ5tj@)&-yTO-u6gzQT|bI{muW?4k{S1y zJK*5oME=(fp>G*#=Iie-+kN+mt$aF%^UtbJiW=qi?jPElcuUn|M82i z0awpin*WIIxwwU6+5Lu1IuG}@7xNjqSv=nmwYI=Q#x4D*gzo=azG_5)jN@6BG^YkMR~E^(UTN`XUfa&uN!wrqd5 fwYaU}MW#I$|IVdyf-5wDF~Z>K>gTe~DWM4f>{`qQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..8280138ae7516e8099c3829e2ec1c711cff76f7e GIT binary patch literal 451 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVC?dAaSW-L^Y)fu-ys75)(hvg zc=MDVa$j&=xr0HJeTH;_C*OupJ%_h#M!eH9-Y9u2R20gX`@lir=H35RIg@?dw#}Ao z=zxJ2@-s_)yF7Rw{QgzE`Sx3@>;8`SXH4!$&x`AO^?6b9zp5s@; zelX$8yhb%f=Y7V@>=jbB%xk={seDcQUq;2`FFbdq?c09)ZG!v4aHd(CDkG<9oEFNQ zweM+6+r8COn!d}0hAv#S>fk)tT9#c^Y%WXczQ=y>d1>vo-a28;yvA*pz6&f8Hb^_~ o5Gb-4$XQ*L8-4A5=f64JkAQ|w-~MGAFmf0?UHx3vIVCg!09YB%!2kdN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/meta.json b/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/meta.json new file mode 100644 index 0000000000..0126b5b4db --- /dev/null +++ b/Resources/Textures/Clothing/Belt/militarywebbingmed.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by emisse for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo.png b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo.png new file mode 100644 index 0000000000000000000000000000000000000000..2e410898ef7664bb77e1ef6358a524f96ebf42d1 GIT binary patch literal 385 zcmV-{0e=38P)Px$J4r-AR9J=Wm9a|0P!xv0V>{bT$kH*8E?wMw5^?b<9DIPjgHs&@pTSoUOX(8f zW)R{KAwz})7gLTyn-B#toCG_V4>H`4d;b5Pb8;>W4E%S*vPo50iDMxH0E|Z?E}b(ASC}r4SrDj*d^x#u f&U_;d3>=hCTq0yn`5&EY00000NkvXXu0mjfR8yX= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a38875627f625db24211be9a9f11423874adcafa GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|PIc^PW=y+(5Z22pRLXW)W^W^ zAw6#)`{a)M>*lX|G>7|KZttpJ7kAeF>3H+GuC#b&^?ts)cH6d8PAuO0`oc-0?{;SP zFK)1kMXuj3JGo=~C)42Uy*A8A`u_SW=OukzxoRa}K&bFmh`|gD4ZHSv)doL$F4MQr z=iSyxi#Gah`|*?cePC^H*0I#EMV3>h?G~O?w{BAVM9KYq^E>x3GB6lbGCJLG-rusJ Q{|Cr%p00i_>zopr0MN{FfB*mh literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a38875627f625db24211be9a9f11423874adcafa GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|PIc^PW=y+(5Z22pRLXW)W^W^ zAw6#)`{a)M>*lX|G>7|KZttpJ7kAeF>3H+GuC#b&^?ts)cH6d8PAuO0`oc-0?{;SP zFK)1kMXuj3JGo=~C)42Uy*A8A`u_SW=OukzxoRa}K&bFmh`|gD4ZHSv)doL$F4MQr z=iSyxi#Gah`|*?cePC^H*0I#EMV3>h?G~O?w{BAVM9KYq^E>x3GB6lbGCJLG-rusJ Q{|Cr%p00i_>zopr0MN{FfB*mh literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/meta.json new file mode 100644 index 0000000000..15cf39658c --- /dev/null +++ b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d and modified by emisse for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "hypo" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file