Skip to content

Commit 5cb0917

Browse files
authored
Ninja items are now highly illegal (space-wizards#39855)
* Added tactical katana + tactical katana shipment (placeholder descriptions) * Revert "Added tactical katana + tactical katana shipment (placeholder descriptions)" This reverts commit aa1928b. Whoops, committed to master by mistake * Made ninja items highly illegal * Rerun checks
1 parent 128d065 commit 5cb0917

File tree

7 files changed

+8
-6
lines changed

7 files changed

+8
-6
lines changed

‎Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@
269269
- WhitelistChameleon
270270

271271
- type: entity
272-
parent: [ClothingEyesBase, BaseMajorContraband]
272+
parent: [ClothingEyesBase, BaseHighlyIllegalContraband]
273273
id: ClothingEyesVisorNinja
274274
name: ninja visor
275275
description: An advanced visor protecting a ninja's eyes from flashing lights.

‎Resources/Prototypes/Entities/Clothing/Hands/gloves.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
- type: FingerprintMask
208208

209209
- type: entity
210-
parent: [ClothingHandsBase, BaseToggleClothing, BaseMajorContraband]
210+
parent: [ClothingHandsBase, BaseToggleClothing, BaseHighlyIllegalContraband]
211211
id: ClothingHandsGlovesSpaceNinja
212212
name: space ninja gloves
213213
description: These black nano-enhanced gloves insulate from electricity and provide fire resistance.

‎Resources/Prototypes/Entities/Clothing/Head/helmets.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191

192192
#Space Ninja Helmet
193193
- type: entity
194-
parent: [ClothingHeadEVAHelmetBase, BaseMajorContraband]
194+
parent: [ClothingHeadEVAHelmetBase, BaseHighlyIllegalContraband]
195195
id: ClothingHeadHelmetSpaceNinja
196196
name: space ninja helmet
197197
description: What may appear to be a simple black garment is in fact a highly sophisticated nano-weave helmet. Standard issue ninja gear.

‎Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
- Tail
146146

147147
- type: entity
148-
parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseToggleClothing, BaseMajorContraband]
148+
parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseToggleClothing, BaseHighlyIllegalContraband]
149149
id: ClothingOuterSuitSpaceNinja
150150
name: space ninja suit
151151
description: This black technologically advanced, cybernetically-enhanced suit provides many abilities like invisibility or teleportation.

‎Resources/Prototypes/Entities/Clothing/Shoes/specific.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
maxContactWalkSlowdown: 0.7
123123

124124
- type: entity
125-
parent: [ClothingShoesBaseButcherable, BaseMajorContraband]
125+
parent: [ClothingShoesBaseButcherable, BaseHighlyIllegalContraband]
126126
id: ClothingShoesSpaceNinja
127127
name: space ninja shoes
128128
description: A pair of nano-enhanced boots with built-in magnetic suction cups.

‎Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: spider clan charge
33
description: A modified C-4 charge supplied to you by the Spider Clan. Its explosive power has been juiced up, but only works in one specific area.
44
# not actually modified C-4! oh the horror!
5-
parent: [ BaseItem, BaseMajorContraband ]
5+
parent: [ BaseItem, BaseHighlyIllegalContraband ]
66
id: SpiderCharge
77
components:
88
- type: Sprite

‎Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@
144144
id: EnergyKatana
145145
description: A katana infused with strong energy.
146146
components:
147+
- type: Contraband
148+
severity: HighlyIllegal
147149
- type: Sprite
148150
sprite: Objects/Weapons/Melee/energykatana.rsi
149151
- type: MeleeWeapon

0 commit comments

Comments
 (0)