diff --git a/Content.Client/Crayon/CrayonSystem.cs b/Content.Client/Crayon/CrayonSystem.cs index 2ed82b6a711..d489361afba 100644 --- a/Content.Client/Crayon/CrayonSystem.cs +++ b/Content.Client/Crayon/CrayonSystem.cs @@ -65,6 +65,17 @@ protected override void FrameUpdate(FrameEventArgs args) } _parent.UIUpdateNeeded = false; + + // Frontier: unlimited crayon + if (_parent.Capacity == int.MaxValue) + { + _label.SetMarkup(Robust.Shared.Localization.Loc.GetString("crayon-drawing-label-unlimited", + ("color", _parent.Color), + ("state", _parent.SelectedState))); + return; + } + // End Frontier + _label.SetMarkup(Robust.Shared.Localization.Loc.GetString("crayon-drawing-label", ("color",_parent.Color), ("state",_parent.SelectedState), diff --git a/Content.Server/Crayon/CrayonSystem.cs b/Content.Server/Crayon/CrayonSystem.cs index a572ad96c85..771fef8d785 100644 --- a/Content.Server/Crayon/CrayonSystem.cs +++ b/Content.Server/Crayon/CrayonSystem.cs @@ -14,7 +14,6 @@ using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.GameStates; -using Robust.Shared.Player; using Robust.Shared.Prototypes; namespace Content.Server.Crayon; @@ -74,9 +73,14 @@ private void OnCrayonAfterInteract(EntityUid uid, CrayonComponent component, Aft if (component.UseSound != null) _audio.PlayPvs(component.UseSound, uid, AudioParams.Default.WithVariation(0.125f)); - // Decrease "Ammo" - component.Charges--; - Dirty(uid, component); + // Frontier: check if crayon is infinite + if (component.Charges != int.MaxValue) + { + // Decrease "Ammo" + component.Charges--; + Dirty(uid, component); + } + // End Frontier _adminLogger.Add(LogType.CrayonDraw, LogImpact.Low, $"{EntityManager.ToPrettyString(args.User):user} drew a {component.Color:color} {component.SelectedState}"); args.Handled = true; diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index c726628aa71..13898015fde 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4325,3 +4325,17 @@ Entries: message: The Crescent now has been fitted with Air Alarms, engineers rejoice! id: 5368 time: '2024-10-07T16:38:08.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: New poster for the FSB Spirit and two new EMS signs. + id: 5369 + time: '2024-10-09T21:40:26.0000000+00:00' +- author: Leander + changes: + - type: Add + message: >- + Added magic crayon and its selection on the Fun loadouts, paint the + world with it! + id: 5370 + time: '2024-10-09T21:54:59.0000000+00:00' diff --git a/Resources/Locale/en-US/_NF/crayon/crayon-component.ftl b/Resources/Locale/en-US/_NF/crayon/crayon-component.ftl new file mode 100644 index 00000000000..cb616f7aaef --- /dev/null +++ b/Resources/Locale/en-US/_NF/crayon/crayon-component.ftl @@ -0,0 +1 @@ +crayon-drawing-label-unlimited = Drawing: [color={$color}]{$state}[/color] diff --git a/Resources/Locale/en-US/_NF/job/job-description.ftl b/Resources/Locale/en-US/_NF/job/job-description.ftl index 3d05a97f3ae..42ee802897a 100644 --- a/Resources/Locale/en-US/_NF/job/job-description.ftl +++ b/Resources/Locale/en-US/_NF/job/job-description.ftl @@ -3,7 +3,7 @@ job-description-brigmedic-nf = Fight in the rear of the sheriff's service, for t job-description-cadet-nf = Learn the basics of arresting criminals and managing the brig. Listen to your supervisors and feel free to ask them for any help. job-description-contractor = Fulfill any profitable contracts out on the frontier of NT space. job-description-deputy = Catch criminals and enemies of the corporation, enforce the law, and ensure that the sector does not fall into disarray. -job-description-detective-nf = Investigate crime scenes using forensic tools, ensure that the guilty party is found, and have a couple smokes. +job-description-nf-detective = Investigate crime scenes using forensic tools, ensure that the guilty party is found, and have a couple smokes. job-description-ertmailcarrier = Nothing stops the mail. job-description-mercenary = Execute the bidding of anyone- for the right price. Enjoy being unbound from the confines of the law. job-description-pilot = Pilot spaceships from point A to B, outmaneuver pirates and dodge asteroids. You are a leaf on the solar wind, let others marvel at how you soar. diff --git a/Resources/Locale/en-US/_NF/job/job-names.ftl b/Resources/Locale/en-US/_NF/job/job-names.ftl index 1670fde69c3..0fb03ff35a5 100644 --- a/Resources/Locale/en-US/_NF/job/job-names.ftl +++ b/Resources/Locale/en-US/_NF/job/job-names.ftl @@ -4,7 +4,7 @@ job-name-brigmedic = Brigmedic job-name-cadet-nf = Cadet job-name-contractor = Contractor job-name-deputy = Deputy -job-name-detective-nf = Detective +job-name-nf-detective = Detective job-name-ertmailcarrier = ERT Mail Carrier job-name-mercenary = Mercenary job-name-pilot = Pilot diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml index eed6dc98d7d..4aa4412037c 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml @@ -2933,7 +2933,7 @@ entities: - type: Transform pos: -0.5,9.5 parent: 1 -- proto: SignShield +- proto: NFSignShield entities: - uid: 359 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml index a0c30104645..34592b38649 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml @@ -10574,7 +10574,7 @@ entities: - type: Transform pos: 2.5,-11.5 parent: 1 -- proto: SignShield +- proto: NFSignShield entities: - uid: 1261 components: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml index e248424857a..534fc12bf27 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml @@ -11602,7 +11602,6 @@ entities: - Pressed: Toggle 2543: - Pressed: Toggle - 12: [] 2541: - Pressed: Toggle 2544: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml b/Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml index a35b7687439..19e7aa5214e 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml @@ -5872,7 +5872,7 @@ entities: - type: Transform pos: 1.7114414,-8.847875 parent: 2 -- proto: SignShield +- proto: NFSignShield entities: - uid: 858 components: diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index c06b4ce47ac..474cbc8a6ef 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -477,6 +477,7 @@ - type: entity id: SpawnPointDetective parent: SpawnPointJobBase + abstract: true # Frontier name: detective components: - type: SpawnPoint diff --git a/Resources/Prototypes/Recipes/Reactions/biological.yml b/Resources/Prototypes/Recipes/Reactions/biological.yml index 604211466f4..7d2eb37f1da 100644 --- a/Resources/Prototypes/Recipes/Reactions/biological.yml +++ b/Resources/Prototypes/Recipes/Reactions/biological.yml @@ -11,7 +11,7 @@ Iron: 0.5 Sugar: 2 CarbonDioxide: 3 - Protein: 4 +# Protein: 4 # Frontier - type: reaction id: SlimeBloodBreakdown @@ -51,7 +51,7 @@ Copper: 0.5 Sugar: 2 CarbonDioxide: 3 - Protein: 4 +# Protein: 4 # Frontier - type: reaction id: ZombieBloodBreakdown @@ -63,5 +63,5 @@ amount: 4 products: Mold: 2 - Protein: 1 +# Protein: 1 # Frontier Toxin: 1 diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml index 7d524a9c7ae..7974d82ed90 100644 --- a/Resources/Prototypes/Recipes/Reactions/food.yml +++ b/Resources/Prototypes/Recipes/Reactions/food.yml @@ -338,7 +338,7 @@ products: Fat: 6 Water: 3 - Protein: 1 #water & protein represent aqueous proteins +# Protein: 1 #water & protein represent aqueous proteins # Frontier #- type: reaction # id: SugarBreakdown diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 80c081f680e..002a774a739 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -126,7 +126,7 @@ - PrisonGuard ##nyano - Brigmedic # Frontier # - SecurityGuard # Frontier - - DetectiveNF # Frontier + - NFDetective # Frontier - Cadet # Frontier - Deputy # Frontier - Bailiff # Frontier diff --git a/Resources/Prototypes/_Park/benches.yml b/Resources/Prototypes/SimpleStation14/benches.yml similarity index 98% rename from Resources/Prototypes/_Park/benches.yml rename to Resources/Prototypes/SimpleStation14/benches.yml index f515772c453..cbc3d0ceeed 100644 --- a/Resources/Prototypes/_Park/benches.yml +++ b/Resources/Prototypes/SimpleStation14/benches.yml @@ -7,6 +7,8 @@ parent: SeatBase description: Multiple seats spanning a single object. Truly a marvel of science. components: + - type: Physics + bodyType: Static - type: Transform anchored: true - type: Rotatable @@ -233,8 +235,6 @@ state: corner - type: Clickable - type: InteractionOutline - - type: Physics - bodyType: Dynamic - type: Pullable - type: Damageable damageContainer: Inorganic @@ -304,8 +304,6 @@ state: corner - type: Clickable - type: InteractionOutline - - type: Physics - bodyType: Dynamic - type: Pullable - type: Damageable damageContainer: Inorganic @@ -323,4 +321,4 @@ collection: MetalBreak - type: Construction # Frontier graph: SofasGraph # Frontier - node: BenchSofaCorpCornerNode # Frontier + node: BenchSofaCorpCornerNode # Frontier \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml index 729e20396fb..c7c544ce837 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml @@ -32,7 +32,7 @@ CadetPDA: 10 DeputyPDA: 10 BrigmedicNFPDA: 10 - DetectiveNFPDA: 10 + NFDetectivePDA: 10 SergeantPDA: 10 BailiffPDA: 10 ClothingHeadsetNfsdBrownCommon: 4294967295 #infinite diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml index 0d774a7d8ca..27b29c73b45 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml @@ -152,13 +152,12 @@ - state: warden - type: entity - id: SpawnPointDetectiveNF + id: NFSpawnPointDetective parent: SpawnPointDetective name: detective - suffix: Frontier components: - type: SpawnPoint - job_id: DetectiveNF + job_id: NFDetective - type: Sprite layers: - state: green diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/posters.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/posters.yml index 2d8eda8242f..0817e3e9e7d 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/posters.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/posters.yml @@ -78,4 +78,6 @@ - NFPosterContrabandFsbStasisDD - NFPosterContrabandFsbApothecaryDD - NFPosterContrabandFsbLogoDD + - NFPosterContrabandFsbSpiritDD + - NFPosterContrabandEmsCoordsDD chance: 1 diff --git a/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml b/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml index b0468cd284f..186fbbd879d 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml @@ -17,7 +17,7 @@ - Brigmedic - Cadet - Deputy - - DetectiveNF + - NFDetective - SeniorOfficer - Sheriff - SecurityGuard diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml index de91c3b9c2a..b1d81f47caa 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml @@ -144,11 +144,11 @@ - type: entity parent: CadetIDCard - id: DetectiveNFIDCard + id: NFDetectiveIDCard name: nfsd detective ID card components: - type: PresetIdCard - job: DetectiveNF + job: NFDetective - type: Sprite sprite: _NF/Objects/Misc/id_cards.rsi layers: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml index fad0f7b6248..ffa6fefc78b 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml @@ -332,13 +332,13 @@ - type: entity parent: BasePDA - id: DetectiveNFPDA + id: NFDetectivePDA name: detective PDA description: Smells like rain... pouring down the rooftops... components: - type: Pda - id: DetectiveNFIDCard - state: pda-detectivenf + id: NFDetectiveIDCard + state: pda-nfdetective bookSlot: # Frontier startingItem: HyperlinkBookNfsdSop priority: -2 @@ -362,7 +362,7 @@ visible: false - type: Icon sprite: _NF/Objects/Devices/pda.rsi - state: pda-detectivenf + state: pda-nfdetective - type: entity parent: BasePDA diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml new file mode 100644 index 00000000000..eb4079fa67f --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml @@ -0,0 +1,28 @@ +- type: entity + parent: CrayonRainbow + id: CrayonMagic + name: magic crayon + description: Specially blended with bluespace crystals and certified non-toxic. + components: + - type: Sprite + sprite: _NF/Objects/Fun/magic_crayon.rsi + state: icon + - type: Item + sprite: _NF/Objects/Fun/magic_crayon.rsi + heldPrefix: icon + - type: Tag # Removing trash & recyclable + tags: + - Write + - Crayon + - type: Crayon + capacity: 2147483647 # int.MaxValue, infinite charges + - type: FlavorProfile + flavors: + - chewy + - magical + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nothing + Quantity: 40 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/contraband.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/contraband.yml index a33a4a51d2f..7853f50073e 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/contraband.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/contraband.yml @@ -335,3 +335,13 @@ parent: [DeadDropBase, NFPosterContrabandFsbApothecary] id: NFPosterContrabandFsbApothecaryDD suffix: DeadDrop + +- type: entity + parent: [DeadDropBase, NFPosterContrabandFsbSpirit] + id: NFPosterContrabandFsbSpiritDD + suffix: DeadDrop + +- type: entity + parent: [DeadDropBase, NFPosterContrabandEmsCoords] + id: NFPosterContrabandEmsCoordsDD + suffix: DeadDrop diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml index 9415721be95..32db6578014 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml @@ -67,3 +67,23 @@ - type: Sprite sprite: _NF/Structures/Wallmounts/posters.rsi state: nf_poster6_contraband + +- type: entity + parent: PosterBase + id: NFPosterContrabandFsbSpirit + name: "Far Star Biotech Spirit" + description: "The FSB Spirit! We know what your life is worth." + components: + - type: Sprite + sprite: _NF/Structures/Wallmounts/posters.rsi + state: nf_poster7_contraband + +- type: entity + parent: PosterBase + id: NFPosterContrabandEmsCoords + name: "EMS Suit Coordinates Reminder" + description: "Rosy the Medroach reminding you to turn your suit coordinates! Make sure your next death isn't your last!" + components: + - type: Sprite + sprite: _NF/Structures/Wallmounts/posters.rsi + state: nf_poster8_contraband diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml index 031683c11cb..035d427bb96 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml @@ -186,3 +186,30 @@ components: - type: Sprite state: bus + +- type: entity + parent: NFBaseSign + id: NFSignShield + name: shield sign + description: A sign with a shield. + components: + - type: Sprite + state: shield + +- type: entity + parent: NFBaseSign + id: NFSignEms1 + name: emergency medical service sign + description: A sign that indicates emergency medical services. + components: + - type: Sprite + state: ems1 + +- type: entity + parent: NFBaseSign + id: NFSignEms2 + name: emergency medical service sign + description: A sign that indicates emergency medical services. + components: + - type: Sprite + state: ems2 diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml index ef9446d3939..35303378a52 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml @@ -193,3 +193,12 @@ price: 10000 inhand: - PetCarrierNPCEmotionalSupportSafe + +- type: loadout + id: ContractorCrayonMagic + effects: + - !type:GroupLoadoutEffect + proto: ContractorT3 + price: 30000 + inhand: + - CrayonMagic diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/pda.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/pda.yml deleted file mode 100644 index f8bea3b9a2c..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/pda.yml +++ /dev/null @@ -1,5 +0,0 @@ -- type: loadout - id: DetectiveNFDetectiveNFPDA - equipment: - id: DetectiveNFPDA - \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/gloves.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/gloves.yml similarity index 59% rename from Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/gloves.yml rename to Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/gloves.yml index de192a10776..4a0de78c434 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/gloves.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/gloves.yml @@ -1,4 +1,4 @@ - type: loadout - id: DetectiveNFClothingHandsGlovesDetectiveNF + id: NFDetectiveClothingHandsGlovesNFDetective equipment: gloves: ClothingHandsGlovesForensicNF diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/head.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/head.yml similarity index 60% rename from Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/head.yml rename to Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/head.yml index 19feb721b07..a6ec1addbd2 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/head.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/head.yml @@ -1,4 +1,4 @@ - type: loadout - id: DetectiveNFClothingHeadHatDetectiveNF + id: NFDetectiveClothingHeadHatNFDetective equipment: head: ClothingHeadHatFedoraBrown diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/jumpsuit.yml similarity index 67% rename from Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/jumpsuit.yml rename to Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/jumpsuit.yml index 0a307277ae4..5c41427096b 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/jumpsuit.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/jumpsuit.yml @@ -1,5 +1,5 @@ - type: loadout - id: DetectiveNFClothingUniformJumpsuitDetectiveNF + id: NFDetectiveClothingUniformJumpsuitNFDetective hideEffects: - !type:GroupLoadoutEffect proto: PantsCapableNF @@ -7,6 +7,6 @@ jumpsuit: ClothingUniformJumpsuitDetective - type: loadout - id: DetectiveNFClothingUniformJumpskirtDetectiveNF + id: NFDetectiveClothingUniformJumpskirtNFDetective equipment: jumpsuit: ClothingUniformJumpskirtDetective \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/neck.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/neck.yml similarity index 61% rename from Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/neck.yml rename to Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/neck.yml index df2dbd06e1d..e75501c583f 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/neck.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/neck.yml @@ -1,5 +1,5 @@ #T0 - type: loadout - id: DetectiveNFClothingNeckBadgeDetectiveNF + id: NFDetectiveClothingNeckBadgeNFDetective equipment: neck: ClothingNeckNfsdBadgeSecurity diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/outer.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/outer.yml similarity index 62% rename from Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/outer.yml rename to Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/outer.yml index fa5d4e21ab3..bf258d8e67f 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/outer.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/outer.yml @@ -1,20 +1,20 @@ #T0 - type: loadout - id: DetectiveNFClothingOuterArmorBasic + id: NFDetectiveClothingOuterArmorBasic equipment: outerClothing: ClothingOuterArmorBasic - type: loadout - id: DetectiveNFClothingOuterCoatDetectiveLoadout + id: NFDetectiveClothingOuterCoatDetectiveLoadout equipment: outerClothing: ClothingOuterCoatDetectiveLoadout - type: loadout - id: DetectiveNFClothingOuterCoatDetectiveLoadoutGrey + id: NFDetectiveClothingOuterCoatDetectiveLoadoutGrey equipment: outerClothing: ClothingOuterCoatDetectiveLoadoutGrey - type: loadout - id: DetectiveNFClothingOuterCoatTrench + id: NFDetectiveClothingOuterCoatTrench equipment: outerClothing: ClothingOuterCoatTrench diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/pda.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/pda.yml new file mode 100644 index 00000000000..f6423805d8c --- /dev/null +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/pda.yml @@ -0,0 +1,5 @@ +- type: loadout + id: NFNFDetectiveDetectivePDA + equipment: + id: NFDetectivePDA + \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml index d5826b14f04..2b7d8008969 100644 --- a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml @@ -730,6 +730,7 @@ - ContractorDawInstrumentFlatpack - ContractorHoverbikeFlatpack - ContractorEmotionalPetCarrier + - ContractorCrayonMagic - type: loadoutGroup id: ContractorFace diff --git a/Resources/Prototypes/_NF/Loadouts/detectivenf_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/detectivenf_loadout_groups.yml deleted file mode 100644 index f2652f5aeda..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/detectivenf_loadout_groups.yml +++ /dev/null @@ -1,54 +0,0 @@ -- type: loadoutGroup - id: DetectiveNFJumpsuit - name: loadout-group-contractor-jumpsuit - loadouts: - - DetectiveNFClothingUniformJumpsuitDetectiveNF - - DetectiveNFClothingUniformJumpskirtDetectiveNF - fallbacks: - - DetectiveNFClothingUniformJumpsuitDetectiveNF - - DetectiveNFClothingUniformJumpskirtDetectiveNF - -- type: loadoutGroup - id: DetectiveNFOuterClothing - name: loadout-group-contractor-outerclothing - minLimit: 0 - loadouts: - - ContractorClothingOuterVestTank - - DetectiveNFClothingOuterArmorBasic - - DetectiveNFClothingOuterCoatDetectiveLoadout - - DetectiveNFClothingOuterCoatDetectiveLoadoutGrey - - DetectiveNFClothingOuterCoatTrench - fallbacks: - - ContractorClothingOuterVestTank - -- type: loadoutGroup - id: DetectiveNFHead - name: loadout-group-contractor-head - minLimit: 0 - loadouts: - - DetectiveNFClothingHeadHatDetectiveNF - -- type: loadoutGroup - id: DetectiveNFGloves - name: loadout-group-contractor-gloves - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - DetectiveNFClothingHandsGlovesDetectiveNF - fallbacks: - - DetectiveNFClothingHandsGlovesDetectiveNF - -- type: loadoutGroup - id: DetectiveNFNeck - name: loadout-group-contractor-neck - minLimit: 0 - loadouts: - - DetectiveNFClothingNeckBadgeDetectiveNF - -- type: loadoutGroup - id: DetectiveNFPDA - name: loadout-group-contractor-id - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - DetectiveNFDetectiveNFPDA - fallbacks: - - DetectiveNFDetectiveNFPDA diff --git a/Resources/Prototypes/_NF/Loadouts/nfdetective_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/nfdetective_loadout_groups.yml new file mode 100644 index 00000000000..55e1c75bc30 --- /dev/null +++ b/Resources/Prototypes/_NF/Loadouts/nfdetective_loadout_groups.yml @@ -0,0 +1,54 @@ +- type: loadoutGroup + id: NFDetectiveJumpsuit + name: loadout-group-contractor-jumpsuit + loadouts: + - NFDetectiveClothingUniformJumpsuitNFDetective + - NFDetectiveClothingUniformJumpskirtNFDetective + fallbacks: + - NFDetectiveClothingUniformJumpsuitNFDetective + - NFDetectiveClothingUniformJumpskirtNFDetective + +- type: loadoutGroup + id: NFDetectiveOuterClothing + name: loadout-group-contractor-outerclothing + minLimit: 0 + loadouts: + - ContractorClothingOuterVestTank + - NFDetectiveClothingOuterArmorBasic + - NFDetectiveClothingOuterCoatDetectiveLoadout + - NFDetectiveClothingOuterCoatDetectiveLoadoutGrey + - NFDetectiveClothingOuterCoatTrench + fallbacks: + - ContractorClothingOuterVestTank + +- type: loadoutGroup + id: NFDetectiveHead + name: loadout-group-contractor-head + minLimit: 0 + loadouts: + - NFDetectiveClothingHeadHatNFDetective + +- type: loadoutGroup + id: NFDetectiveGloves + name: loadout-group-contractor-gloves + hidden: true # No point in showing this, it gets auto-selected. + loadouts: + - NFDetectiveClothingHandsGlovesNFDetective + fallbacks: + - NFDetectiveClothingHandsGlovesNFDetective + +- type: loadoutGroup + id: NFDetectiveNeck + name: loadout-group-contractor-neck + minLimit: 0 + loadouts: + - NFDetectiveClothingNeckBadgeNFDetective + +- type: loadoutGroup + id: NFDetectivePDA + name: loadout-group-contractor-id + hidden: true # No point in showing this, it gets auto-selected. + loadouts: + - NFNFDetectiveDetectivePDA + fallbacks: + - NFNFDetectiveDetectivePDA diff --git a/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml b/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml index 52956441ca3..c72f4d44b2b 100644 --- a/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml @@ -231,17 +231,17 @@ - ContractorTrinkets - type: roleLoadout - id: JobDetectiveNF + id: JobNFDetective groups: - - DetectiveNFHead - - DetectiveNFJumpsuit - - DetectiveNFGloves + - NFDetectiveHead + - NFDetectiveJumpsuit + - NFDetectiveGloves - NfsdBackpackBrown - - DetectiveNFOuterClothing + - NFDetectiveOuterClothing - NfsdShoesBrown - NfsdFace - NfsdGlasses - - DetectiveNFPDA + - NFDetectivePDA - NfsdBelt - NfsdEarsCream - NfsdBoxSurvival diff --git a/Resources/Prototypes/_NF/Maps/debug.yml b/Resources/Prototypes/_NF/Maps/debug.yml index 261027ff421..532057d4c98 100644 --- a/Resources/Prototypes/_NF/Maps/debug.yml +++ b/Resources/Prototypes/_NF/Maps/debug.yml @@ -20,18 +20,18 @@ Valet: [ -1, -1 ] Janitor: [ -1, -1 ] MailCarrier: [ -1, -1 ] - Sheriff: [ -1, -1 ] - Bailiff: [ -1, -1 ] - SeniorOfficer: [ -1, -1 ] - Brigmedic: [ -1, -1 ] - DetectiveNF: [ -1, -1 ] - Deputy: [ -1, -1 ] - Cadet: [ -1, -1 ] - Lawyer: [ -1, -1 ] + Sheriff: [ -1, -1] + Bailiff: [ -1, -1] + SeniorOfficer: [ -1, -1] + Brigmedic: [ -1, -1] + NFDetective: [ -1, -1] + Deputy: [ -1, -1] + Cadet: [ -1, -1] + PublicAffairsLiaison: [ -1, -1] PirateCaptain: [ -1, -1] PirateFirstMate: [ -1, -1] Pirate: [ -1, -1] Prisoner: [ -1, -1] - Borg: [ -1, -1] # For testing. + Borg: [ -1, -1] - type: StationDeadDrop maxDeadDrops: 20 # Testing \ No newline at end of file diff --git a/Resources/Prototypes/_NF/PointsOfInterest/nfsd.yml b/Resources/Prototypes/_NF/PointsOfInterest/nfsd.yml index 4081562e86d..76e86c51d03 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/nfsd.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/nfsd.yml @@ -36,7 +36,7 @@ Bailiff: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] Brigmedic: [ 0, 0 ] - DetectiveNF: [ 0, 0 ] + NFDetective: [ 0, 0 ] Deputy: [ 3, 3 ] Cadet: [ 0, 0 ] # Others: diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/detectivenf.yml b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/nfdetective.yml similarity index 85% rename from Resources/Prototypes/_NF/Roles/Jobs/Nfsd/detectivenf.yml rename to Resources/Prototypes/_NF/Roles/Jobs/Nfsd/nfdetective.yml index a8a5c676b3f..2ab12a7e83d 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/detectivenf.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/nfdetective.yml @@ -1,7 +1,7 @@ - type: job - id: DetectiveNF - name: job-name-detective-nf - description: job-description-detective-nf + id: NFDetective + name: job-name-nf-detective + description: job-description-nf-detective playTimeTracker: JobDetective requirements: - !type:OverallPlaytimeRequirement @@ -13,8 +13,8 @@ longerPlaytimeLessSec: - !type:OverallPlaytimeRequirement time: 360000 # 100 hours - startingGear: DetectiveNFGear - icon: JobIconDetectiveNF + startingGear: NFDetectiveGear + icon: JobIconNFDetective supervisors: job-supervisors-bailiff weight: 110 displayWeight: 20 @@ -31,7 +31,7 @@ prototype: FrontierBirthdayGift - type: startingGear - id: DetectiveNFGear + id: NFDetectiveGear equipment: pocket1: WeaponRevolverInspector pocket2: SpeedLoaderMagnum diff --git a/Resources/Prototypes/_NF/Shipyard/phoenix.yml b/Resources/Prototypes/_NF/Shipyard/phoenix.yml index d91466a8b43..0c349212c47 100644 --- a/Resources/Prototypes/_NF/Shipyard/phoenix.yml +++ b/Resources/Prototypes/_NF/Shipyard/phoenix.yml @@ -2,7 +2,7 @@ id: phoenix name: NR Phoenix description: A research and salvage vessel designed for deep space exploration - price: 60500 # TODO - fix this value, getting tests to pass - Whatstone + price: 62500 # TODO - fix this value, getting tests to pass - Whatstone category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/phoenix.yml diff --git a/Resources/Prototypes/_NF/StatusIcon/job.yml b/Resources/Prototypes/_NF/StatusIcon/job.yml index 3ce4b16f1c1..0219f5593f3 100644 --- a/Resources/Prototypes/_NF/StatusIcon/job.yml +++ b/Resources/Prototypes/_NF/StatusIcon/job.yml @@ -105,7 +105,7 @@ - type: jobIcon parent: JobIcon - id: JobIconDetectiveNF + id: JobIconNFDetective icon: sprite: /Textures/_NF/Interface/Misc/job_icons.rsi state: nfsddetective diff --git a/Resources/Textures/_NF/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/_NF/Objects/Devices/pda.rsi/meta.json index f270202f03f..31d61f0ffa8 100644 --- a/Resources/Textures/_NF/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Devices/pda.rsi/meta.json @@ -53,7 +53,7 @@ "name": "pda-deputy" }, { - "name": "pda-detectivenf" + "name": "pda-nfdetective" }, { "name": "pda-pal" diff --git a/Resources/Textures/_NF/Objects/Devices/pda.rsi/pda-detectivenf.png b/Resources/Textures/_NF/Objects/Devices/pda.rsi/pda-nfdetective.png similarity index 100% rename from Resources/Textures/_NF/Objects/Devices/pda.rsi/pda-detectivenf.png rename to Resources/Textures/_NF/Objects/Devices/pda.rsi/pda-nfdetective.png diff --git a/Resources/Textures/_NF/Objects/Fun/catplushie.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/catplushie.rsi/meta.json index 878f438f4ec..ce57dc29d3f 100644 --- a/Resources/Textures/_NF/Objects/Fun/catplushie.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/catplushie.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise Station", + "copyright": "Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Objects/Fun/corgiplushie.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/corgiplushie.rsi/meta.json index 06c0cf9ed4a..8c36a89ed2c 100644 --- a/Resources/Textures/_NF/Objects/Fun/corgiplushie.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/corgiplushie.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise Station", + "copyright": "Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Objects/Fun/foxplushie.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/foxplushie.rsi/meta.json index 5842b1ad07a..b60d4f5cae8 100644 --- a/Resources/Textures/_NF/Objects/Fun/foxplushie.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/foxplushie.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise Station", + "copyright": "Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-left.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-left.png new file mode 100644 index 00000000000..a88404f0b20 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-right.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-right.png new file mode 100644 index 00000000000..c3376414530 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon.png new file mode 100644 index 00000000000..c520ae93250 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json new file mode 100644 index 00000000000..643dce035ad --- /dev/null +++ b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Taken from tgstation and modified by Swept at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, tweaked by Ubaser and whatston3 (GitHub)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "icon-inhand-left", + "directions": 4, + "delays": [ + [ 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2 ] + ] + }, + { + "name": "icon-inhand-right", + "directions": 4, + "delays": [ + [ 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2 ] + ] + } + ] +} + \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Fun/petrock.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/petrock.rsi/meta.json index d39a58e623d..b00abc40de0 100644 --- a/Resources/Textures/_NF/Objects/Fun/petrock.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/petrock.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise Station", + "copyright": "Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Objects/Fun/prizeticket.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/prizeticket.rsi/meta.json index bf0f0d3224d..667aefdc223 100644 --- a/Resources/Textures/_NF/Objects/Fun/prizeticket.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/prizeticket.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise Station", + "copyright": "Taken from Paradise (arcade.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json index 15cfd9eb4c1..f52f9068543 100644 --- a/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "plushie_jester, plushie_trystan, plushie_vulp: gentlejester-148196053781315584 / plushie_slips: mintymoo-449394523089403905 / gnome/ipc/grey/loveable/abductor/abductor_agent/deer - Taken from Paradise Station", + "copyright": "plushie_jester, plushie_trystan, plushie_vulp: gentlejester-148196053781315584 / plushie_slips: mintymoo-449394523089403905 / gnome/ipc/grey/loveable/abductor/abductor_agent/deer - Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/meta.json index 2f1bfa59a54..26b175e8ee2 100644 --- a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "nf_poster1_legit by exincore and remixed from gentlebutter's Xeeenoooossss | nf_poster1_contraband, nf_poster2_contraband, nf_poster3_contraband by erhardsteinhauer (discord/github)", + "copyright": "nf_poster1_legit by exincore and remixed from gentlebutter's Xeeenoooossss | nf_poster1_contraband, nf_poster2_contraband, nf_poster3_contraband by erhardsteinhauer (discord/github), nf_poster4,5,6,7_contraband by dustylens (discord/github) nf_poster8_contraband by incongruenciaastrologica (discord)", "size": { "x": 32, "y": 32 @@ -27,6 +27,12 @@ }, { "name": "nf_poster6_contraband" + }, + { + "name": "nf_poster7_contraband" + }, + { + "name": "nf_poster8_contraband" } ] } diff --git a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster7_contraband.png b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster7_contraband.png new file mode 100644 index 00000000000..b57c5a5b7bf Binary files /dev/null and b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster7_contraband.png differ diff --git a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster8_contraband.png b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster8_contraband.png new file mode 100644 index 00000000000..8592b55821c Binary files /dev/null and b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster8_contraband.png differ diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/bus.png b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/bus.png index f338771b36f..a3333cbf284 100644 Binary files a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/bus.png and b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/bus.png differ diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/dock.png b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/dock.png index afb63e64a02..65c437187d3 100644 Binary files a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/dock.png and b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/dock.png differ diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/ems1.png b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/ems1.png new file mode 100644 index 00000000000..c8e507c07b7 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/ems1.png differ diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/ems2.png b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/ems2.png new file mode 100644 index 00000000000..1a85fd1b2b5 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/ems2.png differ diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json index 3551fb249b8..37599558c64 100644 --- a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json @@ -5,7 +5,8 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "direction_sr - Created by MagnusCrowe for Frontier Station, cb1/cb2/cb3/cb4/nfsd/shop/vend - Created by GentleButter for Frontier Station, nfsd/range/law/brig/brigmed/detective/brief/armoury/evidence - Created by GhostPrinceLost for Frontier Station, bus/dock (edited from base signs.rsi/dock) made by Whatstone (Discord)", + "copyright": "direction_sr - Created by MagnusCrowe for Frontier Station, cb1/cb2/cb3/cb4/nfsd/shop/vend - Created by GentleButter for Frontier Station, nfsd/range/law/brig/brigmed/detective/brief/armoury/evidence - Created by GhostPrinceLost for Frontier Station, bus/dock/shield (dock edited from base signs.rsi/dock) made by Whatstone (Discord)", + "copyright": "EMS1/2 made by dustylens (discord/github)", "states": [ { "name": "direction_sr", @@ -71,6 +72,15 @@ }, { "name": "dock" + }, + { + "name": "shield" + }, + { + "name": "ems1" + }, + { + "name": "ems2" } ] } diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/shield.png b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/shield.png new file mode 100644 index 00000000000..bf39213d4df Binary files /dev/null and b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/shield.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 8f948d75bce..c5fd504deb0 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -390,7 +390,7 @@ SignChemistry2: SignChem SignCourt: SignLawyer SignAtmosMinsky: SignAtmos SignDrones: SignMaterials -SignShield: null # what was this even for? +SignShield: NFSignShield # what was this even for? # Frontier: null