Commit Graph

418 Commits

Author SHA1 Message Date
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
Víctor Aguilera Puerto
f6da38ccb9 Fix wrong RSI path in LMGs 2020-06-24 16:43:55 +02:00
Víctor Aguilera Puerto
4dac0d9bbe Fix human component warnings 2020-06-24 13:48:12 +02:00
Metal Gear Sloth
a1aec5a579 Merge remote-tracking branch 'upstream/master' into weapon_anims
# Conflicts:
#	Resources/Prototypes/MeleeWeaponAnimations/default.yml
2020-06-24 20:42:16 +10:00
metalgearsloth
8801eea4fb Update Resources/Prototypes/Entities/Effects/weapon_arc.yml
Co-authored-by: Remie Richards <remierichards@gmail.com>
2020-06-24 20:08:56 +10:00
Metal Gear Sloth
8e56f6d985 Address comments
Split out TG arcs into its own thing.
2020-06-24 19:42:16 +10:00
Víctor Aguilera Puerto
137d32e6aa Timed spawners (#1196)
* "Spawner" is a word.

* Timed Spawners.

* Default interval is now 60s
2020-06-23 20:24:25 +02:00
ShadowCommander
5a6417cadf Merge pull request #1184 from ShadowCommander/UnarmedAttack
Implement unarmed combat
2020-06-23 08:17:32 -07:00
Víctor Aguilera Puerto
4d912dd3e2 I'm sorry 2020-06-23 15:13:49 +02:00
ShadowCommander
264d3d3942 Add fist graphic and change some punch settings 2020-06-23 05:53:38 -07:00
Víctor Aguilera Puerto
ffc1319733 Add new weapon spawners for SSS 2020-06-23 14:42:20 +02:00
Swept
fe65d1fa85 Weapon Tweaks (#1186)
* RPG Tweaks

* Decreased bulletbase bb
2020-06-23 14:04:19 +02:00
Víctor Aguilera Puerto
afac9e6320 Make character dummy actually abstract 2020-06-22 19:45:32 +02:00
Víctor Aguilera Puerto
5f457c95d0 Regular human is no longer abstract... 2020-06-22 19:43:36 +02:00
ShadowCommander
9bf53a4218 Implement unarmed combat 2020-06-21 18:31:56 -07:00
Víctor Aguilera Puerto
8e23f8fd40 Food trash is optional by default. Fix FoodBase not having a FoodComponent. 2020-06-21 23:02:58 +02:00
Swept
7b98f37f9a Adds neck UI slot and rearranges inventory UI. (#1130)
* UI Icon

* It worked?

* Reorganized UI

* converted the bedsheet/cloak sprites

* backpacks go over cloaks now

* Added a couple more neck clothing

* Milk Ape
2020-06-21 22:02:18 +02:00
Swept
fbd0eea019 Puddle icon fix. (#1175)
* Fixed, nice going metalgearsolid

* Removes whatever the fuck golem is
2020-06-21 21:56:15 +02:00
metalgearsloth
95995b6232 Add a LOT more dakka (#1033)
* Start adding flashy flash

* Change slop

Might give a smoother decline

* flashy flash

* Add flashbang and flash projectiles

Bang bang bang pull my flash trigger

* Add collision check to area flash

* Flash cleanupo

* flash.ogg mixed to mono
* Adjusted flash curve again

* Enhancing flashes with unshaded and lights and shit

Still a WIP

* Add the other ballistic gun types

Re-organised some of the gun stuff so the powercell guns share the shooting code with the ballistic guns.

* Re-merging branch with master

Also fixed some visualizer bugs

* Last cleanup

Fixed some crashes
Fixed Deckard sprite
Fixed Hitscan effects
Re-applied master changes
Re-factor to using soundsystem
Add some more audio effects

* Cleanup flashes for merge

Can put flashbangs in lockers so you don't get blinded

Fix some bugs

* Fix shotties

Also removed some redundant code

* Bulldoze some legacycode

brrrrrrrrt

* Fix clientignore warnings

* Add the other Stunnable types to StunnableProjectile

* Some gun refactoring

* Removed extra visualizers
* All casing ejections use the same code
* Speed loaders can have their ammo pulled out
* Bolt sound less loud

* Stop ThrowController from throwing

* Fix speed loader visuals

* Update hitscan collision mask and fix typo

* Cleanup

* Fit hitscan and flashbang collisions
* Use the new flags support

* Update taser placeholder description

* Update protonames per style guide

* Add yaml flag support for gun firerates

* Cleanup crew

* Fix Audio up (components, audio file, + remove global sounds)
* Add server-side recoil back-in (forgot that I was testing this client-side)
* Add Flag support for fire-rate selectors

* Wrong int you dolt

* Fix AI conflicts

Haha ranged bulldozer go BRR
(I'll rewrite it after the other AI systems are done).

* Mix bang.ogg from stereo to mono

* Make sure serializer's reading for guns

Fixes integration test

* Change EntitySystem calls to use the static function

Also removed the Pumpbarrel commented-out code

* Change StunnableProjectile defaults to 0

* Fix taser paralyse

Apparently removing defaults means you have to specify the values, whodathunkit

* Add slowdown to stunnableprojectiles and fix tasers

* Remove FlagsFor from gun components

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
2020-06-21 21:47:15 +02:00
DrSmugleaf
99a5e06b98 Adds eating with utensils (#1136)
* Add Utensil component

For eating. With utensils.
Added to fork, plastic fork, spoon, plastic spoon and plastic knife.
Ignored component on the client.

* Add break chance to utensils

Set to 20% for plastic ones

* Add break sound to utensils

* Add utensil kinds

None, fork, spoon and knife.
For sporks, forknifes and sporknifes, of course.

* Add restricting foods by utensils needed

* Fix utensils breaking when food isn't eaten

* Moved getting held utensils to FoodComponent

* Add breaking a clicking utensil even if its not necessary to eat the food

* Move use utensil code to a separate method

* Add telling a handless entity when they need an utensil to eat

The immersion is off the charts

* Change food trash to only be held when the food was also being held

* Fix Wi-Fi utensils

* Remove unnecessary utensil ItemGroup

* Made TryUseFood public, removed redundant trash position update

* Renamed UtensilKind to UtensilType

* Remove eating food when clicking with it on nothing

* Disable eating food when clicked directly if it requires an untensil to eat
2020-06-19 15:20:59 +02:00
Vince
d09cc01838 Added collision mask for vending machines, piano and computers (#1153)
* Added collision mask for vending machines, piano and computers

* Changed naming of "Run" to "Walk"

Fixes #844

* Revert "Changed naming of "Run" to "Walk""

This reverts commit 075083aa6250b9569e4c8ec9803f21d6736b2737.
2020-06-19 15:12:10 +02:00
metalgearsloth
5391d3c72a Add utility AI (#806)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-06-18 14:52:44 +02:00
Pieter-Jan Briers
960287c65d Merge branch '20-06-16-click-detect' into 20-06-18-merge 2020-06-18 02:35:03 +02:00
Pieter-Jan Briers
4136388028 Sprite-based click detection. 2020-06-16 16:00:19 +02:00
Acruid
189ed9309f Removes the ConstructorComponents and moves the construction blueprint feature into a new ECS system. (#1114) 2020-06-15 12:30:11 -07:00
ScumbagDog
f85dc9f94e Church organ (#1121)
* Added organ sprite

* Added church organ object

* Renamed files and references to follow guidelines
2020-06-13 13:23:10 +02:00
windarkata
482bb617e9 Add Anchorable to several objects (#1115) 2020-06-13 03:29:45 +02:00
Pieter-Jan Briers
5c311c6ef5 Make character menu dummy abstract. 2020-06-12 12:42:47 +02:00
AJCM-git
e2c80b7a00 Vending machines name case fix (#1086) 2020-06-09 12:35:13 +02:00
Pieter-Jan Briers
5abd2e23f5 Import freezer airlock sprites from Eris. 2020-06-07 11:15:28 +02:00
Pieter-Jan Briers
83f5c4ed04 Remove duplicate data from preset ID cards.
It is now fetched from the corresponding job.
2020-06-06 22:55:00 +02:00
Swept
9ffdd023fe Adds bed, bedsheets and cloaks. (#1022)
Co-authored-by: AJCM <AJCM@tutanota.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-06-05 23:51:46 +02:00
Víctor Aguilera Puerto
e1df008bce Add conditional spawning component (#1069)
* Add conditional spawning component

* Remove null checks

* Remove leftover return

* Properly spawn items when game rule gets added

* Fix duplicate uids in saltern

* GameRules returns IEnumerable using yield.
2020-06-05 19:42:43 +02:00
AJCM-git
a89e806a50 Making improper nouns lower case. (#1020)
Co-authored-by: Hugo Laloge <hugo.laloge@gmail.com>
2020-06-04 18:45:07 +02:00
Pieter-Jan Briers
0f43e5e6ad Access refactor
Access is now done through a list of access lists, instead of the necessary/sufficient system that was extremely confusing.

Added a "deny" list so you can screw over sec.

Cleaned the API up so it all uses sets and such.

PDA now relays access read-only to fix edge cases.
2020-06-03 11:46:59 +02:00
20kdc
a09131e817 Solar panels occlusion and tracking (#961) 2020-06-02 13:32:18 +02:00
Pieter-Jan Briers
f14701033b Rename ID Card permission to HoP.
So that the HoP office can have a proper access lock.
2020-05-31 21:24:15 +02:00
Swept
44d950ae39 Takes skub to the next level. (#1007)
Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
2020-05-31 20:37:13 +02:00
FL-OZ
a295d205b1 Drink fixes part 2 eclectic boogaloo (#1052)
* Drink fixes part 2 eclectic boogaloo

* NOT THE NNEWLINES

* oops

Co-authored-by: FL-OZ <anotherscuffed@gmail.com>
2020-05-31 19:47:46 +02:00
Hugal31
d68d71807d Draw ghosts at the ghost layer (#1045)
* Draw ghosts at the ghost layer

* Add ghosts draw depth
2020-05-31 19:46:50 +02:00
FL-OZ
8db5adb387 Floor tile fixes (#1055)
Co-authored-by: FL-OZ <anotherscuffed@gmail.com>
2020-05-31 19:36:14 +02:00
Víctor Aguilera Puerto
bffe4df16f Add gilded bike horn instrument, expose MidiBank on instruments (#1034)
* Add gilded bike horn instrument, expose MidiBank on instruments

* Reduce soundfont size by removing duplicated samples
2020-05-31 19:19:18 +02:00
FL-OZ
d3257d6237 Fixes/cleanup in drink yamls (#1040)
* Fixes/cleanup in drink yamls

* fix refactoring fail

* fix fucksie wucksies

* maybe fix all the spacing issues?

Co-authored-by: FL-OZ <anotherscuffed@gmail.com>
2020-05-31 00:50:27 +02:00
AJCM-git
dca5c869d6 ups (#1051) 2020-05-31 00:31:15 +02:00
Pieter-Jan Briers
51e53c43c9 Remove Rotatable component from vending machines. 2020-05-30 16:45:54 +02:00
AJCM-git
a12821bba5 Saltern airlocks (#1008)
* Guidelines, access, IDs resprite

* Import CEV-Eris maintenance doors

* more cleaning

* Restore the IDs so they dont (hopefully) appear in the log

* Airlocks and a little bit of organizing/cleanup

* fixing a mistake

* Remove excess line feeds in airlock_types.yml

* some enhancements

* formating IDs

* Applying feedback

* Fixing all (this time for real)

* deleting empty spaces in spawn_point

* Renaming the jobs and adding maint airlocks

* Placing the airlocks

* fix tiny fuckup

* Import cargo airlock from CEV-Eris

* Cargo airlocks

* Fixes sufficient access type. Renames airlocks to match the guidelines

* I give up

* I tried really hard, okay?

Co-authored-by: Hugo Laloge <hugo.laloge@gmail.com>
2020-05-30 13:43:13 +02:00
FL-OZ
aa26bdfcae Rework Drink/Food/FoodContainer entirely (#1009)
Co-authored-by: FL-OZ <anotherscuffed@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-05-29 22:50:23 +02:00