Commit Graph

464 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
chairbender
b35333d366 Click Drag Functionality + Refactor Interaction Interfaces (#1125)
Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
Co-authored-by: ComicIronic <comicironic@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-07-06 23:27:03 +02:00
DrSmugleaf
45211a2f0b Fix a buckled entity's sprite being drawn over the chair when looking up 2020-07-04 01:28:06 +02:00
Jackw2As
68a515ee09 Adds Damage on tool interaction component (#1060) (#1102)
Fixed issue with Welding Tool ignoring the tools list.
2020-07-03 23:27:52 +02:00
DrSmugleaf
77368886e9 Fix Urist McHands' constant aspirations to follow in Pablo Picasso's steps (#1259) 2020-07-03 23:26:49 +02:00
Acruid
3ee480a3b1 Deconstruction Features (#1242)
* ConstructionSystem now detects when a tool is used on an arbitrary entity.

* Refactored building logic from ConstructionComponent to ConstructionSystem.

* Add OnDeconstruct events so that deconstruction can be blocked if prerequisites are not met.

* Multi-step deconstruction works.
Windows can be deconstructed using a screwdriver.

* In-hand construction and deconstruction works.

* Intermediate entities now have a better name assigned to them when created.

* Removed a question mark to appease Jenkins.

* Instead of running ExposeData on the existing ItemComponent of an intermediateFrame, the system will now replace the existing ItemComponent with a new one, and run ExposeData on the new one.
2020-07-02 14:50:57 -07:00
GlassEclipse
610ab8bf50 BodySystem stuff 2: overused boogaloo (#1174)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-07-02 20:51:14 +02:00
Swept
7d346ede28 Grenade Launcher Adjustments (#1230) 2020-07-02 20:37:24 +02:00
DrSmugleaf
dbd9ee1671 Fix reagent spill errors (#1180)
Co-authored-by: ComicIronic <comicironic@gmail.com>
2020-07-02 20:31:40 +02:00
Swept
ebebb3603a Added a buncha bloat from teegee (#1203)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-07-02 16:05:03 +02:00
Exp
8171e40a37 Added bolts to airlocks (#1138)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-07-02 15:31:06 +02:00
py01
7b17698336 Power works with Anchorable (#1240)
Co-authored-by: py01 <pyronetics01@gmail.com>
2020-07-02 12:02:29 +02:00
Pieter-Jan Briers
a66386149d Adds movement stress test component.
It moves a lot to stress test moving things.
2020-06-30 18:34:42 +02:00
py01
23cc6b1d4e Power Rework (#863)
Co-authored-by: py01 <pyronetics01@gmail.com>
2020-06-28 17:23:26 +02:00
Swept
339dced7a4 Adds Lean (#1221)
* We boolin' now

* Updated Meta.json
2020-06-25 18:02:48 +02:00
DrSmugleaf
602dac393e Add Buckling (#1155)
* Create BuckleableComponent.cs

* Add strap component and keybind to buckle targeted entity

* Remove buckle keybind, turn it into a verb

* Add moving and attaching the buckled entity to the strap

* Fix reality collapsing when clicking on a buckled entity

* Add strap position to buckle a mob in the standing or down position

* Add new default strap position that makes no change to the mob's standing state

* Add Strap component to office chairs and stools

* Add Strap component to the pilot chair

* Add buckled status effect icon

* Add status effect click behaviour

* Add buckling and unbuckling sounds

* Change Buckle verb to only appear when an entity can be currently buckled

* Rotate buckled entity in the direction of the seat

* Disable entity rotation when buckled

* Fix buckle rotation on beds

* Buckling now finds the closest strap to the buckleable entity

* Fix rotation when unbuckling an entity

* Move buckle verb to StrapComponent

* Added buckled entity unbuckle verb, range and interaction checks

* Add checks for currently occupied straps

* Add unbuckling entity if its respective strap component is removed

* Add Clickable, InteractionOutline and Collidable components to bed

* Add rotation property to strap component

* Rename Buckleable to Buckle

* Add Buckle and Strap sizes to buckle multiple entities in the same strap

* Remove out of range popup message from strap verb GetData

* Move BuckledTo setter logic to its methods

* Fix Strap BuckledEntities being public

* Fix not updating status when Buckle component is removed

* Change BuckleComponent.BuckledTo to be of type StrapComponent

* Fix NRE when unbuckling

* Add buckle perspective messages

* Fix not equals comparison in strap verb

* Add added check to Strap TryAdd

* Change buckle.ogg and unbuckle.ogg from stereo to mono

* Remove -2f volume on buckle and unbuckle sounds

* Add summary to Strap TryAdd and Remove methods

* Make buckled entities unable to fall

* Fix default strap position not rotating the buckled entity

* Add downing after unbuckling an entity if it is knocked down

* Prevent an entity from buckling onto itself

Fixes stack overflow error

* Disable recursive buckling

* Add buckling onto straps by clicking them with an empty hand

* Add recursive buckle check to the trybuckle method as well

* Fix being able to click on a different strap to unbuckle from the current one

* Merge TryUnbuckle and ForceUnbuckle with a force argument

* Remove explicit unimplemented status effect clicking cases

* Add documentation to EffectBlockerSystem and ActionBlockerSystem
2020-06-25 15:52:24 +02:00
Swept
bad7f9dc6b Lots of new inhands, adds phoron (#1220)
* Beaker Inhands

* Flashlight Inhands

* Tile Refactor

* Adds metal/glass sheet inhands

* Removes plasma

* Adds Phoron

* We boolin'

* Phoron inhands

* First Pass inhand food

* First food inhand pass

* Soda inhand sprites

* Actually adds them
2020-06-25 13:51:58 +02:00
Víctor Aguilera Puerto
ca1fb126e7 Add timed spawner for Xeno AI and markers 2020-06-24 17:50:46 +02:00
metalgearsloth
d12a6bd9cf Add xenos (#1204)
* Add xenos for stress test

Pretty hacky and not how I'd do it long-term

* Remove claws

* Add in unarmed combat behaviors

* Cleanuppppp

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2020-06-24 17:43:58 +02:00
metalgearsloth
63f2724341 Add default ammo for guns (#1207)
* Add default ammo types

* Add revolver and bolt action default pro support

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2020-06-24 17:29:40 +02:00