Commit Graph

885 Commits

Author SHA1 Message Date
Peptide90
79c265efb3 Fixes ID/Names for Sterile masks / latex gloves. Adds nitrile glove box (#8607)
* fixes box ID/names for mask and gloves. Adds nitrile box

* map update for ID change

* crate fills fix
2022-06-03 22:05:18 -07:00
Moony
fada213a22 Implements item pricing, and piracy. (#8548)
* Start implementing item pricing.

* Flesh out prices a bit, add the appraisal tool.

* Add prices to more things.

* YARRRRRRR

* gives pirates an appraisal tool in their pocket.

* Makes the various traitor objectives valuable. Also nerfs the price of a living person, so it's easier to bargain for them.

* Address reviews.

* Address reviews.
2022-06-03 10:56:11 -05:00
Emisse
c87f4ab65c Holofan Projector Upstream from Nyano (#8352)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-03 21:58:18 +10:00
Veritius
237cb3d0b4 Communications Console: The ECSining (#8374)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-03 21:37:35 +10:00
Peptide90
b93286fc61 Emergency Response Team (#6258)
* Clothing pass 1

Backpacks, hardsuits and helmets pass 1

* ERT Leader Role first pass

* ERT Backpacks (nearly there)

* ERT Backpacks final

* ERT helmets pass 1

* remaining hardsuit sprites added.

* ERT leader ID

* removed duplicates

* hardsuits + helmets entities

* ID + PDA for ERT

* ERT leader role pass 1

* job icons / markers for ERT

* military / ert name dataset

* starting gear pass 1 for ERT

* removed in favor of singular ERT roles file

* ERT mobs for spawning

* ERT spawn points added

* fixed case on ERT name

* Increased ERT access to most areas

* ERT ghost role takeover fixes

* ERT removed invalid parent

* path issue resolved

* more file path fixes

* fixes random naming pt 1

* Buffs ERT hardsuits and integrates helmet

parents ert to syndie hardsuit and adds toggleable helmet

* Adds suit storage slot and cargo access

* Adds backpack fills for ERT

* Updates ERT loadout for filled backpacks

+ other misc changes

* buff ERT backpack storage

* fixes ert jani backpack fills

* tweaks spawn loadout to EVA

* gave centcom official AA

* formatting

* ERT shuttle mapped with spawners

* update access
2022-06-03 20:48:28 +10:00
Peptide90
05c701975b Post Light sprite fix and state (#8578)
* adjusted post light sprite and added empty state

* update construction location
2022-06-02 15:12:23 -05:00
Peptide90
8d9b56fce6 Goon floor pack 1 (#8267)
* floors boxing, arcadeblue2 and carpet clown

* adds gym, metaldiamond and carpetoffice from goon

* adds variants for boxing and gym

* tile variants updated
2022-06-02 12:10:58 +10:00
metalgearsloth
fb943a61dc Gun refactor (#8301)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: T-Stalker <le0nel_1van@hotmail.com>
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-06-01 19:59:58 +10:00
Flipp Syder
d4697c000c Surveillance cameras (#8246)
* cameras but i didn't feel like git stashing them

* Adds more functionality server-side for surveillance cameras

* rider moment

* Adds skeleton for SurveillanceCameraMonitorBoundUi on client

* whoops

* makes surveillance camera monitor UI more defined

* removes tree from SurveillanceCameraMonitorWindow

* surveillance camera active flag, other routing things

* actually sets how SurveillanceCameraMonitorSystem sends camera info to clients

* adds entity yaml, changes field

* adds the camera/monitor entities, makes the UI open

* SurveillanceCameraRouters (not implemented fully)

* subnets for cameras, server-side

* it works!

* fixes rotation in cameras

* whoops

restores surveillance cameras to ignored components
makes it so that switching cameras now lerps the other camera

* makes the UI work

* makes it so that cameras actually refresh now

* cleanup

* adds camera.rsi

* cleans up prototypes a bit

* adds camera subnet frequencies, cameras in subnets

* adds surveillance camera router subnets

* might fix testing errors

* adds the circuit board to the surveillance camera monitor

* fixes up the camera monitor (the detective will get his tv soon)

* adds heartbeat, ensures subnet data is passed into cameras to send

* fixes up a few things

* whoops

* changes to UI internals

* fixes subnet selection issue

* localized strings for UI

* changes 'test' id to 'camera' for cameras

* whoops

* missing s

* camera static!

* adds a delay to camera switching

* adjusts a few things in camera timing

* adds setup for cameras/routers, localization for frequency names

* adds setup ui for routers, makes subnet names in monitor window follow frequency name in prototype

* localization, some cleanup

* ui adjustments

* adds surveillance camera visuals

* fixes a bug when closing the UI for monitors

* adds disconnect message to UI

* adds construction graph to cameras

* adds the camera to the construction menu

* fixes network selection for setup, tweak to assembly

* adds surveillance camera router construction, fixes up surveillance camera wire cutting

* adds disconnect button to monitor UI

* switches around the status text

* tweaks monitor UI

* makes the address actually show

* might make tests pass

* UI adjustments, hard name limit

* ok, that didn't work

* adds wireless cameras

* makes the television work/look nicer

* adds tripod cameras in addition to mobile cameras

* makes wireless cameras constructable

* fixes up those prototypes

* reorganization in C#, small cleanup

* ensures that power changes deactivate some devices

* adds a component to the television, comments out a function

* actually, never mind, i forgot that wireless cameras existed/are creatable for a second

* tweaks to router construction, removes SubnetTest from prototypes

* removes it from frequencies too

* Apply suggestions from code review

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* type serializers into components

* setup window opens centered, enum is now byte

* replaces active monitor list with ActiveSurveillanceCameraMonitorComponent

* adds paused/deleted entity checks, changes how verbs are given

* removes EntitySystem.Get<T>() references

* fixes bug related to selecting network from setup, alphabet-orders network listing in setup

* rider moment

* adds minwidth to surveillance camera setup window

* addresses reviews

* should fix the issue with camera visuals not updating properly

* addresses some reviews

* addresses further review

* addresses reviews related to RSIs

* never needed a key there anyways

* changes a few things with routers to ensure that they're active

* whoops

* ensurecomp over addcomp

* whoops

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-05-31 18:44:57 +10:00
keronshb
11f729d024 Simple Magic Spellbook System (#7823)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-29 16:29:10 +10:00
efzapa
94b1308f56 Add a BRB Sign (#8437) 2022-05-28 17:09:29 -07:00
EmoGarbage404
d2783efad8 Spationaut Resprite (#8458)
* resprite

* inhand fix

* small engi fix

* losing my mind aaaa fuck me

* what the hell is wrong with me

* Update Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json

Co-authored-by: wrexbe <81056464+wrexbe@users.noreply.github.com>

* Update Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json

Co-authored-by: wrexbe <81056464+wrexbe@users.noreply.github.com>

Co-authored-by: wrexbe <81056464+wrexbe@users.noreply.github.com>
2022-05-27 09:02:49 -07:00
Moony
130302a262 Adds twenty-one new smites, moves the explosion smite to the verb category. (#8456)
* Adds seven new smites, moves the explosion smite to the verb category.

* adds even more smites.

* Even more smites, some messages for specific smites.

* Adds even more smites.

* Removes some junk, adds a smite that angers the pointing arrows.

* get rid of dumb component.

* Remove mistake from verb menu presentation.

* How did that happen?

* whoops

* c

* e

* fuck

* Loading...

* removes the BoM go away

* adds the funny kill sign. Fixes ghost smite.

* Move systems around.

* Adjust organ vomit.

* Adds a smite that turns people into an instrument, and one that removes their gravity.

* oops

* typo

Co-authored-by: Veritius <veritiusgaming@gmail.com>
2022-05-27 00:41:18 -07:00
Emisse
7d5989a9cc Atmos sign (#8462)
* Add files via upload

* Update meta.json

* Update meta.json

* Update signs.yml

* Update meta.json
2022-05-26 23:41:50 -07:00
EmoGarbage404
d908435222 Mini Gravity Generator (#8449)
* meenee

* Update Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-05-26 20:08:05 -07:00
T-Stalker
4c3be517b8 New parallax, again (#8395)
* weh

Multiplies the amount of power used by the battery guns, triple-ish for the laser cannon and a fuckton more for the xray

* Parallax again
2022-05-25 14:49:20 -07:00
Flipp Syder
a8f1ffd435 Mousetraps (#8440)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-05-25 13:16:34 -07:00
Emisse
cf67baee7d Maid outfit for janidrobe (#8071)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-05-23 21:19:23 +10:00
Emisse
a1b2a9c142 Nuclear Operative Medic (#8274)
* Update belts.yml

* Add files via upload

* Update hypospray.yml

* Update hypospray.yml

* Update belt.yml

* Update belts.yml

* Add files via upload

* Update misc_startinggear.yml

* Update belts.yml

* Update misc_startinggear.yml

* Update misc_startinggear.yml

* Update belt.yml

* Update duffelbag.yml

* Update duffelbag.yml

* Update misc_startinggear.yml

* Update belts.yml

* Update chemistry-bottles.yml

* Update chemistry-bottles.yml

* Update belt.yml

* Update belt.yml
2022-05-22 21:32:08 +10:00
Kara
a3decccd35 Immovable rod (#8306) 2022-05-20 19:43:26 -07:00
Emisse
3ffda1a8bb High Security Door (#8148)
* Add files via upload

* Update layouts.yml

* Add files via upload

* Update highsec.yml

* Update highsec.yml

* Update highsec.yml

* Update meta.json

* Update meta.json

* Add files via upload

* Delete panel_closed.png

* Update meta.json

* Update meta.json

* Update meta.json

* Update layouts.yml
2022-05-19 08:04:44 +10:00
Emisse
bcf5f3eba1 More Coats (#7939) 2022-05-19 07:58:15 +10:00
ZeroDayDaemon
a8937db9e1 Funny dog mug (#8224) 2022-05-18 11:21:38 -07:00
Pieter-Jan Briers
ebfe5e888f Kick mines (real) (#8056)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-18 14:07:35 +10:00
Peptide90
18c2d7a4df Gas Tank dispenser (#8160) 2022-05-18 12:46:35 +10:00
20kdc
dc45f14536 Underplating, go away (#8138) 2022-05-17 11:11:47 -07:00
Alex Evgrashin
af926c5279 Typing indicator (typing chat bubble) (#8215) 2022-05-17 02:55:19 -07:00
EmoGarbage404
53a05caa35 Skeleton Bugfix Pt. 2 (#8137) 2022-05-13 18:31:34 -07:00
Emisse
83da49e1be Add files via upload (#8142) 2022-05-13 14:06:48 -07:00
EmoGarbage404
bf009ee60a Skeleton Sprite Fix (#8126) 2022-05-13 12:20:43 +10:00
EmoGarbage404
075eb0d982 The Newest Furry Race [Skeletons] (#7825)
Co-authored-by: Moony <moonheart08@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-13 09:35:55 +10:00
Emisse
f8f5a7fbf3 fix fish hat (#8123) 2022-05-12 16:01:20 -07:00
Veritius
656ec38f99 Add power sinks (#8020)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-12 23:12:35 +10:00
Emisse
0de06cb9c0 Syndie Commander and Syndie Elite Armors (#8003)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-05-12 22:37:12 +10:00
Emisse
40361ec0ad Fish Cap (#8046)
* Add files via upload

* Update hats.yml

* Update clothesmate.yml
2022-05-12 21:15:25 +10:00
Peptide90
a1aba4983a Adds cat ears as rare loot and traitor item (#6939)
* adds cat ears that give uwu accent

* error

* Updated to 20tc

Web edit yoink

* 21 TC now
2022-05-12 20:53:01 +10:00
ZeroDayDaemon
b2792cf3ad Salami Lid (#7813)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-05-12 20:24:48 +10:00
Pieter-Jan Briers
63b9cd0b92 Adds suppermatter (#7633)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-12 19:44:17 +10:00
wrexbe
e4312e08f1 Censor Slimes (#8101) 2022-05-12 17:40:11 +10:00
Emisse
bb0266c779 Remove the nose off the ghost (#8076) 2022-05-11 20:34:32 -07:00
EmoGarbage404
09425d0137 paintings 1 (#8067) 2022-05-12 09:46:21 +10:00
Peptide90
3b54566e5b Changs chinese food vending machine (#7754)
* new chinese food items from paradise

* made soy sauce salty

* new snacks based on the new assets

* chang assets 1

* chang vending machine

* rsi animation and fix

* rsi path fix

* misc changes

* fortune cookie snacks complete with fortunes

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml

darn Americans

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2022-05-11 00:17:24 -07:00
Kara
4bf0aac814 Rename Assistant to Passenger (#8007)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-10 13:35:08 +10:00
EmoGarbage404
8b8ad9a513 Filing Cabinet Resprites (#8043) 2022-05-09 17:46:23 -07:00
Emisse
ea498da45d Captain's Antique Laser Gun and Traitor Objective (#7940) 2022-05-09 17:43:36 -07:00
Tomeno
73d2e9043f Icon smoothing for asteroid rocks (#8058)
Co-authored-by: Tomeno <tomeno@lulzsec.co.uk>
2022-05-09 17:41:28 -07:00
Pieter-Jan Briers
5076c4d8ef Revert new parallax (#7994) (#8049) 2022-05-09 19:15:42 +10:00
Emisse
c364cbf7a9 Very Important PR That Adds 2 Fountain Pens (#8019)
* Add files via upload

* Update paper.yml

* Update meta.json

* Update pda.yml

* Update pda.yml
2022-05-09 15:17:39 +10:00
Kara
8604faab2b Nanotrasen Interns (#8006) 2022-05-08 13:00:00 -07:00
Emisse
da1e3c3dd8 Atmospherics Access, Air Alarms, Doors, Locker (#7923) 2022-05-08 00:54:04 -07:00