DeltaV-Station / Delta-v

A fork of Space Station 14, embracing a mixture of classic SS13 chaos and experimentation only possible with the new engine
https://delta-v.org
GNU Affero General Public License v3.0
70 stars 304 forks source link

Add painkillers and antidepressant pills + canisters #2260

Open Radezolid opened 4 days ago

Radezolid commented 4 days ago

About the PR

Adds pills of the medicines added on #1243.

Why / Balance

I plan to use some of them for round start for the psychologist + convenience for future loadout changes in case of chronic pain or depressive characters.

Technical details

Added a YAML.

Media

Nope.

Requirements

Breaking changes

None.

Changelog No CL.

deltanedas commented 3 days ago

mapped gamer stun pills throw em in a grinder then inject

Radezolid commented 3 days ago

They aren't mapped... yet. But i do intend on giving a pill canister to the psych for traitor usage.

Avalon-Proto commented 3 days ago

They aren't mapped... yet. But i do intend on giving a pill canister to the psych for traitor usage.

What's this I hear. Handing the pysch a traitor item of mislabeled pills hm?

github-actions[bot] commented 1 day ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Radezolid commented 1 day ago

wait oh god i fumbled the merge from master.

github-actions[bot] commented 1 day ago

RSI Diff Bot; head commit af70edb41e0c396cbbf29370f07766fbbf575349 merging into 3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-INNERCLOTHING | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png) | ![](https://raw.githubusercontent.com/Radezolid/Delta-v/af70edb41e0c396cbbf29370f07766fbbf575349/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png) | Modified | icon | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png) | ![](https://raw.githubusercontent.com/Radezolid/Delta-v/af70edb41e0c396cbbf29370f07766fbbf575349/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png) | Modified | inhand-left | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-left.png) | ![](https://raw.githubusercontent.com/Radezolid/Delta-v/af70edb41e0c396cbbf29370f07766fbbf575349/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-left.png) | Modified | inhand-right | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-right.png) | ![](https://raw.githubusercontent.com/Radezolid/Delta-v/af70edb41e0c396cbbf29370f07766fbbf575349/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/inhand-right.png) | Modified | prisoner-inhand-left | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-left.png) | ![](https://raw.githubusercontent.com/Radezolid/Delta-v/af70edb41e0c396cbbf29370f07766fbbf575349/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-left.png) | Modified | prisoner-inhand-right | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-right.png) | ![](https://raw.githubusercontent.com/Radezolid/Delta-v/af70edb41e0c396cbbf29370f07766fbbf575349/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/prisoner-inhand-right.png) | Modified | trinkets-equipped-INNERCLOTHING | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-equipped-INNERCLOTHING.png) | ![](https://raw.githubusercontent.com/Radezolid/Delta-v/af70edb41e0c396cbbf29370f07766fbbf575349/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/trinkets-equipped-INNERCLOTHING.png) | Modified

Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-INNERCLOTHING | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png) | ![](https://raw.githubusercontent.com/Radezolid/Delta-v/af70edb41e0c396cbbf29370f07766fbbf575349/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png) | Modified | icon | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png) | ![](https://raw.githubusercontent.com/Radezolid/Delta-v/af70edb41e0c396cbbf29370f07766fbbf575349/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png) | Modified | inhand-left | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-left.png) | ![](https://raw.githubusercontent.com/Radezolid/Delta-v/af70edb41e0c396cbbf29370f07766fbbf575349/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-left.png) | Modified | inhand-right | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-right.png) | ![](https://raw.githubusercontent.com/Radezolid/Delta-v/af70edb41e0c396cbbf29370f07766fbbf575349/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/inhand-right.png) | Modified | prisoner-equipped-INNERCLOTHING | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-equipped-INNERCLOTHING.png) | ![](https://raw.githubusercontent.com/Radezolid/Delta-v/af70edb41e0c396cbbf29370f07766fbbf575349/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-equipped-INNERCLOTHING.png) | Modified | prisoner-icon | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-icon.png) | ![](https://raw.githubusercontent.com/Radezolid/Delta-v/af70edb41e0c396cbbf29370f07766fbbf575349/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-icon.png) | Modified | prisoner-inhand-left | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-inhand-left.png) | ![](https://raw.githubusercontent.com/Radezolid/Delta-v/af70edb41e0c396cbbf29370f07766fbbf575349/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/prisoner-inhand-left.png) | Modified | trinkets-equipped-INNERCLOTHING | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-equipped-INNERCLOTHING.png) | ![](https://raw.githubusercontent.com/Radezolid/Delta-v/af70edb41e0c396cbbf29370f07766fbbf575349/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-equipped-INNERCLOTHING.png) | Modified | trinkets-icon | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-icon.png) | ![](https://raw.githubusercontent.com/Radezolid/Delta-v/af70edb41e0c396cbbf29370f07766fbbf575349/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-icon.png) | Modified | trinkets-inhand-left | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-left.png) | ![](https://raw.githubusercontent.com/Radezolid/Delta-v/af70edb41e0c396cbbf29370f07766fbbf575349/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-left.png) | Modified | trinkets-inhand-right | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-right.png) | ![](https://raw.githubusercontent.com/Radezolid/Delta-v/af70edb41e0c396cbbf29370f07766fbbf575349/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/trinkets-inhand-right.png) | Modified

Resources/Textures/DeltaV/Objects/Misc/books.rsi

| State | Old | New | Status | --- | --- | --- | --- | | icon_kiss | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/DeltaV/Objects/Misc/books.rsi/icon_kiss.png) | ![]() | Removed

Resources/Textures/DeltaV/Structures/Power/Generation/solar_panel.rsi

| State | Old | New | Status | --- | --- | --- | --- | | random_solar | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/DeltaV/Structures/Power/Generation/solar_panel.rsi/random_solar.png) | ![]() | Removed

Resources/Textures/Interface/Actions/actions_borg.rsi

| State | Old | New | Status | --- | --- | --- | --- | | select-type | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Interface/Actions/actions_borg.rsi/select-type.png) | ![]() | Removed

Resources/Textures/Interface/Alerts/walking.rsi

| State | Old | New | Status | --- | --- | --- | --- | | walking | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Interface/Alerts/walking.rsi/walking.png) | ![]() | Removed

Resources/Textures/Objects/Consumable/Food/meat.rsi

| State | Old | New | Status | --- | --- | --- | --- | | anomalymeat-cooked | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Objects/Consumable/Food/meat.rsi/anomalymeat-cooked.png) | ![]() | Removed | anomalymeat | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Objects/Consumable/Food/meat.rsi/anomalymeat.png) | ![]() | Removed

Resources/Textures/Objects/Magic/magicactions.rsi

| State | Old | New | Status | --- | --- | --- | --- | | jaunt | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Objects/Magic/magicactions.rsi/jaunt.png) | ![]() | Removed

Resources/Textures/Objects/Power/portable_recharger.rsi

| State | Old | New | Status | --- | --- | --- | --- | | charging-equipped-BACKPACK | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Objects/Power/portable_recharger.rsi/charging-equipped-BACKPACK.png) | ![]() | Removed | charging-unlit | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Objects/Power/portable_recharger.rsi/charging-unlit.png) | ![]() | Removed | charging | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Objects/Power/portable_recharger.rsi/charging.png) | ![]() | Removed | inhand-left | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Objects/Power/portable_recharger.rsi/inhand-left.png) | ![]() | Removed | inhand-right | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Objects/Power/portable_recharger.rsi/inhand-right.png) | ![]() | Removed

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi

| State | Old | New | Status | --- | --- | --- | --- | | base | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/base.png) | ![]() | Removed | beanbag | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/beanbag.png) | ![]() | Removed | flare | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/flare.png) | ![]() | Removed | incendiary | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/incendiary.png) | ![]() | Removed | lethal | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/lethal.png) | ![]() | Removed | mag-1 | ![](https://raw.githubusercontent.com/DeltaV-Station/Delta-v/3a0ec3d9989d35f0e7cdc3c39470a4d8c4aca9dd/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/mag-1.png) | ![]() | Removed