Commit Graph

545 Commits

Author SHA1 Message Date
DrSmugleaf
0a82aba88e Add pulling (#1409)
* Initial framework for pulling.

* Make it possible to pull items via (temporary) keybind Ctrl+Click, make items follow the player correctly.

* Make other objects pullable, implement functionality for moving an object being pulled, make only one object able to be pulled at a time.

* Make sure that MoveTo won't allow collisions with the player

* Update everything to work with the new physics engine

* Update Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs

Co-authored-by: ComicIronic <comicironic@gmail.com>

* Physics update and convert to direct type casts

* Add notnull checks

* Add pull keybinds to the tutorial window

* Move PullController to shared

* Fix pulled items getting left behind

* Fix moving pulled objects into walls

* Remove flooring of coordinates when moving pulled objects

* Add missing null check in PutInHand

* Change pulling keybind to control and throwing to alt

* Change PhysicsComponent references to IPhysicsComponent

* Add trying to pull a pulled entity disabling the pull

* Add pulled status effect

* Fix merge conflicts

* Merge fixes

* Make players pullable

* Fix being able to pull yourself

* Change pull moving to use a velocity

* Update pulled and pulling icons to not be buckle

A tragedy

* Make pulled and pulling icons more consistent

* Remove empty not pulled and not pulling images

* Pulled icon update

* Pulled icon update

* Add clicking pulling status effect to stop the pull

* Fix spacewalking when pulling

* Merge conflict fixes

* Add a pull verb

* Fix nullable error

* Add pulling through the entity drop down menu

Co-authored-by: Jackson Lewis <inquisitivepenguin@protonmail.com>
Co-authored-by: ComicIronic <comicironic@gmail.com>
2020-07-27 00:54:32 +02:00
Víctor Aguilera Puerto
b9e1f9283d Adds cursed lockers that teleport anything inside them to other lockers (#1493) 2020-07-26 20:49:41 +02:00
Swept
60a2a400e0 Clothing Cleanup | Phase 1 (#1459) 2020-07-26 17:33:43 +02:00
Moses
8e08c64fcf Show if items can be placed in a slot when hovering (#1480)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-07-26 14:25:38 +02:00
Pieter-Jan Briers
2bd318e83f Make clown clumsy. (#1481)
Co-authored-by: scuffedjays <yetanotherscuffed@gmail.com>
2020-07-26 14:08:09 +02:00
DrSmugleaf
96ec60adab Replace Houdini's magical piloting locker with buckle (#1336) 2020-07-26 12:12:53 +02:00
DrSmugleaf
4b4e83d2bf Add changing the amount of hands on the GUI depending on your body parts (#1406)
* Multiple hands in gui first pass

* Remove IHandsComponent interface

* Create hand class and more hand textures

* Refactor ServerHandsComponent to use a single list of hands

* Seal SharedHand

* Fix picked up items not showing on top of the hand buttons

* Remove HandsGui buttons and panels dictionaries

* Fix items in hands rendering

* Fix wrong hand container comparison

* Fix not updating the location of duplicate hands

* Change ClientHandsComponent to use a SortedList instead of a dictionary

* More merge conflict fixes

* Change SortedList to List

* Fix hand button order

* Add item tooltip for more than 2 hands and updating when removing hands

* Add add hand and remove hand command

* Merge conflict fixes

* Remove nullable reference type from ContainerSlot

* Fix texture errors

* Fix error when reaching 0 hands

* Fix error when swapping hands with no hands

* Merged remove hand methods

* Fix item panel texture errors

* Merge conflict fixes

* Fix addhand and removehand command descriptions

* Add properly displaying tooltips for 2 hands

* Make hand indexes and locations consistent across the client and server

* Add dropping held entity if a hand is removed

* Change hand location to be calculated by index

* Made different hand gui updates more consistent

* Remove human body yml testing changes

* Sanitize addhand and removehand commands

* Merge conflict fixes

* Remove testing changes

* Revert body system changes

* Add missing imports

* Remove obsolete hands parameter in yml files

* Fix broken import

* Fix startup error and adding and removing hands on the same tick

* Make hand container id use an uint

In case someone gets more than 2 billion hands

* Rename hand component files

* Make hands state use an array
2020-07-25 15:11:16 +02:00
DrSmugleaf
245dbdaa3a Add pointing (#1435)
* Add pointing keybind and simple message

* Add turning the player when pointing

* Add pointing arrow

* Make the popup message appear on the pointing entity

* Add pointing to tiles and space and proper grammar

* Move pointing bind from HandsSystem to PointingSystem

* Add more messages for pointing depending on the viewer perspective

* Fix non nullable reference type

* Serialize pointing arrow duration

* Serialize pointing arrow step and add summaries

* Make arrow speed serializable and make it depend on frame time

* Add 0.2 second delay between pointings

* Add pointing arrow yaml examples

* Add the ability for pointing arrows to be rogue

* Remove rogue package reference

* Add point to verb

https://cdn.discordapp.com/attachments/313107470031650816/735268651636228197/unknown.png

* Add shift middle clicking an entity in the verb menu to point at it

* Add VV to PointingArrowComponent

* Increase pointing delay from 0.2 to 0.5 seconds

* Address reviews

* Fix nullability errors

* Separate pointing and rogue pointing code

* Fix rogue pointing arrow visuals

* Made rogue pointing arrow rotation adjustment readable for mortals

* Make rogue pointing arrows less destructive

* Cleanup more of the rogue pointing arrow code
2020-07-24 14:51:18 +02:00
Swept
cd40eaffff Tweaks to the random trashspawner (#1446) 2020-07-24 14:17:45 +02:00
DrSmugleaf
7708950401 Fix remaining 2D visualizer suffix (#1469) 2020-07-23 13:40:03 -07:00
metalgearsloth
56737b635f Damage visualizer for simple mobs (#1332)
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-07-23 02:04:03 +02:00
DrSmugleaf
989025b222 Add drink atmos (#1434) 2020-07-23 01:42:09 +02:00
DrSmugleaf
c9057d01ae Remove 2D suffix from visualizers (#1453) 2020-07-23 00:56:53 +02:00
Vince
a80bcda75b Make ghost unshaded (#1458) 2020-07-23 00:53:03 +02:00
Swept
c4aa732d3c Fixes (#1456) 2020-07-22 22:29:35 +02:00
DrSmugleaf
700f31e77b Fix build (#1448) 2020-07-22 11:43:34 +02:00
Swept
656d8c6d9f Fixes Skubsuit (#1443) 2020-07-22 09:54:28 +02:00
Swept
fb57a0a53f Jumpskirts and Beesocks ok baby be calling me hercules but this bitch here stand for hermes ok I done pop me a perkay cause I heard it helped with my pain but just help my backaches (#1444) 2020-07-22 09:53:59 +02:00
AJCM-git
20ca4ccd4a Re-organizing the prototypes folder (#1384)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-07-20 12:26:16 +02:00
ShadowCommander
935e3b56df Merge pull request #1416 from DrSmugleaf/wt550-mags-fix-1405
Fix .35 auto top-mounted ammo not being valid for the WT550
2020-07-19 12:23:13 -07:00
ShadowCommander
9e93972deb Merge pull request #1426 from collinlunn/construction_yaml
Construction prototype camelCase
2020-07-19 12:22:50 -07:00
ShadowCommander
b06e18981a Merge pull request #1425 from collinlunn/tech
Technology prototype camelCase
2020-07-19 12:22:25 -07:00
ShadowCommander
e4fbc054cc ServerStorage and Storable Yaml casing (#1424)
* Storable size yaml case fix

* ServerStorage yaml case fix

Co-authored-by: py01 <pyronetics01@gmail.com>
2020-07-19 12:12:02 -07:00
Acruid
7f3fabd72a The janitor's Mop Bucket (yellow thing that rolls around) is now back to being a world item. 2020-07-19 12:11:35 -07:00
R. Neuser
86c318cc74 OverlayManager 2 Electric Boogaloo (#1410) 2020-07-19 17:32:26 +02:00
py01
e8daca3539 Construction prototype camelCase 2020-07-18 20:51:39 -06:00
py01
07e4318893 Technology prototype camelCase 2020-07-18 20:47:10 -06:00
py01
e33caaddea ServerStorage yaml case fix 2020-07-18 19:41:44 -06:00
py01
72a5a3f3fd Storable size yaml case fix 2020-07-18 19:36:40 -06:00
DrSmugleaf
96d762670f Fix .35 auto top-mounted ammo not being valid for the WT550 2020-07-18 12:09:18 +02:00
ike709
e65c64af14 Adds the ChemMaster 4000 (#1398) 2020-07-17 22:41:19 +02:00
Hugal31
a5051c549b Use TheName macro and GrammarComponent (#1396) 2020-07-17 10:44:32 +02:00
DrSmugleaf
f313a9267a 0 days without buckle breaking (#1366) 2020-07-17 10:43:10 +02:00
Kmc2000
5c723ea70e RCD (#912) 2020-07-17 10:42:05 +02:00
ike709
e9c6e2a5da Adds boiling points and melting points for all chemicals and elements (#1390)
* Adds boiling points and melting points for all chemicals and elements

* Readd ice, will deal with it later
2020-07-14 21:41:11 +02:00
Swept
33ed9eea82 Finished dark souls carvings (#1383) 2020-07-12 22:49:20 +02:00
Víctor Aguilera Puerto
85497bb157 Clown PDA is now slippery. 2020-07-12 12:23:40 +02:00
ike709
07301bdfc3 Better water color (#1379) 2020-07-11 18:45:56 -07:00
ike709
203a835264 Emergent Sanitation Gameplay (#1378)
* Emergent Sanitation Gameplay

* Fix the map

* Address review

* Mention if it's slippery in the description
2020-07-11 23:49:54 +02:00
Víctor Aguilera Puerto
626c8c51a1 Adds slippery items (#1321)
* Start work on Slippery Component

* Slips work

* Add banana peel

* Add required slip speed

* Add slip sound

* Adds soap

* Make soapnt, soapsyndie and soapdeluxe inherit soap

* Adds homemade soap and omega soap

* Fix slipping not taking into account the entity being in a container
2020-07-09 17:00:37 +02:00
ShadowCommander
71f9e7aad2 Fix bag of holding sprite (#1328) 2020-07-08 21:05:50 -07:00
DrSmugleaf
e1f9033a69 Merge branch 'master' into buckle-locker-fix-1262 2020-07-08 15:35:20 +02:00
AJCM-git
1fbd32c9d9 Misc path fixes (#1319)
* fixing wall girder sprite

* fixing lathe
2020-07-08 13:58:21 +02:00
DrSmugleaf
d20e4969e2 Add light to lit welders (#1282)
* Add light to lit welders

* Fix null errors

* Make the welder light orange
2020-07-08 13:41:32 +02:00
Víctor Aguilera Puerto
f0892c20f1 Make xeno mob clickable, fixes #1310 2020-07-08 00:26:54 +02:00
DrSmugleaf
8f685f0541 Merge branch 'master' into buckle-locker-fix-1262 2020-07-07 20:36:43 +02:00
AJCM-git
ae41d03ec6 Re-organizing the Resources folder. Part 1. (#1234)
* First commit

* Lockers

* Lockers electric boogaloo

* Crates and Lockers

* Almost finishing the Textures folder

* Updating texture paths. Reminder to fix:
* Lockers
* Windows
* Vending Machines
* APC
* Catwalks
* Bedsheets and Cloaks
* Status effects

* dont know what happened here

* Commit before merge

* re-organizing

* Lockers broken

* Commit before merge

* Submodule

* renaming

* Fixing most issues

* forgot these ones

* Updating submodule

* typo

* Fixing some paths

* fixing some paths

* updating submodule

* (hopefully) fixing the submodule
2020-07-07 19:19:00 +02:00
metalgearsloth
0ecaba1727 Minor AI system fixes (#1292)
* Add test to check all LogicNames in prototypes
* Change CreateProcessor to AiLogicProcessor (I thought I'd already done this as I remember PJB telling me to do this but apparently I'm an idiot)
* Temporarily remove invalid AiControllers

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2020-07-07 18:56:38 +02:00
DrSmugleaf
b850ac2437 Merge branch 'master' into buckle-locker-fix-1262 2020-07-07 00:20:07 +02:00
R. Neuser
88f49961d8 OverlayManager refactor and Flash (#1218)
* Flash component, overlay and shader
Add BeginDraw method to Overlay.cs

* Add flash icons, sounds

* Progress

* Multiple overlays without enums

* This is probably the worst way to do this IDK

* Remove nullable reference type

* Add AttackEventArgs as parameter to OnHitEntities
MeleeWeaponComponent.Attack now continues when OnHitEntities returns true (it hit something)
Add OverlayType enum so client and server can agree on overlay ids
Move IConfigurable to its own file
Add AoE flash with shorter duration
Flashing someone slows them down

* Add arc to flash
Set item size to something reasonable
Remove chat log message when flash burns out

* Remove unused interface
2020-07-06 23:37:39 +02:00