NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-11-08 20:14:16 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
CatStation/Content.Server
History
FacePluslll 422a84e029
Adds Double bladed Esword (#17227) 
* Changed Energy Sword system to allow Wieldable eswords

Needed to add conditions to allow the wielding system to handle the esword if the component existed in the entity. The normal eswords work just fine still.

* Adds sprites for double bladed esword

* added double bladed esword to yml

* Add double bladed esword to uplink catalog

* fixed sprites on right handed wielding

* decresed speed a little and added a wielding time

* Reduced damage

* Damage change

* Balence change

* edited attack speed and heavy windup

* fixed readability issue and removed unwanted brackets

* reflectProp to .75

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

* wieldTime to 0

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

* litDisarmMalus to .7

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

* changed heat and slash damage to 9 and structural damage to 20

* changed uplink desc

---------

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
2023-06-18 15:35:23 -04:00
..
Abilities/Mime Fix mime wall intersecting with adjacent wall (#16701) 2023-05-22 15:58:04 -06:00
Access Fix PDA capitalization to be PascalCase (#17335) 2023-06-15 11:44:28 +10:00
Actions Predict wielding (#16275) 2023-05-10 10:01:23 +10:00
Acz Content-side changes for packaging. (#9382) 2022-09-14 19:39:55 +10:00
Administration Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Advertise more component ref removal + combining server/client comps (#13178) 2022-12-25 05:28:21 +01:00
Advertisements Fix warnings and code cleanup/fixes (#13570) 2023-01-19 13:56:45 +11:00
Afk Fix warnings and code cleanup/fixes (#13570) 2023-01-19 13:56:45 +11:00
AirlockPainter More DoAfter Changes (#14609) 2023-04-02 21:13:48 -04:00
Alert Fix snares (#16699) 2023-05-22 15:49:37 -06:00
AlertLevel Fix PDA capitalization to be PascalCase (#17335) 2023-06-15 11:44:28 +10:00
AME Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Animals Puddles & spreader refactor (#15191) 2023-04-10 15:37:03 +10:00
Announcements Fix some announcements code (#16585) 2023-05-21 20:06:05 +10:00
Anomaly Ice anomaly buff (anti-box maneuvers) (#17293) 2023-06-16 10:52:49 +10:00
Arcade ECS Arcade Machines (#16791) 2023-06-15 21:25:25 +10:00
Armor Remove static ILocalizationManager resolves. (#17392) 2023-06-17 11:57:32 +10:00
Atmos Fix gas tile overlays (#17397) 2023-06-17 12:30:55 +10:00
Audio Probably fix playglobalsound completion (#16297) 2023-05-13 11:54:02 -04:00
BarSign/Systems Move BarSign appearance logic to client. (#11524) 2022-09-27 02:59:47 -05:00
Beam Content mapmanager query changes (#16894) 2023-05-28 23:22:44 +10:00
Bed Moves buckling and vehicles to shared, some cleanup (#15923) 2023-05-01 17:04:23 +10:00
Bible Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566) 2023-04-20 20:16:01 +10:00
Body Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Botany Prevent mutation of non-unique plant seeds (#15702) 2023-05-02 11:37:30 +10:00
Bql Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Buckle/Systems Moves buckling and vehicles to shared, some cleanup (#15923) 2023-05-01 17:04:23 +10:00
Cabinet predict itemcabinet (#14045) 2023-02-12 02:35:05 +00:00
Camera Misc audio and related changes for replays (#12578) 2022-11-22 11:49:48 +11:00
CardboardBox big cardboard box improvements (#16418) 2023-05-14 08:46:19 -04:00
Cargo expedition rewards (#16972) 2023-06-16 15:19:02 +10:00
CartridgeLoader Fix PDA capitalization to be PascalCase (#17335) 2023-06-15 11:44:28 +10:00
CharacterInfo Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Charges Content fixes for timeoffsets (#15934) 2023-05-01 14:49:25 +10:00
Chat Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Chemistry Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Chunking Replace GridEntityId with Owner (#12743) 2022-12-12 14:59:02 +11:00
Climbing Fix double vault do_after (#16743) 2023-05-24 01:08:04 -06:00
Cloning Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Clothing Remove diseases (#15684) 2023-05-07 17:50:37 +10:00
Cluwne Refactor: Chat transmission ranges (+ a little preparation for downstream fork functionality) (#16026) 2023-05-04 12:08:08 -07:00
CombatMode New indicators for combat mode (#15427) 2023-05-06 15:06:42 +10:00
Commands Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
Communications Multiline edit everywhere (#15216) 2023-04-14 12:57:47 -07:00
Configurable remove a bunch of instances of component reference (#13164) 2022-12-24 15:55:31 +11:00
Connection Ban message improvements (#14731) 2023-03-18 19:55:12 -05:00
Construction Split Door Bolt functionality out of AirlockDoor (#16354) 2023-05-31 10:23:35 -04:00
Containers Map-Init guidebook entities. (#14823) 2023-03-24 20:00:29 +11:00
Contests Fix warnings and code cleanup/fixes (#13570) 2023-01-19 13:56:45 +11:00
Cooldown Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
Coordinates Content changes for mapgrid kill (#12567) 2022-11-22 13:12:04 +11:00
CPUJob/JobQueues/Queues Move jobQueue to engine (#16443) 2023-05-15 12:47:12 +10:00
Crayon Crayonsystem cleanup (#13400) 2023-02-26 23:55:44 +11:00
CrewManifest Refactor stations to properly use entity prototypes. (stationsv3) (#16570) 2023-05-19 15:45:09 -05:00
Cuffs More DoAfter Changes (#14609) 2023-04-02 21:13:48 -04:00
Damage Remove obsolete Fixture.Body references (#16259) 2023-05-09 17:21:26 +10:00
Database Limit postgres database concurrency (#17246) 2023-06-10 21:52:08 +10:00
Decals Implicit gas tile & decal states (#15146) 2023-04-05 17:43:12 -06:00
Destructible Reduce vendor restocking time + some code cleanup (#16025) 2023-05-03 15:38:03 +10:00
DetailExaminable Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566) 2023-04-20 20:16:01 +10:00
DeviceLinking logic gate momentary pulse, switch status port (#17198) 2023-06-12 15:43:59 -07:00
DeviceNetwork Device network address improvements (#16934) 2023-05-30 00:56:31 +10:00
Devour Added a component to eat bodies for health #8922 (#16345) 2023-05-15 18:44:35 -04:00
Dice Fixes dice being unable to roll their max value (#13845) 2023-02-02 06:27:05 +13:00
Disposal Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566) 2023-04-20 20:16:01 +10:00
DoAfter More DoAfter Changes (#14609) 2023-04-02 21:13:48 -04:00
Doors Revert "Door opening tweaks" (#17395) 2023-06-17 12:09:49 +10:00
Dragon Refactor stations to properly use entity prototypes. (stationsv3) (#16570) 2023-05-19 15:45:09 -05:00
Drone Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Drunk Drunk Shader (#8910) 2022-06-23 14:33:25 +10:00
Electrocution Events all over melee (#16997) 2023-06-07 13:26:45 -07:00
Emoting Remove hands component reference (#15197) 2023-04-07 11:21:12 -07:00
Emp Revert "Revert "Emp more effects" (#16159)" (#16165) 2023-05-06 11:26:04 -04:00
Engineering More DoAfter Changes (#14609) 2023-04-02 21:13:48 -04:00
Ensnaring Fix snares (#16699) 2023-05-22 15:49:37 -06:00
EntityList Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
Entry Fix PDA capitalization to be PascalCase (#17335) 2023-06-15 11:44:28 +10:00
EUI Ensure EUIs close themselves (#15860) 2023-04-29 13:16:24 +10:00
Examine Remove static ILocalizationManager resolves. (#17392) 2023-06-17 11:57:32 +10:00
Explosion Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Extinguisher ECS SolutionTransfer, move to shared (#14156) 2023-02-18 19:01:05 -06:00
Eye/Blinding Blindness refactor (#15705) 2023-04-29 15:32:14 +10:00
Fax Ensure EUIs close themselves (#15860) 2023-04-29 13:16:24 +10:00
Flash flash uses charges system now (#15898) 2023-04-29 23:38:40 +10:00
Fluids Update puddle stickiness (#16597) 2023-06-03 12:34:43 -07:00
Foldable Rollerbed / foldable strap fixes. (#16106) 2023-05-05 17:27:15 +10:00
Forensics Add custom paper for forensic scanner output (#16221) 2023-05-31 19:09:05 +10:00
Friends pet dehydrated fish to make him nice to you (#14709) 2023-04-13 18:17:25 -07:00
GameTicking Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Gatherable Proto-kinetic crusher (#16277) 2023-05-14 13:15:18 +10:00
Ghost Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
GhostKick Modular landmines (#8351) 2022-06-01 01:39:06 -07:00
Glue Crazy Glue Fix (#17262) 2023-06-15 13:02:33 +10:00
Gravity Makes mobs visually float when weightless (#13391) 2023-01-17 18:01:53 -04:00
Guardian [tweak] Minor Holoparasite tweak (#15803) 2023-04-26 00:52:07 -06:00
GuideGenerator Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
Hands/Systems Raise hand (un)equipped events on container insert/remove (#15664) 2023-04-24 05:38:52 +10:00
HealthExaminable Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566) 2023-04-20 20:16:01 +10:00
Holiday Fix warnings and code cleanup/fixes (#13570) 2023-01-19 13:56:45 +11:00
Holosign fix holofan loc string missing (#15648) 2023-04-22 19:54:42 +10:00
HotPotato Hot potato on fire (#16017) 2023-05-06 20:30:16 +10:00
Humanoid Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566) 2023-04-20 20:16:01 +10:00
IdentityManagement Makes humanoid appearance component networked. (#13009) 2023-01-24 11:38:19 +11:00
IgnitionSource Fix welder interaction (#14704) 2023-03-23 13:08:46 -04:00
ImmovableRod Remove obsolete Fixture.Body references (#16259) 2023-05-09 17:21:26 +10:00
Implants Misc implant fixes (#17172) 2023-06-06 21:53:11 -06:00
Info Rename "Server Info" to ServerInfo (#15436) 2023-04-16 10:55:59 +10:00
Instruments PopupSystem public methods rejig (#12830) 2022-12-19 08:41:47 +11:00
Interaction Completely remove every last reference to underplating. (#16559) 2023-05-19 16:58:49 +10:00
Inventory Remove inventory component references (#15249) 2023-04-12 10:20:47 +10:00
IoC Move upload commands to engine (#16582) 2023-05-20 11:53:09 +10:00
IP Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
Item multi-handed item component (#12523) 2022-12-19 22:07:23 -06:00
Jittering Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
Jobs Make AddComponentSpecial.cs overwrite existing components. (#16897) 2023-05-31 19:06:25 +10:00
Kitchen microwave tweaks (#17107) 2023-06-07 12:44:42 -07:00
Labels/Label Remove some obsolete AppearanceComponent method usages (#13726) 2023-02-02 12:34:53 -04:00
LandMines PopupSystem public methods rejig (#12830) 2022-12-19 08:41:47 +11:00
Lathe Make sure lathes don't waste time trying to print when out of mats. (#16617) 2023-05-19 10:25:22 -05:00
Light Revert handheld light changes (#16492) 2023-05-16 13:26:05 +10:00
Lightning Revert "Revert "Fix UninitializedSaveTest prototypes" (#16169)" (#16175) 2023-05-06 14:30:51 -04:00
MachineLinking Blast door/shutter, timer and or gate device linking fixes (#16347) 2023-05-11 18:16:02 -04:00
Magic Split Door Bolt functionality out of AirlockDoor (#16354) 2023-05-31 10:23:35 -04:00
MagicMirror Marking default coloring (#13039) 2023-03-04 18:59:07 -08:00
Mapping Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566) 2023-04-20 20:16:01 +10:00
Maps Remove plural BaseTurfs as a thing in favour of BaseTurf (#16560) 2023-05-19 17:10:56 +10:00
Materials Sheet-meister 2000 (#16686) 2023-06-15 10:49:23 +10:00
Mech HAMTR mech (hamster mech) (needs review) (#16393) 2023-06-08 16:33:35 +10:00
Medical Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Mind Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Mining 1 do_after for ore veins (#14083) 2023-02-13 15:32:09 +00:00
MoMMI Fix warnings and code cleanup/fixes (#13570) 2023-01-19 13:56:45 +11:00
Morgue Add ambient music (#16829) 2023-05-29 10:44:11 +10:00
Motd MotD (#13655) 2023-02-28 08:15:48 -08:00
Mousetrap Remove some obsolete AppearanceComponent method usages (#13726) 2023-02-02 12:34:53 -04:00
Movement Lag compensation for wide attacks (#15877) 2023-05-01 15:07:17 -04:00
NameIdentifier Fix server crash for name identifiers (#15584) 2023-05-01 12:56:44 -04:00
NodeContainer Puddles & spreader refactor (#15191) 2023-04-10 15:37:03 +10:00
NPC Hotfix NPC pathfinding (#17360) 2023-06-16 01:01:26 +10:00
Nuke fix nuke when arming off station (#16702) 2023-05-25 19:13:21 +10:00
Nutrition make mice not eat uranium bananium and pills (#17110) 2023-06-15 22:35:11 +10:00
Objectives Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
PAI Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Paper Enhance paperwork UI (#16006) 2023-05-06 17:35:22 +10:00
Parallax Ore tweaks (#16930) 2023-05-30 21:40:36 -06:00
ParticleAccelerator Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Payload/EntitySystems Solution rejig (#12428) 2023-01-12 14:41:40 +11:00
PDA Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Physics Shuttle drone improvements (#16931) 2023-05-31 11:13:02 +10:00
Pinpointer Add universal pinpointer (#13854) 2023-05-28 20:24:09 +10:00
Plants PopupSystem public methods rejig (#12830) 2022-12-19 08:41:47 +11:00
Players Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
PneumaticCannon pneumatic cannon fixes (#14705) 2023-03-25 16:15:46 -07:00
Pointing Add support for client-side replays (#17168) 2023-06-19 03:23:31 +10:00
Polymorph Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Popups rcd refactor (#15172) 2023-05-01 23:46:59 +10:00
Power Connect to the closest ExtensionCable instead of the first (#17271) 2023-06-15 11:31:14 +10:00
PowerCell Add tether gun (#16430) 2023-05-18 11:36:06 +10:00
PowerSink Power Sink Upgraded (#15683) 2023-05-17 23:55:42 +10:00
Prayer Add ambient music (#16829) 2023-05-29 10:44:11 +10:00
Preferences/Managers Makes humanoid appearance component networked. (#13009) 2023-01-24 11:38:19 +11:00
Procedural Move jobQueue to engine (#16443) 2023-05-15 12:47:12 +10:00
Projectiles Add reflection for crystals (#16426) 2023-05-15 15:21:05 +10:00
Pulling Revert "ctrl-rclick tweaks" (#7171) 2022-03-18 15:40:02 +11:00
Puppet Toy Box filled with toys (ready for merge) (#16252) 2023-06-03 13:31:47 +10:00
Radiation Replace GridEntityId with Owner (#12743) 2022-12-12 14:59:02 +11:00
Radio Add support for client-side replays (#17168) 2023-06-19 03:23:31 +10:00
RandomAppearance Remove some obsolete AppearanceComponent method usages (#13726) 2023-02-02 12:34:53 -04:00
RandomMetadata Use Segments for RandomMetadata (#11190) 2022-09-14 00:13:22 -07:00
RatKing Hunger ECS (#14939) 2023-04-03 12:42:30 +10:00
Remotes Split Door Bolt functionality out of AirlockDoor (#16354) 2023-05-31 10:23:35 -04:00
Repairable DoAfter fixes (#15127) 2023-04-03 23:28:55 -07:00
Research Tech disk 4891 (#16752) 2023-05-25 16:07:39 -06:00
Resist Fix mice getting trapped in potted plants (#16745) 2023-05-24 10:30:08 -07:00
Respawn improve SpecialRespawn logs and add admin alert (#15784) 2023-04-25 23:19:14 +10:00
Revenant Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Roles Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Rotatable Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566) 2023-04-20 20:16:01 +10:00
RoundEnd Escape pods (#14809) 2023-03-23 19:54:41 -06:00
Salvage use parts crates for rewards, show rewards in ui (#17374) 2023-06-17 12:00:54 +10:00
Sandbox Fix PDA capitalization to be PascalCase (#17335) 2023-06-15 11:44:28 +10:00
Security fix locks and deployable barriers (#14063) 2023-02-13 12:22:37 +00:00
ServerInfo Launcher info links. (#12781) 2022-12-02 17:23:43 -08:00
ServerUpdates Fix server update restarts when server paused. (#8509) 2022-05-30 01:09:50 -07:00
Shuttle/Components Shuttle drone improvements (#16931) 2023-05-31 11:13:02 +10:00
Shuttles Zooming for everyone with keyboard keys (#16605) 2023-06-17 09:22:21 +10:00
Singularity Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Solar reduced max solar power to 750 from 1500 (#15307) 2023-04-24 15:32:01 -04:00
Sound Add wallbonk sound to BaseItem (#15689) 2023-04-23 13:42:09 -04:00
Spawners Gamerule Entities, Take 2 (#15765) 2023-04-25 20:23:14 -04:00
Speech Toy Box filled with toys (ready for merge) (#16252) 2023-06-03 13:31:47 +10:00
Spider Spiders Buff and critters change (#13377) 2023-01-22 18:50:05 -04:00
Spreader Fix cringe 2 (#16145) 2023-05-06 15:16:36 +10:00
Sprite Water gun cargo crate (#16172) 2023-05-07 13:14:54 +10:00
Stack Stack and storage enhancements (#16405) 2023-05-14 22:24:45 -04:00
Standing Remove hands component reference (#15197) 2023-04-07 11:21:12 -07:00
Station Fix PDA capitalization to be PascalCase (#17335) 2023-06-15 11:44:28 +10:00
StationEvents Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
StationRecords Fix PDA capitalization to be PascalCase (#17335) 2023-06-15 11:44:28 +10:00
Stealth Cardboard Box and Stealth Components (#11569) 2022-10-10 09:17:53 +11:00
Sticky Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566) 2023-04-20 20:16:01 +10:00
Storage Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Store Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Strip add strip attempt logs (#17376) 2023-06-16 20:58:17 +10:00
Stunnable Misc replay related changes (#17102) 2023-06-05 14:33:49 +10:00
SubFloor Make trays clientside (#14826) 2023-03-31 14:40:38 +11:00
SurveillanceCamera Revert "Revert "Emp more effects" (#16159)" (#16165) 2023-05-06 11:26:04 -04:00
Tabletop Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566) 2023-04-20 20:16:01 +10:00
Teleportation Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Temperature ignore resistances in temperature system (#17301) 2023-06-13 07:59:07 -05:00
Tiles Add arrivals (#14755) 2023-03-22 04:29:55 -05:00
Tips Tips system (#13509) 2023-01-16 10:52:52 -06:00
Toilet Moves buckling and vehicles to shared, some cleanup (#15923) 2023-05-01 17:04:23 +10:00
Tools Content mapmanager query changes (#16894) 2023-05-28 23:22:44 +10:00
Traitor/Uplink Fix PDA capitalization to be PascalCase (#17335) 2023-06-15 11:44:28 +10:00
Traits Mass hallucinations event (#17321) 2023-06-15 00:45:50 -06:00
UserInterface Northstar Gloves (#16021) 2023-05-23 14:12:30 -04:00
Vehicle Moves buckling and vehicles to shared, some cleanup (#15923) 2023-05-01 17:04:23 +10:00
VendingMachines Revert "Revert "Emp more effects" (#16159)" (#16165) 2023-05-06 11:26:04 -04:00
Verbs Remove hands component reference (#15197) 2023-04-07 11:21:12 -07:00
Visible Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
VoiceMask fix voice mask working in pockets (#14743) 2023-03-19 16:41:25 -07:00
Voting Fixes map vote localisation issue (#16904) 2023-05-28 13:19:08 -05:00
Warps Only ghosts can examine warps names (#11124) 2022-09-08 20:42:46 -07:00
Weapons Adds Double bladed Esword (#17227) 2023-06-18 15:35:23 -04:00
Weather Rename WorldMap to MapId (#14857) 2023-03-27 22:40:57 +11:00
Whitelist Whitelist shell feedback (#10694) 2022-08-18 23:42:47 -07:00
Wires Add missing WirePanel components (#16676) 2023-05-22 13:45:36 +10:00
Worldgen Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Xenoarchaeology Fix foam artifacts (#17332) 2023-06-15 21:26:10 +10:00
Zombies Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
AssemblyInfo.cs
Content.Server.csproj Update project files for configuration changes. (#14281) 2023-03-06 11:38:07 -08:00
Content.Server.csproj.DotSettings Electrocution. (#4958) 2021-10-25 16:21:56 +02:00
GlobalUsings.cs Global usings (#6472) 2022-02-05 11:39:36 -07:00
Program.cs