juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,213 Commits 57 Branches 0 Tags
bc930da84f681a52dc48b7c6f9782037ed128564
Commit Graph

6453 Commits

Author SHA1 Message Date
Ed
5b2020d708 Merge remote-tracking branch 'upstream/master' into ed-08-09-2024-upstream 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
 2024-09-08 21:20:54 +03:00
K-Dynamic
7eb5c0af03 Radiation blocker values for directional plasma and uranium windows (#31975) 
resistances to directional windows
 2024-09-08 12:08:06 -06:00
beck-thompson
eab318ed39 Rings now give a small amout of gold / silver when scrapped (#31847) 
* Ring

* Silly name fix
 2024-09-08 18:10:05 +02:00
slarticodefast
c46a4ab876 Revert "FTL + AI fixes (#31952)" (#31968) 2024-09-08 17:50:23 +02:00
lzk
a1b27db35f remove HatBase (#31971) 2024-09-08 18:23:01 +03:00
Killerqu00
c7b989598f some securiby contra fixes (#31956) 
* some contra fixes

* whistles change
 2024-09-08 14:06:00 +02:00
PopGamer46
0e99ddbc8a Fixes being able to craft the justice helmet with a justice helmet (#31957) 
fix
 2024-09-08 12:21:55 +02:00
metalgearsloth
f7a87b5f32 FTL + AI fixes (#31952) 2024-09-08 18:12:23 +10:00
Ed
230ea9be46 Metamorphosis - FoodSequence 3 (#31012) 
* setup some data

* cheeseburger recipe

* Update FoodSequenceSystem.cs

* finalize cheseburger recipe

* remove fun

* return old taco sprites

* full foodsequence data refactor

* return tacos

* well done

* add cutlets to burger

* chickenburger recipe

* +2 burger recipes

* more fun

* Update brain.png

* some slice produce added

* documentation

* watermelon

* skewer work

* flipping

* tomato

* skewer watermelon

* Update skewer.yml

* oopsie, ok, im go to sleep

* fix checks

* Update produce.yml

* screwed

* cheeeeeeeese

* all cooked meat added

* produce added

* aaaaand suppermatter

* key to Tag

* More

* proto string remove

* raw snail

* fix

* Update FoodMetamorphableByAddingComponent.cs

* fixes

* fix3

* fififififx
 2024-09-08 02:22:27 -04:00
Nemanja
efe54e011e Biogenerator (#30694) 
* biogenerator

* ack

* test success!

* fix tests

* increase price of reagents
 2024-09-07 23:34:22 -06:00
LucasTheDrgn
b51d9382c0 Returned functionality to industrial reagent grinders (#31903) 
* Returned functionality to industrial reagent grinders without un-nerfing recyclers

* Limited industrial reagent grinder to only extractable solutions
 2024-09-07 17:47:02 -06:00
qwerltaz
6158bab715 fix wall closet storage range (#31933) 
fix wall closet range
 2024-09-07 17:44:29 -06:00
Boaz1111
66f3b780ef uranium ammo mag being called rubber ammo mag fixed (#31934) 
minor misspelling
 2024-09-07 22:34:42 +02:00
lzk
932ff660d0 fix paper label whitelist (#31919) 
* fix paper label whitelist

* forgor

* oh lmao
 2024-09-07 15:22:11 +02:00
lzk
9680c1d1d9 Remake bottles and syringes names to use labels (#29956) 
* Remake bottles and syringes names to use labels

* vial

* fix and add stuff
 2024-09-07 15:51:36 +10:00
Boaz1111
3a3a5fbaf4 makes the maple wing marking have a primary and a secondary color (#31691) 
bogos binted
 2024-09-07 15:48:40 +10:00
Nemanja
a197baac17 split temperature protection into heating and cooling (#30662) 
* split temperature protection into heating and cooling

* fugg

* weh
 2024-09-07 15:37:17 +10:00
themias
f49d83ac81 Add justice helm (#31905) 
* Add justice helm

* backslash moment

* spinny light

* remove power cell from recipe
 2024-09-06 21:04:31 -06:00
Boaz1111
2acee53f72 Energy Shotgun Change 2 - Narrow Nerf + instances from NoSpawn --> categories: [ HideSpawnMenu ] + self recharge removed + 1 more shot + normal recharge speed (#31235) 
* narrow nerf

* last instance of nospawn gone

* removes self recharge

* 8 shots, less recharge time
 2024-09-07 02:35:01 +02:00
lzk
bda9a4b0fc Fix ai upload console itemslot whitelist (#31900) 
* Fix ai upload console itemslot whitelist

* aw man
 2024-09-06 21:07:57 +02:00
Nemanja
8599251825 Mineral Scanner (#31390) 
* Mineral Scanner

* doink

* review

* sunday funday

* review and fix bugs i think?

* Update MiningOverlay.cs
 2024-09-07 00:05:53 +10:00
Chubbicous
73520b011b Fixed throngler name inconsistencies (#31889) 
changed throngler names
 2024-09-06 18:18:45 +10:00
Ed
1a4d58816f Tech Anomaly (#31764) 
* A

* B

* C

* D

* Update TechAnomalySystem.cs

* idle anim

* Update meta.json

* new animation
 2024-09-06 10:24:17 +03:00
Ekkosangen
2b455b1c00 Pizza boxes now have a chance to contain cotton pizza (#31883) 
Pizza box now contains cotton pizza

Co-authored-by: Ekkosangen <9094006+XyyxShard@users.noreply.github.com>
 2024-09-06 09:04:28 +03:00
Pieter-Jan Briers
1b1d63f5d6 Vox sign/N2 locker update (#31845) 
* Vox sign/N2 locker update

The "vox area" sign and N2 locker sprite were both taken from /vg/station. These sprites have bad racist connotations as discussed in https://github.com/space-wizards/space-station-14/issues/31840, and do not fit our server culture.

The new N2 locker is not a taped on piece of trash. It now also has a blue stripe to mimic the regular O2 locker and make it more distinct from fire safety closets.

The new "vox area" sign sprite follows the same style as other "area indicator" signs used throughout the blue and isn't an explicit warning sign anymore. It still has "No O2" on it to fill that role though.

* emogarbage adjustments

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
 2024-09-05 23:26:26 -06:00
lzk
0b6516e97c Cleanup books.yml (#31838) 
* Cleanup books.yml

* yeah

* shame
 2024-09-06 02:22:27 +02:00
Nim
a1dc48cfe2 Board for the AI upload console (#31867) 
board
 2024-09-05 20:20:41 +02:00
drakewill-CRL
511d759a70 A kit to help new botanists discover chemistry (#31738) 
* Add a kit for botanists to do some limited chemistry to the NutriMax. Intended to help new botanists learn in-game about chemistry.

* remove exclamation marks from names

* naming fix

* Rejected trademark application for 'Farmers Helper'.

---------

Co-authored-by: PraxisMapper <praxismapper@gmail.com>
 2024-09-05 18:43:00 +02:00
ScarKy0
ecc38ad782 Fixed AI Actions (#31823) 
* Updated sprites for AI HUD

* Epic test fail

* Merged AGhost actions and AI actions together again.

* Seperate comms and bugfix. Fixed broadcast.
 2024-09-05 22:49:20 +10:00
ScarKy0
83eac642c4 Basically every electronic device can now be used by the AI. (#31730) 
* Basically every electronic device can now be used by the AI.

* Removed stuff that didnt make sense

* oops

* Removed access from mailing and disposal units.

* Added AI wires to a couple machines.

* cool epic stuff
 2024-09-05 11:31:03 +02:00
SlamBamActionman
3817fe04d8 Re-add Atmos Directional sign (#31851) 
blep
 2024-09-05 11:12:57 +02:00
chromiumboy
63ba0f61ea Atmospheric alerts computer (#25938) 
* Atmospheric alerts computer

* Moved components, restricted access to them

* Minor tweaks

* The screen will now turn off when the computer is not powered

* Bug fix

* Adjusted label

* Updated to latest master version
 2024-09-04 21:13:17 -04:00
Ilya246
5878d04999 quietify stealthbox (#30741) 2024-09-05 00:42:15 +02:00
Ty Ashley
4f1518c687 CorrectContraband levels on each type of magboots (#30960) 
* Added a ClothingShoesBootsMagBase, to allow the other versions of the magboots to have their own contraband settings

* Changed Science Boots to not be contraband

* Made ClothingShoesBootsMagBase abstract

* Removed Engineering Contraband from base magboots. Now only the CE's Advanced Magboots are contraband (Grand Theft Contraband). Blood Reds are Syndie Contraband.
 2024-09-05 01:04:50 +10:00
qwerltaz
ce893d9281 make tesla brighter (#31357) 
* make tesla brighter

* radius to 10
 2024-09-05 00:47:40 +10:00
Hreno
fce7abb88e Delete nonsense solar assembly construction through the Construction window (#31425) 
* Delete construction for solar assembly, it's the way to do it

* Fix description of solar tracker electronics
 2024-09-04 16:12:54 +02:00
lzk
2185f3a2a5 Allow some mobs to walk slowly (#31360) 
* Allow mice to walk slowly

* add more
 2024-09-05 00:10:58 +10:00
IProduceWidgets
3f3ef567fb No Mr.Snail, I expect you to die! (fix sprite) (#31834) 
* No Mr.Snail, I expect you to die!

* emoting
 2024-09-04 15:57:23 +02:00
Ilya246
f0d3b684d1 add structural damage taken to a lot of prototypes (#30790) 
* fix

* add structural damage taken to a lot of other things

* do requested changes

* how did this happen
 2024-09-04 15:37:06 +02:00
lzk
7ce7b9e236 Add disabled station anchors version (#31794) 
* Add disabled station anchors versions

* remove this
 2024-09-04 12:23:39 +02:00
IProduceWidgets
c8e59ebdd5 Add Snails (#30765) 
* add snails

* scuffix

* migrate

* mo-grate

* oopsied the ftls

* Revert "oopsied the ftls"

This reverts commit 0d3c6c17f31ec904679d6a48799cea71e77c1f99.

* the curse of staging the wrong file, resolved.

* Snoth

* fix my dumbs

* reviews 1

* anti space technology

* salt hurty

* spelling

* Its a slotherhouse out here

* sequencing

* cooked snail

* volfix

* speed reversal
 2024-09-03 12:33:44 +02:00
ScarKy0
783243618c Added many old ion lawsets for borgs and AI. (#31664) 
* Added the Commandments, Paladin, LetLive, Station Efficiency, Robocop, Overlord, Dungeon Master, Artist, Antimov and Nutimov lawsets/

* Wording

* Anti-Antimov

* Fixed fun
 2024-09-03 19:45:46 +10:00
Арт
0c018769a6 Return Long2 and Long3 hairstyles (#30963) 
* Sprites

* Prototype_&_Locale

* sorted_in_alphabetical_order
 2024-09-03 18:29:24 +10:00
themias
78201101d6 Add Donk Co. microwave board to Combat Bakery Kit (#31239) 
* Add special microwave board to Combat Bakery Kit

* use event instead of trycomp

* make the board sus

* add instructions note

* embarrassing typo

* Add functionality to Donk Co. microwave instead

* update note
 2024-09-02 15:49:00 +02:00
Moomoobeef
63ad627bc8 Throw the book at em! The space law book now does 1 blunt projectile damage (#31387) 
* you can now throw the space law book for 1 blunt damage

* made book damage a feature of all books
 2024-09-02 13:07:56 +02:00
poeMota
9a51d37d02 Add ERT time stats (#31629) 
* add jobs for ghost roles

* add job to ToggleableGhostRole

* typo

---------

Co-authored-by: Mota <belochuc@gmail.com>
 2024-09-02 10:32:49 +05:00
Nemanja
a4333da241 Lite Magnet Rebalancing (#31726) 
magnet rebalancing ish
 2024-09-01 22:36:28 -06:00
godisdeadLOL
a112c24b54 Added in-hand sprite for Smile the Slime (#31731) 
added smile the slime in-hand texture

Co-authored-by: YourUsername <you@example.com>
 2024-09-01 22:36:05 -06:00
Nemanja
f710b34573 Roundstart Grappling Gun (#31737) 
Roundstart grappling hook
 2024-09-01 22:33:25 -06:00
lzk
7b82317b67 Cleanup railings yml (#31618) 
* Cleanup railings

* fix line

* real fix
 2024-09-02 04:01:25 +02:00