Commit graph

19 commits

Author SHA1 Message Date
Dmitry
ac752fea47 merge origin/master 2026-09-18 02:09:26 +07:00
Whatstone
a023e5784c
Cleanup: Remove byte order markers from most files (#45796) 2026-09-17 23:23:54 +10:00
Krosus777
50a7cda544
Корвакс контрабанда (#3725)
Co-authored-by: Dmitry <57028746+DIMMoon1@users.noreply.github.com>
2026-09-10 06:42:35 +07:00
UpAndLeaves
0c27263fba
Add recursive storage checking to the admin contra overlay. (#44759)
* Add recursive storage checking to the admin contra overlay.

* remove redundant dependencies

* Requested changes

* whoops :P

* Requested changes

* Requested changes

* Requested changes

* Rqchanges + automatic reformatting whoops

* RQ

* RQ
2026-08-09 18:22:03 +00:00
Whatstone
a8453723d8
Cleanup: ProtoMan Part 1 - remove Shared EntitySystem IPrototypeManager instances (#44386)
* Remove Shared System IPrototypeManager instances

* Remove RecipeManager IPrototypeManager instance

* Fix ItemSystem IPrototypeManager refs, use TryComp

* SharedItemSystem changes, EntWhitelist CompName

* HasComponent->HasComp
2026-06-29 10:18:44 +00:00
beck-thompson
5f37c95e9f
Admins can now see what items are contraband and chameleon in the strip menu (#43658)
* Admins can now see what items are contraband and chameleon in the strip menu

* Fix the color, the default is now red

* better admin view comment

* Simplify logic, make new simple slot overlay to combine logic

* Make isadmin logic a little clearer

* Minor cleanup / spelling mistakes

* change  button shape

* change to res path

* opps

* Add option to change default behavior

* Fix spacing

* Remove unused

* Rename to default

* Take away the soul of the overlay

* Add tooltip

* Fix error
2026-05-10 10:45:58 +00:00
Pieter-Jan Briers
5168b5f3d4
IoC source gen compatibility (#43863)
* IoC source gen compatibility

Can be merged before or after https://github.com/space-wizards/RobustToolbox/pull/6549 doesn't really matter.

* Missed a spot
2026-05-09 03:29:58 +00:00
SlamBamActionman
3da0b0299f
Add support for contraband text to the reagent guidebook (#37113)
* Add contraband text to reagent guidebook

* Add reagent for examining

* Update Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-09-10 15:30:53 +02:00
qrwas
6d935ced3a
Only sec glasses can show contraband: second attempt (#36412)
* Add base code for cheking contraband in hud

* Fix missing using in InventorySystem.Relay

* Fix errors and update HUD yml

* Add show contraband with component on entity

* fix component description

* Update Content.Shared/Contraband/ShowContrabandDetailsComponent.cs

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Update "if" for check if ent hasComp in contrabandSystem

* Remove << InventorySystem.Relay.cs

* Update Content.Shared/Contraband/ShowContrabandDetailsComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/CCVar/CCVars.Game.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Fix partial class ShowContrabandSystem

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Contraband/ShowContrabandDetailsComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Inventory/InventorySystem.Relay.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Some update ShowContrabandSystem

* Try with record struct

* back again ti default class with EntityEventArgs

* Remove EntityEventArgs

* Finally use record struct

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-04-26 17:06:34 -04:00
Killerqu00
e0308d0913
Contraband examine changes (again) (#36032)
* g

* no one caught it in review, damn
2025-04-18 11:23:02 +10:00
Tayrtahn
6f925dd610
Fix prototypes so they pass analyzer checks (#35435) 2025-02-24 15:21:59 +11:00
Killerqu00
239634269c
[Bugfix] ContrabandSystem checks jobs correctly (#35228)
* make it work lol

* index protos only once
2025-02-18 12:33:08 +01:00
Killerqu00
a62ffdc740
Move contraband text to a separate examine tab (#32250) 2025-02-12 01:06:22 +11:00
Ignaz "Ian" Kraft
371b1f8012
replace all instances of "department-{id}" with department.name (#34607)
replace all instances of "department-{id}" with department.name"
2025-01-23 19:46:32 -08:00
Ignaz "Ian" Kraft
39c1737902
pluralize the job name in the contra description (#34559)
* pluralize the job name in the contra description

* pluralization specific to contraband descriptions
2025-01-23 11:08:40 +01:00
John
796f599172
Job contraband rework (#33385)
* contraband system rework to allow restriction by job, not just department

* Fixing detective trenchcoat inheritance

* removing unnecessary using declarations

* trying to fix testing error by re-adding diagnostics using declaration

* removing unecessary dependency, making allowedJobs nullable

* Adding all of slarti's requested changes except for the hacky job icon method fix

* removing accidental whitespace

* choosing to use the non-localized version because we're comparing the string against the AllowedJobs field, and the contraband classes that fill that field are written in english

* removing unneeded using dec, fixing nesting logic problem

* didn't remove the old nesting, doing that now

* using localized job title and localizing the allowed jobs string, removing usages of JobTitle field. Also networked the _jobTitle field instead.

* rewrite some stuff

* fixes

* fix energy pen

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-01-21 10:51:27 +01:00
Brandon Hu
20bb9ede11
fix(contraband): Make contraband work with chameleon items (#30986)
* formatting

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-09-23 22:19:15 +02:00
Plykiya
dc66386e5f
Contraband Review Pass - The Threequel (#30970)
Contraband pass number three
2024-08-15 20:52:46 +02:00
Kara
485caa4553
Contraband marking & examining (#28688)
* System & loc strings

* pass over syndie contraband

* fixes

* grand theft pass

* contrabandexamine -> contraband

* examine text generation update

* all composition parents necessary

* bring back minor contra so it has a less confusing message

* minor

* weapon pass

* jumpsuit pass

* feet pass

* AUUUUUUUUUGHHHHHHHHHHHHHHHHHH

* head

* AUUUUGH

* ear

* belt

* back

* fix

* bro

* rename for more clarity

* do da review

* add cvar for contraband examine

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-08-11 23:57:49 -04:00