Commit Graph

6313 Commits

Author SHA1 Message Date
SpaceyLady
9103061ac0 Correct spelling mistakes for daily tips (#22893)
Update tips.yml
2023-12-23 07:57:58 -06:00
Velcroboy
dfa71af1f8 Add Chef's Belt (#22868)
* Add Chef's Belt

* Reduce contents in filled belt to just s&p

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-12-23 00:11:30 -07:00
Alzore
a09efd47cd Add a bottle of water to the survival box (#22881)
* BO'OH'O'WA'ER

* smallbottle

* extendedbox
2023-12-22 23:33:20 -07:00
Nemanja
06a663d3ab Move HUD options to general options tab (#22884) 2023-12-22 23:32:56 -07:00
Nemanja
9b18357a88 Corner Clothing UI (#22883)
* Corner clothing (save point)

* IT WORKS. YIPPEE

* the last of it

* template rejigs
2023-12-22 23:32:23 -07:00
liltenhead
33399db6c2 Vial Drinking (#22886)
vial drink
2023-12-22 23:32:13 -07:00
lapatison
6baf564fa0 Cargo request plasma canister locale (#22858)
* name and desc removal

* locale

* shouldnt have touch that for now
2023-12-23 00:42:19 -05:00
Moomoobeef
c64c98ec1d New sprites for books on bookshelves in order to look less sad. (#22874)
Changed sprites for books on bookshelves, added one missing sprite
2023-12-23 00:34:19 -05:00
Ed
3f8ad3a13d Anomaly synchronizer buff (#22771)
* Update production.yml

* Update electronics.yml

* Wat

* Update anomaly_sync.yml

* Update anomaly_sync.yml
2023-12-22 23:46:51 -05:00
deltanedas
ffe4569854 jaws cant pry bolted doors (#22860)
* jaws cant pry bolted doors valid jaws can

* no valid jaw

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-22 20:22:12 -07:00
Ed
def4e0f60e Doggy Ears (#22832)
* add content

* sprite update

* goodbuy nose
2023-12-22 20:20:08 -07:00
lzk
fe8e0e6f9f Remove job specific traitor items from vendors (#22867)
Update chapel.yml
2023-12-22 14:54:54 -08:00
magmodius
053c1e877f Rigged boxing gloves have variant TC costs. (#22851)
Made the rigged boxing gloves have variant TC costs.O[Oi
2023-12-22 02:54:20 -07:00
Ed
5a1e317e0f It's time to build a barbershop! (#22565)
* barber!

* 5% change to maintenance
2023-12-22 02:54:00 -07:00
lzk
3389955648 hotfix for party hats (#22852)
lololo
2023-12-22 00:32:11 -07:00
Kevin Zheng
054321d2c2 Add YAML gas reactions (#22803)
* Add YAML gas reactions

* Convert more reactions

* Use enum names

* Convert more names

* Add migration for MiasmaCanister

* Prevent reactants from going negative

* Fix energy conservation, lift energy calculation

* Fix comment

* Comment

* Add rate multiplier
2023-12-22 00:30:56 -07:00
MACMAN2003
0828c32abf Add some clothes to the uniform printer (#22829)
all the clothes (ft. emag)
2023-12-22 00:26:38 -07:00
2013HORSEMEATSCANDAL
af753c13a5 Glossary (#22840)
* Added a glossary to the guidebook to help new players understand slang.

🆑 2013HORSEMEATSCANDAL
- add: What's a Greytide ? The new edition of your employee guidebook now has a glossary !

* added one more definition
2023-12-22 00:25:56 -07:00
lzk
279d345e6c PARTY HATS YIPPIE (#22850)
* :party:

* a little trolling
2023-12-22 00:25:20 -07:00
Emisse
d066b6a2c9 add gambling to cargo (#22842)
* gambling

* fix typos
2023-12-21 21:24:00 -07:00
Guilherme Ornel
fb47c4c83b Added ashtrays (#22837)
added
2023-12-21 21:21:01 -07:00
RiceMar1244
c7052f5a6c Adds top surgery scar markings to the character creator (#22806)
* Adds top surgery scar markings to the character creator

* Darkens scars and adds new short and long variants
2023-12-21 21:20:21 -07:00
Ilya246
fcd1a4dde8 adds embedding + throw damage to cybersun pen (#22822)
cyberpen throw damage
2023-12-21 21:20:02 -07:00
Tayrtahn
8ad0d26015 Change range of 10-sided dice (#22833)
* d10s now roll values from 0 to 9

* Changelog for PR #22406 (#22824)

* Remove meta entry for 10 value state

* Gotta delete the 10 face state or the RSI validator complains

* Attempting to fix invalid state causing tests to fail

* Another, better attempt to fix the test

* Once again

* I am an overcomplicating dingbat

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2023-12-21 19:53:17 -07:00
Guilherme Ornel
456deea19e Makes sabre sheathe use ItemSlots (#22792)
* added item slot

* fixed filled

* localized verbs

* github check was acting up
2023-12-21 14:16:42 -08:00
Boaz1111
4c081aab04 Uranium Ammo (#22406)
* working on depleted uranium shotgun ammo

* added depleted uranium to more ammo

* Last changes and additions

* Forgot something, theoretically resolved the merge conflict too

* Nerfed the DU munitions, renamed em to uranium because it's not really DU

* made the ammo more expensive, also fixing the crash at the same time

* Fixed the last error, theoretically at least

* Revert "Fixed the last error, theoretically at least"

This reverts commit a875d2ac320478e4cb407564d704d915d0ef158b.

* copyright changes, small sprite changes, last references of depleted uranium removed

* Revert "copyright changes, small sprite changes, last references of depleted uranium removed"

This reverts commit 93a12bf20bc72581a0bdc32a3cdc7d887f50de3f.

* Update meta.json

* Update meta.json

* Update lathe.yml

* Update arsenal.yml
2023-12-21 12:07:44 -05:00
Łukasz Mędrek
d6f5ff7865 Fix gas canister random item insertion prediction (#22809)
* Fix gas canister random item insertion prediction

Fix #22652

* Revert Component changes, just rename in prototype
2023-12-21 21:37:34 +11:00
Repo
af76a4a76b Prevent mice from spilling containers. (#22812)
Added component on mouse prototype to prevent spill verb from being added
2023-12-21 03:23:01 -07:00
Emisse
174dcac683 give service borg syringe so they can mix drinks (#22813)
give syringe so they can mix drinks
2023-12-21 03:22:27 -07:00
Emisse
5bf9a8776d remove base agent id from nukie operatives (#22811)
remove base agent id
2023-12-21 02:59:06 -07:00
themias
59c8f23857 Cleanup forensic cleaning (#22715)
* Cleanup forensic cleaning

* move cleandelay to new component; buff syndiesoap

* updated based on feedback

* remove tag
2023-12-21 01:54:52 -07:00
KittenColony
eac8796fad Gauze Markings 2 - Medical Boogaloo (#22452)
* renamed leg wrap to thigh wrap

* gauze species rework pt. 1

attempt 73

I hate it here please god get me out

* fixing lizard foot wraps part 80

* Attempt 80 to get lizard markings to work

i fucking hate it here

someone help me D:

* attempt 82

im crying please work now

* made gauze eye pads actually tape on

* Handwraps added

* fixed lizard foot wraps (again)

84.

* attempt 83.5

* attempt 84

please work

* added blindfold gauze

* fixed boxerwrap_r

:greenfrog:

* fixed @ubaserB's eye scars

* Revert "fixed @ubaserB's eye scars"

This reverts commit eb364e1e61c03c2b8567fec8c1a5c6c78c9a333c.

* Revert "Revert "fixed @ubaserB's eye scars""

This reverts commit ac1ee343ae2a8adb2569f88b81cc4afc6915f220.
2023-12-21 00:35:47 -07:00
Emisse
a1caf30dd1 borgs know who is crew now (#22802)
borg see job borg see crew
2023-12-21 00:09:53 -07:00
RiceMar1244
5ee01ce900 Resprites energy sword and double energy sword (#22797)
* Removes old inhand visuals from e_sword.rsi and its meta.json

* Adds new visuals with a longer blade for the e sword

* Makes e sword use its new sprites and modifies other energy weapons prototypes to keep using their own inhands

* Makes the toy sword use the old less scary e sword sprites (and gives it BaseItem parent because I thought I broke something when i couldnt pick it up)

* Removes old desword sprites and modifies meta.json

* Temporarily removes esword blade sprites

* Adds back esword sprites after modifying them to flash instead of shimmer

* Adds new desword inhand sprites and modifies meta.json and entity prototype to use them

* Moves desword sprites back to its own folder from inhands_64x after a supposed prefix conflict

* Removes blade inhands

* Adds back blade inhands

* Moves all inhand sprites to their own inhand folders related to the items. Removes inhands_64x folder
2023-12-20 23:32:11 -07:00
Kevin Zheng
4c1e71e84a Raise cryo metabolism min temperature (#22785)
Many people have been running into issues cooling bodies to the current
temperature. Make it a bit easier by raising the max temperature.

This is the temperature that the body has to change to in order to
metabolize the drug, so in practice cryo has to cool lower than this in
order to actually get the body to this temperature.
2023-12-20 22:02:32 -08:00
CrigCrag
e9516fc43e add Fresium, a chillingly complex chemical to prank your friends with (#22527)
* everything

* tweakeroo

* maintspill

* some balancing and tweaking

* adds ice tags and gives it to ice crust

* fix code because im smart im the smart guy yeah that's me

* yeah

* oops

* do you wanna try that again

* conserve matter

* im rather smart
2023-12-20 22:35:22 -07:00
Guilherme Ornel
3db343f160 Updated (most) medipen sprites (#22789)
* changed sprites

* desaturated a bit
2023-12-20 22:30:58 -07:00
Kara
ad97580727 Rename Miasma to Ammonia (#22791)
* Rename Miasma to Ammonia

* Namespace changes

* Map change????? why
2023-12-20 21:19:50 -07:00
Emisse
2eeaf5efcd Structural Balancing Pass (#22790)
* new structural type

* riveted wall stronk

* balance structural items
2023-12-20 20:03:06 -07:00
username
c514af0366 Add nitrous oxide decomposition reaction (#22738)
Co-authored-by: whateverusername0 <whateveremail>
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-12-20 17:33:08 -08:00
username
5a4e04ea14 Add nitrous oxide synthesis reaction (#22774)
Co-authored-by: whateverusername0 <whateveremail>
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-12-20 16:14:59 -08:00
Velcroboy
3cf058f9f4 Add coal distribution to progen (#22755)
* Add coal distribution to progen

* Add sprite

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-12-20 16:46:20 -07:00
Moomoobeef
b8583ed573 fixed nocturine locale (#22737)
* removed nocturine from the uplink catalog

* fixed nocturine locale, added back to catalog for 6tc
2023-12-20 16:43:17 -07:00
Emisse
8d867faac1 put new centcom outfit in centdrobe for easy admin shits (#22786)
webedit ops
2023-12-20 16:38:16 -07:00
Guilherme Ornel
d318e96936 Added CentCom clipboard, folder and added a normal green folder. (#22693)
* added

* pen touch up

* fixed conflict?

* whatever i dont want credits
2023-12-20 16:29:35 -07:00
Guilherme Ornel
62cee0bca5 CentCom Agent Suit (#22700)
* added suit

* added suit

* tweaked monkey suit
2023-12-20 16:29:13 -07:00
JoeHammad1844
be7c43e753 ports deltastation shuttle from ss13, assigned to fland installation (#22776)
* gogoogsf

* deltanedas has been banned from the repo

* double banned
2023-12-20 16:26:07 -07:00
Kevin Zheng
98d499d178 Reduce frezon price (#22784)
50 mols of frezon can be made from one mol of tritium, and so without
adjusting the price pretty ridiculous sums of money can be made in
cargo.

I considered reducing the amount of frezon producible, but all of the
atmos players that I surveyed prefered a price decrease instead of a
yield decrease, so give them what they want.
2023-12-21 08:40:29 +11:00
ERROR404
fe1c301be5 New plant (#22704)
New plant
2023-12-19 21:57:02 -07:00
Veritius
bc2925de3e Make ethylredoxrazine effective at curing drunkness (#22763) 2023-12-19 18:20:04 -08:00