Admin/wwdpublic
1
0
Fork 0
mirror of https://github.com/WWhiteDreamProject/wwdpublic.git synced 2026-04-17 13:37:47 +03:00
Code Issues Packages Projects Releases Wiki Activity
Files
b63a41d6e9e5d0ea8a6aa601e350e2ff669c3512
wwdpublic/Content.Server
History
Skubman b63a41d6e9 Pacification Prevents Throwing Weapons (#1433) 
# Description

Prevents entities who are Pacified (through the Pacifist trait or being
a thief) from throwing items that deal damage on hit or embed.

## Technical Details

Two components will prevent throwing if they deal any damage:
`DamageOtherOnHitComponent` and `EmbedPassiveComponent`.

The pacifist check on `EmbeddableProjectileComponent` has been removed,
because just because an item is embeddable does not mean they deal
damage.

## Media

**Throw attempt with the Pacifist trait**

![image](https://github.com/user-attachments/assets/6c439bb3-b41b-4f30-975d-4fa15c2cfa6d)

# Changelog

🆑 Skubman
- fix: Pacified characters (Pacifist trait and thieves) can no longer
throw items that deal throwing damage.

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
(cherry picked from commit 71e3c031750db523f8fcccc4a36a61200b1028f2)
2025-01-14 01:31:56 +03:00
..
_NF
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
_Shitmed
Ports Shitmed Updates From Goob (#1387)
2025-01-13 23:01:51 +03:00
_White
Revert "[Port] Night And Thermal Vision / Ночное И Термальное (#89)"
2025-01-13 22:26:25 +03:00
Abilities
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Access
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Actions
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Acz
…
Administration
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Advertise
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Afk
…
Alert
Shadowkin Rework (#1200)
2025-01-13 22:35:59 +03:00
AlertLevel
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Ame
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Animals
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Announcements
…
Anomaly
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Antag
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Arcade
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Armor
…
Atmos
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Audio
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
AutoVote
Upstream (#129)
2024-11-21 17:49:04 +07:00
BarSign/Systems
Upstream (#129)
2024-11-21 17:49:04 +07:00
Beam
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Bed
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Bible
[Upstream] Апстрим фич и фиксов с Einstein Engines. (#39)
2024-09-06 02:58:42 +07:00
Body
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Botany
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Buckle/Systems
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Cabinet
…
Camera
…
CardboardBox
Upstream (#142)
2024-12-14 10:41:27 +02:00
Cargo
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Carrying
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
CartridgeLoader
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Chapel
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
CharacterInfo
…
Charges
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Chat
Add Chatstack (#1422)
2025-01-14 01:19:23 +03:00
Chemistry
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Chunking
…
Cloning
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Clothing
Generic Clothing Equip Functions (#1407)
2025-01-14 00:34:58 +03:00
Cluwne
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Cocoon
No Cocooning Yourself! (#1396)
2025-01-14 00:16:09 +03:00
CombatMode
…
Commands
…
Communications
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Configurable
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Connection
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Construction
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Containers
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Coordinates
…
CPUJob/JobQueues/Queues
…
Crayon
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
CrewManifest
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
CriminalRecords/Systems
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Cuffs
…
Damage
Pacification Prevents Throwing Weapons (#1433)
2025-01-14 01:31:56 +03:00
Database
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Decals
Upstream (#129)
2024-11-21 17:49:04 +07:00
Defusable
…
DeltaV
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Destructible
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
DetailExaminable
…
DeviceLinking
Upstream (#142)
2024-12-14 10:41:27 +02:00
DeviceNetwork
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Devour
Space Dragon Gib/Butchering Fixes (#992)
2024-10-19 13:25:10 +07:00
Dice
…
Discord
Upstream (#142)
2024-12-14 10:41:27 +02:00
DiscordAuth
…
Disposal
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
DoAfter
…
Doors
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Dragon
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Drowsiness
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Drunk
…
DynamicHostname
Upstream (#142)
2024-12-14 10:41:27 +02:00
Effects
…
Electrocution
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Emoting
Upstream (#142)
2024-12-14 10:41:27 +02:00
Emp
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
EmpFlashlight
Upstream (#142)
2024-12-14 10:41:27 +02:00
Engineering
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Ensnaring
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
EntityEffects
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
EntityList
…
Entry
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
EUI
…
Examine
…
Explosion
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Extinguisher
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Eye/Blinding
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Fax
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Flash
[Port] Resomi (#172)
2024-12-24 19:52:58 +07:00
Flight
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Fluids
Footprints Performance Updates (#1439)
2025-01-14 01:31:23 +03:00
FootPrint
Footprints Performance Updates (#1439)
2025-01-14 01:31:23 +03:00
Forensics
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
GameTicking
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Gateway
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Gatherable
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
GenericAntag
…
Geras
Upstream (#129)
2024-11-21 17:49:04 +07:00
Ghost
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
GhostKick
…
Glue
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Gravity
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
GridPreloader
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Guardian
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
GuideGenerator
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Hands/Systems
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
HeightAdjust
Make Blood Deficiency Bloodloss Consistent (#895)
2024-10-19 12:48:27 +07:00
Holiday
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Holosign
[Tweak] Holoprojector / Голопроектрор (#112)
2024-11-06 10:48:03 +07:00
HotPotato
Upstream (#129)
2024-11-21 17:49:04 +07:00
Humanoid
Upstream (#129)
2024-11-21 17:49:04 +07:00
IdentityManagement
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
IgnitionSource
…
ImmovableRod
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Implants
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Info
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Instruments
Upstream (#129)
2024-11-21 17:49:04 +07:00
Interaction
Upstream (#142)
2024-12-14 10:41:27 +02:00
InteractionVerbs
Upstream (#129)
2024-11-21 17:49:04 +07:00
Inventory
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
IoC
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
IP
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Item
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Jittering
…
Jobs
Upstream (#129)
2024-11-21 17:49:04 +07:00
JoinQueue
…
KillTracking
…
Kitchen
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Labels/Label
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
LandMines
…
Language
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Lathe
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
LifeDrainer
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Light
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Lightning
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Lock
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Lube
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Magic
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
MagicMirror
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Mail
Feat: Port All Delta-V Mail Improvements (#1011)
2024-10-19 13:49:46 +07:00
Mapping
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Maps
…
MassMedia
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Materials
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Mech
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Medical
[Feat] CPR Impovements (#1405)
2025-01-14 00:32:37 +03:00
Mind
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Mining
…
Mobs
[Upstream] Апстрим фич и фиксов с Einstein Engines. (#39)
2024-09-06 02:58:42 +07:00
MoMMI
…
Mood
Upstream (#142)
2024-12-14 10:41:27 +02:00
Morgue
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Motd
…
MouseRotator
…
Mousetrap
[Upstream] Upstream. Yappie (#50)
2024-09-09 23:06:49 +07:00
Movement
…
NameIdentifier
Upstream (#129)
2024-11-21 17:49:04 +07:00
Ninja
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
NodeContainer
…
NPC
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Nuke
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
NukeOps
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Nutrition
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Nyanotrasen
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Objectives
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
OfferItem
Upstream (#129)
2024-11-21 17:49:04 +07:00
PAI
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Paint
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Paper
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Parallax
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
ParticleAccelerator
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Payload/EntitySystems
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
PDA
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Physics
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Pinpointer
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Placement
…
Players
Upstream (#142)
2024-12-14 10:41:27 +02:00
PneumaticCannon
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Pointing
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Points
…
Polymorph
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Popups
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Power
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
PowerCell
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
PowerSink
…
Prayer
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Preferences/Managers
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Procedural
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Projectiles
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Psionics
More Psionic Admin Commands (#1394)
2025-01-14 00:14:02 +03:00
Punpun
Upstream (#129)
2024-11-21 17:49:04 +07:00
Puppet
…
Radiation
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Radio
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
RandomAppearance
…
RandomMetadata
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
RatKing
…
Remotes
…
Repairable
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
RequiresGrid
…
Research
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Resist
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Respawn
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Revenant
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Revolutionary
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Robotics/Systems
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Roles
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Rotatable
…
Rotation
…
RoundEnd
Upstream (#142)
2024-12-14 10:41:27 +02:00
Salvage
Upstream (#129)
2024-11-21 17:49:04 +07:00
Sandbox
…
Screens
…
SensorMonitoring
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Sericulture
…
ServerInfo
…
ServerUpdates
…
Shadowkin
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Shipyard
Upstream (#142)
2024-12-14 10:41:27 +02:00
ShortConstruction
Upstream (#129)
2024-11-21 17:49:04 +07:00
Shower
…
Shuttles
Lamia & Segmented Entity System (#11)
2025-01-14 01:02:39 +03:00
Silicon
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Silicons
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Singularity
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Solar
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Sound
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Spawners
Upstream (#129)
2024-11-21 17:49:04 +07:00
Species/Systems
…
Speech
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Spider
…
SprayPainter
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Spreader
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Sprite
Upstream (#129)
2024-11-21 17:49:04 +07:00
Stack
…
Standing
Feat: Togglable Under-Table Crawling (#1036)
2024-10-19 13:45:49 +07:00
Station
Use EnsureComp for StationSpawningSystem (#1424)
2025-01-14 01:20:28 +03:00
StationEvents
Graytide Virus Event (#1293)
2025-01-14 00:33:04 +03:00
StationGoal
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
StationRecords
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Stealth
…
Sticky
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Storage
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Store
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
StoreDiscount/Systems
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Strip
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Stunnable
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
SubFloor
…
Supermatter/Systems
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
SurveillanceCamera
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Tabletop
Upstream (#142)
2024-12-14 10:41:27 +02:00
Teleportation
Lamia & Segmented Entity System (#11)
2025-01-14 01:02:39 +03:00
Telescope
Better Lying Down System (From White Dream) (#815)
2024-10-19 13:02:04 +07:00
TelescopicBaton
Upstream (#129)
2024-11-21 17:49:04 +07:00
Temperature
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Tesla
…
Thief
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Tiles
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
TimeCycle
Upstream (#129)
2024-11-21 17:49:04 +07:00
Tips
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Toilet
…
Tools
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Toolshed/Commands
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Traitor
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Traits
New Traits: Steadfast And Feeble (#1431)
2025-01-14 01:27:15 +03:00
UserInterface
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Vampire
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
VendingMachines
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Verbs
…
VoiceMask
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Voting
…
Wagging
…
Warps
…
Weapons
Throwing Mini-Update 1 (#1434)
2025-01-14 01:26:24 +03:00
Weather
…
Whetstone
Upstream (#142)
2024-12-14 10:41:27 +02:00
WhiteDream/BloodCult
[Tweak] Cherry Pick White Dream's Cult Fixes (#1397)
2025-01-14 01:11:28 +03:00
Whitelist
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Wires
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Worldgen
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Xenoarchaeology
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
Zombies
Wizmerge for Station AI (#1351)
2025-01-14 00:13:42 +03:00
AssemblyInfo.cs
…
Content.Server.csproj
Catch-Up Cherry Pick 2 (#944)
2024-10-19 14:53:37 +07:00
Content.Server.csproj.DotSettings
…
GlobalUsings.cs
…
Program.cs
…