Commit Graph

7616 Commits

Author SHA1 Message Date
nikthechampiongr 6d38428b56
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

(cherry picked from commit 22e9d6562f21bdd4f0962d6e3b6fcdd81bb4c253)
2024-03-24 00:01:51 +01:00
Killerqu00 f33fe79c7a
Initial Infected can see each other (#25934)
initial infected icon

(cherry picked from commit 45d6c03407e41d92caa368e1db826efd6d828b66)
2024-03-24 00:01:46 +01:00
Boaz1111 bcd45f1203
Bumps LoneOps minimum required players to 20 (#26244)
done

(cherry picked from commit 61e31f4062b568591448ff5be83ba8be851269e9)
2024-03-24 00:01:39 +01:00
Plykiya 60b23640c5
Adds craftable ducky slippers (#26138)
* Craftable ducky slippers

* fix node

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>

(cherry picked from commit 6694f92171ad8d6465b8c8403bf863ba66a75b74)
2024-03-23 23:59:51 +01:00
brainfood1183 53b2d209b0
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

(cherry picked from commit e4d5e7f1aebfc37b1bc3453fdb39578f3897b6a1)
2024-03-23 23:59:20 +01:00
potato1234_x c8a02d666f
makes closets/lockers better (#24942)
* hmngm

* fix

(cherry picked from commit e94fba5f702820588ad358a1824d67920fd399f8)
2024-03-23 23:58:16 +01:00
Ilya246 30ad71fe77
fix decoy bomb uplink category (#26205)
move

(cherry picked from commit 21c527d6d09847a742202613d8aefce62c79b334)
2024-03-23 23:56:20 +01:00
DoutorWhite 2db74bd7c5
Improves Medical Hud interface and functionality (#26027)
* Improvements to the medical hud interface

* Adds an icon for SSD players

* Indentation fix

* Update sprites, changes direction and adds new status icon.

* Adds decomposing icon

* Code cleaning

* Changes Crit Icon sprite

* Simplifies the decision structure

* Changes copyright line

* Changes Critical Icon sprite

* Makes the Critical Icon border darker

* Changes sprites to /tg/ station

* Updates copyright

* Makes Dead Icon animation slight faster

* Code cleaning

* Remove some unused imports

* Code cleaning and rename icon

* Minor code cleaning

(cherry picked from commit 8d40bc36a93d3d5c6d3ece6c662ac9747f7837ae)
2024-03-23 23:56:19 +01:00
Mr. 27 b2564e7a3b
make romerol work on the dead (#26222)
* a

* review

* g

(cherry picked from commit 87386ca0baa9fc3006b726d26723b345b737943d)
2024-03-23 23:52:03 +01:00
vanx 678468cc05
Suit slot weapon consistency + visuals (#26152)
suit slot my beloved

Co-authored-by: vanx <#vanxxxx>
(cherry picked from commit 6c239890c5c63c2e058fe9d7dfddcd36e25ca221)
2024-03-23 23:52:02 +01:00
HappyRoach 51071c7f1b
Fixed safe filling with WT550 (#26208)
(cherry picked from commit 597107c4314f001e1026fd02db33749492c5a62c)
2024-03-23 23:51:57 +01:00
Pieter-Jan Briers 83beb03c31
Increase air alarm low pressure thresholds.
If a room's pressure drops it can become unbreathable long before people start taking pressure damage, and so also long before the air alarm starts reporting a danger state. I've increased the values so that the air alarm should show danger if the pressure becomes so low as to be unbreathable.

(cherry picked from commit 865f530d1f8b50219b5e73b5ad9eb135cec1ce73)
2024-03-23 23:51:54 +01:00
Golinth b56551f310
Criminal Record Icons below Job Icons (#26203)
SS13 Criminal Record Icon Location REAL

Adds a new Offset DataField to the StatusIcon Prototype. It effects status icon location on a per-pixel level. Not sure what else it could be used for, but hey, nothing wrong with generalizing. Also moves the mindshield icon priority to one, to fix an unreported bug with them covering non-job icons.

(cherry picked from commit 21de5e9a08929e8c710030b887c081bf6afc9649)
2024-03-23 23:51:45 +01:00
FungiFellow 6dc0db9e0a
Change Syndie Monkey Price 8-6 TC (#26214)
Price 8-6 TC

(cherry picked from commit 6095383ce491e9cb4836662f3bc56ee26eee29f6)
2024-03-23 23:51:44 +01:00
Ko4ergaPunk 519573369b
New wooden furniture (#26182)
* ю

* Fences

* bench, stairs and fence shadow

* small gate desc

* empty

* empty

* destructible

* price fix

(cherry picked from commit 909b2aaa2d5976122f17f9e4fe6ce1a1389dc619)
2024-03-23 23:51:40 +01:00
wafehling 14b72975df
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

(cherry picked from commit 4357b9ef08fee0e08c4fdf4eeef714fa8eb38112)
2024-03-23 23:51:36 +01:00
Velcroboy 2ad986dddd
Adds pre-set warp points (#991)
* Adds pre-set warp points

* Trim yaml

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-03-21 20:35:14 -05:00
Danger Revolution! d07fa88e1d
Adds Lunchboxes to Lockers (#989)
* do the chnage

* Revert "do the chnage"

This reverts commit f691377136.

* lunchboxlunchboxlunchbox

* Update science.yml

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>

---------

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
2024-03-21 13:46:44 -05:00
Velcroboy a14b7c5e23
Add Submarine to map pool :) (#984)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-03-20 22:49:58 +00:00
rosieposie bc19445e42
Submarine Patches 2/10 (#809)
* various retooling

- moved bar & arcade to food court
- retooled west wing of hospital
- fixed atmos markers in gas area
- fixed some misc emergency lights, lowered overall emergency light amount in maints
- removed barbershop, laundry made smaller and slid over a bit
- epi gets their maints back for real
- SIX SMES's. power problems better be fixed or im eating my hat
- removed any labyrinth loot of value pending a full labyrinth redo out of scope for this patch
- WIP supply room for the big hole left by the old bar & arcade/cafe area

* minor touchups

* Update submarine.yml

- added a park substation
- minor tweaks & cleanup

* remove unnecessary extra SMESs

* fix erroneous tiles

* fixgridatmos & variantize

* Update submarine.yml

- added a central hospital substation
- retooled the sec & engi outposts
- labyrinth REMOVED.
- made the robotics room """bigger"""

* sorry prototypes file

* Update submarine.yml

- bingus room
- ai containment room
- minor tweaks & cleanup

* minor fixes again

* cave time

* further refinement of cave area

* old xenobio lab

* decal'd up

* 1 more light

* glass airlocks in xenolab

* ICU door & cave prison

* Update submarine.yml

- added some railings / line stuff
- borg chargers at logi lobby
- fixed some tiles
- retooled ICU a little

* signage babeyyyyy

* Update submarine.yml

removed laika, added SOME stalagmites but not all

* Update submarine.yml

stalagmites, sec main area rejiggering, detailing

* button fixes

- made all buttons directional
- named janitor service light buttons
- added some missing jani lights

* stuff

- moved brigmedics room into sec
- moved detective out of sec
- prettified more substations
- added martial artist, tweaked some crew numbers

* custom escape pod

* custom evac shuttle - NTES Propeller

* fix some wiring on evac shuttle

* rotate some items & telecomms added

also intercomms

* more room at arrivals in case evac shuttle flips

* swap to metem machines

* strengthen armory

* armory touch-ups

* a treat for the warden

* fix stinky decals

* added laser box

and fixed armory more and also apparently never added the metem machine ??????? i swear i did this, must have not saved it

* add secondary sec entrance

also added some posters

* swap armory & wardens room

* armory touchups

* Update submarine.yml

- added blast doors to holding cells
- fixed corpsman door
- added some more cameras
- stuck some secret doors around
- added ninja bombing targets
- minor touchups

* fix some connections

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* Update submarine.yml

* sec checkpoint 2

* minor fixes + panopticon

* fix power near arrivals

* missed two wires fuck

* Update submarine.yml

* atmos maint changes

* more external access points

* camera monitor fixes

* fix area around camera router a bit

power, etc

* fix test failure

PROTIP: dont throw darts

* inconsistent windows at bars

* Update submarine.yml

* Update submarine.yml

* retool cargo dock significantly

* single tile that was gonna annoy me

* forgot lights oops

* Update submarine.yml

* improved ICU way more

* Update submarine.yml

- contraband crate
- minor ICU touchups

* minor fixes

* cloning room tweaks

* decal'd up the bar
2024-03-19 18:50:02 -05:00
rosieposie 304fdcd356
Add Corspman Access & Airlocks (#892)
* add corpsman access & mantis maint airlock

* fine

* accessible guy

---------

Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>
2024-03-19 13:13:13 +01:00
Debug 9ad761ae18
Lunchboxes! Revival (#980)
* Adds Sprites, courtesy of Noctrn

* Adds lunchboxes

* Adds the "notes from mom" that can spawn inside

* Adds to vendors.

* shrunk storage by one row

* update the locale to have "note from mom"

* new sprites :O

* Update lunchbox.yml to have higher price

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>

* Update chefvend.yml

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>

* why the fuck did they remove tap.ogg?

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>

* update credits

* One RSI, many states

---------

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
2024-03-19 12:39:39 +01:00
Velcroboy 1f6cb805d6
Change map prefix to DV (#979)
Co-authored-by: Velcroboy
2024-03-19 02:19:47 +00:00
Danger Revolution! 0271f2ac35
Fix Moth not eating Jumpskirts (#976)
* do the chnage

* Revert "do the chnage"

This reverts commit f691377136.

* Update base_clothinguniforms.yml
2024-03-17 17:45:11 +00:00
Danger Revolution! e2d21fe867
Fix #974 (#975)
Update jumpskirts.yml
2024-03-17 17:31:10 +00:00
Debug fed10b87a4
Merge pull request #973 from DebugOk/2024/03/15-merge-upstream
Merge upstream
2024-03-17 18:09:43 +01:00
Debug 0e62b240b8
Uplink 2024-03-17 15:47:30 +01:00
Debug fad821db3e
Silly stamps parts 2 2024-03-17 15:43:49 +01:00
Whisper baf87790eb
Update blood related tips! (#25809)
(cherry picked from commit f259f2f3a21127427ae7f026e16694fcdfe14583)
2024-03-17 15:11:36 +01:00
Ilya246 0387a58d2a
Add decoy syndicate bomb to uplink (#26034)
bombening

(cherry picked from commit 90be67e67956c7dd0348ddd0688d7d3ab614cb99)
2024-03-17 15:11:31 +01:00
Ed 58e6820428
SlowContactsSystem to SpeedModifierContactsSystem mini rework (#26110)
* rework

* update logic

(cherry picked from commit c35ff87e146f0cda7c10782f4ab80b784b51e5fe)
2024-03-17 15:11:29 +01:00
Adrian16199 709b379c88
Gives glue tag to crazy glue (#26154)
(cherry picked from commit 209846b18a0b22e60c520ee98f7afcfa08a102a8)
2024-03-17 15:11:27 +01:00
21Melkuu 603582ebc1
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>
(cherry picked from commit 1d72d0777b662a2cb58350d666042da17c18d43f)
2024-03-17 15:11:26 +01:00
Velcroboy 53cbe12642
Change collision mask of canisters to allow passing through cargo flaps (#26193)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
(cherry picked from commit 03b5c21b6e4d0efc70e0172690d9d2ec02d7a711)
2024-03-17 15:11:19 +01:00
Mr. 27 c45cb7f84f
Small species melee weapon change (#26183)
* inital

* Update animals.yml

(cherry picked from commit 0a8def1ea2dc4b7aee297098b3b50a7367f3c4d1)
2024-03-17 15:11:12 +01:00
deltanedas 23fac4c6b9
less fish in maints (#26156)
pro

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 6aa77700c1e4ae9d5e287c7c4f6e3484e1eb28b4)
2024-03-17 15:11:06 +01:00
Plykiya f8f62bdc17
Round start Ion storms (#26165)
* Round start Ion storms

* five

* Update Resources/Prototypes/GameRules/events.yml

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 23e6d537a44d8aaea781462ce600292811ac4998)
2024-03-17 15:10:52 +01:00
Hannah Giovanna Dawson 385a8bd07a
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>
(cherry picked from commit 41093ab03cc6a643ee7721de3567963b34fe8e54)
2024-03-17 15:10:44 +01:00
Ed b9f41c2d48
Convert "IgnoreWeatherComponent" into "BlockWeatherComponent" (#26135)
* ignore

* doc

(cherry picked from commit 4aa72af574cc7a3370085fb70831fbde1df29077)
2024-03-17 15:10:41 +01:00
deltanedas 98ea628ed2
fix eggsplosion (#26146)
Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit d87be642ee9ec81064eff22389705755ab557b54)
2024-03-17 15:10:37 +01:00
Plykiya 575d169605
Sleep on Stasis Beds (#26129)
* eepy stasis bed

* Make healing 100x worse because it's funny

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
(cherry picked from commit 5912b062503841ad8adc6a4a959f97670063f1fb)
2024-03-17 15:10:32 +01:00
Nairod 8ec5d2ba9b
Red Neck Gaiter (#25891)
* Red Neck Gaiter

* Minor Meta Mistake

(cherry picked from commit 1938768ea69ad2f69758036816142a205552eb63)
2024-03-17 15:10:26 +01:00
Ed a74bbc0fc0
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

(cherry picked from commit 986ac589b44687fd2f3b71da00a52434db75abe3)
2024-03-17 15:09:40 +01:00
metalgearsloth abaade5fcf
Freeze clothesmate (#26125)
People will do anything but add uniform dying.

(cherry picked from commit 3c814f4652c679821613c618cd206988f011599a)
2024-03-17 15:09:38 +01:00
Adrian16199 cfe2e712d6
A small change to ifriit. (#972)
Basicly adds playtime requirement to ifriit and makes them unable to die from bleedout (cus they are a floating rock)
2024-03-17 14:09:23 +00:00
shamp e9bdb23d28
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>

(cherry picked from commit d370f16e04fc12c8fa2b89c41c3fce12225334b4)
2024-03-17 15:08:53 +01:00
deltanedas 76330eae64
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>
(cherry picked from commit f8305a26a9bd1dc080daca8f45f7289829b91682)
2024-03-17 15:08:11 +01:00
lzk 2f641412dc
Sort all tags in aplhabetical order (#26114)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 0fdb551c3d54824b8191a94befdd97ae88cc0102)
2024-03-17 15:08:09 +01:00
Brandon Hu 99a46a3be1
Agent IDs default to passenger icon (#25993)
(cherry picked from commit 0aee4bf3479df41583a2e7101ab2028f0db2d1aa)
2024-03-17 15:08:01 +01:00
nikthechampiongr 554aa0774b
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.

(cherry picked from commit dce24dfd03b3ddfe1044297edf9d35bc9f75c523)
2024-03-17 15:07:58 +01:00