Commit Graph

1300 Commits

Author SHA1 Message Date
brainfood1183
5f9c6e6ee3 [entity] jonk bot
* jonkbot

* copyright

* fix

* fix
2023-04-23 20:32:32 -06:00
brainfood1183
4d2a558977 [entities] Kangaroos, boxer improvements, boxing bell and hamlet updates. (#15546)
* kangaroo

* fixes

* fuix

* fixes and rotational sprites for bell

* why wont u work, stupid rsi thingy

* attempt to fix

* now hsould work

* fix bell

* fix the bell

* bell make noise on hitting it

* add faction simple hostile to space kangaroo

* added boxing kangaroo spawner comes with gloves and agressive
2023-04-23 20:31:07 -06:00
Tunguso4ka
d20be7d3da [clothing] hetman hat and cossack uniform (#15654)
* hetman hat and cossack uniform (i know sprites looks bad)

* capitalism strikes again

* the old ones looked kinda ugly
2023-04-23 19:46:15 -06:00
Nemanja
37bc649eef CHIMP handcannon (#15667) 2023-04-24 09:58:45 +10:00
Chris
e6012a3956 Add secure chemistry crates and jugs (#15211) 2023-04-24 09:53:17 +10:00
ProPandaBear
9110a8fe0a Added "Spacebucks" barsign (#15660)
* Added "Spacebucks" barsign

* Fixed indentation on meta.json

* Added copyright information.

* Added missing comma to copyright information

* Update Resources/Textures/Structures/Wallmounts/barsign.rsi/meta.json

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

---------

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
2023-04-23 18:13:31 -04:00
Jackal298
484611d741 add salvage rig (#15656) 2023-04-23 17:36:00 +10:00
Nim
f2ae5687cc [entity] Animal masks (#15583)
* animal masks

Seven new animal masks. Let the masquerade be more diverse.

* maint fluff spawner
2023-04-23 00:56:23 -06:00
Nemanja
fadee354db Anomaly Locator (#15677) 2023-04-23 15:39:33 +10:00
metalgearsloth
eabbfefdd2 Fix some damagestatevisuals (#15674) 2023-04-23 14:29:56 +10:00
Menshin
fd973be10c Thermomachines code cleaning + some QoL (#14772) 2023-04-23 13:05:32 +10:00
Slava0135
c00bd9c247 Add hot potato (#14204)
Co-authored-by: AJCM <AJCM@tutanota.com>
2023-04-22 21:40:36 +10:00
T-Stalker
108d7d9cb4 Adds shiny crystal for salvage and decoration (#15643) 2023-04-22 17:10:50 +10:00
Nemanja
4f9ae1116e Lipid Extractor (#15597) 2023-04-22 17:03:50 +10:00
Nemanja
e4642cefcb [entity] Mega Spray Bottle (#15558) 2023-04-21 03:16:33 -06:00
AsikKEsel
dce680065d [Entity] Add new medals (#15577)
* Add 6 new medals

* Update medalcase.yml

* Update medals.yml

* Update medalcase.yml
2023-04-20 17:54:31 -06:00
Kit0vras
e37a549cb6 [Entity] forensic gloves and locker fill (#15595) 2023-04-20 17:47:48 -06:00
Slava0135
adb12676c6 replace apc panel with wires panel (#14832) 2023-04-20 16:42:22 +10:00
Nim
c0be4fcc82 [Entity] SWAT gas mask for HoS (#15539)
* SWAT gas mask for HoS

Adds a SWAT gas mask. Replaces the standard Security gas mask in the HoC box with an elite one.

* fix

* commit

* commit2

* commit3
2023-04-19 20:50:15 -06:00
Puro
bb6f8543cd [Clothing] Samurai dogi (#14927)
* [Clothing] Samurai hakama

syndicate only.

* meta.json update

Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>

* hakama desc

the description of the hakama is shortened

* Update theater.yml

* Update coats.yml

* Update RobustToolbox

* Revert "Update RobustToolbox"

This reverts commit 113dd54a5d0e49a415039f8f03ea1bf87bad04c9.

* dogi

---------

Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
2023-04-19 10:27:39 -04:00
Nemanja
31851e5468 [Entity] Brig Timers (#15285)
* brigtimer

* ok

* TextScreen w timer implementation

* second commit

* working brig timer

* signal timers near completion

* soon done

* removed licenses, fixes noRotation on screens, minor edits

* no message

* no message

* removed my last todos

* removed csproj.rej??

* missed a thing with .yml and tests

* fix tests

* Update base_structureairlocks.yml

* timespan type serialize

* activation turned into comp

* sloth review

* Update timer.yml

* small changes

---------

Co-authored-by: CommieFlowers <rasmus.cedergren@hotmail.com>
Co-authored-by: rolfero <45628623+rolfero@users.noreply.github.com>
2023-04-19 01:47:01 -06:00
Floofi
0181b1e64d [Entity] Hospital Gown for medical (#15405)
* Functional hospital gown

* Added gowns to medidrobe
2023-04-19 01:43:57 -06:00
keronshb
ac87effca0 [Revert] Reverts Ninja (#15516)
* Revert "[Antag] add space ninja as midround antag (#14069)"

This reverts commit c1cda0dbf8.

* Revert "[Fix] move ninja objectives into NinjaRole (#15490)"

This reverts commit 251f429fb3.
2023-04-19 01:43:09 -06:00
mhamster
6161f7d5f3 [Entity] Add scientist lab coat (#15455)
* Hey bro nice coat

+ added scientist lab coat
+ made scientist lab coat obtainable from scidrobe
+ made scientist lab coat obtainable from robodrobe
+ made scientist lab coat obtainable from role joining science departament
+ made scientist lab coat obtainable from science locker
+ made scientist lab coat obtainable from science wardrobe

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>

---------

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
2023-04-19 01:42:05 -06:00
RobbyTheFish
426bb95e1b [Entity] Add Ian's Backpack (#15519)
* Initial commit

Add Ian's backpack

* Fixed inhand sprites

* Add fill to HoP Locker

Added Ian's 50% probability chance to spawn Ian's backpack in HoP locker
2023-04-19 01:40:25 -06:00
Puro
7a5fb7ea67 [Sprite] Stimpack Sprite (#14987)
* [Sprite] Stimpack Sprite

* updated meta.json
2023-04-19 01:41:10 -04:00
SonicHDC
c9f341fcce [Sprite] Brigmed hardsuit sprite stylization (#15461)
* Add files via upload

* Add files via upload
2023-04-17 16:47:08 -06:00
Puro
7f481f4b73 [Sprite] In hand sprites for cloaks (#15484) 2023-04-17 16:21:49 -06:00
deltanedas
c1cda0dbf8 [Antag] add space ninja as midround antag (#14069)
* start of space ninja midround antag

* suit has powercell, can be upgraded only (not replaced with equal or worse battery)

* add doorjacking to ninja gloves, power cell, doorjack objective (broken), tweaks

* 💀

* add basic suit power display that uses stamina rsi

* add draining apc/sub/smes - no wires yet

* add research downloading

* ninja starts implanted, move some stuff to yaml

* add Automated field to OnUseTimerTrigger

* implement spider charge and objective

* fix client crash when taking suit off, some refactor

* add survive condition and tweak locale

* add comms console icon for objective

* add calling in a threat - currently revenant and dragon

* combine all glove abilities

* locale

* spark sounds when draining, refactoring

* toggle is actually toggle now

* prevent crash if disabling stealth with outline

* add antag ctrl for ninja, hopefully show greentext

* fix greentext and some other things

* disabling gloves if taken off or suit taken off

* basic energy katana, change ninja loadout

* recallable katana, refactoring

* start of dash - not done yet

* katana dashing ability

* merge upstream + compiling, make AutomatedTimer its own component

* docs and stuff

* partial refactor of glove abilities, still need to move handling

* make dooremaggedevent by ref

* move bunch of stuff to shared - broken

* clean ninja antag verb

* doc

* mark rule config fields as required

* fix client crash

* wip systems refactor

* big refactor of systems

* fuck

* make TryDoElectrocution callable from shared

* finish refactoring?

* no guns

* start with internals on

* clean up glove abilities, add range check

* create soap, in place of ninja throwing stars

* add emp suit ability

* able to eat chefs stolen food in space

* stuff, tell client when un/cloaked but there is bug with gloves

* fix prediction breaking gloves on client

* ninja soap despawns after a minute

* ninja spawns outside the station now, with gps + station coords to navigate

* add cooldown to stun ability

* cant use glove abilities in combat mode

* require empty hand to use glove abilities

* use ghost role spawner

* Update Content.Server/Ninja/Systems/NinjaSuitSystem.cs

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

* some review changes

* show powercell charge on examine

* new is needed

* address some reviews

* ninja starts with jetpack, i hope

* partial feedback

* uhh

* pro

* remove pirate from threats list

* use doafter refactor

* pro i gave skeleton jetpack

* some stuff

* use auto gen state

* mr handy

* use EntityQueryEnumerator

* cleanup

* spider charge target anti-troll

* mmmmmm

---------

Co-authored-by: deltanedas <deltanedas@laptop>
Co-authored-by: deltanedas <user@zenith>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
2023-04-17 01:33:27 -06:00
Peptide90
97006710b4 [QOL] Removed unnecessary delays in some old texture meta.json files (#15378)
* removed old delay from meta.json

* removed old delay from meta.json

* removed old delay from meta.json

* removed old delay from meta.json

* removed old delay from meta.json

* delay fix

* delay fix

* delay fix

* fix delays

* fix delays
2023-04-16 23:50:37 -06:00
EnDecc
5ed99bf497 [Tweak] Janibucket buffs (#15422)
* Improves Janitor trolley significantly by adding bucket slot with sprite overlay, and 300 extra water capacity. Improves Janitor bucket slightly by adding 100 extra water capacity.

* Reduces janitor trolley density by 100 to it's pull a bit faster
2023-04-15 16:46:00 -06:00
Puro
d639b0c002 [Sprite] Toy Mouse is hat!? (#15425) 2023-04-15 16:44:00 -06:00
Puro
a3102147ca [Entity] Centcom PDA (#15415)
* [PDA] Centcom PDA

* Centcom pen update

* sheesh

* Pen based on CyberPen
2023-04-15 16:43:15 -06:00
Nemanja
ca4c523635 Remove brigmedic hypospray (#15426) 2023-04-16 01:07:13 +10:00
Slava0135
7886d27dda Add radio jammer (#14369) 2023-04-14 12:50:19 -07:00
potato1234_x
41f8b401da Misc sprite changes (#15011) 2023-04-14 12:43:49 -07:00
Puro
a35e2a8bba [Speech] Moth speech bubble (#15356) 2023-04-13 00:21:57 -07:00
metalgearsloth
be4e69b0c0 Station maps (#13027) 2023-04-13 16:21:24 +10:00
deltanedas
2b14e9a99b [Tweak] Syndi pens are bought in boxes now (#15190)
* pens are bought in wrappers now

* pro

* maybe

* pro

* pro

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-04-12 12:44:52 -06:00
Puro
37f4cfe8b2 [Fix] Security cadet spawner icon (#15324)
* [Fix] Security cadet spawner icon

* fix meta

* mergefix
2023-04-12 12:33:19 -06:00
brainfood1183
318cbc4146 Craftable Clown Hardsuit (#15317)
* clownhardsuit

* clothing construction catagory
2023-04-12 02:52:08 -06:00
Puro
682c6e02cc [Job] Brigmedic (#15319)
* [Job] Brigmedic

Everything is included!

* id meta fix

* fix brigmed.yml

* brigmed hardsuit migration
2023-04-11 17:11:01 -06:00
brainfood1183
8e817e2b97 pirate content (#11799)
* pirate content

* pirate content

* merge

* merge

* update launchers

* trying to fix launcher error

* merge

* merge

* merge

* fix for launchers

* update to held cannon sprite

* attempt to fix issue

* first updates in long time

* changes mostly to sprites

* more sprite fixes

* more sprite changes

* json fixes

* small update

* new pirate crate

* update

* updae json

* fix eva

* update accent

* fix accentcomp

* improved pirate chest

* accent localized

* station to docks

* modified the pirate ship

* changed pda spawns for firstmate nad piratecaptain to passenger pdas

* fixes

* pirate accent

* removed  spacing in shotgun.yml

* redo accent

* fix

* removed no spawn from helmet hardsuit

* suffix capitalization

* tweaks

* a

* jusdt fixing up the hi and yes which are both replacement and not replacement and replaced.

* pirate accent fixes

* desc fix

---------

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2023-04-09 22:47:40 -07:00
metalgearsloth
317a4013eb Puddles & spreader refactor (#15191) 2023-04-10 15:37:03 +10:00
Nemanja
57f2a768a0 Material Reclaimer (#14969)
* Material Reclaimer

* Fix this test

* autostack output, tweak volume, add upgrade examine

* whitelist AND blacklist support

why not

* trying so hard to get this fucking test to work

* EmoGarbage delves into MaterialArbitrageTest, never to return

* VV and restore cloth to glory

* make the system more robust

* even more stuff has composition; add blacklist for important items

* fix test fails

* convert recycling

* forgor :sadge:

* lol

* simply a modiCUM of doc commentary
2023-04-09 23:38:20 -05:00
Nim
b9e71237c4 Predatory pet for HoS (#15237) 2023-04-09 21:33:22 -07:00
potato1234_x
5a4e93fabd [Entity] Sustenance Vendor (#15119)
* sustenance vendor

* emaggedinventory
2023-04-09 16:00:23 -06:00
Puro
2c8d148bca [Sprites] Adds in hand sprites (#15244) 2023-04-09 15:42:17 -06:00
lzk228
7be21a62ec Added clown satchel (#15225) 2023-04-08 19:24:44 -07:00
JerryTheMouse
a16c29ce73 Janimaid sprite fix (#15202)
There was some additional pixels, when you keep janimaid's jumpskirt in hands. I just changed the sprite a little
2023-04-07 14:10:35 -06:00