Commit Graph

36638 Commits

Author SHA1 Message Date
metalgearsloth bfe9ab9789
Fix more tag ordering (#23634)
(cherry picked from commit f5909f68ae)
2024-01-26 22:03:25 +01:00
Alekshhh 8274aad9bf
Ore Visual Change (#23618)
* Revert "New moth antennae and wing pair, Underwing (#23559)"

This reverts commit 1b4f1ac35d.

* Revert "Revert "New moth antennae and wing pair, Underwing (#23559)""

This reverts commit d2543d566cb398b4d7496e3f189cb638f826bf27.

* ore

* banona

* glo

* shadwe

(cherry picked from commit a3f40c239e)
2024-01-26 22:03:23 +01:00
Ubaser 1189291386
Darken syndicate implanter sprite (#23622)
add

(cherry picked from commit 7858dad9e4)
2024-01-26 22:03:22 +01:00
Ubaser 5a76c4f135
Rename Goldschläger to Gildlager (#23223)
* add

* fix

* catalog

* migration

* conflicts..

* uh

* test

* m

* fix fr

* line?

* beg

* suffering

* um

* fix

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 172fcaf2d4)
2024-01-26 22:03:21 +01:00
Pieter-Jan Briers 7fa89a2d17
Fix bad sawmill IPostInjectInit (#23626)
Same issue as 359811f71e

(cherry picked from commit d8cbddf1f4)
2024-01-26 22:03:20 +01:00
Ubaser 58affca371
Add Flippo lighter to the cig vend (#23620)
add

(cherry picked from commit 1299c81df6)
2024-01-26 22:03:19 +01:00
MACMAN2003 3ff6808627
Add hats and berets to the uniform printer (take 2) (#23556)
* hates and beretes

welcome to team 4tress, after eighteen millennia in development, hopefully it will have been worth the wait

* EEYIKES!! How will I ever "fix" these "typos"???

* SPELL WARS 2: ATTACK OF THE TYPOS

hlep me i catn' stop speeling bad

* put hats above associated uniforms

(cherry picked from commit 04cf1c3c49)
2024-01-26 22:03:04 +01:00
Ubaser 1f245a76cc
Fix a stray pixel on the large lizard tail (#23619)
add

(cherry picked from commit 17da2f0bee)
2024-01-26 22:02:26 +01:00
DrSmugleaf 78d911fc17
Make DamageOtherOnHitSystem only flash an entity red if damage was dealt (#23612)
(cherry picked from commit d79ead6fb1)
2024-01-26 22:02:25 +01:00
Nairod 173bdc8d9c
Snout Fitting Masks (#23545)
* Snout Fitting Masks

* Line Fix

* Happy Clown

(cherry picked from commit d9eaf9f3c3)
2024-01-26 22:02:11 +01:00
deathride58 e7f53d8578
Limits the minimum base skin color brightness for species with Hue coloration (#23605)
adds a minimum skin tone for hue skin colors

(cherry picked from commit 43d1be51fb)
2024-01-26 21:51:32 +01:00
metalgearsloth 5e3dd3cc22
Tags fix (#23608)
* Fix tags

- Boots is redundant and people keep dumping at end of list.

* weh

(cherry picked from commit 434206c00c)
2024-01-26 21:50:24 +01:00
LankLTE fa4e993903
Fix deadmin on join cvar for nukies (#20198)
* fix

* oops

(cherry picked from commit 993793f162)
2024-01-26 21:50:23 +01:00
Leon Friedrich 8f70116b2f
Freeze eventbus dictionaries (#22628)
* Freeze event bus

* Cleanup

(cherry picked from commit 347655fac1)
2024-01-26 21:50:22 +01:00
Trevor Day 5eef5bba73
Add whitelist to centrifuge, only allowing vials. (#23538)
* Add whitelist to centrifuge, only allowing vials.

* Better Tag Name

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 57f245e789)
2024-01-26 21:50:21 +01:00
Ed dee31da6a4
Barber scissors fix (#22895)
* barber!

* 5% change to maintenance

* some fixes

* refactor some

* ElectroJR fix merge

* aoa

* remvoe humanoid

* Magic mirror cleanup

* Cleanup

* Bunch more fixes

* Fix nohair + range bugs

* Fixes

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit f0097d4963)
2024-01-26 21:50:20 +01:00
Velcroboy 45bae76bec
Add Diphenhydramine Recipe (#23006)
Add Diphenhydramine

Co-authored-by: Jeff <velcroboy333@hotmail.com>
(cherry picked from commit 52aac0ea3b)
2024-01-26 21:50:19 +01:00
iacore f2adcd8783
more balanced constructing and unscrewing for metal objects (#21051)
* more balanced constructing and unscrewing for metal objects

- computer frame, machine frame, rack and meatspike can be deconstructed while anchored by screwing
- Computer frames now need time to be constructed.
- it now takes a reasonable time to make a meatspike. If you can construct a machine frame in 2.5, surely you can make a meatspike in 2.

* Fixes test

(cherry picked from commit d73c7e9a0a)
2024-01-26 21:50:18 +01:00
Ilya246 113c5ccbbf
add syndicate singularity beacon (#18486)
* implement singulo attraction

* add attractor syndie item

* cleanup

* fix name/desc

* actually fix name

* singulo toolbox no longer whitelisted

* add custom sprite, overhaul prototype

* address review

* beacon real

* webedit 1

* webedit 2

* webedit 3

* permalink to copyright

---------

Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
(cherry picked from commit 154416787e)
2024-01-26 21:50:16 +01:00
Ioannis Eleftheriou 4caa41f63e
Provide non-flake hermetic shell by pinning nixpkgs (#23368)
Provide non-flake solution by pinning in shell.nix

Invoking `nix-shell` makes shell.nix not consume the flake. Importing
`<nixpkgs>` is dependent on the user's current nixpkgs channel. This is not
reproducible.

Fix this by pinning nixpkgs to the same revision of the flake input.

(cherry picked from commit 2629a8d92c)
2024-01-26 21:49:59 +01:00
metalgearsloth c8614758c1
Update submodule to 203.0.0 (#23604)
(cherry picked from commit 9b4325bafc)
2024-01-26 21:49:58 +01:00
Nim 1fd55c7a53
Add medhud to the lockers medics (#23591)
add medhud to the closets

(cherry picked from commit ea7428cf99)
2024-01-26 21:49:57 +01:00
mr-bo-jangles 20d3e1f0eb
Set pAI up with a static map the pAI can use (#23499)
* Set pAI up with a trackless map

* Added a untracked map user interface class to support gps-less mapping
* Added to pAI by default, expect it to be  given to borgs as well in time.

As the personal AI is literally immobile as a ghost, it is useful to ensure that people carry one. With that idea in mind, it is worth giving the pAI a reason to be carried that doesn't depend on the player having a cracking selection of midi files on hand.

* Tried to use new ProtoId and have EntityUid on the client as commented by metalgearsloth

* Review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 412f3f470c)
2024-01-26 21:49:51 +01:00
GNF54 cce9aba601
Added Black Jumpsuit and various colorful gloves to the Clothesmate (#23489)
* Added the Black Jumpsuit and various colorful gloves to the Clothesmate

Considering that Black Gloves are available in the Clothesmate, it makes sense to add the various colorful gloves that are almost entirely unused currently.

* Update cargo_vending.yml

(cherry picked from commit 46ea3b63e8)
2024-01-26 21:49:38 +01:00
Ed 41751ecaef
Tesla Gun (#23175)
* add content

* u cant pickup lightning

* -5 heat damage

* Update battery_guns.yml

(cherry picked from commit 7d30b5ae63)
2024-01-26 21:48:53 +01:00
Ed 03cbdbecd2
Some thief steal target tweaks (#23572)
pipip

(cherry picked from commit 45be12b834)
2024-01-26 21:48:07 +01:00
778b 5a93f97d59
Fixed lighters exeption with missing component (#23589)
Update lighters.yml

(cherry picked from commit 6a4914436b)
2024-01-26 21:48:05 +01:00
J. Brown d586983869
Restore correct table-bonk behaviour with clumsy mobs. (#23583)
(cherry picked from commit ed7a787970)
2024-01-26 21:48:05 +01:00
Ubaser ceccab5b79
Large tail marking (#23551)
* add

* fix copyright

* large

(cherry picked from commit 14e15b4437)
2024-01-26 21:48:03 +01:00
Kara 03b3e36d43
Examine prediction (#23565)
* Initial prediction

* new group handling

* groups for all examines that use multiple rn

* compile

* why was it doing this??

* handle newlines with sorting properly

(cherry picked from commit 0ae3858b69)
2024-01-26 21:48:02 +01:00
MrFippik 0a14e137bf
Add input port of the network system in timer (#20026)
* Add port link sink in timer

* Update SignalTimerSystem.cs

Moving the trigger so that everything works correctly and does not conflict. Correction of remarks.

* Update SignalTimerSystem.cs

* a

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 731cfc278a)
2024-01-26 21:48:00 +01:00
TherapyGoth 08313aaa2b
Added more pride cloaks and made them craftable at the uniform printer (#21077)
* added more pride capes

* made the capes craftable

* fixed sprite names and coding errors

* renamed capes to cloaks to be in line with other cloaks

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit c94189d78b)
2024-01-26 21:47:59 +01:00
Vigers Ray ea13b0382d
Login tips (#22234)
* Init coomit

* meh

* okay

* Revert "okay"

This reverts commit bb638aa4baa8dbd0e285c3435aabf83171a4806a.

* enable-d

* Update Content.Client/Launcher/LauncherConnectingGui.xaml.cs

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* review

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 5492cc5fd1)
2024-01-26 21:47:47 +01:00
Aexxie e4a568aa86
Lizzer axolotl frills no longer look bad (it had messed up offset) (#23595)
FIXES THE 2 PIXEL OFFSET AHHHHHHHHH

(cherry picked from commit 05866a267f)
2024-01-26 21:47:46 +01:00
metalgearsloth ed65f5d54e
Remove dummy gameticker cvars (#23596)
At some point they got moved to stationsystem it seems

(cherry picked from commit ff965b971e)
2024-01-26 21:47:44 +01:00
Arendian 572bbdbedc
Adds steel tiles to construction module (#23598)
(cherry picked from commit 20a1b4a3d9)
2024-01-26 21:47:43 +01:00
dolgovmi 2003171650
Fix player rolling agent and operative at the same time (#23568)
Update NukeopsRuleSystem.cs

Probably fix the double pick bug by removing the picked agent from the Operative list

(cherry picked from commit 7ff348f1bc)
2024-01-26 21:47:42 +01:00
Nemanja 57d762185c
Allow storage to specify a default orientation for stored items. (#23594)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit a448e5fa56)
2024-01-26 21:47:41 +01:00
Hannah Giovanna Dawson eec188294b
Fix Round Restarted Announcements not playing (#23387)
* Fix Round Restarted Announcements not playing

Just make the RoundFlow manager play the funny
announcement sound effect, rather than pass it
through to players in an event that doesn't work.

Only three round end announcements probably
isn't enough. Maybe it is time for fresh memes.

* Remove the handling in ClientGameTicker.

* Pass in a specific filepass to broadcast.

* you make one line change in vscode and the linter
goes AH-HAH I CAN HELP YOU LET ME CLEAN
THIS UP and I'm like 😔 and have to revert

(cherry picked from commit a9075e5d24)
2024-01-26 21:47:40 +01:00
Vasilis a02eba7505
Expose preset in status (#23586)
(cherry picked from commit a2fdad31ed)
2024-01-26 21:47:39 +01:00
Nemanja 3d4fa26e22
Fix iron naming, add specific materials for ores (#23590)
add materials for ores, fix iron naming

(cherry picked from commit 86c1e36cd5)
2024-01-26 21:47:38 +01:00
metalgearsloth c711014af6
Fix throwing asserts (#23562)
* Fix throwing bad regencontacts call

Throwing needs throwing out the window but this stops it causing problems with anomalies.

* Bandaid throwing

(cherry picked from commit 8b7bec2f1d)
2024-01-26 21:47:37 +01:00
Mr. 27 6d00f06dc5
More arachnid emote noises (#23548)
* inital

* add click

* aaaa

* Create arachnid_click.ogg

* attributions

* hu

* actually fix attributions

(cherry picked from commit 4dc0a5f6ae)
2024-01-26 21:47:36 +01:00
ninruB 8d92469c13
Nerf rigged gloves PROPERLY (#23592)
FUCK

(cherry picked from commit c26bb7b6c0)
2024-01-26 21:47:35 +01:00
LankLTE e2134322ea
add secret weight prototype cvar (#23564)
Add cvar

(cherry picked from commit 4c179d69e7)
2024-01-26 21:47:34 +01:00
Alekshhh 325c88af4e
Ghost Sheet Inhand Fix (#23560)
boo

(cherry picked from commit 35fe14430c)
2024-01-26 21:47:33 +01:00
ninruB d85a5ec603
Slightly nerf rigged boxing gloves (#23576)
number number where are you

(cherry picked from commit 88dc9cb98e)
2024-01-26 21:47:04 +01:00
Ubaser 157cc51876
Fix epinephrine yaml (#23579)
fix

(cherry picked from commit 7f0c9c59c6)
2024-01-26 21:47:03 +01:00
GreyMario e1bc14743b
make chem layer in bottles not semitransparent (#23581)
(cherry picked from commit 8577507c20)
2024-01-26 21:47:01 +01:00
SpeltIncorrectyl ea405555a1
Can no longer place an infinite quantity of items inside a microwave (#23577)
* initial commit

* rewrote code to early return to reduce nesting

* added VV to Capacity field of MicrowaveComponent

(cherry picked from commit 655b54145a)
2024-01-26 21:46:59 +01:00