Commit Graph

6908 Commits

Author SHA1 Message Date
Alzore
cc5f45bb16 Nerf Beanbags (#24653)
Lowers beanbag damage from 55 stam to 30 stam
2024-02-10 00:49:24 -08:00
themias
f7a3ea6dcf Flipped caps real (#24961)
* Flipped caps real

* oops

* whoops

* flip not fold

* fix formatting

* cargosoft formatting
2024-02-10 00:44:19 -08:00
Ubaser
b07e8abedb EMT Belt Part 2 (#24289)
* add

* fix

* aaaa
2024-02-10 00:42:55 -08:00
Hanz
400036b962 QM drip DLC (#24477)
* New Drip for the QM

QM beret and QM formal uniform

* Asd

Asd

* Adds the new clothing to the uniform printer

what it says on the tin

* I always forget to update the copyright RAAAAAH

yup
2024-02-10 00:41:54 -08:00
potato1234_x
667cebef52 Laughin' Peas (#25089)
* laughter

* make clownmobs bleed laughter

* laughin syrup and laughter recipe

* add laughin peas
2024-02-10 00:21:44 -08:00
Varen
b46944f80e Remove battery from crew observation kit, fix description (#25000)
-Remove battery from crew observation kit, fix description
2024-02-10 19:17:07 +11:00
lapatison
39b01fda09 Minor airlock assembly clean up (#25073)
1
2024-02-09 23:30:24 -05:00
PoorMansDreams
bd4e2c35ec Added Tourniquets to stop bleeds (#23198)
* Fixed Error with RobustToolbox Edits. Removed the addition of secbelt tag from assault belt.

* Resprite of the monstrosity

* Resprite of the tourniquet NO LONGER PHALLUS SHAPED

* too bright, now darker and edgier

* Tourniquet resprite

* metajson yay
2024-02-09 17:57:42 -08:00
Armok
de0d5e4af6 Syndicate key grammar fix (#25085)
* Syndicate encryption key grammar fix

An encryption key used by... wait... Who is owner of this chip? > An encryption key used by... wait... Who is the owner of this chip?

* Syndicate key grammar fix

An encryption key used by... wait... Who is owner of this chip? > An encryption key used by... wait... Who is the owner of this chip?
2024-02-09 16:46:43 -05:00
Adrian16199
007adfc8a6 Straw hat. (#24997)
* Straw hat.

A craftable, flammable straw hat.

Thats it.

* seems to made it go in flames!
2024-02-08 18:17:00 -05:00
Vero
717d4230e2 Fixes indestructible mop buckets (#25001)
* destructible mop buckets

* remove wwod

* spacing

---------

Co-authored-by: doom <ghostrecon5123@gmail.com>
2024-02-08 18:15:12 -05:00
Ilya246
5380f64cca allow building atmos devices on lattice or thindow tiles (#25057)
do
2024-02-08 18:07:42 -05:00
Tunguso4ka
6c20938c46 Paper is now bad food (#25065) 2024-02-08 18:05:43 -05:00
deltanedas
55dbe26019 predict egg cracking + refactor (#25028)
* move stuff to server and some refactoring

* update spikables to not use triggering

* add Delete bool just incase

* a new egg

* mom can we have webedit. no, we have webedit at home

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-02-08 17:24:24 +11:00
Kevin Zheng
8ccdbe7350 Disable voting for Sandbox mode (#25027)
Sandbox mode should not be votable, because players can vote for it, and
then entity spam to quickly lag a server or run it out of memory.
2024-02-08 10:33:53 +11:00
Mangohydra
e789e9c956 Add New Fland Shuttle (#25016)
* Add New Fland Shuttle

* Update cargo_fland.yml
2024-02-07 01:49:06 -07:00
Kevin Zheng
effcc5d827 Make radiation collector a power supplier (#24978) 2024-02-06 11:32:39 -05:00
ada-please
c5027b51ec Added Monitor Computer Boards to Observation Kit (#24979)
* Added Monitor Computer Boards to Observation Kit

* Removed crew monitor board from bundle as requested by mainters
2024-02-06 11:25:07 -05:00
Rainfey
4129c77a5b Make Health Analysers UI continuously update (#22449) 2024-02-06 09:20:09 -04:00
FungiFellow
ce77589155 Borg Module QoL and Gas Analyzer Module Removal (#24702)
* Borg Module QoL Focused on Engi Modules

* Update borg_modules.yml

* Update borg_modules.yml

* Removed Gas Analyzer Module Recipe

* Update borg_modules.yml

* Removes Gas Analyzer Module from research

* Update borg_modules.yml

* Update lathe.yml

* Update handheld_crew_monitor.yml

* Update borg_modules.yml

* Exchanged Service Module Dropper with BorgDropper

* Made a Lingering Plasteel Stack

* Made Lingering Reinforced Glass Stack

* Added Reinforced Glass and Plasteel into Construction Module

* Change Borg Crew Monitor Charge use

* Update handheld_crew_monitor.yml

* Removed Borg Crew Monitor

* Removed Crew Monitor From Diagnosis Module

* ID change

* Update handheld_crew_monitor.yml

* Delete Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml

* Update borg_modules.yml

* Update metal.yml

* Update glass.yml
2024-02-05 15:46:38 -08:00
SlamBamActionman
d47865cb2d Minor addition to Cybersun pen description (#24704)
Minor change to cybersun pen description
2024-02-05 15:38:46 -08:00
Emisse
43b9233e09 Special pens embed again (#24849)
* embeddable pen

* exploding pen

* lol
2024-02-05 15:30:06 -08:00
themias
66e162c1a2 Restore Outlaw Glasses full identity blocking coverage (#24971) 2024-02-05 15:23:43 -08:00
Tayrtahn
a1fa82fdb4 Adjust drink reagent colors (#24968) 2024-02-05 15:58:36 -07:00
deltanedas
683591ab04 criminal records revival (#22510) 2024-02-04 19:29:35 -04:00
Scribbles0
8ae63ccc03 Auto Attack for Holoparasites (#24944)
autoAttack field
2024-02-04 18:01:49 -05:00
deltanedas
66d7e60cdc grille is flimsy (#24881)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-02-04 13:48:06 -07:00
Tayrtahn
41cf3e5599 Add open/closed/fill states and sprites (#24600)
This adds visual differences to the sprites of many of the game's drinks when they are opened, as well as visual fill levels for most see-through drink containers. Condiment packets are visibly torn open in the corner when opened. Glue, lube, and condiment bottles are visibly opened too. I also noticed that the soda bottles were all completely opaque, so I fixed that while I was at it. Oh, and I updated the wine bottle sprite to say 14 instead of 13, 'cause yeah.

As a result of the way fill levels take on the color of the contained liquid, many of the drinks have changed slightly in appearance. This can be adjusted in the future by modifying the colors of the reagents, but seems outside the scope of this already large PR. This also means that if you refill the bottles with a different liquid, they'll take on the new color appropriately.
2024-02-04 12:13:47 -08:00
Velcroboy
aa86b93add Adds navmap beacon for escape pods (#24938)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2024-02-04 01:24:58 -05:00
themias
b503fe5864 Add face bandanas (#24597)
* add face bandanas

* oops

* make face bandanas butcherable, also one bite

* oops

* Add mouth IdentityBlocker to bandanas

* refactor to use foldablecomponent

* remove some leftover bits

* remove HamsterWearable until face sprite updated

* oops

* review changes

* remove a few unneeded bits
2024-02-04 11:52:44 +11:00
deltanedas
24af66a544 nuke biochem research discipline (#24871)
* make chem machine boards roundstart

* nuke biochem

* kill

* pro

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-02-03 13:13:30 -05:00
Nemanja
2d48ec52ab chat color change (#24922) 2024-02-03 12:33:57 -05:00
deltanedas
604748534e Add carp pocket (#24888)
* texture

* add the item

* add it to present and salv loot

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-02-03 19:12:56 +11:00
shamp
8af1bea937 Fixed incorrect path to the uranium spear image in the construction menu (#24895)
Update weapons.yml

Fixed incorrect path to the uranium spear image in the construction menu
2024-02-03 19:11:01 +11:00
lzk
c4e7f1ebe8 Remove soapy water (#24301)
* localize shuttle timer eta etd

* remove soapy water for real
2024-02-03 15:23:34 +11:00
Adrian16199
bff50de746 Make scarfs craftable (#24735)
* Make scarfs craftable

Also sorted the lathe a bit because I like it when it looks nice.

* reverts sorting
2024-02-03 13:12:37 +11:00
lapatison
e7ee364af3 Space-Up flavor quick-fix (#24863)
Fix spaceup flavor
2024-02-03 13:08:43 +11:00
IProduceWidgets
ca5db8a8d4 freezer prevents nuclear annihilation (#24884) 2024-02-02 21:08:01 -05:00
Tayrtahn
765ea789cc Add Stonk Pockets (#24876)
* Added stonk pockets

* Give me a little credit

* Update Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json

* Update Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-02-03 12:55:02 +11:00
metalgearsloth
641fb665b7 Add puller sanity test (#24885)
* Add puller sanity test

* weh

* NRTs
2024-02-03 12:51:05 +11:00
metalgearsloth
2191c7558a Remove puller from simplemob (#22957)
Not every mob needs to be able to pull, no, if you want it implement it manually.
2024-02-03 12:25:55 +11:00
Anzarot121
30bd3d1da0 Fix mob pull issue (#22485)
* fix issue

* fix fix

* add space

* really fix

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-02-03 12:25:11 +11:00
Arendian
214961f46e Fix slipping through fences (#24850)
* Can't slide under fences anymore

* Small mobs can't pass instead
2024-02-01 23:24:20 -05:00
Hanz
82434e7959 Booze/Soda Dispenser label fix (#24848)
This is literally it

Ayup
2024-02-02 11:49:42 +11:00
Vasilis
20ecbc252c Nerf the fridge explosion resistance (#24844)
Nerf
2024-02-02 10:41:43 +11:00
Mr. 27
8ef69ff2e1 detective patch (#24739)
* inital

* fikss

* nuh uh
2024-02-01 17:49:53 -05:00
themias
f25093e85e Add Diona salute sound (#24836) 2024-02-02 09:34:09 +11:00
deltanedas
c49c78bafa spray painter rework (#23287)
* refactor and add Department to PaintableAirlock, move it to server dir since its in namespace

* add departments to doors, cleanup

* add style -> departments mapping

* AirlockDepartmentsPrototype

* update shared spray stuff to have department

* name file the same as the class name

* department optional

* refactor spray painter system + send department

* fixy

* client

* no need to rewrite ActivateableUi

* pro ops

* the reckoning

* hiss

* .

* :trollface:

* add standard atmos colors to palette

* Update Content.Shared/SprayPainter/SharedSprayPainterSystem.cs

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-02-02 09:30:46 +11:00
SlamBamActionman
e36844de47 Remove gondola donkpocket & change berry box description (#24655)
* Remove gondola & change berry box description

* Removed map gondolas

* Revert "Removed map gondolas"

This reverts commit 42fcfb85f16e778df135d2a68b9cea08d794e28b.

* Updated migration.yml to remove FoodBoxDonkpocketGondola

* Replacing is better than removing

* Changed description slightly
2024-02-02 09:27:52 +11:00
themias
eed7ca1ddc Fix dylovene OD damage (#24826)
fix dylovene OD damage
2024-02-01 15:21:04 -07:00