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

Arcadia drip #341

Merged
merged 13 commits into from
Sep 28, 2023
32 changes: 32 additions & 0 deletions Resources/Locale/en-US/advertisements/vending/arcadiadrobe.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
advertisement-arcadiadrobe-1 = Brand new outfits!
advertisement-arcadiadrobe-2 = Roof-top outfits for any occasion!
advertisement-arcadiadrobe-3 = Being a warrior can be stylish.
advertisement-arcadiadrobe-4 = According to the analysis: by dressing more stylishly, the chance of success of your actions increases by 0.0098%!
advertisement-arcadiadrobe-5 = Hey, it seems to me you haven't looked at my assortment for a long time!
advertisement-arcadiadrobe-6 = A BETTER TOMORROW FORGED TODAY!
advertisement-arcadiadrobe-7 = Hey handsome and or pretty stranger, take a gander at our wares!
advertisement-arcadiadrobe-8 = The truth is told — it's not the bullet that kills, but the lack of style.
advertisement-arcadiadrobe-9 = Before the battle of the body, there is the battle of the mind. You can always win that battle with our apparel.
advertisement-arcadiadrobe-10 = Dress with style as you stand atop the corpses of your foes.
advertisement-arcadiadrobe-11 = If you're not wearing our apparel, then your outfit sucks!
advertisement-arcadiadrobe-12 = You can transfer enemies to your side by dressing them in the best outfits in the universe!
advertisement-arcadiadrobe-13 = ...project Eylsium is under way... is that mic on?
advertisement-arcadiadrobe-14 = Wake up, Arc. We need you to record more lines.
advertisement-arcadiadrobe-15 = Hey! Study the unknown in style!
advertisement-arcadiadrobe-16 = Have you always dreamed of dressing stylishly? Then come quickly!
advertisement-arcadiadrobe-17 = I quote the great writer: "Look at my assortment of clothing assortment"
advertisement-arcadiadrobe-18 = According to the scan of the area - you need our top of the line apparel!
advertisement-arcadiadrobe-19 = Have you dreamed of dressing stylishly? Then you come to us!
advertisement-arcadiadrobe-20 = What could be better than new clothes from ArcadiaDrobe!
advertisement-arcadiadrobe-21 = Frighten everyone with your appearance only in our clothes!
advertisement-arcadiadrobe-22 = This isnt the gun vendor.
advertisement-arcadiadrobe-23 = We are not responsible for increased aggression towards our uniforms.
advertisement-arcadiadrobe-24 = Who said functionality and design had to be seperate?
advertisement-arcadiadrobe-25 = The best fibers in the Nexus!
advertisement-arcadiadrobe-26 = Our uniforms are white, to let you paint them with your enemy's blood!
advertisement-arcadiadrobe-27 = 10 out of 10 Realities call our apparel top of the line!
advertisement-arcadiadrobe-28 = Our suits are moisture-resistant, which means you can not be afraid to get dirty with blood!
advertisement-arcadiadrobe-29 = The best in the galaxy!
advertisement-arcadiadrobe-30 = What could be better than the smell of our uniform in the morning?
advertisement-arcadiadrobe-31 = Can you turn off that mic, Duke? Really dont want unauthorized knowledge of Elysium.

1 change: 0 additions & 1 deletion Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -273,4 +273,3 @@
sprite: Clothing/Back/Backpacks/cluwne.rsi
- type: Unremoveable
deleteOnDrop: false

1 change: 1 addition & 0 deletions Resources/Prototypes/Procedural/salvage_rewards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
ClothingOuterArmorReflective: 0.5
MoneyTreeSeeds: 0.5
CrateMedicalSupplies: 0.5
VendingMachineArcadia: 0.5

- type: weightedRandomEntity
id: SalvageRewardEpic
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
- type: advertisementsPack
id: ArcadiaDrobeAds
advertisements:
- advertisement-arcadiadrobe-1
- advertisement-arcadiadrobe-2
- advertisement-arcadiadrobe-3
- advertisement-arcadiadrobe-4
- advertisement-arcadiadrobe-5
- advertisement-arcadiadrobe-6
- advertisement-arcadiadrobe-7
- advertisement-arcadiadrobe-8
- advertisement-arcadiadrobe-9
- advertisement-arcadiadrobe-10
- advertisement-arcadiadrobe-11
- advertisement-arcadiadrobe-12
- advertisement-arcadiadrobe-13
- advertisement-arcadiadrobe-14
- advertisement-arcadiadrobe-15
- advertisement-arcadiadrobe-16
- advertisement-arcadiadrobe-17
- advertisement-arcadiadrobe-18
- advertisement-arcadiadrobe-19
- advertisement-arcadiadrobe-20
- advertisement-arcadiadrobe-21
- advertisement-arcadiadrobe-22
- advertisement-arcadiadrobe-23
- advertisement-arcadiadrobe-24
- advertisement-arcadiadrobe-25
- advertisement-arcadiadrobe-26
- advertisement-arcadiadrobe-27
- advertisement-arcadiadrobe-28
- advertisement-arcadiadrobe-29
- advertisement-arcadiadrobe-30
- advertisement-arcadiadrobe-31
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- type: vendingMachineInventory
id: ArcadiaDrobeInventory
startingInventory:
ClothingBackpackArcadia: 3
ClothingBackpackDuffelArcadia: 3
ClothingBackpackSatchelArcadia: 3
ClothingBeltArcadia: 3
ClothingEyesArcadiaVisor: 3
ClothingHandsGlovesArcadiaCombat: 3
ClothingMaskArcadia: 3
ClothingOuterWinterArcadia: 3
ClothingUniformJumpskirtArcadia: 5
ClothingUniformJumpsuitArcadia: 5
emaggedInventory:
ClothingHeadHatTacticalMaidHeadband: 3
ClothingUniformJumpskirtTacticalMaid: 3
ClothingHandsTacticalMaidGloves: 3
8 changes: 8 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- type: entity
parent: ClothingBackpack
id: ClothingBackpackArcadia
name: arcadia backpack
description: A backpack produced by Arcadia Industries
components:
- type: Sprite
sprite: _NF/Clothing/Back/Backpacks/arcadia-backpack.rsi
8 changes: 8 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- type: entity
parent: ClothingBackpackDuffel
id: ClothingBackpackDuffelArcadia
name: arcadia duffel
description: A duffelbag produced by Arcadia Industries
components:
- type: Sprite
sprite: _NF/Clothing/Back/Duffels/arcadia-dufflebag.rsi
8 changes: 8 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- type: entity
parent: ClothingBackpackSatchel
id: ClothingBackpackSatchelArcadia
name: arcadia satchel
description: A satchel produced by Arcadia Industries.
components:
- type: Sprite
sprite: _NF/Clothing/Back/Satchels/arcadia-satchel.rsi
12 changes: 12 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- type: entity
parent: ClothingBeltStorageBase
id: ClothingBeltArcadia
name: arcadia webbing
description: A webbing created by Arcadia Industries. Seems very capable of fitting many items.
components:
- type: Sprite
sprite: _NF/Clothing/Belt/arcadia-webbing.rsi
- type: Clothing
sprite: _NF/Clothing/Belt/arcadia-webbing.rsi
- type: Storage
capacity: 60
14 changes: 14 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
- type: entity
parent: ClothingEyesBase
id: ClothingEyesArcadiaVisor
name: arcadia visor
description: A visor produced by Arcadia Industries, with some high tech optics systems built in.
components:
- type: Sprite
sprite: _NF/Clothing/Eyes/Glasses/arcadiavisor.rsi
- type: Clothing
sprite: _NF/Clothing/Eyes/Glasses/arcadiavisor.rsi
- type: FlashImmunity
- type: EyeProtection
- type: VisionCorrection
- type: IdentityBlocker
17 changes: 17 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- type: entity
parent: ClothingHandsBase
id: ClothingHandsGlovesArcadiaCombat
name: arcadia combat gloves
description: Combat gloves produced by Arcadia Industries.
components:
- type: Sprite
sprite: _NF/Clothing/Hands/Gloves/arcadia-combatgloves.rsi
- type: Clothing
sprite: _NF/Clothing/Hands/Gloves/arcadia-combatgloves.rsi
- type: GloveHeatResistance
heatResistance: 1400
- type: Insulated
- type: Fiber
fiberMaterial: fibers-synthetic
fiberColor: fibers-black
- type: FingerprintMask
10 changes: 10 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: ClothingHeadHatHoodWinterBase
id: ClothingHeadHatHoodArcadia
noSpawn: true
name: arcadia coat hood
components:
- type: Sprite
sprite: _NF/Clothing/Head/Hoods/Coat/hoodarcadia.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hoods/Coat/hoodarcadia.rsi
19 changes: 19 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- type: entity
parent: ClothingMaskBase
id: ClothingMaskArcadia
name: arcadia battle mask
description: A close-fitting high tech mask designed by Arcadia Industries for space faring battlers.
components:
- type: Sprite
sprite: _NF/Clothing/Masks/arcadia-battleface.rsi
- type: Clothing
sprite: _NF/Clothing/Masks/arcadia-battleface.rsi
- type: BreathMask
- type: IdentityBlocker
- type: Armor
modifiers:
coefficients:
Blunt: 0.80
Slash: 0.80
Piercing: 0.90
Heat: 0.90
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- type: entity
parent: ClothingOuterWinterCoatToggleable
id: ClothingOuterWinterArcadia
name: arcadia winter coat
description: A coat produced by Arcadia Industries, seems soft.
components:
- type: Sprite
sprite: _NF/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi
- type: Clothing
sprite: _NF/Clothing/OuterClothing/WinterCoats/coatarcadia.rsi
- type: ToggleableClothing
clothingPrototype: ClothingHeadHatHoodArcadia
- type: Armor
modifiers:
coefficients:
Heat: 0.75
Caustic: 0.9
10 changes: 10 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtArcadia
name: arcadia jumpskirt
description: A jumpskirt produced by Arcadia Industries. Designed to reduce chaffing between the legs for the comfort of skin, slime, scales, fluff, and wood
components:
- type: Sprite
sprite: _NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpskirt/arcadia-jumpskirt.rsi
10 changes: 10 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitArcadia
name: arcadia jumpsuit
description: A jumpsuit produced by Arcadia Industries. Designed to reduce chaffing between the legs for the comfort of skin, slime, scales, fluff, and wood
components:
- type: Sprite
sprite: _NF/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpsuit/arcadia-jumpsuit.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
radius: 1.5
energy: 1.6
color: "#4b93ad"

- type: entity
parent: VendingMachine
id: VendingMachineCircuitVend
Expand Down Expand Up @@ -135,7 +135,7 @@
color: "#ad2c2b"
- type: MarketModifier
mod: 50

- type: entity
parent: VendingMachine
id: VendingMachineBountyVend
Expand Down Expand Up @@ -166,3 +166,37 @@
radius: 1.5
energy: 1.6
color: "#4b93ad"

- type: entity
parent: VendingMachine
id: VendingMachineArcadia
name: ArcadiaDrobe
description: Selling clothes from another reality for cheap prices!
components:
- type: VendingMachine
pack: ArcadiaDrobeInventory
dispenseOnHitChance: 0.25
dispenseOnHitThreshold: 2
offState: off
brokenState: broken
normalState: normal-unshaded
# ejectState: eject-unshaded No sprite, see chefvend/dinnerware/BODA/etc for expamples
denyState: deny-unshaded
screenState: screen
ejectDelay: 3
- type: Advertise
pack: ArcadiaDrobeAds
- type: Sprite
sprite: _NF/Structures/arcadiadrobe.rsi
layers:
- state: "off"
map: ["enum.VendingMachineVisualLayers.Base"]
- state: "off"
map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
shader: unshaded
- state: panel
map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: PointLight
radius: 1.5
energy: 1.6
color: "#ff033e"
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 | modified by AjexRose for NewFrontier",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading