Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Contraband Drop 1 - Narcotics 1 #466

Open
wants to merge 58 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
a661646
Graffiti and posters 1
KittenColony Oct 11, 2024
59a7e61
Knuckle Dusters
KittenColony Oct 11, 2024
97b791b
Cigarettes 1
KittenColony Nov 11, 2024
a8e272a
typo + vender inventory
KittenColony Nov 11, 2024
510f65d
A G O N Y
KittenColony Nov 11, 2024
d3e9633
Fixed cigs
KittenColony Nov 12, 2024
a885538
Removed dusters
KittenColony Nov 12, 2024
95d2a54
Removed posters
KittenColony Nov 13, 2024
7b6cb2a
Dynamoxine added
KittenColony Nov 13, 2024
321fd9c
adjusted ftl file
KittenColony Nov 13, 2024
2af9137
Dynamoxine recipe + injector
KittenColony Nov 13, 2024
dc42fdd
OD damage increased, added inventory
KittenColony Nov 13, 2024
de37fdc
Made more dangerous + added Epi influence
KittenColony Nov 13, 2024
9d4fdfd
Commit Dynamoxine fix
KittenColony Nov 13, 2024
36f8b53
Addictine reaction
KittenColony Nov 13, 2024
da9982f
Update narcotics.yml
KittenColony Nov 13, 2024
a40efe3
Revert "Update narcotics.yml"
KittenColony Nov 13, 2024
9740e20
ISSUE FOUND.
KittenColony Nov 13, 2024
2967b92
dynamoxine injector sprited
KittenColony Nov 13, 2024
ca4ba75
removed inhands from namespaced medipen
KittenColony Nov 13, 2024
06d5031
CD pill rsi
KittenColony Nov 13, 2024
c3d3c8b
happiness pill
KittenColony Nov 13, 2024
3c46ec3
Added Happiness to Chefvend
KittenColony Nov 14, 2024
e9a2c03
Made Dynamox OD limit 6.1u, added notes for new narcotics
KittenColony Nov 14, 2024
f13088f
Added noted form of planned drugs
KittenColony Nov 14, 2024
f7c5a25
Stray tea and mindleaf sprites, localizations and several YAMLs
KittenColony Nov 14, 2024
c9ef9bc
Update meta.json
KittenColony Nov 14, 2024
650da1f
d > f, added placeholder reagent
KittenColony Nov 14, 2024
e966fd6
namespace for consumable_stacks.yml
KittenColony Nov 14, 2024
7f04c65
Adds Breakout, fixes typo, adds ragechem popups, adjusts metabolism r…
KittenColony Nov 14, 2024
0fc106d
Update narcotics.yml
KittenColony Nov 14, 2024
3c6ec12
Update narcotics.yml
KittenColony Nov 14, 2024
27340b3
Placeholder chems, adjusted Breakout, added addictine properties
KittenColony Nov 14, 2024
d897299
reagent ID fill-ins
KittenColony Nov 14, 2024
0a15c6f
typo
KittenColony Nov 14, 2024
638d4a3
Added Rust
KittenColony Nov 14, 2024
ec3fe98
Added Bake
KittenColony Nov 14, 2024
ac431a3
Added Grit
KittenColony Nov 14, 2024
2ded12a
Added Grit pt.2
KittenColony Nov 14, 2024
ed64f22
Added recipes for Mindleaf products
KittenColony Nov 14, 2024
f8d073f
Update narcotics.yml
KittenColony Nov 14, 2024
7f73a49
I fucking hate crafting code
KittenColony Nov 14, 2024
7e57b65
Attempting to get crafting to work
KittenColony Nov 14, 2024
a2121f6
Suffering with Crafting.
KittenColony Nov 14, 2024
9c26fdb
Revert "Suffering with Crafting."
KittenColony Nov 14, 2024
605857c
change craft name, increase hista rate, +2k value
KittenColony Nov 14, 2024
a1d1969
???
KittenColony Nov 14, 2024
ede9cce
throttled Rust emotes, trying to get crafting to work
KittenColony Nov 14, 2024
f057f2f
fixing crafting >:(
KittenColony Nov 14, 2024
4bc326e
Hour 3
KittenColony Nov 14, 2024
678e5fe
Suggested fix for Crafting.
KittenColony Nov 14, 2024
226bb6a
Suggested crafting code
KittenColony Nov 14, 2024
27207d7
Cleanup of code
KittenColony Nov 14, 2024
6622567
emptypacket reagent fix
KittenColony Nov 14, 2024
8712769
specifics fixing, +CD tags
KittenColony Nov 15, 2024
046c4c6
changed 3 characters
KittenColony Nov 15, 2024
615ea54
more fixing?
KittenColony Nov 15, 2024
ce0c260
one last commit
KittenColony Nov 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions Resources/Locale/en-US/_CD/reagents/RPdrugs.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
### Messages for mental influences from narcotics.

reagent-effect-ragechem-intense1 = KILL THEM! KILL THEM ALL!
reagent-effect-ragechem-intense2 = RAAAAAAHG! FUCK, FUCK!
reagent-effect-ragechem-intense3 = GUT THEM! RIP THEM TO PIECES! KILL THEM!
reagent-effect-ragechem-intense4 = SHUT THE FUCK UP!
reagent-effect-ragechem-intense5 = RIP THEM TO PIECES! TEAR THEM UP!
reagent-effect-ragechem-intense6 = KILL KILL KILL KILL KILL KILL KILL KILL KILL

reagent-effect-motivate-intense1 = COME ON, LET'S GO!
reagent-effect-motivate-intense2 = GET A MOVE ON!
reagent-effect-motivate-intense3 = LETS FUCKING GO!
reagent-effect-motivate-intense4 = OH FUCK YEAH!
reagent-effect-motivate-intense5 = YOU'VE FUCKIN' GOT THIS!

reagent-effect-euphoria-intense1 = YOU'RE ON TOP OF THE WORLD!
reagent-effect-euphoria-intense2 = YOU'RE THE BEST!
reagent-effect-euphoria-intense3 = WOOHOO!!!
reagent-effect-euphoria-intense4 = YEAH, YEAH! KEEP GOING!
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/_CD/reagents/meta/medicine.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@ reagent-desc-saprodipine = A commonly used anti-psychotic with minimal side-effe
reagent-name-cortexene = Cortexene
reagent-desc-cortexene = A somewhat addictive chemical used to treat amnesia. Not effective on cloning related memory loss. Incompatible with alcohol and generally dangerous if improperly used.
reagent-name-dynamoxine = Dynamoxine
reagent-desc-dynamoxine = An attempt at synthizing a stimulant for extended engagements, the Dynamoxine project was shelved after Donk Co. came out with Hyperzine. Overdoses will cause heart and lung spasms. Reacts violently with Epinephrine.
18 changes: 18 additions & 0 deletions Resources/Locale/en-US/_CD/reagents/meta/narcotics.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
reagent-name-mindleafsap = mindleaf sap
reagent-desc-mindleafsap = The pure sap from the Mindleaf plant, a relatively weak painkiller on its own. Consumption causes strain on the liver and kidneys.
reagent-name-stray = stray
reagent-desc-stray = A rich, mildly spicy tea made from Mindleaf sap, the process of making it into a tea has destroyed most of the toxins in the sap. Consumption causes a numbing and relaxing effect.
reagent-name-breakout = breakout
reagent-desc-breakout = Dried sap from the Mindleaf plant, an off-white powder that blocks pain receptors and creates an intense euphoria. Highly toxic, acidic when concentrated.
reagent-name-rust = rust
reagent-desc-rust = A refined form of Breakout, further processed to reduce the toxic chemicals found inside the powder to create a potent painkiller, while making Users feel extremely motivated. Overdose causes the body to rapidly eject stomach contents. Can cause rashes on internal organs.
reagent-name-bake = bake
reagent-desc-bake = The product of extreme amounts of laberatory work. A highly processed form of Mindleaf sap that takes the form of a flour-like substance. Sought after by executives and drug lords across the galaxy, it reduces lactic acid build-up and blocks pain to the applied area.
reagent-name-grit = grit
reagent-desc-grit = An augmented form of Bake. Creating an intense feeling of anger and adrenaline, dulling pain and making the user unable to be slowed down by external weaponry. Mixing with other Mindleaf derivatives causes the body to rapidly destroy itself.
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@
FoodButter: 3
FoodCheese: 1
FoodMeat: 6
contrabandInventory:
PillCanisterHappiness: 2 # _CD 14 Happiness Pills

Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,8 @@
CheapLighter: 4
Lighter: 3
FlippoLighter: 2
contrabandInventory: # _CD
CigPackDarkGreen: 2 # _CD
CigPackUnmarked: 4 # _CD
emaggedInventory:
CigPackSyndicate: 1
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@
contrabandInventory:
FoodDonutHomer: 12
FoodBoxDonut: 2
SecurityStimpack: 4 # _CD
#box evidence
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,101 @@
reagents:
- ReagentId: Sugar
Quantity: 10

- type: entity
id: CigaretteMirage
suffix: mirage
parent: Cigarette
name: cigarette
description: A roll of dried plant matter dipped with medical-grade narcotics.
components:
- type: SolutionContainerManager
solutions:
smokable:
maxVol: 40
reagents:
- ReagentId: THC
Quantity: 15
- ReagentId: SpaceDrugs
Quantity: 15
- ReagentId: Psicodine
Quantity: 10

- type: entity
id: CigaretteHappiPsi
suffix: happsiness
parent: Cigarette
name: cigarette
description: A laced cigarette roll. This one has a striped mint and violet ring above the filter.
components:
- type: SolutionContainerManager
solutions:
smokable:
maxVol: 40
reagents:
- ReagentId: Happiness
Quantity: 15
- ReagentId: Psicodine
Quantity: 15

- type: entity
id: CigaretteWeh
suffix: weh
parent: Cigarette
name: cigarweh
description: A roll that makes you weh.
components:
- type: SolutionContainerManager
solutions:
smokable:
maxVol: 40
reagents:
- ReagentId: JuiceThatMakesYouWeh
Quantity: 20

# CD Chems below

- type: entity
id: CigaretteBliss
suffix: bliss
parent: Cigarette
name: cigarette
description: A laced cigarette roll. This one has a bright yellow ring above the filter.
components:
- type: SolutionContainerManager
solutions:
smokable:
maxVol: 10
reagents:
- ReagentId: Blissifylovene
Quantity: 7.5

- type: entity
id: CigaretteAgono
suffix: agono
parent: Cigarette
name: cigarette
description: A laced cigarette roll. This one has a pink ring above the filter.
components:
- type: SolutionContainerManager
solutions:
smokable:
maxVol: 10
reagents:
- ReagentId: Agonolexyne
Quantity: 7.5

- type: entity
id: CigaretteEquili
suffix: equili
parent: Cigarette
name: cigarette
description: A laced cigarette roll. This one has a dark brown ring above the filter.
components:
- type: SolutionContainerManager
solutions:
smokable:
maxVol: 10
reagents:
- ReagentId: Equilibrazine
Quantity: 7.5
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,182 @@
contents:
- id: CigaretteCandy
amount: 10

- type: entity
id: CigPackDarkGreen
parent: CigPackBase
name: Garden Mirage packet
description: Life's a Mirage, see through it.
components:
- type: Sprite
sprite: _CD/Objects/Consumable/Smokeables/Cigarettes/Packs/darkgreen.rsi
- type: Item
sprite: _CD/Objects/Consumable/Smokeables/Cigarettes/Packs/darkgreen.rsi
- type: StorageFill
contents:
- id: CigaretteMirage
amount: 10

# Unmarked packets

- type: entity
id: CigPackUnmarkedWeh
parent: CigPackBaseUnmarked
name: cigarweh packet
suffix: weh
description: An unmarked packet of cigarettes. There is a lizard plushie sticker on the back of it.
components:
- type: Sprite
sprite: _CD/Objects/Consumable/Smokeables/Cigarettes/Packs/unmarked.rsi
- type: Item
sprite: _CD/Objects/Consumable/Smokeables/Cigarettes/Packs/unmarked.rsi
- type: StorageFill
contents:
- id: CigaretteWeh
amount: 10

- type: entity
id: CigPackUnmarkedHappiPsi
parent: CigPackBaseUnmarked
name: unmarked packet
suffix: happsiness
description: An unmarked packet of cigarettes. There is a striped mint and violet marker on the bottom.
components:
- type: Sprite
sprite: _CD/Objects/Consumable/Smokeables/Cigarettes/Packs/unmarked.rsi
- type: Item
sprite: _CD/Objects/Consumable/Smokeables/Cigarettes/Packs/unmarked.rsi
- type: StorageFill
contents:
- id: CigaretteHappiPsi
amount: 10

- type: entity
id: CigPackUnmarkedBliss
parent: CigPackBaseUnmarked
name: unmarked packet
suffix: bliss
description: An unmarked packet of cigarettes. There is a bright yellow marker on the bottom.
components:
- type: Sprite
sprite: _CD/Objects/Consumable/Smokeables/Cigarettes/Packs/unmarked.rsi
- type: Item
sprite: _CD/Objects/Consumable/Smokeables/Cigarettes/Packs/unmarked.rsi
- type: StorageFill
contents:
- id: CigaretteBliss
amount: 10

- type: entity
id: CigPackUnmarkedAgono
parent: CigPackBaseUnmarked
name: unmarked packet
suffix: agono
description: An unmarked packet of cigarettes. There is a pink marker on the bottom.
components:
- type: Sprite
sprite: _CD/Objects/Consumable/Smokeables/Cigarettes/Packs/unmarked.rsi
- type: Item
sprite: _CD/Objects/Consumable/Smokeables/Cigarettes/Packs/unmarked.rsi
- type: StorageFill
contents:
- id: CigaretteAgono
amount: 10

- type: entity
id: CigPackUnmarkedEquili
parent: CigPackBaseUnmarked
name: unmarked packet
suffix: equili
description: An unmarked packet of cigarettes. There is a dark brown marker on the bottom.
components:
- type: Sprite
sprite: _CD/Objects/Consumable/Smokeables/Cigarettes/Packs/unmarked.rsi
- type: Item
sprite: _CD/Objects/Consumable/Smokeables/Cigarettes/Packs/unmarked.rsi
- type: StorageFill
contents:
- id: CigaretteEquili
amount: 10


- type: entity
parent: CigPackBaseUnmarked
id: CigPackUnmarked
name: unmarked packet
components:
- type: RandomSpawner
offset: 0
prototypes:
- CigPackUnmarkedWeh
- CigPackUnmarkedHappiPsi
- CigPackUnmarkedBliss
- CigPackUnmarkedAgono
- CigPackUnmarkedEquili

- type: entity
id: CigPackBaseUnmarked
parent: [ BaseStorageItem, BaseBagOpenClose ]
name: unmarked cigarette pack
abstract: true
components:
- type: Sprite
sprite: _CD/Objects/Consumable/Smokeables/Cigarettes/Packs/unmarked.rsi
layers:
- state: closed
map: ["closeLayer"]
- state: open
map: ["openLayer"]
visible: false
- state: cig1
map: ["cig1"]
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
visible: false
- state: cig2
map: ["cig2"]
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
visible: false
- state: cig3
map: ["cig3"]
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
visible: false
- state: cig4
map: ["cig4"]
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
visible: false
- state: cig5
map: ["cig5"]
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
visible: false
- state: cig6
map: ["cig6"]
sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi
visible: false
- type: Tag
tags:
- CigPack
- Trash
- type: PhysicalComposition
materialComposition:
Steel: 50
- type: SpaceGarbage
- type: Item
size: 10
- type: Storage
capacity: 10
- type: StorageFill
contents:
- id: Cigarette
amount: 10
- type: ItemCounter
count:
tags: [Cigarette]
composite: true
layerStates:
- cig1
- cig2
- cig3
- cig4
- cig5
- cig6
- type: Appearance
Loading
Loading