diff --git a/Resources/Prototypes/Guidebook/species.yml b/Resources/Prototypes/Guidebook/species.yml
index b0a87660919..3b1ef20092a 100644
--- a/Resources/Prototypes/Guidebook/species.yml
+++ b/Resources/Prototypes/Guidebook/species.yml
@@ -21,6 +21,7 @@
- Drask # Adventure
- Plasman # Adventure
- Insect # Adventure
+ - Android # Adventure
- type: guideEntry
id: Arachnid
@@ -60,4 +61,4 @@
- type: guideEntry
id: Vox
name: species-name-vox
- text: "/ServerInfo/Guidebook/Mobs/Vox.xml"
\ No newline at end of file
+ text: "/ServerInfo/Guidebook/Mobs/Vox.xml"
diff --git a/Resources/Prototypes/_Adventure/Guidebook/species.yml b/Resources/Prototypes/_Adventure/Guidebook/species.yml
index 34d056f1f40..55b23fefd5c 100644
--- a/Resources/Prototypes/_Adventure/Guidebook/species.yml
+++ b/Resources/Prototypes/_Adventure/Guidebook/species.yml
@@ -41,4 +41,9 @@
- type: guideEntry
id: Insect
name: Серпентид
- text: "/ServerInfo/_Adventure/Guidebook/Races/Insect.xml"
\ No newline at end of file
+ text: "/ServerInfo/_Adventure/Guidebook/Races/Insect.xml"
+
+- type: guideEntry
+ id: Android
+ name: Андроид
+ text: "/ServerInfo/_Adventure/Guidebook/Races/Android.xml"
diff --git a/Resources/Prototypes/_Adventure/Races/Android/Android.yml b/Resources/Prototypes/_Adventure/Races/Android/Android.yml
index 9f55c0324f1..ce464020585 100644
--- a/Resources/Prototypes/_Adventure/Races/Android/Android.yml
+++ b/Resources/Prototypes/_Adventure/Races/Android/Android.yml
@@ -20,6 +20,7 @@
#- BaseMobSpeciesOrganic
id: BaseMobAndroid
components:
+ - type: DamagedSiliconAccent
- type: BodyEmotes
soundsId: SynthBodyEmotes
- type: Reactive
@@ -27,19 +28,6 @@
Flammable: [ Touch ]
Extinguish: [ Touch ]
reactions:
- - reagents: [ SpaceLube ]
- methods: [ Touch ]
- effects:
- - !type:HealthChange
- scaleByQuantity: true
- damage:
- types:
- Cold: -2
- - !type:PopupMessage
- type: Local
- visualType: Large
- messages: [ "Обледенение отпадает от вашего корпуса" ]
- probability: 0.25
- reagents: [ TereumAndroid ]
methods: [ Touch ]
effects:
@@ -48,6 +36,11 @@
damage:
groups:
Brute: -1.5
+ - !type:PopupMessage
+ type: Local
+ visualType: Medium
+ messages: [ "Полимер впитывает жидкость, начиная конструировать оболочку" ]
+ probability: 1
- reagents: [ ActiveTereumAndroid ]
methods: [ Touch ]
effects:
@@ -55,9 +48,14 @@
scaleByQuantity: true
damage:
types:
- Heat: -0.75
- Shock: -0.75
- Cold: -0.75
+ Heat: -0.6
+ Shock: -0.5
+ Cold: -0.35
+ - !type:PopupMessage
+ type: Local
+ visualType: Medium
+ messages: [ "Полимер впитывает жидкость, начиная восстановление" ]
+ probability: 1
- type: ThermalRegulator
metabolismHeat: 800
radiatedHeat: 100
@@ -70,8 +68,8 @@
- type: Barotrauma
damage:
types:
- Blunt: 0.60
- Heat: 0.2
+ Shock: 0.80
+ maxDamage: 140
- type: Temperature
heatDamageThreshold: 773.15
coldDamageThreshold: 173
@@ -91,9 +89,10 @@
Heat: 0.75
- type: TemperatureSpeed
thresholds:
- 233: 0.8
- 228: 0.6
- 225: 0.4
+ 258: 0.95
+ 233: 0.9
+ 193: 0.85
+ 123: 0.7
- type: StatusEffects
allowed:
- Stun
@@ -129,9 +128,9 @@
attackRate: 1
damage:
types:
- Blunt: 6
+ Blunt: 7
- type: Bloodstream
- bloodMaxVolume: 250 # на 150 больше
+ bloodMaxVolume: 400 #250
bloodReagent: TereumAndroid
bloodRefreshAmount: 0
chemicalMaxVolume: 0
@@ -152,20 +151,19 @@
sprite: Mobs/Effects/brute_damage.rsi
color: "#8a8a9e"
- type: MobState
- - type: MobStateActions
- actions:
- Critical:
- - ActionCritSuccumb
- - ActionCritFakeDeath
- - ActionCritLastWords
+ ## - type: MobStateActions
+ ## actions:
+ ## Critical:
+ ## - ActionCritSuccumb
+ ## - ActionCritFakeDeath
- type: MobThresholds
thresholds:
0: Alive
- 100: Critical
+ ##100: Critical
175: Dead
stateAlertDict:
Alive: BorgHealth
- Critical: BorgCrit
+ ##Critical: BorgCrit
Dead: BorgDead
showOverlays: true
allowRevives: true
@@ -182,7 +180,7 @@
thresholds:
- trigger:
!type:DamageTrigger
- damage: 500
+ damage: 850
behaviors:
- !type:GibBehavior { }
- !type:PlaySoundBehavior
@@ -190,12 +188,13 @@
collection: MetalSlam
- type: SlowOnDamage
speedModifierThresholds:
- 60: 0.9
- 80: 0.7
- 100: 0.5
- 120: 0.3
- 140: 0.2
- 160: 0.1
+ 40: 0.9
+ 60: 0.8
+ 80: 0.6
+ 100: 0.3
+ 120: 0.2
+ 140: 0.1
+ 150: 0
- type: Speech
speechSounds: Alto
speechVerb: Default
@@ -210,12 +209,18 @@
- type: TypingIndicator
proto: robot
- type: Repairable
- doAfterDelay: 5
- damage:
- types:
- Slash: -8
- Piercing: -8
+ doAfterDelay: 2
+ bloodlossModifier: -10
allowSelfRepair: true
+ - type: IntrinsicRadioReceiver
+ channels:
+ - Trio
+ - type: IntrinsicRadioTransmitter
+ channels:
+ - Trio
+ - type: ActiveRadio
+ channels:
+ - Trio
- type: DamageOnInteractProtection
damageProtection:
flatReductions:
diff --git a/Resources/Prototypes/_Adventure/Races/Android/AndroidBaseInorganic.yml b/Resources/Prototypes/_Adventure/Races/Android/AndroidBaseInorganic.yml
index 3fdcfa0cca3..c21c4a72ff0 100644
--- a/Resources/Prototypes/_Adventure/Races/Android/AndroidBaseInorganic.yml
+++ b/Resources/Prototypes/_Adventure/Races/Android/AndroidBaseInorganic.yml
@@ -44,6 +44,9 @@
- map: [ "head" ]
- map: [ "pocket1" ]
- map: [ "pocket2" ]
+ #- map: [ "module1" ]
+ #- map: [ "module2" ]
+ #- map: [ "module3" ]
- map: ["enum.HumanoidVisualLayers.Handcuffs"]
color: "#ffffff"
sprite: Objects/Misc/handcuffs.rsi
@@ -191,11 +194,10 @@
attributes:
proper: true
- type: MobPrice
- price: 1500
- deathPenalty: 0.01
+ price: 2775000
+ deathPenalty: 0
- type: Tag
tags:
- CanPilot
- FootstepSound
- DoorBumpOpener
- - AnomalyHost
\ No newline at end of file
diff --git a/Resources/Prototypes/_Adventure/Races/Android/Android_Body.yml b/Resources/Prototypes/_Adventure/Races/Android/Android_Body.yml
index 1bb1a8cce5b..77c0a8d87db 100644
--- a/Resources/Prototypes/_Adventure/Races/Android/Android_Body.yml
+++ b/Resources/Prototypes/_Adventure/Races/Android/Android_Body.yml
@@ -2,7 +2,7 @@
id: OrganAndroidBrain
parent: OrganHumanBrain
name: мозг Андроида
- description: Источник невероятного, бесконечного интеллекта.
+ description: Высокотехнологичный мозг, хранит в себе большое количество информации, корректирует работу тела и обрабатывает большое количество запросов одновременно.
components:
- type: Sprite
sprite: _Adventure/Races/androids/Mobs/Species/Android/organs.rsi
@@ -12,7 +12,7 @@
id: OrganAndroidHeart
parent: OrganHumanHeart
name: сердце Андроида
- description: Мне жаль бессердечного ублюдка, который потерял это.
+ description: Высокотехнологичное сердце, можно лишь предположить, как оно работает.
components:
- type: Sprite
sprite: _Adventure/Races/androids/Mobs/Species/Android/organs.rsi
@@ -72,7 +72,7 @@
bodypart: !type:Container
ents: []
- type: StaticPrice
- price: 500
+ price: 0
- type: Tag
tags:
- Trash
diff --git a/Resources/Prototypes/_Adventure/Races/Android/Android_Damage.yml b/Resources/Prototypes/_Adventure/Races/Android/Android_Damage.yml
index 81ec39675aa..c6a4a45ab57 100644
--- a/Resources/Prototypes/_Adventure/Races/Android/Android_Damage.yml
+++ b/Resources/Prototypes/_Adventure/Races/Android/Android_Damage.yml
@@ -11,10 +11,10 @@
- type: damageModifierSet
id: Android
coefficients:
- Blunt: 1.1
- Slash: 0.8
- Piercing: 1.2
- Heat: 0.7
+ Blunt: 0.9
+ Slash: 1
+ Piercing: 1
+ Heat: 1
Shock: 2
- Cold: 0.7
- Bloodloss: 1.5
+ Cold: 1.5
+ Bloodloss: 0.9
diff --git a/Resources/Prototypes/_Adventure/Races/Android/Android_Species.yml b/Resources/Prototypes/_Adventure/Races/Android/Android_Species.yml
index 0e8b3cb40f7..5e3a6f2bc88 100644
--- a/Resources/Prototypes/_Adventure/Races/Android/Android_Species.yml
+++ b/Resources/Prototypes/_Adventure/Races/Android/Android_Species.yml
@@ -8,10 +8,10 @@
dollPrototype: MobAndroidDummy
skinColoration: Hues
defaultSkinTone: "#ebebeb"
- minAge: 1
- youngAge: 40
- oldAge: 100
- maxAge: 200
+ minAge: 0
+ youngAge: 120
+ oldAge: 275
+ maxAge: 10 ##Андроиды кроме О2 начали создаваться в 3015 году
sexes:
- Male
- Female
diff --git a/Resources/Prototypes/_Adventure/Races/Android/Catalog/VendingMachines/Inventories/medical.yml b/Resources/Prototypes/_Adventure/Races/Android/Catalog/VendingMachines/Inventories/medical.yml
index cec3cbe929b..7c21d76f886 100644
--- a/Resources/Prototypes/_Adventure/Races/Android/Catalog/VendingMachines/Inventories/medical.yml
+++ b/Resources/Prototypes/_Adventure/Races/Android/Catalog/VendingMachines/Inventories/medical.yml
@@ -7,5 +7,6 @@
Nanopack: 5
Tereumpack: 5
Toolpack: 5
+ CauterizerAndroid: 4
Welder: 2
ClothingHeadHatWelding: 2
diff --git a/Resources/Prototypes/_Adventure/Races/Android/Healing/Android.yml b/Resources/Prototypes/_Adventure/Races/Android/Healing/Android.yml
index f4d7439642b..a065fdbd43b 100644
--- a/Resources/Prototypes/_Adventure/Races/Android/Healing/Android.yml
+++ b/Resources/Prototypes/_Adventure/Races/Android/Healing/Android.yml
@@ -13,6 +13,113 @@
- type: StaticPrice
price: 0
+- type: stack
+ id: ExtraAndroidPack
+ name: extraandroidpack
+ icon: { sprite: "_Adventure/Races/androids/Objects/Specific/Medical/medical.rsi", state: emergencyandroid }
+ spawn: ExtraAndroidPack
+ maxCount: 4
+
+- type: stack
+ id: Nanopack
+ name: nanopack
+ icon: { sprite: "_Adventure/Races/androids/Objects/Specific/Medical/medical.rsi", state: nanopack }
+ spawn: Nanopack
+ maxCount: 10
+
+- type: stack
+ id: Tereumpack
+ name: tereumpack
+ icon: { sprite: "_Adventure/Races/androids/Objects/Specific/Medical/medical.rsi", state: tereumpack }
+ spawn: Tereumpack
+ maxCount: 10
+
+- type: stack
+ id: Toolpack
+ name: toolpack
+ icon: { sprite: "_Adventure/Races/androids/Objects/Specific/Medical/medical.rsi", state: toolpack }
+ spawn: Toolpack
+ maxCount: 10
+
+- type: stack
+ id: CauterizerAndroid
+ name: cauterizer
+ icon: { sprite: "_Adventure/Races/androids/Objects/Specific/Medical/medical.rsi", state: cauterizer }
+ spawn: CauterizerAndroid
+ maxCount: 5
+
+- type: entity
+ name: Прижигатель
+ description: Прижигатель для андроидов, позволяющий быстро приварить рану.
+ parent: BaseHealingItemAndroid
+ id: CauterizerAndroid
+ suffix: Genesis_Dynamics
+ components:
+ - type: Tag
+ tags:
+ - Gauze
+ - type: Sprite
+ state: cauterizer
+ - type: Healing
+ damageContainers:
+ - Android
+ damage:
+ types:
+ Slash: -3
+ Piercing: -3
+ bloodlossModifier: -10
+ delay: 2
+ healingBeginSound:
+ path: "/Audio/_Adventure/Weapon/Melee/fuelswords/welderactivate.ogg"
+ params:
+ volume: -5
+ healingEndSound:
+ path: "/Audio/_Adventure/Weapon/Melee/fuelswords/welderdeactivate.ogg"
+ params:
+ variation: 0.250
+ volume: -5
+ - type: Stack
+ stackType: CauterizerAndroid
+ count: 5
+ - type: StackPrice
+ price: 5
+
+- type: entity
+ name: экстренный набор восстановления андройдов
+ description: Экстренный набор содержащий мульти-инструмент с баком тереума, для быстрой починки андроида.
+ parent: BaseHealingItemAndroid
+ id: ExtraAndroidPack
+ suffix: Genesis_Dynamics
+ components:
+ - type: Tag
+ tags:
+ - Brutepack
+ - type: Sprite
+ state: emergencyandroid
+ - type: Healing
+ damageContainers:
+ - Android
+ damage:
+ groups:
+ Brute: -45
+ types:
+ Heat: -15
+ Cold: -15
+ Shock: -15
+ Bloodloss: -15
+ ModifyBloodLevel: 30
+ bloodlossModifier: -4
+ delay: 1
+ healingBeginSound:
+ path: "/Audio/Items/Medical/brutepack_begin.ogg"
+ healingEndSound:
+ path: "/Audio/Items/Medical/brutepack_end.ogg"
+ - type: Stack
+ stackType: ExtraAndroidPack
+ count: 4
+ - type: StackPrice
+ price: 5
+
- type: entity
name: Нано Набор
description: Набор содержающий иструментальный аналог, излечивающий Андроида.
diff --git a/Resources/Prototypes/_Adventure/Races/Android/emergency.yml b/Resources/Prototypes/_Adventure/Races/Android/emergency.yml
new file mode 100644
index 00000000000..6f83c2ac2ab
--- /dev/null
+++ b/Resources/Prototypes/_Adventure/Races/Android/emergency.yml
@@ -0,0 +1,17 @@
+- type: entity
+ parent: BoxCardboard
+ id: BoxSurvivalAndroid
+ name: коробка выживания андроидов
+ description: Коробка, с содержимым внутри
+ suffix: genesis_dynamics
+ components:
+ - type: StorageFill
+ contents:
+ - id: CauterizerAndroid
+ - id: Tereumpack
+ - id: Toolpack
+ - id: Nanopack
+ - id: Flare
+ - type: Sprite
+ layers:
+ - state: box_android
diff --git a/Resources/Prototypes/_Adventure/Races/Android/survival.yml b/Resources/Prototypes/_Adventure/Races/Android/survival.yml
new file mode 100644
index 00000000000..836c5d19fe9
--- /dev/null
+++ b/Resources/Prototypes/_Adventure/Races/Android/survival.yml
@@ -0,0 +1,17 @@
+# Species
+- type: loadoutEffectGroup
+ id: AndroidNoBreather
+ effects:
+ - !type:SpeciesLoadoutEffect
+ species:
+ - Android
+
+# Basic
+- type: loadout
+ id: EmergencyAndroid
+ effects:
+ - !type:GroupLoadoutEffect
+ proto: AndroidNoBreather
+ storage:
+ back:
+ - BoxSurvivalAndroid
diff --git a/Resources/ServerInfo/Guidebook/Mobs/Species.xml b/Resources/ServerInfo/Guidebook/Mobs/Species.xml
index 918148c649c..68a7612d8b5 100644
--- a/Resources/ServerInfo/Guidebook/Mobs/Species.xml
+++ b/Resources/ServerInfo/Guidebook/Mobs/Species.xml
@@ -27,5 +27,8 @@
+
+
+
diff --git a/Resources/ServerInfo/_Adventure/Guidebook/Races/Android.xml b/Resources/ServerInfo/_Adventure/Guidebook/Races/Android.xml
new file mode 100644
index 00000000000..ab9a5ffb6ae
--- /dev/null
+++ b/Resources/ServerInfo/_Adventure/Guidebook/Races/Android.xml
@@ -0,0 +1,51 @@
+
+ # Андроиды
+
+
+
+
+
+ [color=yellow]Внимание! Эта раса имеет,как ограничивающие игровые механики,так и облегчающие.Не рекомендуется для новых игроков. [/color]
+
+ Андроиды – искусственно созданная раса, разумные машины, имитирующие биологическую жизнь. Разрабатываются учеными и инженерами, представляя собой вершину технологического прогресса. Создание одного андроида – чрезвычайно сложный и дорогостоящий процесс, требующий объединения знаний в области робототехники, искусственного интеллекта и материаловедения.
+
+ ## Расовые особенности
+
+ [color=green]Им не нужно дышать, есть и пить.[/color]
+
+ Они получают в [color=red]2 раза больше урона от электричества[/color] и в [color=red]1.5 раза больше урона от обморожения[/color]
+
+ Они получают на [color=green]10% меньше урона от ушибов[/color]. А также [color=green]имеют иммунитет к ядам,радиации и клеточным[/color]
+
+ [color=green]Не гниют[/color]
+
+ [color=red]Не имеют места для веществ внутри себя[/color]
+
+ [color=red]Не восстанавливают кровь естественным путём[/color], но [color=green]имеют обьём 400 унций[/color]
+
+ [color=red]Кровь может быть восстановлена, только пакетом с тереумом[/color]
+
+ [color=green]Сварка быстрее излечивает их[/color], но она [color=red]только[/color] убирает кровотечение
+
+ [color=green]Штраф за обморожение значительно снижен[/color]
+
+ [color=green]Имеют 175 здоровья[/color], но [color=red]получают значительный штраф к передвижению после 100 урона. При 150 урона не могут двигаться[/color]
+
+ [color=green]Не имеют критического состояния, дефибрилятор не требуется чтобы их воскресить[/color]
+
+ [color=red]Их тело выдерживает только 850 урона[/color]
+
+ [color=red]Очень дорогие[/color], но [color=green]ни одна организация не рискует их купить[/color]
+
+ [color=red]Лечатся особыми комплектами из нанодроида, обращайтесь в "РНД"[/color]
+
+ [color=red]Только Андроиды и члены организации знают как эффективно использовать все методы лечения с Андроидами[/color]
+
+ [color=green]Могут лечится веществами по типу "Тереума" и "Активного Тереума", один лечит механические повреждения, а второй физические[/color]
+
+ [color=red]Урон от давления приходится ввиде "Электрического" и складывается с множителем урона[/color], но [color=green]максимальный урон от давления составляет 140[/color]
+
+ [color=green]Имеют собственный канал связи[/color] [color=cyan]:а [/color]
+
+ [color=green]Используют кулаки в поле боя, их урон равен 7[/color]
+
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_android.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_android.png
new file mode 100644
index 00000000000..48bc1925923
Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/box_android.png differ
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
index 32b8118aa82..63071264d5e 100644
--- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
@@ -241,6 +241,9 @@
},
{
"name": "agrichemkit"
+ },
+ {
+ "name": "box_android"
}
]
}
diff --git a/Resources/Textures/_Adventure/Races/androids/Mobs/Species/Android/organs.rsi/meta.json b/Resources/Textures/_Adventure/Races/androids/Mobs/Species/Android/organs.rsi/meta.json
index ac5c4a54f5b..22b7893a6ef 100644
--- a/Resources/Textures/_Adventure/Races/androids/Mobs/Species/Android/organs.rsi/meta.json
+++ b/Resources/Textures/_Adventure/Races/androids/Mobs/Species/Android/organs.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation and cev-eris at https://github.com/tgstation/tgstation/commit/c4b7f3c41b6742aca260fe60cc358a778ba9b8c8 and https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af, inhands by mubururu_ (github)",
+ "copyright": "Made by @Aelout(discord)",
"size": {
"x": 32,
"y": 32
diff --git a/Resources/Textures/_Adventure/Races/androids/Mobs/Species/Android/parts.rsi/meta.json b/Resources/Textures/_Adventure/Races/androids/Mobs/Species/Android/parts.rsi/meta.json
index cdf0cd3ef5b..f54ed12192f 100644
--- a/Resources/Textures/_Adventure/Races/androids/Mobs/Species/Android/parts.rsi/meta.json
+++ b/Resources/Textures/_Adventure/Races/androids/Mobs/Species/Android/parts.rsi/meta.json
@@ -2,6 +2,7 @@
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf, also modified by Ko4erga (discord)",
+ "copyright": "Small remade for Androids by @Aelout(discord)",
"size": {
"x": 32,
"y": 32
diff --git a/Resources/Textures/_Adventure/Races/androids/Objects/Specific/Medical/medical.rsi/cauterizer.png b/Resources/Textures/_Adventure/Races/androids/Objects/Specific/Medical/medical.rsi/cauterizer.png
new file mode 100644
index 00000000000..17807b57ff2
Binary files /dev/null and b/Resources/Textures/_Adventure/Races/androids/Objects/Specific/Medical/medical.rsi/cauterizer.png differ
diff --git a/Resources/Textures/_Adventure/Races/androids/Objects/Specific/Medical/medical.rsi/emergencyandroid.png b/Resources/Textures/_Adventure/Races/androids/Objects/Specific/Medical/medical.rsi/emergencyandroid.png
new file mode 100644
index 00000000000..3fafbab81dd
Binary files /dev/null and b/Resources/Textures/_Adventure/Races/androids/Objects/Specific/Medical/medical.rsi/emergencyandroid.png differ
diff --git a/Resources/Textures/_Adventure/Races/androids/Objects/Specific/Medical/medical.rsi/meta.json b/Resources/Textures/_Adventure/Races/androids/Objects/Specific/Medical/medical.rsi/meta.json
index 2181c718503..4561332c75c 100644
--- a/Resources/Textures/_Adventure/Races/androids/Objects/Specific/Medical/medical.rsi/meta.json
+++ b/Resources/Textures/_Adventure/Races/androids/Objects/Specific/Medical/medical.rsi/meta.json
@@ -1,9 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93 and Taken from tgstation at https://github.com/tgstation/tgstation/blob/623290915c2292b56da11048deb62d758e1e3fb4/icons/obj/bloodpack.dmi, Blood pack redone by Ubaser",
- "copyright": "Taken from https://github.com/tgstation/tgstation/blob/a3568da5634e756d0849480104afda402c6f1c3c/icons/obj/medical/stack_medical.dmi",
- "copyright": "Tourniquet Sprite by PoorMansDreams",
+ "copyright": "Made by @Aelout(discord)",
"size": {
"x": 32,
"y": 32
@@ -17,6 +15,12 @@
},
{
"name": "toolpack"
+ },
+ {
+ "name": "cauterizer"
+ },
+ {
+ "name": "emergencyandroid"
}
]
}
diff --git a/Resources/Textures/_Adventure/Races/androids/androidmedical.rsi/meta.json b/Resources/Textures/_Adventure/Races/androids/androidmedical.rsi/meta.json
index 3035a0a0c83..7971ab1bec0 100644
--- a/Resources/Textures/_Adventure/Races/androids/androidmedical.rsi/meta.json
+++ b/Resources/Textures/_Adventure/Races/androids/androidmedical.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept",
+ "copyright": "Made by @Aelout(discord)",
"size": {
"x": 32,
"y": 32
diff --git a/Resources/Textures/_Adventure/Races/androids/vending_machine_restock.rsi/meta.json b/Resources/Textures/_Adventure/Races/androids/vending_machine_restock.rsi/meta.json
index 5afd5487164..81a78ffc5ca 100644
--- a/Resources/Textures/_Adventure/Races/androids/vending_machine_restock.rsi/meta.json
+++ b/Resources/Textures/_Adventure/Races/androids/vending_machine_restock.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Original source: https://github.com/tgstation/tgstation/blob/master/icons/obj/vending_restock.dmi @ commit 014c44ef6279beb02a5f3e76824439fa57181c22 - Additions and cleanup by @Vordenburg. Refill_honk made by brainfood1183 (github) for ss14. Refill_robotics made by potato1234x (github) for ss14.",
+ "copyright": "Made by @Aelout(discord)",
"size": {
"x": 32,
"y": 32