Commit Graph

1284 Commits

Author SHA1 Message Date
Lei Yunxing
b1391b35ef adds damp rag (#15553)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-05-03 10:01:55 -07:00
Interrobang01
a155fc432a [fix] removing the stray disabler pixel (#16041) 2023-05-02 23:07:23 -06:00
Nemanja
0604c93d50 Defibrillator (#15922)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-05-03 10:10:19 +10:00
lzk228
7181a095ad [Sprite] inhand sprites for bags (#16005) 2023-05-02 18:24:37 +10:00
brainfood1183
d598ada16f Omega Cartridges Uplink rounds for CHIMP. (#15755)
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-05-02 16:11:04 +10:00
iller_saver
369bdcc3d1 New smokable: Vape! (#13072) 2023-05-02 00:34:11 +10:00
Maxtone
332510df3b Paramedic role, redone (#15439)
Co-authored-by: MagnusCrowe <whiterider1988@yahoo.com>
2023-05-01 17:13:56 +10:00
Dawid Bla
449689e6ae [fix] ammo typo(#15954) 2023-04-30 21:44:58 -06:00
potato1234_x
24e6088dd7 Salt & Pepper Shakers (#15808) 2023-04-29 18:42:44 +10:00
keronshb
0f7e7da450 Ratvarian Language and CogChamp (#15639) 2023-04-29 18:34:19 +10:00
brainfood1183
2fba2b18ab Adds Bananium (#14663) 2023-04-29 15:38:09 +10:00
Nim
0eec1d8441 [mob] Space Spider (#15744)
* Space Spider

* git name
2023-04-26 00:51:40 -06:00
Puro
509761c260 [Brigmedic] Something like a "big update" (#15496)
* [Brigmedic] Something like a "big update"

* new locker

* hardsuit resprite

* resprite resprited hardsuit

back to the future

* custom headset

* remove key

* TrackingImplanter in locker

* pda UI fix

* brigmedic bedsheet

* added transparency

* mask

* desc

* name mask

* skirt of life

* Suits resprite

* PDA resprite | Brigmed - Brigmedic

* meta dic :)

* Beret + medical gown

* backpacks

* locker fill update

* why not?

bzzz Moth-pocalypse

* Brigmed - Brigmedic

* fix

* chance update
2023-04-26 00:48:44 -06:00
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
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
Nemanja
fadee354db Anomaly Locator (#15677) 2023-04-23 15:39:33 +10:00
Slava0135
c00bd9c247 Add hot potato (#14204)
Co-authored-by: AJCM <AJCM@tutanota.com>
2023-04-22 21:40:36 +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
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
Puro
7a5fb7ea67 [Sprite] Stimpack Sprite (#14987)
* [Sprite] Stimpack Sprite

* updated meta.json
2023-04-19 01:41:10 -04: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
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
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
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
lapatison
cc5c590ece Adds the clown recorder (Clown fix) (#15074) 2023-04-06 20:06:52 -06:00
Whisper
1dbc75abd5 new bloodpack sprite (#15095) 2023-04-03 01:50:32 -06:00
Puro
4443850de3 [Drink] Robust nukie drink (#15051)
* [Drink] Robust nukie drink

only syndie.

* [desc]grammar fix

* [Meta] newline at the end
2023-04-03 00:42:37 -06:00
Lei Yunxing
edef526a37 Adds holobarrier projector to warden and HOS lockers (#15091)
* adds holobarrier projector and adds it to warden&hos locker

* a
2023-04-03 00:20:15 -06:00
Whisper
0e43f90bb8 The bleed update (#14814)
* Removed arbitrary modifier scaling. The bleed amount is now 1-1 in units.

* Added some comments to explain the blood and bleed code

* added some comments

* added some comments

* profusely bleeding message scales with max bleed rate

* Added some comments

* Added some comments (tm)

* Halved the speed bleed rate heals.

* Changed the wording of a comment to make the function of the values more clear

* Changed bleed rate values, made heat heal more bleed rate

* doubled crit chance, since damage types were reduced

* Made iron restore more blood, 2->4u per 1u

* Starting to add the blood pack

* add bloodlevel to healingcomponent

* Created code support in the healing system for restoring blood

* first test of blood pack prototype

* More pack testing, and defining the yml stack

* yml syntax fix

* adds bloodpack tag

* Successfully added the item, but the effect and deletion after using the item is not working yet.

* the blood regen worksgit add -A!

* blood pack is entirely functioning

* Removed bleed rate healing from brute pack

* Comment correction

* I tried

* Removed bleed stats from corrupted corgi, they inherit same stats from basemob

* Removed bleed stats from xeno, they inherit same stats from a base mob

* Removed bleed stats from diona, they inherit same stats from a base mob

* Removed bleed stats from slimes, they inherit same stats from a base mob

* All mobs now heal bloodloss damage at a rate of 1 instead of 0.25 when healthy

* The cautery now closes bleed wounds

* Nerf blood pack bleed rate heal

* Added 2 blood packs to medicine locker

* Added 2 blood packs to wall medicine locker

* Minor YML fix to chemistry locker, no changes in game

* Added tag to medical belt for blood pack, added 2 blood packs to medical belt

* Added 1 gauze to medical belt

* 5 blood packs addded to nanomed plus

* nanomed inventory change

* 2 blood packs added to medical supplies crate from cargo

* Moved 1 gauze from med kit to advanced med kit

* Moved 1 tricord pill from advanced med kit to basic med kit

* added 2 ointment to burn kit

* Moved ina syringe from burn treatment to oxygen kit

* Removed one gauze from brute kit

* Added one bloodpack to brute med kit

* Moved tranex acid syringe from advanced first aid to brute kit

* Poison medipen moved from advanced first aid kit to toxin kit

* Removed health analyzer from advanced first aid kit

* removed one brute pack from advanced aid kit

* added one ointment to advanced aid kit

* Added one blood pack to advanced aid kit

* Added 2 blood packs to combat med kit

* Starting with adding the license for the tg sprite

* Adds the blood pack sprite and meta.json code

* I forgor to actually code the sprite in

* Advanced med kit missing one blood pack

* Replaced tricord pill with emergency medipen in cobat kit

* Removed emergency pen from combat kit, there's no space for it

* Revert "I tried"

This reverts commit 94c2e28df3200993d3f09b72ecabc838ea5ae5c0.

* Trying to fix yml test fail

* Try again

* attempt number 3

* Restock crate price was too low

* fixing merge conflict without making a HUGE mess this time

* ???

* again

* again

* Can I add the newline now maybe???

* Revert "Can I add the newline now maybe???"

This reverts commit 22d26706a65a24633f7da1dea6315012e2d3ac6f.

* Adds the doafter fix code from Keron to the blood level healing

* minor typo fix

* Feedback from Emisse and sloth; Removed chance based feedback on cauterizing

* comment fix
2023-04-02 23:59:51 -06:00
potato1234_x
6bfd1d8f11 Missing box icons (#14891)
* boxes

* holo box
2023-03-30 22:46:06 -06:00
brainfood1183
ad31749b55 Desk Bell fix, Poster Rise fix, Happyhonk Mime inhand fix. (#14973)
* deskbell, poster rise fix, happyhonk mime inhand fix.

* cancollide: false
2023-03-30 22:32:57 -06:00
Lei Yunxing
cf61150ebd Adds advanced mop and research (#14917)
* add advanced mop

* make advmop clean faster

* works now

* tweak stats

* tweak speed again

* typo!!!

* copyright change for nerds
2023-03-30 22:21:54 -06:00
dontbetank
81a2b29317 plushie (#14962) 2023-03-29 17:36:54 -05:00
MisterMecky
a7571ac45b Add cardboard material (#14701)
* add cardboard material

* missing stack visualizers

* add crafting recipes

* cardboard crate

* license thing

* rename various things
2023-03-27 19:04:24 -04:00
DocNight
57094966ce desk bell from SS13 (tgstation) (#14870) 2023-03-27 10:29:09 -04:00
lapatison
ccbf8b5748 Watermelon and grapes (#14587) 2023-03-25 08:15:21 -04:00
potato1234_x
51778afe6f TG Vending Machines + Tweaks (#14703)
* d

d

* engivend misalignment

* sustenance vendor

* Revert "sustenance vendor"

This reverts commit 2f4fb47df4529e93b7fc69da1b7a10e8a7c9f2c2.

* shamblers juice

* pwrgame

* most food/drink machines

* robotech deluxe, centdrobe and some restock boxes

* copyright + salv vend

* tweaks

* restock box + more tweaks

* yaml linter fail

* divide vendor contents

* divide contents 2
2023-03-24 02:54:47 -06:00
MisterMecky
fba633a6b1 Modify and add stack sprites for wood (#14684) 2023-03-23 22:26:19 -04:00
Slava0135
620c40e087 Add explosive banana peel 2 (#14491) 2023-03-23 11:54:14 -04:00
adamsong
980c3ef799 Improved solution container visuals (#13791) 2023-03-23 14:49:42 +11:00