Merge pull request #719 from Rxup/upstream-sync

Upstream sync

Resources/Changelog/Changelog.yml

@@ -1,18 +1,4 @@
 Entries:
-- author: EdenTheLiznerd
-  changes:
-  - message: Removed the throngler from the grand lottery
-    type: Tweak
-  id: 6597
-  time: '2024-05-15T21:02:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28060
-- author: deltanedas
-  changes:
-  - message: Fixed ninja criminal records hack not changing sechud icons.
-    type: Fix
-  id: 6598
-  time: '2024-05-16T20:51:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28021
 - author: EmoGarbage404
   changes:
   - message: Fixed a bug that would cause items in your inventory to get stuck to
@@ -3795,3 +3781,21 @@
   id: 7096
   time: '2024-08-12T03:57:50.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28688
+- author: DieselMohawk
+  changes:
+  - message: Resprited Security vest and helmet
+    type: Tweak
+  id: 7097
+  time: '2024-08-12T06:20:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30291
+- author: Ubaser
+  changes:
+  - message: Mantles are now available in loadouts, requiring 20 hours of that head
+      of department's time.
+    type: Add
+  - message: Mantles are no longer spawned in dressers or able to be printed at uniform
+      lathes.
+    type: Remove
+  id: 7098
+  time: '2024-08-12T07:14:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30929

Resources/Locale/en-US/contraband/contraband-severity.ftl

@@ -1,6 +1,7 @@
 contraband-examine-text-Minor = [color=yellow]This item is considered minor contraband.[/color]
 contraband-examine-text-Restricted = [color=yellow]This item is departmentally restricted.[/color]
 contraband-examine-text-Restricted-department = [color=yellow]This item is restricted to {$departments}, and may be considered contraband.[/color]
+contraband-examine-text-Major = [color=red]This item is considered major contraband.[/color]
 contraband-examine-text-GrandTheft = [color=red]This item is a highly valuable target for Syndicate agents![/color]
 contraband-examine-text-Syndicate = [color=crimson]This item is highly illegal Syndicate contraband![/color]
 

Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl

@@ -22,8 +22,6 @@ ent-ActionActivateScramImplant = SCRAM!
     .desc = Randomly teleports you within a large distance.
 ent-ActionActivateDnaScramblerImplant = Scramble DNA
     .desc = Randomly changes your name and appearance.
-ent-ActionMorphGeras = Morph into Geras
-    .desc = Morphs you into a Geras - a miniature version of you which allows you to move fast, at the cost of your inventory.
 ent-ActionToggleSuitPiece = Toggle Suit Piece
     .desc = Remember to equip the important pieces of your suit before going into action.
 ent-ActionCombatModeToggle = [color=red]Combat Mode[/color]

Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl

@@ -16,8 +16,8 @@ ent-ClothingBackpackDuffelSyndicateFilledCarbine = M-90gl bundle
     .desc = A versatile battle rifle with an attached grenade launcher, bundled with 3 magazines and 6 grenades of various capabilities.
 ent-ClothingBackpackDuffelSyndicateAmmoFilled = ammo bundle
     .desc = Reloading! Contains 4 magazines for the C-20r, 4 drums for the Bulldog, and 2 ammo boxes for the L6 SAW.
-ent-ClothingBackpackDuffelSyndicateCostumeCentcom = CentCom official costume duffel bag
-    .desc = Contains a full CentCom Official uniform set, headset and clipboard included. Encryption keys and ID access are not included.
+ent-ClothingBackpackDuffelSyndicateCostumeCentcom = CentComm official costume duffel bag
+    .desc = Contains a full CentComm Official uniform set, headset and clipboard included. Encryption keys and ID access are not included.
     .suffix = DO NOT MAP
 ent-ClothingBackpackDuffelSyndicateCostumeClown = { ent-ClothingBackpackDuffelClown }
     .suffix = syndicate

Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/heads.ftl

@@ -1,42 +1,42 @@
 ent-LockerQuarterMasterFilled = { ent-LockerQuarterMaster }
     .suffix = Filled
     .desc = { ent-LockerQuarterMaster.desc }
-ent-LockerCaptainFilledHardsuit = { ent-LockerCaptain }
-    .suffix = Filled, Hardsuit
+ent-LockerCaptainFilledNoLaser = { ent-LockerCaptain }
+    .suffix = Filled
     .desc = { ent-LockerCaptain.desc }
 ent-LockerCaptainFilled = { ent-LockerCaptain }
     .suffix = Filled, AntiqueLaser
     .desc = { ent-LockerCaptain.desc }
-ent-LockerCaptainFilledNoLaser = { ent-LockerCaptain }
-    .suffix = Filled
+ent-LockerCaptainFilledHardsuit = { ent-LockerCaptain }
+    .suffix = Filled, Hardsuit
     .desc = { ent-LockerCaptain.desc }
 ent-LockerHeadOfPersonnelFilled = { ent-LockerHeadOfPersonnel }
     .suffix = Filled
     .desc = { ent-LockerHeadOfPersonnel.desc }
-ent-LockerChiefEngineerFilledHardsuit = { ent-LockerChiefEngineer }
-    .suffix = Filled, Hardsuit
-    .desc = { ent-LockerChiefEngineer.desc }
 ent-LockerChiefEngineerFilled = { ent-LockerChiefEngineer }
     .suffix = Filled
     .desc = { ent-LockerChiefEngineer.desc }
-ent-LockerChiefMedicalOfficerFilledHardsuit = { ent-LockerChiefMedicalOfficer }
+ent-LockerChiefEngineerFilledHardsuit = { ent-LockerChiefEngineer }
     .suffix = Filled, Hardsuit
-    .desc = { ent-LockerChiefMedicalOfficer.desc }
+    .desc = { ent-LockerChiefEngineer.desc }
 ent-LockerChiefMedicalOfficerFilled = { ent-LockerChiefMedicalOfficer }
     .suffix = Filled
     .desc = { ent-LockerChiefMedicalOfficer.desc }
-ent-LockerResearchDirectorFilledHardsuit = { ent-LockerResearchDirector }
+ent-LockerChiefMedicalOfficerFilledHardsuit = { ent-LockerChiefMedicalOfficer }
     .suffix = Filled, Hardsuit
-    .desc = { ent-LockerResearchDirector.desc }
+    .desc = { ent-LockerChiefMedicalOfficer.desc }
 ent-LockerResearchDirectorFilled = { ent-LockerResearchDirector }
     .suffix = Filled
     .desc = { ent-LockerResearchDirector.desc }
-ent-LockerHeadOfSecurityFilledHardsuit = { ent-LockerHeadOfSecurity }
+ent-LockerResearchDirectorFilledHardsuit = { ent-LockerResearchDirector }
     .suffix = Filled, Hardsuit
-    .desc = { ent-LockerHeadOfSecurity.desc }
+    .desc = { ent-LockerResearchDirector.desc }
 ent-LockerHeadOfSecurityFilled = { ent-LockerHeadOfSecurity }
     .suffix = Filled
     .desc = { ent-LockerHeadOfSecurity.desc }
+ent-LockerHeadOfSecurityFilledHardsuit = { ent-LockerHeadOfSecurity }
+    .suffix = Filled, Hardsuit
+    .desc = { ent-LockerHeadOfSecurity.desc }
 ent-LockerFreezerVaultFilled = { ent-LockerFreezerBase }
     .suffix = Vault, Locked
     .desc = { ent-LockerFreezerBase.desc }

Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl

@@ -6,8 +6,6 @@ ent-ClothingUniformJumpskirtElegantMaid = elegant maid uniform
     .desc = Call me master and bring me some beer.
 ent-ClothingUniformColorJumpskirtRainbow = rainbow jumpskirt
     .desc = A multi-colored jumpskirt!
-ent-ClothingUniformJumpskirtPsychologist = psychologist suitskirt
-    .desc = I don't lose things. I place things in locations which later elude me.
 ent-ClothingUniformJumpskirtSchool = school skirt
     .desc = Stylish and comfortable school skirt.
 ent-ClothingUniformJumpskirtCapTurtleneck = captain's turtleneck

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets.ftl

@@ -8,7 +8,7 @@ ent-ClothingHeadsetMining = mining headset
     .desc = Headset used by shaft miners.
 ent-ClothingHeadsetQM = qm headset
     .desc = A headset used by the quartermaster.
-ent-ClothingHeadsetCentCom = CentCom headset
+ent-ClothingHeadsetCentCom = CentComm headset
     .desc = A headset used by the upper echelons of Nanotrasen.
 ent-ClothingHeadsetCommand = command headset
     .desc = A headset with a commanding channel.

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/ears/headsets_alt.ftl

@@ -2,7 +2,7 @@ ent-ClothingHeadsetAlt = headset
     .desc = An updated, modular intercom that fits over the head. Takes encryption keys.
 ent-ClothingHeadsetAltCargo = quartermaster's over-ear headset
     .desc = { ent-ClothingHeadsetAlt.desc }
-ent-ClothingHeadsetAltCentCom = CentCom over-ear headset
+ent-ClothingHeadsetAltCentCom = CentComm over-ear headset
     .desc = { ent-ClothingHeadsetAlt.desc }
 ent-ClothingHeadsetAltCentComFake = { ent-ClothingHeadsetAltCentCom }
     .suffix = Fake

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/eva-helmets.ftl

@@ -9,4 +9,4 @@ ent-ClothingHeadHelmetCosmonaut = cosmonaut helmet
 ent-ClothingHeadHelmetVoidParamed = paramedic void helmet
     .desc = A void helmet made for paramedics.
 ent-ClothingHeadHelmetAncient = NTSRA void helmet
-    .desc = An ancient space helmet, designed by the NTSRA branch of CentCom.
+    .desc = An ancient space helmet, designed by the NTSRA branch of CentComm.

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl

@@ -30,7 +30,7 @@ ent-ClothingHeadHatCaptain = captain's hardhat
     .desc = It's good being the king.
 ent-ClothingHeadHatCardborg = cardborg helmet
     .desc = A hat made out of a box.
-ent-ClothingHeadHatCentcom = CentCom brand hat
+ent-ClothingHeadHatCentcom = CentComm brand hat
     .desc = It's good to be the emperor.
 ent-ClothingHeadHatChef = chef's hat
     .desc = It's a hat used by chefs to keep hair out of your food. Judging by the food in the mess, they don't work.
@@ -126,7 +126,7 @@ ent-ClothingHeadHatMagician = magician's tophat
     .desc = A magician's tophat.
 ent-ClothingHeadHatCapcap = cap cap
     .desc = A grand, stylish captain cap.
-ent-ClothingHeadHatCentcomcap = CentCom cap
+ent-ClothingHeadHatCentcomcap = CentComm cap
     .desc = An extravagant, fancy Central Commander cap.
 ent-ClothingHeadHatGladiator = gladiator helmet
     .desc = Protects the head from harsh ash winds and toy spears.

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hoods.ftl

@@ -44,15 +44,15 @@ ent-ClothingHeadHatHoodWinterCargo = cargo winter coat hood
     .desc = { ent-ClothingHeadHatHoodWinterBase.desc }
 ent-ClothingHeadHatHoodWinterCE = chief engineer's winter coat hood
     .desc = { ent-ClothingHeadHatHoodWinterBase.desc }
-ent-ClothingHeadHatHoodWinterCentcom = Centcom winter coat hood
+ent-ClothingHeadHatHoodWinterCentcom = CentComm winter coat hood
     .desc = A hood for keeping the central comander's head warm.
 ent-ClothingHeadHatHoodWinterChem = chemist winter coat hood
     .desc = { ent-ClothingHeadHatHoodWinterBase.desc }
 ent-ClothingHeadHatHoodWinterCMO = chief medical officer's winter coat hood
     .desc = { ent-ClothingHeadHatHoodWinterBase.desc }
 ent-ClothingHeadHatHoodWinterEngineer = engineer winter coat hood
     .desc = { ent-ClothingHeadHatHoodWinterBase.desc }
-ent-ClothingHeadHatHoodWinterHOP = head of personel's winter coat hood
+ent-ClothingHeadHatHoodWinterHOP = head of personnel's winter coat hood
     .desc = { ent-ClothingHeadHatHoodWinterBase.desc }
 ent-ClothingHeadHatHoodWinterHOS = head of security's winter coat hood
     .desc = { ent-ClothingHeadHatHoodWinterBase.desc }

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/masks.ftl

@@ -8,7 +8,7 @@ ent-ClothingMaskGasAtmos = atmospheric gas mask
     .desc = Improved gas mask utilized by atmospheric technicians. It's flameproof!
 ent-ClothingMaskGasCaptain = captain's gas mask
     .desc = Nanotrasen cut corners and repainted a spare atmospheric gas mask, but don't tell anyone.
-ent-ClothingMaskGasCentcom = CentCom gas mask
+ent-ClothingMaskGasCentcom = CentComm gas mask
     .desc = Oooh, gold and green. Fancy! This should help as you sit in your office.
 ent-ClothingMaskGasExplorer = explorer gas mask
     .desc = A military-grade gas mask that can be connected to an air supply.

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/masks/specific.ftl

@@ -6,3 +6,5 @@ ent-ClothingMaskGasVoiceChameleon = { ent-ClothingMaskGasChameleon }
     .desc = { ent-ClothingMaskGasChameleon.desc }
 ent-ClothingMaskWeldingGas = welding gas mask
     .desc = A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd.
+ent-ClothingMaskGoldenCursed = golden mask
+    .desc = Previously used in strange pantomimes, after one of the actors went mad on stage these masks have avoided use. You swear its face contorts when you're not looking.

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/neck/scarfs.ftl

@@ -18,7 +18,7 @@ ent-ClothingNeckScarfStripedSyndieGreen = striped syndicate green scarf
     .desc = A stylish striped syndicate green scarf. The perfect winter accessory for those with a keen fashion sense, and those who are in the mood to steal something.
 ent-ClothingNeckScarfStripedSyndieRed = striped syndicate red scarf
     .desc = A stylish striped syndicate red scarf. The perfect winter accessory for those with a keen fashion sense, and those who are in the mood to steal something.
-ent-ClothingNeckScarfStripedCentcom = striped CentCom scarf
-    .desc = A stylish striped centcom colored scarf. The perfect winter accessory for those with a keen fashion sense, and those who need to do paperwork in the cold.
+ent-ClothingNeckScarfStripedCentcom = striped CentComm scarf
+    .desc = A stylish striped centcomm colored scarf. The perfect winter accessory for those with a keen fashion sense, and those who need to do paperwork in the cold.
 ent-ClothingNeckScarfStripedZebra = zebra scarf
     .desc = A striped scarf, a mandatory accessory for artists.

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/softsuits.ftl

@@ -3,10 +3,10 @@ ent-ClothingOuterHardsuitEVA = EVA suit
 ent-ClothingOuterHardsuitSyndicate = syndicate EVA suit
     .desc = Has a tag on the back that reads: 'Totally not property of an enemy corporation, honest!'
 ent-ClothingOuterSuitEmergency = emergency EVA suit
-    .desc = An emergency EVA suit with a built-in helmet. It's horribly slow and lacking in temperature protection, but enough to buy you time from the harsh vaccuum of space.
+    .desc = An emergency EVA suit with a built-in helmet. It's horribly slow and lacking in temperature protection, but enough to buy you time from the harsh vacuum of space.
 ent-ClothingOuterHardsuitEVAPrisoner = prisoner EVA suit
     .desc = A lightweight space suit for prisoners to protect them from the vacuum of space during emergencies.
 ent-ClothingOuterHardsuitAncientEVA = NTSRA voidsuit
-    .desc = An ancient space suit, designed by the NTSRA branch of CentCom. It is very finely crafted, allowing for greater mobility than most modern space suits.
+    .desc = An ancient space suit, designed by the NTSRA branch of CentComm. It is very finely crafted, allowing for greater mobility than most modern space suits.
 ent-ClothingOuterHardsuitVoidParamed = paramedic void suit
     .desc = A void suit made for paramedics.

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl

@@ -124,3 +124,5 @@ ent-ClothingUniformJumpskirtOldDress = old dress
     .desc = A worn-looking dress from a very long time ago.
 ent-ClothingUniformJumpskirtMusician = musician's skirt
     .desc = A fancy skirt for the musically inclined. Perfect for any lounge act!
+ent-ClothingUniformJumpskirtPsychologist = psychologist suitskirt
+    .desc = I don't lose things. I place things in locations which later elude me.

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl

@@ -20,12 +20,12 @@ ent-ClothingUniformJumpsuitChiefEngineerTurtle = chief engineer's turtleneck
     .desc = A yellow turtleneck designed specifically for work in conditions of the engineering department.
 ent-ClothingUniformJumpsuitChaplain = chaplain's jumpsuit
     .desc = It's a black jumpsuit, often worn by religious folk.
-ent-ClothingUniformJumpsuitCentcomAgent = CentCom agent's jumpsuit
-    .desc = A suit worn by CentCom's legal team. Smells of burnt coffee.
-ent-ClothingUniformJumpsuitCentcomOfficial = CentCom officer's suit
-    .desc = It's a suit worn by CentCom's highest-tier Commanders.
-ent-ClothingUniformJumpsuitCentcomOfficer = CentCom turtleneck suit
-    .desc = A casual, yet refined green turtleneck, used by CentCom Officials. It has a fragrance of aloe.
+ent-ClothingUniformJumpsuitCentcomAgent = CentComm agent's jumpsuit
+    .desc = A suit worn by CentComm's legal team. Smells of burnt coffee.
+ent-ClothingUniformJumpsuitCentcomOfficial = CentComm officer's suit
+    .desc = It's a suit worn by CentComm's highest-tier Commanders.
+ent-ClothingUniformJumpsuitCentcomOfficer = CentComm turtleneck suit
+    .desc = A casual, yet refined green turtleneck, used by CentComm Officials. It has a fragrance of aloe.
 ent-ClothingUniformJumpsuitChef = chef uniform
     .desc = Can't cook without this.
 ent-ClothingUniformJumpsuitChemistry = chemistry jumpsuit
@@ -163,15 +163,15 @@ ent-ClothingUniformJumpsuitMusician = carpskin suit
 ent-ClothingUniformJumpsuitERTChaplain = ERT chaplain uniform
     .desc = A special suit made for Central Command's elite chaplain corps.
 ent-ClothingUniformJumpsuitERTEngineer = ERT engineering uniform
-    .desc = A special suit made for the elite engineers under CentCom.
+    .desc = A special suit made for the elite engineers under CentComm.
 ent-ClothingUniformJumpsuitERTJanitor = ERT janitorial uniform
-    .desc = A special suit made for the elite janitors under CentCom.
+    .desc = A special suit made for the elite janitors under CentComm.
 ent-ClothingUniformJumpsuitERTLeader = ERT leader uniform
-    .desc = A special suit made for the best of the elites under CentCom.
+    .desc = A special suit made for the best of the elites under CentComm.
 ent-ClothingUniformJumpsuitERTMedic = ERT medical uniform
-    .desc = A special suit made for the elite medics under CentCom.
+    .desc = A special suit made for the elite medics under CentComm.
 ent-ClothingUniformJumpsuitERTSecurity = ERT security uniform
-    .desc = A special suit made for the elite security under CentCom.
+    .desc = A special suit made for the elite security under CentComm.
 ent-ClothingUniformJumpsuitCluwne = cluwne suit
     .desc = Cursed cluwne suit.
     .suffix = Unremoveable

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/ship_vs_ship.ftl

@@ -1,7 +1,7 @@
 ent-ClothingUniformJumpsuitRecruitNT = recruit jumpsuit
     .desc = A classy grey jumpsuit with blue trims. Perfect for the dignified helper.
-ent-ClothingUniformJumpsuitRecruitSyndie = syndicate recuit jumpsuit
-    .desc = A dubious,, dark-grey jumpsuit. As if passengers weren't dubious enough already.
+ent-ClothingUniformJumpsuitRecruitSyndie = syndicate recruit jumpsuit
+    .desc = A dubious, dark-grey jumpsuit. As if passengers weren't dubious enough already.
 ent-ClothingUniformJumpsuitRepairmanNT = repairman jumpsuit
     .desc = A jumpsuit that reminds you of a certain crew-sector work position. Hopefully, you won't have to do the same job as THOSE freaks.
 ent-ClothingUniformJumpsuitRepairmanSyndie = syndicate repairman jumpsuit

Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/slimes.ftl

@@ -2,8 +2,6 @@ ent-BaseMobAdultSlimes = basic slime
     .desc = It looks so much like jelly. I wonder what it tastes like?
 ent-MobAdultSlimes = basic slime
     .desc = It looks so much like jelly. I wonder what it tastes like?
-ent-MobSlimesGeras = geras
-    .desc = A geras of a slime - the name is ironic, isn't it?
 ent-MobAdultSlimesBlue = blue slime
     .desc = { ent-MobAdultSlimes.desc }
 ent-MobAdultSlimesBlueAngry = blue slime

Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/spacetick.ftl

@@ -1,5 +1,5 @@
 ent-MobTick = space tick
-    .desc = It's a space tick, watch out for its nasty bite. CentCom reports that 90 percent of cargo leg amputations are due to space tick bites.
+    .desc = It's a space tick, watch out for its nasty bite. CentComm reports that 90 percent of cargo leg amputations are due to space tick bites.
 ent-MobTickSalvage = { ent-MobTick }
     .suffix = Salvage Ruleset
     .desc = { ent-MobTick.desc }

Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl

@@ -46,7 +46,7 @@ ent-RandomHumanoidSpawnerERTMedicalEVA = ERT medic
 ent-RandomHumanoidSpawnerCBURNUnit = CBURN Agent
     .suffix = ERTRole
     .desc = { "" }
-ent-RandomHumanoidSpawnerCentcomOfficial = CentCom official
+ent-RandomHumanoidSpawnerCentcomOfficial = CentComm official
     .desc = { "" }
 ent-RandomHumanoidSpawnerSyndicateAgent = syndicate agent
     .desc = { "" }

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/base_contraband.ftl

@@ -0,0 +1,24 @@
+ent-BaseSyndicateContraband = { "" }
+    .desc = { "" }
+ent-BaseMinorContraband = { "" }
+    .desc = { "" }
+ent-BaseMajorContraband = { "" }
+    .desc = { "" }
+ent-BaseRestrictedContraband = { "" }
+    .desc = { "" }
+ent-BaseCommandContraband = { ent-BaseRestrictedContraband }
+    .desc = { ent-BaseRestrictedContraband.desc }
+ent-BaseSecurityCommandContraband = { ent-BaseRestrictedContraband }
+    .desc = { ent-BaseRestrictedContraband.desc }
+ent-BaseSecurityScienceCommandContraband = { ent-BaseRestrictedContraband }
+    .desc = { ent-BaseRestrictedContraband.desc }
+ent-BaseEngineeringContraband = { ent-BaseRestrictedContraband }
+    .desc = { ent-BaseRestrictedContraband.desc }
+ent-BaseScienceContraband = { ent-BaseRestrictedContraband }
+    .desc = { ent-BaseRestrictedContraband.desc }
+ent-BaseSecurityCargoContraband = { ent-BaseRestrictedContraband }
+    .desc = { ent-BaseRestrictedContraband.desc }
+ent-BaseCargoContraband = { ent-BaseRestrictedContraband }
+    .desc = { ent-BaseRestrictedContraband.desc }
+ent-BaseGrandTheftContraband = { "" }
+    .desc = { "" }