Commit Graph

5554 Commits

Author SHA1 Message Date
Killerqu00
8928761c0d 1x2 cable coils (#26361)
* 1x2 cable coils

* sprite edits

* Revert "sprite edits"

This reverts commit 3c76c55d06e97c8ffa864a2eb025b9726112e2e5.

* coil rotate
2024-03-23 13:30:14 -04:00
Ubaser
393bcbfc13 Throwing Knives: Syndicate Kit (#26026)
* add

* rename

* change damage type and lower price

* 6 tc

* fix?

* missed listing

* Update Resources/Textures/Objects/Storage/boxes.rsi/meta.json

* Update Resources/Textures/Objects/Storage/boxes.rsi/meta.json

* Update Resources/Textures/Objects/Storage/boxes.rsi/meta.json

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-03-23 15:13:06 +11:00
RenQ
6bffa31eba The return of the 'long bedhead' haircut as an alternative (#26336) 2024-03-22 13:35:40 -04:00
liltenhead
bec3a2fecd Nerf budget insulated gloves (#26318)
Insul Chance
2024-03-22 19:20:46 +11:00
deltanedas
5ac88d9b27 remove rped (#26316)
* remove rped

* trol

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-03-21 20:20:26 -04:00
James Simonson
12f94b33c3 Rats eyes glow in dark + reorganize rat textures (#26300)
* Split mice from rats and made rats eye glow

+ added red eyes to regal rats (Both king and buff) + normal rats
- removed mouse-3 sprites from mice and moved it into a dedicated rat rsi
+fixed admin smite wording (you turn players into mice, not rats)

* minor formatting fix

* removed version numbers float.

* Typo fix + removed unneeded layer name
2024-03-21 14:16:18 +01:00
Tayrtahn
b34777177c Fix some invalid damage types (#26295)
Fixed some invalid damage types
2024-03-21 12:58:21 +11:00
Pieter-Jan Briers
b06d40e853 fix legally distinct visor man plush name. (#26299)
am in vr. approved by real spaniard.
2024-03-20 21:48:05 -04:00
Tayrtahn
1200d406ca Pizza is not a fruit (#26293)
* Pizza is not a fruit

* Also the slice

* Let the lizards still eat pizza
2024-03-20 20:03:53 +01:00
Killerqu00
670a9826fe Per-department wire layouts (#26247)
* add per-department wire layouts

* fix science/research inconsistency

* fix wireLayout inheritance

* science is no longer security

* Security doors back to normal wire count

* implement proper wire inheritance

* revert WiresSystem.cs fix
2024-03-20 17:07:38 +01:00
Mr. 27
205edfe6d7 Fix blunt melee weapon hitsound (#26286)
* ok

* Update welders.yml
2024-03-20 15:25:38 +01:00
Mr. 27
3836da964c Monkey and gorilla melee weapon fix (#26288)
Update animals.yml
2024-03-20 15:22:30 +01:00
Mr. 27
a7d95c3b13 make traitor syndicate reinforcements get the traitor role (#25400)
inital
2024-03-20 09:41:50 +01:00
Boaz1111
0a6921d5ef new book - Tales of a Tired Janitor (#24441)
* book

* Update book-authorbooks.ftl
2024-03-20 09:27:37 +01:00
IProduceWidgets
c28cbe40c3 spawn panel rock crab suffix (#26264)
crab crab crab crab crab its all crabs.
2024-03-19 23:22:16 -04:00
nikthechampiongr
22e9d6562f Fix SCRAM implant not working while cuffed. Incidentally fix freedom implant working while dead/crit (#25978)
* Fix SCRAM implant not being usable while in cuffs. Also fix freedom implant from working while dead/crit as a side effect

* Move check up to apply to all actions and do thing I forgor to do before

* Change check into an ActionBlocker check that also checks whether the user is sleeping.

* Make checking for Consciousness the default for actions

Went through and chose what I believe to be sensible defaults for actions that had CheckCanInteract.

* Fix typos my beloved

I had an unbelievable skill issue

* Fix major skill issue
2024-03-18 23:35:46 +01:00
Plykiya
6694f92171 Adds craftable ducky slippers (#26138)
* Craftable ducky slippers

* fix node

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
2024-03-18 15:34:34 -06:00
brainfood1183
e4d5e7f1ae Spray Paint (Review Ready) (#23003)
* Spray Paint (Draft)

* paint colors, paints in maints loot, cargo crate of paints.

* fix

* remove paint (sort of)

* moved paintcleaner into own system

* Moved paint to server (had to unfortunately)

* doafter now breaks when moving away.

* cant paint mobstatecomp

* loads of fixes

* fixes

* fixes

* nopaintshadercomp

* fixes

* fix

* use locale for paint remove string

* remove nopaintshadercomponent and use blacklist

* remove enabled.true from visualizer

* paint doafter event.

* add verbs for paint and remove paint and icon for paint verb.

* fixes

* no longer replaces shader when shader exists.

* replace forloop with foreach, check shader before adding and removing.

* paint doafter now separate so no copy paste code

* Entities in sprayed targets item slots are also now correctly sprayed.

* fix

* fix

* fix airlock psray painter now removes painted before painting door.

* spray paints now use openablecomponent.

* fix

* fix damn accesstypes.

* fix

* fix
2024-03-18 15:29:48 -06:00
potato1234_x
e94fba5f70 makes closets/lockers better (#24942)
* hmngm

* fix
2024-03-18 21:53:13 +01:00
Plykiya
75287db555 Increase lone ops TC from 40 to 60 (#26130)
* Create lone ops outfit and 60 TC radio

* Changed lone op entity to use the new loneop outfit prototype

* Fix shop

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
2024-03-19 01:15:53 +11:00
vanx
6c239890c5 Suit slot weapon consistency + visuals (#26152)
suit slot my beloved

Co-authored-by: vanx <#vanxxxx>
2024-03-18 00:16:09 -06:00
Ko4ergaPunk
909b2aaa2d New wooden furniture (#26182)
* ю

* Fences

* bench, stairs and fence shadow

* small gate desc

* empty

* empty

* destructible

* price fix
2024-03-18 00:18:58 +03:00
wafehling
4357b9ef08 Added 18 new bounties to cargo (#26160)
* Added 18 new bounties + tags, couple of balance tweaks

* Oops, 2 corn tags.

* Fixed another duplicate from merge conflict

* Fixed all arbitrage issues

* Removed metamorphic glass/manly dorf bounty

* Removed manly dorf bounty

* Removed manly dorf bounty

* Removed manly dorf bounty

* Changed hiviz tag, removed commented out bounty

* Removed extra line

* Change HiViz tag

* Removed unused tag

* Removed LaceupShoes, changed HiViz

* Changed flavor text for fruit bounty

* Removed live mouse bounty
2024-03-17 13:06:16 -04:00
Ilya246
90be67e679 Add decoy syndicate bomb to uplink (#26034)
bombening
2024-03-17 13:31:41 +11:00
Ed
c35ff87e14 SlowContactsSystem to SpeedModifierContactsSystem mini rework (#26110)
* rework

* update logic
2024-03-17 13:27:22 +11:00
Adrian16199
209846b18a Gives glue tag to crazy glue (#26154) 2024-03-17 13:22:11 +11:00
21Melkuu
1d72d0777b Add explosion-proof backpack to uplink (#26187)
* Backpacks

* move to wearables

* Update Resources/Prototypes/Catalog/uplink_catalog.yml

* Update Resources/Prototypes/Entities/Clothing/Back/backpacks.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-03-17 13:21:13 +11:00
Velcroboy
03b5c21b6e Change collision mask of canisters to allow passing through cargo flaps (#26193)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2024-03-16 20:55:32 -04:00
Mr. 27
0a8def1ea2 Small species melee weapon change (#26183)
* inital

* Update animals.yml
2024-03-16 22:23:53 +03:00
Hannah Giovanna Dawson
41093ab03c SS14-12462 Nerf food and drink vending machines (#25999)
* SS14-17183 Nerf vending machines

Vending machines provide too much food
(and drink) at the moment to the crew,
robbing the chef/bartender of a reason
to exist, and robbing the janitor of a reason
to want to refil vending machines early in
the round.

This PR adds a new "initialStockQuality" field
to vending machines and sets it at 0.33 for almost all
food and drink vendors. The intent at the moment
is to drop food and drink vending machine stocks
by somewhere around a half - two thirds of the time,
about two-thirds of the stock of a given item will be
missing.

This number can be tuned to discourage people relying
on vending machines and make round start
a bit more variable when hunting noms.

* Add comment to InitialStockQuality.

* Update Content.Shared/VendingMachines/VendingMachineComponent.cs

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-03-15 19:28:00 -04:00
Ed
4aa72af574 Convert "IgnoreWeatherComponent" into "BlockWeatherComponent" (#26135)
* ignore

* doc
2024-03-15 18:36:09 -04:00
Plykiya
5912b06250 Sleep on Stasis Beds (#26129)
* eepy stasis bed

* Make healing 100x worse because it's funny

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
2024-03-16 01:00:03 +11:00
Nairod
1938768ea6 Red Neck Gaiter (#25891)
* Red Neck Gaiter

* Minor Meta Mistake
2024-03-15 21:11:40 +11:00
Ed
986ac589b4 Fashion is my profession - Procedural jumpsuit variants (#25888)
* add color field to clothing layers

* add support to randomsprite

* bababa

* finalize spriting work

* add to game

* fix

* remove space

* edit patelle, +1 decor variant

* added only pants, some sprite fix

* inflation

* fix mixed

* not tested commit

* Revert "not tested commit"

This reverts commit 4a904df3452263e87c9cb819ab5d8cf411ebe468.

* naked human is fun

* update

* add new style

* some sprite pixel tweak

* Update meta.json
2024-03-15 18:37:12 +11:00
shamp
d370f16e04 Added cheap sunglasses into ClothesMate (#25479)
* cheap sunglasses

* Update glasses.yml

* Update Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

* Fix price

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-03-15 14:56:33 +11:00
deltanedas
f8305a26a9 add more carp plushies (#26081)
* carp plushie textures

* add the plushies

* add plushies to spawners

* rainbow carp and make special plushies rarer

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-03-15 13:58:17 +11:00
Brandon Hu
0aee4bf347 Agent IDs default to passenger icon (#25993) 2024-03-14 12:09:46 -04:00
nikthechampiongr
dce24dfd03 Make radio jammer block suit sensors (#26046)
* Make radio jammer block suit sensors

* Fix stupid

Use CancellableEventArgs instead of doing what the hell I was doing before.

* Address Reviews.

Change the event from a CancellableEntityEventArgs to a ByRefEvent.
2024-03-14 11:55:14 -04:00
Tayrtahn
696f97f78e Split smoke grenade sound into two parts (#26095)
* Split smoke grenade sound into two parts and converted to mono

* Restore old sound for admin trigger effect
2024-03-14 11:46:04 -04:00
Mr. 27
3cb1c585c5 Pipebombs and IED rework (#25705)
* inital

* 2-9

* add crafting function, rename ied to fire bomb

* add firebomb ignition

* fikss

* change damage values

* add note

* fix tests i think

* ok

* good

* Review

* warning

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-03-14 15:27:08 +11:00
lzk
2a1d6e0ae0 Fix some tags for prototypes (#26088)
* Fix some tags

* oop
2024-03-14 10:27:26 +11:00
wafehling
c0bbbc33c1 Trading Outpost now has half buy-only and half sell-only pallets (#25955)
* Added new Buy & Sell specific cargo pallets

* Remapped trading outpost with new pallets, tweaked texture

* Removed debug message

* Fixed/Compacted conditional checking to let old pallets still work for backwards compatability

* Update Content.Server/Cargo/Components/CargoPalletComponent.cs

Alright, updating all the references to it.

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Changed textures, changed to enum instead of string for pallet type check

* Few minor code tweaks/formatting fixes

* Missed the prototype change

* Update Content.Server/Cargo/Components/CargoPalletComponent.cs

* Update Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-03-14 10:26:25 +11:00
lzk
91aa644571 More good looking inventory part 2.2 (instruments version) (#26090) 2024-03-13 22:03:34 +03:00
lzk
2b5a75ba66 Some more whitelists for belts (#26085)
* Allow surgery tools in medbelt

* add lil more changes
2024-03-13 21:55:26 +03:00
Gyrandola
6574681bcb Make fireaxe & shotgun cabinets destructible (#25962)
* Update fireaxe_cabinet.yml

* added min(75) and max (100) dmg threshold

100 dmg destroys the axe as well.

* made the cabinet tougher
2024-03-13 18:09:06 +03:00
Errant
8a77722f91 Fix vox custom sprites (#25989)
fix vox specific sprites
2024-03-13 18:06:37 +03:00
Mangohydra
61b3eb4de0 The lawyer finally gets a stamp (#26012)
lawyer stamp
2024-03-13 18:05:39 +03:00
icekot8
86ab7a1074 foxes are now neutral🦊 (#25992)
foxes became neutral
2024-03-13 18:02:48 +03:00
Velcroboy
bcc147634a Fix placement mode on chairs (#26041)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2024-03-13 17:45:28 +03:00
PursuitInAshes
49c8193739 Contraband Storage Crate (#25974)
* Contraband Storage Crate

* Better description

* Better Communication of Purpose

* Update Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-03-13 21:10:12 +11:00