Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixbugs (#464)

Browse Source 
* - fix: Starting gear.

* - fix: Lockers.

* - tweak: Jani tweaks.

* - fix: Mindswap.

* - fix: Discounts.

* - fix: No nuke operative component on monkey and borg.

* - tweak: Ebow.

* - fix: Wizard teleport.

* - fix: Animals internals toggle.

* - fix: Thief icon.
This commit is contained in:
Aviu00
2024-07-19 12:52:40 +00:00
committed by GitHub
parent 742af4542f
commit a8002843a3
60 changed files with 330 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
View File

@@ -117,7 +117,7 @@ public sealed partial class AdminVerbSystem
{
Text = Loc.GetString("admin-verb-text-make-thief"),
Category = VerbCategory.Antag,
Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Clothing/Hands/Gloves/ihscombat.rsi"), "icon"),
Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Clothing/Hands/Gloves/Color/black.rsi"), "icon"),
Act = () =>
{
_thief.AdminMakeThief(args.Target, false); //Midround add pacified is bad

5
Content.Server/Body/Systems/InternalsSystem.cs
View File

@@ -241,7 +241,7 @@ public sealed class InternalsSystem : EntitySystem
// 3. in-hand tanks
// 4. pocket/belt tanks
if (!Resolve(user, ref user.Comp1, ref user.Comp2, ref user.Comp3))
if (!Resolve(user, ref user.Comp2, ref user.Comp3, false)) // WD EDIT
return null;
if (_inventory.TryGetSlotEntity(user, "back", out var backEntity, user.Comp2, user.Comp3) &&
@@ -258,6 +258,9 @@ public sealed class InternalsSystem : EntitySystem
return (entity.Value, gasTank);
}
if (!Resolve(user, ref user.Comp1, false)) // WD EDIT
return null;
foreach (var item in _inventory.GetHandOrInventoryEntities((user.Owner, user.Comp1, user.Comp2)))
{
if (TryComp(item, out gasTank) && _gasTank.CanConnectToInternals(gasTank))

2
Content.Server/Store/Systems/StoreSystem.Ui.cs
View File

@@ -278,7 +278,7 @@ public sealed partial class StoreSystem
_audio.PlayEntity(component.BuySuccessSound, msg.Session, uid); //cha-ching!
//WD START
if (listing.SaleLimit != 0 && listing.SaleAmount > 0 && listing.PurchaseAmount >= listing.SaleLimit && listing.ProductAction.HasValue)
if (listing.SaleLimit != 0 && listing.SaleAmount > 0 && listing.PurchaseAmount >= listing.SaleLimit)
{
listing.SaleAmount = 0;
listing.Cost = listing.OldCost;

12
Content.Server/_White/Wizard/Magic/WizardSpellsSystem.cs
View File

@@ -179,6 +179,12 @@ public sealed class WizardSpellsSystem : EntitySystem
if (!userHasMind)
return;
SwapComponent<WizardComponent>(uid, target);
SwapComponent<RevolutionaryComponent>(uid, target);
SwapComponent<HeadRevolutionaryComponent>(uid, target);
SwapComponent<PentagramComponent>(uid, target);
SwapComponent<CultistComponent>(uid, target);
_mindSystem.TransferTo(mindId, target, mind: mind);
if (targetHasMind)
@@ -193,12 +199,6 @@ public sealed class WizardSpellsSystem : EntitySystem
_standing.TryLieDown(target);
Cast(msg);
SwapComponent<WizardComponent>(uid, target);
SwapComponent<RevolutionaryComponent>(uid, target);
SwapComponent<HeadRevolutionaryComponent>(uid, target);
SwapComponent<PentagramComponent>(uid, target);
SwapComponent<CultistComponent>(uid, target);
}
#endregion

9
Content.Server/_White/Wizard/WizardRuleSystem.cs
View File

@@ -159,7 +159,8 @@ public sealed class WizardRuleSystem : GameRuleSystem<WizardRuleComponent>
var query = QueryActiveRules();
while (query.MoveNext(out _, out _, out var wizardRule, out _))
{
AddRole(mindId, mind, wizardRule);
if (!AddRole(mindId, mind, wizardRule))
return;
if (mind.Session is not { } playerSession)
return;
@@ -171,10 +172,10 @@ public sealed class WizardRuleSystem : GameRuleSystem<WizardRuleComponent>
}
}
private void AddRole(EntityUid mindId, MindComponent mind, WizardRuleComponent wizardRule)
private bool AddRole(EntityUid mindId, MindComponent mind, WizardRuleComponent wizardRule)
{
if (_roles.MindHasRole<WizardRoleComponent>(mindId))
return;
return false;
wizardRule.WizardMinds.Add(mindId);
@@ -182,6 +183,8 @@ public sealed class WizardRuleSystem : GameRuleSystem<WizardRuleComponent>
_roles.MindAddRole(mindId, new WizardRoleComponent {PrototypeId = role});
GiveObjectives(mindId, mind, wizardRule);
return true;
}
private void GiveObjectives(EntityUid mindId, MindComponent mind, WizardRuleComponent wizardRule)

1
Resources/Prototypes/Entities/Clothing/Belt/belts.yml
View File

@@ -248,6 +248,7 @@
- WetFloorSign
- HolosignProjector
- Plunger
- Bucket
components:
- LightReplacer
- SmokeOnTrigger

2
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
View File

@@ -1338,8 +1338,6 @@
id: MobMonkeySyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink
parent: MobBaseSyndicateMonkey
suffix: NukeOps
components:
- type: NukeOperative
- type: entity
name: kobold

1
Resources/Prototypes/Entities/Mobs/Player/silicon.yml
View File

@@ -279,7 +279,6 @@
parent: BorgChassisSyndicateAssault
suffix: Battery, Module, Operative
components:
- type: NukeOperative
- type: ContainerFill
containers:
borg_brain:

3
Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
View File

@@ -67,6 +67,9 @@
- type: Item
size: Large
sprite: Objects/Specific/Janitorial/advmop.rsi
storedRotation: -135
shape:
- 0, 0, 3, 0
- type: Absorbent
pickupAmount: 100
- type: UseDelay

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml
View File

@@ -15,7 +15,7 @@
- Belt
- type: Gun
resetOnHandSelected: false
fireRate: 0.5
fireRate: 0.4
soundGunshot:
path: /Audio/Weapons/click.ogg
- type: RechargeBasicEntityAmmo

1
Resources/Prototypes/Entities/Stations/nanotrasen.yml
View File

@@ -26,6 +26,7 @@
- BaseStationAllEventsEligible
- BaseStationNanotrasen
- BaseRandomStation
- BaseStationTeleportLocation
noSpawn: true
components:
- type: Transform

7
Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
View File

@@ -45,7 +45,7 @@
min: 1
max: 2
- type: Construction
graph: ClosetSteel
graph: ClosetSteelSecure
node: done
containers:
- entity_storage
@@ -71,8 +71,3 @@
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- type: Construction
graph: ClosetSteelSecure
node: done
containers:
- entity_storage

2
Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml
View File

@@ -19,8 +19,6 @@
conditions:
- !type:StorageWelded
welded: false
- !type:Locked
locked: false
completed:
- !type:SpawnPrototype
prototype: SheetSteel1

8
Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
View File

@@ -3,7 +3,6 @@
name: job-name-cargotech
description: job-description-cargotech
playTimeTracker: JobCargoTechnician
startingGear: CargoTechGear
icon: "JobIconCargoTechnician"
supervisors: job-supervisors-qm
access:
@@ -14,3 +13,10 @@
- type: startingGear
id: CargoTechGear
equipment:
jumpsuit: ClothingUniformJumpsuitCargo
back: ClothingBackpackCargoFilled
shoes: ClothingShoesColorBlack
id: CargoPDA
ears: ClothingHeadsetCargo
pocket1: AppraisalTool

8
Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
View File

@@ -13,7 +13,6 @@
- !type:OverallPlaytimeRequirement
time: 108000
weight: 10
startingGear: QuartermasterGear
icon: "JobIconQuarterMaster"
arrivalNotificationPrototype: QuartermasterArrivalNotification
supervisors: job-supervisors-captain
@@ -37,3 +36,10 @@
- type: startingGear
id: QuartermasterGear
equipment:
head: ClothingHeadHatQMsoft
jumpsuit: ClothingUniformJumpsuitQM
back: ClothingBackpackQuartermasterFilled
shoes: ClothingShoesColorBrown
id: QuartermasterPDA
ears: ClothingHeadsetQM

7
Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
View File

@@ -10,7 +10,6 @@
- !type:OverallPlaytimeRequirement
time: 36000 #10 hrs
icon: "JobIconShaftMiner"
startingGear: SalvageSpecialistGear
supervisors: job-supervisors-qm
access:
- Cargo
@@ -20,3 +19,9 @@
- type: startingGear
id: SalvageSpecialistGear
equipment:
jumpsuit: ClothingUniformJumpsuitSalvageSpecialist
back: ClothingBackpackSalvageFilled
shoes: ClothingShoesBootsSalvage
id: SalvagePDA
ears: ClothingHeadsetCargo

7
Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
View File

@@ -3,7 +3,6 @@
name: job-name-passenger
description: job-description-passenger
playTimeTracker: JobPassenger
startingGear: PassengerGear
icon: "JobIconPassenger"
supervisors: job-supervisors-everyone
access:
@@ -11,3 +10,9 @@
- type: startingGear
id: PassengerGear
equipment:
jumpsuit: ClothingUniformJumpsuitColorGrey
back: ClothingBackpackFilled
shoes: ClothingShoesColorBlack
id: PassengerPDA
ears: ClothingHeadsetGrey

7
Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
View File

@@ -7,7 +7,6 @@
- !type:DepartmentTimeRequirement
department: Civilian
time: 1800
startingGear: BartenderGear
icon: "JobIconBartender"
supervisors: job-supervisors-hop
access:
@@ -20,3 +19,9 @@
- type: startingGear
id: BartenderGear
equipment:
jumpsuit: ClothingUniformJumpsuitBartender
back: ClothingBackpackFilled
shoes: ClothingShoesColorBlack
id: BartenderPDA
ears: ClothingHeadsetService

7
Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
View File

@@ -3,7 +3,6 @@
name: job-name-botanist
description: job-description-botanist
playTimeTracker: JobBotanist
startingGear: BotanistGear
icon: "JobIconBotanist"
supervisors: job-supervisors-hop
access:
@@ -16,3 +15,9 @@
- type: startingGear
id: BotanistGear
equipment:
jumpsuit: ClothingUniformJumpsuitHydroponics
back: ClothingBackpackHydroponicsFilled
shoes: ClothingShoesColorBrown
id: BotanistPDA
ears: ClothingHeadsetService

11
Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
View File

@@ -3,7 +3,9 @@
name: job-name-chaplain
description: job-description-chaplain
playTimeTracker: JobChaplain
startingGear: ChaplainGear
requirements:
- !type:OverallPlaytimeRequirement
time: 18000 #5 hrs
icon: "JobIconChaplain"
supervisors: job-supervisors-hop
access:
@@ -16,3 +18,10 @@
- type: startingGear
id: ChaplainGear
equipment:
neck: ClothingNeckNecklaceSilver
jumpsuit: ClothingUniformJumpsuitChaplain
back: ClothingBackpackChaplainFilled
shoes: ClothingShoesColorBlack
id: ChaplainPDA
ears: ClothingHeadsetService

7
Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
View File

@@ -7,7 +7,6 @@
- !type:DepartmentTimeRequirement
department: Civilian
time: 1800
startingGear: ChefGear
icon: "JobIconChef"
supervisors: job-supervisors-hop
access:
@@ -20,3 +19,9 @@
- type: startingGear
id: ChefGear
equipment:
jumpsuit: ClothingUniformJumpsuitChef
back: ClothingBackpackFilled
shoes: ClothingShoesColorBlack
id: ChefPDA
ears: ClothingHeadsetService

10
Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
View File

@@ -3,7 +3,6 @@
name: job-name-clown
description: job-description-clown
playTimeTracker: JobClown
startingGear: ClownGear
icon: "JobIconClown"
supervisors: job-supervisors-hop
access:
@@ -27,3 +26,12 @@
- type: startingGear
id: ClownGear
equipment:
jumpsuit: ClothingUniformJumpsuitClown
back: ClothingBackpackClownFilled
shoes: ClothingShoesClown
mask: ClothingMaskClown
pocket1: BikeHorn
pocket2: ClownRecorder
id: ClownPDA
ears: ClothingHeadsetService

15
Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
View File

@@ -3,7 +3,6 @@
name: job-name-janitor
description: job-description-janitor
playTimeTracker: JobJanitor
startingGear: JanitorGear
icon: "JobIconJanitor"
supervisors: job-supervisors-hop
access:
@@ -17,6 +16,20 @@
- type: startingGear
id: JanitorGear
equipment:
jumpsuit: ClothingUniformJumpsuitJanitor
back: ClothingBackpackFilled
shoes: ClothingShoesColorPurple
id: JanitorPDA
ears: ClothingHeadsetService
- type: startingGear
id: JanitorMaidGear
equipment:
jumpsuit: ClothingUniformJumpskirtJanimaid
back: ClothingBackpackFilled
id: JanitorPDA
gloves: ClothingHandsGlovesJanitor
head: ClothingHeadHatCatEars
ears: ClothingHeadsetService
belt: ClothingBeltJanitorFilled

9
Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
View File

@@ -3,7 +3,6 @@
name: job-name-librarian
description: job-description-librarian
playTimeTracker: JobLibrarian
startingGear: LibrarianGear
icon: "JobIconLibrarian"
supervisors: job-supervisors-hop
access:
@@ -12,3 +11,11 @@
- type: startingGear
id: LibrarianGear
equipment:
jumpsuit: ClothingUniformJumpsuitLibrarian
back: ClothingBackpackLibrarianFilled
shoes: ClothingShoesBootsLaceup
id: LibrarianPDA
ears: ClothingHeadsetService
inhand:
- BriefcaseBrownFilled

11
Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
View File

@@ -6,7 +6,6 @@
requirements:
- !type:OverallPlaytimeRequirement
time: 14400 #4 hrs
startingGear: MimeGear
icon: "JobIconMime"
supervisors: job-supervisors-hop
access:
@@ -20,6 +19,16 @@
- type: startingGear
id: MimeGear
equipment:
jumpsuit: ClothingUniformJumpsuitMime
back: ClothingBackpackMimeFilled
head: ClothingHeadHatBeret
gloves: ClothingHandsGlovesLatex
shoes: ClothingShoesColorWhite
pocket1: CrayonMime
mask: ClothingMaskMime
id: MimePDA
ears: ClothingHeadsetService
- type: entity
id: ActionMimeInvisibleWall

7
Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
View File

@@ -3,7 +3,6 @@
name: job-name-musician
description: job-description-musician
playTimeTracker: JobMusician
startingGear: MusicianGear
icon: "JobIconMusician"
supervisors: job-supervisors-hire
access:
@@ -16,3 +15,9 @@
- type: startingGear
id: MusicianGear
equipment:
jumpsuit: ClothingUniformJumpsuitMusician
back: ClothingBackpackMusicianFilled
shoes: ClothingShoesBootsLaceup
id: MusicianPDA
ears: ClothingHeadsetService

7
Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
View File

@@ -3,7 +3,6 @@
name: job-name-serviceworker
description: job-description-serviceworker
playTimeTracker: JobServiceWorker
startingGear: ServiceWorkerGear
icon: "JobIconServiceWorker"
supervisors: job-supervisors-service
access:
@@ -16,3 +15,9 @@
- type: startingGear
id: ServiceWorkerGear
equipment:
jumpsuit: ClothingUniformJumpsuitBartender
back: ClothingBackpackFilled
shoes: ClothingShoesColorBlack
id: ServiceWorkerPDA
ears: ClothingHeadsetService

7
Resources/Prototypes/Roles/Jobs/Command/captain.yml
View File

@@ -17,7 +17,6 @@
department: Command
time: 18000 # 15 3
weight: 20
startingGear: CaptainGear
icon: "JobIconCaptain"
requireAdminNotify: true
joinNotifyCrew: true
@@ -38,3 +37,9 @@
- type: startingGear
id: CaptainGear
equipment:
jumpsuit: ClothingUniformJumpsuitCaptain
back: ClothingBackpackCaptainFilled
shoes: ClothingShoesBootsLaceup
id: CaptainPDA
ears: ClothingHeadsetAltCommand

3
Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml
View File

@@ -27,6 +27,3 @@
belt: WeaponPistolN1984
pocket1: BoxFolderBlack
pocket2: PenCentcom
underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
underweart: ClothingUnderwearTopBraWhite # White-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear

7
Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
View File

@@ -17,7 +17,6 @@
department: Command
time: 3600
weight: 20
startingGear: HoPGear
icon: "JobIconHeadOfPersonnel"
requireAdminNotify: true
arrivalNotificationPrototype: HeadOfPersonnelArrivalNotification
@@ -60,3 +59,9 @@
- type: startingGear
id: HoPGear
equipment:
jumpsuit: ClothingUniformJumpsuitHoP
back: ClothingBackpackHOPFilled
shoes: ClothingShoesColorBrown
id: HoPPDA
ears: ClothingHeadsetAltCommand

7
Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
View File

@@ -7,7 +7,6 @@
- !type:DepartmentTimeRequirement
department: Engineering
time: 54000 # 15 hrs
startingGear: AtmosphericTechnicianGear
icon: "JobIconAtmosphericTechnician"
supervisors: job-supervisors-ce
canBeAntag: true
@@ -19,3 +18,9 @@
- type: startingGear
id: AtmosphericTechnicianGear
equipment:
jumpsuit: ClothingUniformJumpsuitAtmos
back: ClothingBackpackAtmosphericsFilled
shoes: ClothingShoesColorWhite
id: AtmosPDA
ears: ClothingHeadsetEngineering

7
Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
View File

@@ -13,7 +13,6 @@
- !type:OverallPlaytimeRequirement
time: 108000
weight: 10
startingGear: ChiefEngineerGear
icon: "JobIconChiefEngineer"
requireAdminNotify: true
arrivalNotificationPrototype: ChiefEngineerArrivalNotification
@@ -39,3 +38,9 @@
- type: startingGear
id: ChiefEngineerGear
equipment:
jumpsuit: ClothingUniformJumpsuitChiefEngineer
back: ClothingBackpackChiefEngineerFilled
shoes: ClothingShoesColorBrown
id: CEPDA
ears: ClothingHeadsetCE

7
Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml
View File

@@ -13,7 +13,6 @@
- !type:DepartmentTimeRequirement
department: Engineering
time: 216000 # 60 hrs
startingGear: SeniorEngineerGear
icon: "JobIconSeniorEngineer"
supervisors: job-supervisors-ce
canBeAntag: false
@@ -28,3 +27,9 @@
- type: startingGear
id: SeniorEngineerGear
equipment:
jumpsuit: ClothingUniformJumpsuitSeniorEngineer
back: ClothingBackpackEngineeringFilled
shoes: ClothingShoesBootsMag
id: SeniorEngineerPDA
ears: ClothingHeadsetEngineering

7
Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
View File

@@ -7,7 +7,6 @@
- !type:DepartmentTimeRequirement
department: Engineering
time: 14400 #4 hrs
startingGear: StationEngineerGear
icon: "JobIconStationEngineer"
supervisors: job-supervisors-ce
access:
@@ -19,3 +18,9 @@
- type: startingGear
id: StationEngineerGear
equipment:
jumpsuit: ClothingUniformJumpsuitEngineering
back: ClothingBackpackEngineeringFilled
shoes: ClothingShoesBootsWork
id: EngineerPDA
ears: ClothingHeadsetEngineering

10
Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
View File

@@ -1,4 +1,4 @@
- type: job
- type: job
id: TechnicalAssistant
name: job-name-technical-assistant
description: job-description-technical-assistant
@@ -10,7 +10,6 @@
department: Engineering
time: 54000 #15 hrs
inverted: true # stop playing intern if you're good at engineering!
startingGear: TechnicalAssistantGear
icon: "JobIconTechnicalAssistant"
supervisors: job-supervisors-engineering
canBeAntag: true
@@ -21,3 +20,10 @@
- type: startingGear
id: TechnicalAssistantGear
equipment:
jumpsuit: ClothingUniformJumpsuitColorYellow
back: ClothingBackpackEngineeringFilled
shoes: ClothingShoesBootsWork
id: TechnicalAssistantPDA
ears: ClothingHeadsetEngineering
pocket1: BookEngineersHandbook

3
Resources/Prototypes/Roles/Jobs/Fun/cluwne.yml
View File

@@ -8,9 +8,6 @@
id: CluwnePDA
gloves: ClothingHandsGlovesCluwne
pocket1: CluwneHorn
underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
underweart: ClothingUnderwearTopBraWhite # White-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
- type: startingGear
id: HoloClownGear

28
Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml
View File

@@ -1,21 +1,15 @@
#Cult outfit startingGear definitions.
- type: startingGear
id: CultLeaderGear
equipment:
jumpsuit: ClothingUniformJumpsuitColorBlack
back: ClothingBackpackFilled
head: ClothingHeadHelmetCult
neck: BedsheetCult
outerClothing: ClothingOuterArmorCult
shoes: ClothingShoesCult
id: PassengerPDA
ears: ClothingHeadsetService
underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
underweart: ClothingUnderwearTopBraWhite # White-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
innerClothingSkirt: ClothingUniformJumpskirtColorBlack
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
# - type: startingGear
# id: CultLeaderGear
- type: startingGear
id: CultistGear
equipment:
jumpsuit: ClothingUniformJumpsuitColorBlack
back: ClothingBackpackFilled
head: ClothingHeadHatHoodCulthood
outerClothing: ClothingOuterRobesCult
shoes: ClothingShoesColorRed
id: PassengerPDA
ears: ClothingHeadsetService

36
Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
View File

@@ -29,9 +29,6 @@
belt: ClothingBeltSecurityFilled
pocket1: WeaponPistolN1984Nonlethal
pocket2: FlashlightSeclite
underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
underweart: ClothingUnderwearTopBraWhite # White-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
- type: startingGear
id: ERTLeaderGearEVA
@@ -49,9 +46,6 @@
belt: ClothingBeltSecurityFilled
pocket1: WeaponPistolN1984Nonlethal
pocket2: FlashlightSeclite
underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
underweart: ClothingUnderwearTopBraWhite # White-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
- type: startingGear
id: ERTLeaderGearEVALecter
@@ -69,9 +63,6 @@
belt: ClothingBeltSecurityFilled
pocket1: MagazineRifle
pocket2: MagazineRifle
underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
underweart: ClothingUnderwearTopBraWhite # White-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
inhand:
- AirTankFilled
@@ -161,9 +152,6 @@
belt: ClothingBeltChiefEngineerFilled
pocket1: Flare
pocket2: GasAnalyzer
underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
underweart: ClothingUnderwearTopBraWhite # White-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
- type: startingGear
id: ERTEngineerGearEVA
@@ -181,9 +169,6 @@
belt: ClothingBeltChiefEngineerFilled
pocket1: Flare
pocket2: GasAnalyzer
underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
underweart: ClothingUnderwearTopBraWhite # White-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
# Security
- type: job
@@ -216,9 +201,6 @@
belt: ClothingBeltSecurityFilled
pocket1: WeaponPistolMk58Nonlethal
pocket2: FlashlightSeclite
underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
underweart: ClothingUnderwearTopBraWhite # White-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
- type: startingGear
id: ERTSecurityGearEVA
@@ -236,9 +218,6 @@
belt: ClothingBeltSecurityFilled
pocket1: WeaponPistolMk58Nonlethal
pocket2: FlashlightSeclite
underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
underweart: ClothingUnderwearTopBraWhite # White-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
- type: startingGear
id: ERTSecurityGearEVALecter
@@ -256,9 +235,6 @@
belt: ClothingBeltSecurityFilled
pocket1: MagazineRifle
pocket2: MagazineRifle
underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
underweart: ClothingUnderwearTopBraWhite # White-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
inhand:
- AirTankFilled
@@ -292,9 +268,6 @@
ears: ClothingHeadsetAltCentCom
belt: ClothingBeltMedicalFilled
pocket1: Flare
underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
underweart: ClothingUnderwearTopBraWhite # White-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
- type: startingGear
id: ERTMedicalGearEVA
@@ -311,9 +284,6 @@
ears: ClothingHeadsetAltCentCom
belt: ClothingBeltMedicalFilled
pocket1: Flare
underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
underweart: ClothingUnderwearTopBraWhite # White-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
# Janitor
- type: job
@@ -344,9 +314,6 @@
ears: ClothingHeadsetAltCentCom
belt: ClothingBeltJanitorFilled
pocket1: Flare
underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
underweart: ClothingUnderwearTopBraWhite # White-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
- type: startingGear
id: ERTJanitorGearEVA
@@ -362,6 +329,3 @@
ears: ClothingHeadsetAltCentCom
belt: ClothingBeltJanitorFilled
pocket1: Flare
underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
underweart: ClothingUnderwearTopBraWhite # White-Underwear
underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear

9
Resources/Prototypes/Roles/Jobs/Justice/inspector.yml
View File

@@ -12,7 +12,6 @@
- !type:DepartmentTimeRequirement
department: Security
time: 36000 #10 hrs
startingGear: InspectorGear
icon: "JobIconInspector"
arrivalNotificationPrototype: InspectorArrivalNotification
supervisors: job-supervisors-captain
@@ -24,3 +23,11 @@
- type: startingGear
id: InspectorGear
equipment:
jumpsuit: ClothingUniformJumpsuitWhiteInspectorFormal
back: ClothingBackpackFilled
shoes: ClothingShoesBootsInspector
id: InspectorPDA
ears: ClothingHeadsetAltSecurity
inhand:
- BriefcaseBrownFilled

9
Resources/Prototypes/Roles/Jobs/Justice/lawyer.yml
View File

@@ -9,7 +9,6 @@
- !type:DepartmentTimeRequirement
department: Security
time: 18000 #5 hr
startingGear: LawyerGear
icon: "JobIconLawyer"
supervisors: job-supervisors-inspector
access:
@@ -20,3 +19,11 @@
- type: startingGear
id: LawyerGear
equipment:
jumpsuit: ClothingUniformJumpsuitLawyerBlack
back: ClothingBackpackLawyerFilled
shoes: ClothingShoesBootsLaceup
id: LawyerPDA
ears: ClothingHeadsetSecurity
inhand:
- BriefcaseBrownFilled

7
Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
View File

@@ -7,7 +7,6 @@
- !type:DepartmentTimeRequirement
department: Medical
time: 14400 #4 hrs
startingGear: ChemistGear
icon: "JobIconChemist"
supervisors: job-supervisors-cmo
access:
@@ -17,3 +16,9 @@
- type: startingGear
id: ChemistGear
equipment:
jumpsuit: ClothingUniformJumpsuitChemistry
back: ClothingBackpackChemistryFilled
shoes: ClothingShoesColorWhite
id: ChemistryPDA
ears: ClothingHeadsetMedical

7
Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
View File

@@ -12,7 +12,6 @@
- !type:OverallPlaytimeRequirement
time: 108000
weight: 10
startingGear: CMOGear
icon: "JobIconChiefMedicalOfficer"
arrivalNotificationPrototype: ChiefMedicalOfficerArrivalNotification
requireAdminNotify: true
@@ -36,3 +35,9 @@
- type: startingGear
id: CMOGear
equipment:
jumpsuit: ClothingUniformJumpsuitCMO
back: ClothingBackpackCMOFilled
shoes: ClothingShoesColorBrown
id: CMOPDA
ears: ClothingHeadsetCMO

7
Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
View File

@@ -7,7 +7,6 @@
- !type:DepartmentTimeRequirement
department: Medical
time: 14400 #4 hrs
startingGear: DoctorGear
icon: "JobIconMedicalDoctor"
supervisors: job-supervisors-cmo
access:
@@ -18,3 +17,9 @@
- type: startingGear
id: DoctorGear
equipment:
jumpsuit: ClothingUniformJumpsuitMedicalDoctor
back: ClothingBackpackMedicalFilled
shoes: ClothingShoesColorWhite
id: MedicalPDA
ears: ClothingHeadsetMedical

10
Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
View File

@@ -1,4 +1,4 @@
- type: job
- type: job
id: MedicalIntern
name: job-name-intern
description: job-description-intern
@@ -8,7 +8,6 @@
department: Medical
time: 54000 # 15 hrs
inverted: true # stop playing intern if you're good at med!
startingGear: MedicalInternGear
icon: "JobIconMedicalIntern"
supervisors: job-supervisors-medicine
canBeAntag: true
@@ -18,3 +17,10 @@
- type: startingGear
id: MedicalInternGear
equipment:
jumpsuit: ClothingUniformJumpsuitColorWhite
back: ClothingBackpackMedicalFilled
shoes: ClothingShoesColorWhite
id: MedicalInternPDA
ears: ClothingHeadsetMedical
pocket1: BookMedicalReferenceBook

7
Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
View File

@@ -9,7 +9,6 @@
time: 14400 #4 hrs
- !type:OverallPlaytimeRequirement
time: 54000 # 15 hrs
startingGear: ParamedicGear
icon: "JobIconParamedic"
supervisors: job-supervisors-cmo
access:
@@ -20,3 +19,9 @@
- type: startingGear
id: ParamedicGear
equipment:
jumpsuit: ClothingUniformJumpsuitParamedic
back: ClothingBackpackParamedicFilled
shoes: ClothingShoesColorBlue
id: ParamedicPDA
ears: ClothingHeadsetMedical

7
Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml
View File

@@ -13,7 +13,6 @@
- !type:DepartmentTimeRequirement
department: Medical
time: 216000 # 60 hrs
startingGear: SeniorPhysicianGear
icon: "JobIconSeniorPhysician"
supervisors: job-supervisors-cmo
canBeAntag: false
@@ -27,3 +26,9 @@
- type: startingGear
id: SeniorPhysicianGear
equipment:
jumpsuit: ClothingUniformJumpsuitSeniorPhysician
back: ClothingBackpackMedicalFilled
shoes: ClothingShoesColorBlack
id: SeniorPhysicianPDA
ears: ClothingHeadsetMedical

8
Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
View File

@@ -8,7 +8,6 @@
department: Science
time: 54000 #15 hrs
inverted: true # stop playing intern if you're good at science!
startingGear: ResearchAssistantGear
icon: "JobIconResearchAssistant"
supervisors: job-supervisors-science
canBeAntag: true
@@ -18,3 +17,10 @@
- type: startingGear
id: ResearchAssistantGear
equipment:
jumpsuit: ClothingUniformJumpsuitColorWhite
back: ClothingBackpackScienceFilled
shoes: ClothingShoesColorWhite
id: ResearchAssistantPDA
ears: ClothingHeadsetScience
pocket1: BookScientistsGuidebook

7
Resources/Prototypes/Roles/Jobs/Science/research_director.yml
View File

@@ -10,7 +10,6 @@
- !type:OverallPlaytimeRequirement
time: 108000
weight: 10
startingGear: ResearchDirectorGear
icon: "JobIconResearchDirector"
requireAdminNotify: true
arrivalNotificationPrototype: ResearchDirectorArrivalNotification
@@ -33,3 +32,9 @@
- type: startingGear
id: ResearchDirectorGear
equipment:
jumpsuit: ClothingUniformJumpsuitResearchDirector
back: ClothingBackpackResearchDirectorFilled
shoes: ClothingShoesColorBrown
id: RnDPDA
ears: ClothingHeadsetRD

7
Resources/Prototypes/Roles/Jobs/Science/scientist.yml
View File

@@ -7,7 +7,6 @@
- !type:DepartmentTimeRequirement
department: Science
time: 14400 #4 hrs
startingGear: ScientistGear
icon: "JobIconScientist"
supervisors: job-supervisors-rd
access:
@@ -16,3 +15,9 @@
- type: startingGear
id: ScientistGear
equipment:
jumpsuit: ClothingUniformJumpsuitScientist
back: ClothingBackpackScienceFilled
shoes: ClothingShoesColorWhite
id: SciencePDA
ears: ClothingHeadsetScience

7
Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml
View File

@@ -7,7 +7,6 @@
- !type:DepartmentTimeRequirement
department: Science
time: 216000 #60 hrs
startingGear: SeniorResearcherGear
icon: "JobIconSeniorResearcher"
supervisors: job-supervisors-rd
canBeAntag: false
@@ -20,3 +19,9 @@
- type: startingGear
id: SeniorResearcherGear
equipment:
jumpsuit: ClothingUniformJumpsuitSeniorResearcher
back: ClothingBackpackScienceFilled
shoes: ClothingShoesColorBlack
id: SeniorResearcherPDA
ears: ClothingHeadsetScience

7
Resources/Prototypes/Roles/Jobs/Security/detective.yml
View File

@@ -7,7 +7,6 @@
- !type:DepartmentTimeRequirement
department: Security
time: 54000 # 15 hours
startingGear: DetectiveGear
icon: "JobIconDetective"
supervisors: job-supervisors-hos
whitelistedSpecies:
@@ -27,3 +26,9 @@
- type: startingGear
id: DetectiveGear
equipment:
jumpsuit: ClothingUniformJumpsuitDetective
back: ClothingBackpackSecurityFilledDetective
shoes: ClothingShoesBootsCombatFilled
id: DetectivePDA
ears: ClothingHeadsetSecurity

7
Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
View File

@@ -13,7 +13,6 @@
- !type:OverallPlaytimeRequirement
time: 108000
weight: 10
startingGear: HoSGear
icon: "JobIconHeadOfSecurity"
requireAdminNotify: true
arrivalNotificationPrototype: HeadOfSecurityArrivalNotification
@@ -41,3 +40,9 @@
- type: startingGear
id: HoSGear
equipment:
jumpsuit: ClothingUniformJumpsuitHoS
back: ClothingBackpackHOSFilled
shoes: ClothingShoesBootsCombatFilled
id: HoSPDA
ears: ClothingHeadsetAltSecurity

8
Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
View File

@@ -10,7 +10,6 @@
department: Security
time: 54000 #15 hrs
inverted: true # stop playing intern if you're good at security!
startingGear: SecurityCadetGear
icon: "JobIconSecurityCadet"
supervisors: job-supervisors-security
whitelistedSpecies:
@@ -29,3 +28,10 @@
- type: startingGear
id: SecurityCadetGear
equipment:
jumpsuit: ClothingUniformJumpsuitColorRed
back: ClothingBackpackSecurityFilled
shoes: ClothingShoesBootsCombatFilled
id: SecurityCadetPDA
ears: ClothingHeadsetSecurity
pocket1: BookSecurity

7
Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
View File

@@ -7,7 +7,6 @@
- !type:DepartmentTimeRequirement
department: Security
time: 36000 #10 hrs
startingGear: SecurityOfficerGear
icon: "JobIconSecurityOfficer"
supervisors: job-supervisors-hos
whitelistedSpecies:
@@ -26,3 +25,9 @@
- type: startingGear
id: SecurityOfficerGear
equipment:
jumpsuit: ClothingUniformJumpsuitSec
back: ClothingBackpackSecurityFilled
shoes: ClothingShoesBootsCombatFilled
id: SecurityPDA
ears: ClothingHeadsetSecurity

7
Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
View File

@@ -16,7 +16,6 @@
- !type:DepartmentTimeRequirement
department: Security
time: 216000 # 60 hrs
startingGear: SeniorOfficerGear
icon: "JobIconSeniorOfficer"
supervisors: job-supervisors-hos
whitelistedSpecies:
@@ -35,3 +34,9 @@
- type: startingGear
id: SeniorOfficerGear
equipment:
jumpsuit: ClothingUniformJumpsuitSeniorOfficer
back: ClothingBackpackSecurityFilled
shoes: ClothingShoesBootsCombatFilled
id: SeniorOfficerPDA
ears: ClothingHeadsetSecurity

7
Resources/Prototypes/Roles/Jobs/Security/warden.yml
View File

@@ -7,7 +7,6 @@
- !type:RoleTimeRequirement
role: JobSecurityOfficer
time: 36000 #10 hrs
startingGear: WardenGear
icon: "JobIconWarden"
supervisors: job-supervisors-hos
whitelistedSpecies:
@@ -28,3 +27,9 @@
- type: startingGear
id: WardenGear
equipment:
jumpsuit: ClothingUniformJumpsuitWarden
back: ClothingBackpackSecurityFilled
shoes: ClothingShoesBootsCombatFilled
id: WardenPDA
ears: ClothingHeadsetSecurity

9
Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml
View File

@@ -3,7 +3,6 @@
name: job-name-boxer
description: job-description-boxer
playTimeTracker: JobBoxer
startingGear: BoxerGear
icon: "JobIconBoxer"
supervisors: job-supervisors-hop
access:
@@ -12,3 +11,11 @@
- type: startingGear
id: BoxerGear
equipment:
jumpsuit: UniformShortsRed
back: ClothingBackpackFilled
id: BoxerPDA
ears: ClothingHeadsetService
gloves: ClothingHandsGlovesBoxingRed
shoes: ClothingShoesColorRed
belt: ClothingBeltChampion

7
Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
View File

@@ -3,7 +3,6 @@
name: job-name-psychologist
description: job-description-psychologist
playTimeTracker: JobPsychologist
startingGear: PsychologistGear
icon: "JobIconPsychologist"
supervisors: job-supervisors-cmo
access:
@@ -14,3 +13,9 @@
- type: startingGear
id: PsychologistGear
equipment:
jumpsuit: ClothingUniformJumpsuitPsychologist
back: ClothingBackpackMedicalFilled
shoes: ClothingShoesLeather
id: PsychologistPDA
ears: ClothingHeadsetMedical

7
Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml
View File

@@ -3,7 +3,6 @@
name: job-name-reporter
description: job-description-reporter
playTimeTracker: JobReporter
startingGear: ReporterGear
icon: "JobIconReporter"
supervisors: job-supervisors-hop
access:
@@ -12,3 +11,9 @@
- type: startingGear
id: ReporterGear
equipment:
jumpsuit: ClothingUniformJumpsuitReporter
back: ClothingBackpackFilled
shoes: ClothingShoesColorWhite
id: ReporterPDA
ears: ClothingHeadsetService

8
Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml
View File

@@ -3,7 +3,6 @@
name: job-name-zookeeper
description: job-description-zookeeper
playTimeTracker: JobZookeeper
startingGear: ZookeeperGear
icon: "JobIconZookeeper"
supervisors: job-supervisors-hop
access:
@@ -12,3 +11,10 @@
- type: startingGear
id: ZookeeperGear
equipment:
jumpsuit: ClothingUniformJumpsuitSafari
back: ClothingBackpackFilled
head: ClothingHeadSafari
shoes: ClothingShoesColorWhite
id: ZookeeperPDA
ears: ClothingHeadsetService