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.

Sign up for GitHub

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

CC Outpost, Shuttle, Plushie, and Locker #482

Merged
merged 6 commits into from
Jan 16, 2025
Merged

CC Outpost, Shuttle, Plushie, and Locker #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ed798a9
- Added Pepper Plush
JenreyDominos Jan 8, 2025
08f70be
Update to PR
JenreyDominos Jan 13, 2025
ad0da7b
CC Locker PR update
JenreyDominos Jan 14, 2025
fac5573
Merge branch 'Fansana:master' into master
JenreyDominos Jan 14, 2025
0e4acee
Added CC Locker textures
JenreyDominos Jan 14, 2025
ba31813
Merge remote-tracking branch 'origin/master'
JenreyDominos Jan 14, 2025
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
30,001 changes: 30,001 additions & 0 deletions Resources/Maps/Floof/admin_only/CCO1362.yml
View file
Open in desktop

Large diffs are not rendered by default.

6,829 changes: 6,829 additions & 0 deletions Resources/Maps/Floof/admin_only/CCS6378.yml
View file
Open in desktop

Large diffs are not rendered by default.

33 changes: 33 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,3 +391,36 @@
- id: SpaceCash1000
- id: BeachBall
- id: BikeHorn

- type: entity
id: LockerCentCommFilled # CC Locker
suffix: Filled
parent: LockerCentComm
components:
- type: StorageFill
contents:
- id: ClothingBackpackHolding
- id: JetpackBlackFilled
- id: DoorRemoteAll
- id: RubberStampCentcom
- id: RubberStampDenied
- id: RubberStampApproved
- id: BoxFolderCentComClipboard
- id: CentcomPDA
- id: BoxFolderCentCom
- id: ClothingHeadsetAltCentCom
- id: ClothingHeadHatCentcomcap
- id: ClothingMaskGasCentcom
- id: CentcomIDCard
- id: ClothingOuterWinterCCWarden
- id: ClothingNeckCloakCentcom
- id: AccessConfigurator
- id: ClothingOuterHardsuitERTCentcomm
- id: WeaponDisabler
- id: WeaponPistolN1984
- id: ClothingShoesBootsCombatFilled
- id: ClothingUniformJumpskirtCentcomDirector
- id: ClothingUniformJumpsuitCentcomDirector
- id: ClothingEyesGlassesSunglasses
- id: ClothingHandsGlovesColorBlack
- id: PenCentcom
44 changes: 0 additions & 44 deletions Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,28 +256,6 @@
- id: null #Sets lewd group to 44% chance of spawn
prob: 0.56
orGroup: Lewd
# HypnoTemp Merch - Start
- id: PlushieHypnoTempCap
prob: 0.005
orGroup: HypnoTempPlush
- id: PlushieHypnoTempMysta
prob: 0.010
orGroup: HypnoTempPlush
- id: PlushieHypnoTempHoS
prob: 0.010
orGroup: HypnoTempPlush
- id: PlushieHypnoTempLO
prob: 0.025
orGroup: HypnoTempPlush
- id: PlushieHypnoTempHoP
prob: 0.025
orGroup: HypnoTempPlush
- id: PlushieHypnoTempCMO
prob: 0.025
orGroup: HypnoTempPlush
- id: null
orGroup: HypnoTempPlush
#HypnoTemp Merch - End
# Syndicate loot
- id: null
prob: 0.95
Expand Down Expand Up @@ -455,28 +433,6 @@
- id: null #Sets lewd group to 44% chance of spawn
prob: 0.56
orGroup: Lewd
# HypnoTemp Merch - Start
- id: PlushieHypnoTempCap
prob: 0.005
orGroup: HypnoTempPlush
- id: PlushieHypnoTempMysta
prob: 0.010
orGroup: HypnoTempPlush
- id: PlushieHypnoTempHoS
prob: 0.010
orGroup: HypnoTempPlush
- id: PlushieHypnoTempLO
prob: 0.025
orGroup: HypnoTempPlush
- id: PlushieHypnoTempHoP
prob: 0.025
orGroup: HypnoTempPlush
- id: PlushieHypnoTempCMO
prob: 0.025
orGroup: HypnoTempPlush
- id: null
orGroup: HypnoTempPlush
#HypnoTemp Merch - End
# Floof - End
# Syndicate loot
- id: null
Expand Down
18 changes: 17 additions & 1 deletion Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,25 @@
- PlushieCatWhite
- PlushieRatvar
- PlushieNar
- PlushieTrystan
- PlushieTrystan # Floof Plushies Start
- PlushieSlips
- PlushieJester
- PlushieCentCom
- PlushieSlimeTider
- PlushieChillHuman
- PlushieDino
- PlushieDragon
- PlushieFRavager
- PlushieFPraetorian
- PlushieFDrone
- PlushieFRouny
- PlushieHypnoTempCap
- PlushieHypnoTempHoS
- PlushieHypnoTempHoP
- PlushieHypnoTempCE
- PlushieHypnoTempCMO
- PlushieHypnoTempLO
- PlushieHypnoTempMysta # Floof Plushies End
chance: 0.5
offset: 0.2

Expand Down
13 changes: 12 additions & 1 deletion Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1791,6 +1791,7 @@
- CrazyGlue
- PlushieRatvar
- PlushieNar
#Floof Plushies - Start
#HypnoTemp Plushies - Start
- PlushieHypnoTempCap
- PlushieHypnoTempCMO
Expand All @@ -1800,14 +1801,24 @@
- PlushieHypnoTempLO
- PlushieHypnoTempMysta
#HypnoTemp Plushies - End
- PlushieTrystan
- PlushieCentCom
- PlushieSlimeTider
- PlushieChillHuman
- PlushieDino
- PlushieDragon
- PlushieFRavager
- PlushieFPraetorian
- PlushieFDrone
- PlushieFRouny
#Floof Plushies - End
- type: EmagLatheRecipes
emagStaticRecipes:
- PlushieGhost
- PlushieRGBee
- PlushieRainbowCarp
- PlushieJester
- PlushieSlips
- PlushieTrystan
- PlushieAbductor
- PlushieAbductorAgent
- PlushieNuke
Expand Down
14 changes: 14 additions & 0 deletions Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,3 +503,17 @@
stateBaseClosed: hop
stateDoorOpen: hop_open
stateDoorClosed: representative_door

# Central Command
- type: entity
id: LockerCentComm
name: central command officer locker
parent: LockerBaseSecure
components:
- type: Appearance
- type: AccessReader
access: [["CentralCommand"]]
- type: EntityStorageVisuals
stateBaseClosed: CentCom
stateDoorOpen: CentCom_open
stateDoorClosed: CentCom_door
29 changes: 27 additions & 2 deletions Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@
- type: entity
parent: BasePlushie
id: PlushieDragon
name:
description:
name: dragon plushie
description: Rawr Im'ma eat ya!
components:
- type: Sprite
sprite: Floof/Objects/Fun/floof_plush.rsi
Expand Down Expand Up @@ -250,3 +250,28 @@
path: /Audio/Voice/Slime/slime_squish.ogg
params:
volume: 1

- type: entity
parent: PlushieHuman
id: PlushieCentCom
name: Central Command plushie
description: Your own personal CentCom Pal!
components:
- type: Sprite
sprite: Floof/Objects/Fun/floof_plush.rsi
state: pepper
- type: UseDelay
delay: 1.5
- type: EmitSoundOnUse
sound:
path: /Audio/Animals/mouse_squeak.ogg
params:
volume: 1
- type: EmitSoundOnLand
sound:
path: /Audio/Animals/mouse_squeak.ogg
- type: EmitSoundOnActivate
sound:
path: /Audio/Animals/mouse_squeak.ogg
params:
volume: 1
Loading
Loading