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

303 Commits

Author SHA1 Message Date
Kevin Zheng
c723d54a51 Chef update (#11189) 
* Sort recipes based on total ingredient count

Fix the recipe sort function so that recipes with more ingredients are
matched first. This fixes vegetable pizzas and allows more complex
recipes in the future.

* Chef update

* Pet linter
 2022-09-10 20:47:37 -05:00
Will Robson
7accbcbe9b Implement Charcoal. #10042 (#11024) 
* Add charcoal

Flush chemicals that are not the charcoal out of the chemical stream

* Add into EN localization to get chem dispenser to display correctly

* Remove method that wasn't needed

* Remove charcoal from dispenser

Charcoal is made by combing ash and carbon

* Place ash in elements prototype
 2022-09-10 18:20:44 -05:00
rolfero
d7b31865ff APC construction updated, uses electronics (#10987) 
* APC construction and deconstruction
Construction action GivePrototype

* APC needs screwing + sprites

* apc framework, working construction recipe

* Energy swords hot

* APC changes

* APC construction/deconstruction

* removed comments

* Revert "Energy swords hot"

This reverts commit 75228483abb3cc6252118b319bc8949d5198362d.

* Renamed function for clarity

* Fixed the last step not showing in the construction menu

* Some fixes

* Update Content.Server/Power/EntitySystems/ApcSystem.cs

Co-authored-by: Jacob Tong <10494922+ShadowCommander@users.noreply.github.com>

* Update Content.Server/Construction/Completions/GivePrototype.cs

Co-authored-by: Jacob Tong <10494922+ShadowCommander@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Structures/Power/apc.yml

Co-authored-by: Jacob Tong <10494922+ShadowCommander@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Structures/Power/apc.yml

Co-authored-by: Jacob Tong <10494922+ShadowCommander@users.noreply.github.com>

* Update Content.Server/Power/Components/ApcElectronicsComponent.cs

Co-authored-by: Jacob Tong <10494922+ShadowCommander@users.noreply.github.com>

* Update Content.Client/Power/APC/ApcVisualizer.cs

Co-authored-by: Jacob Tong <10494922+ShadowCommander@users.noreply.github.com>

Co-authored-by: CommieFlowers <rasmus.cedergren@hotmail.com>
Co-authored-by: Jacob Tong <10494922+ShadowCommander@users.noreply.github.com>
 2022-09-09 20:27:41 -07:00
Rane
a29e86a896 Pacification status effect and Pax (#10796) 2022-09-05 19:52:58 -07:00
Francesco
c11a431f70 Fix: Drop plasteel when deconstructing reinforced walls (#10992) 2022-09-05 19:28:15 -07:00
Flipp Syder
8e54ec27f2 Makes it so that all wires (except the bolt wire) have to be cut on airlocks/windoors (#11056) 2022-09-05 18:41:39 -07:00
Jacob Tong
a75fa74b5d Fix extra plasteel getting returned when deconstructing shuttle airlocks (#10980) 2022-09-02 18:32:18 -07:00
Flipp Syder
ba2995b7c8 Merge pull request #10721 from vulppine/air-alarm-fixup 
Air sensors & air alarm fixup
 2022-09-02 13:00:33 -07:00
Jacob Tong
fdc89cea84 Fix metal counter frame deconstruction (#10957) 2022-09-01 00:21:39 -07:00
Kevin Zheng
3bc318071e Make t-rays, gas analyzers, and belts lathable (#10950) 2022-08-31 20:39:32 -07:00
Jacob Tong
68a17b3794 Add shuttle airlock construction (#10944) 2022-08-31 02:28:40 -05:00
Rane
f36d278499 Biomass (#10313) 
* Material

* good prototype

* Fix material storage

* You can insert biomass into the cloner

* ok, basic biomass subtraction works

* amogus

* ok chance works

* Alright, the biomass and genetic stuff works

* feedback for cloning

* more reclaimer polish

* ship it

* starting biomass + fix lathes

* I changed my mind on rat mass and these guys are definitely getting ground up

* Doafter

* clean up, sync the two

* fix naming, fix mass

* technology + construction

* additional logging, stop unanchoring when active

* fix event / logs

* dont gib dead salvage

* auto eject

* fix deconstruction behavior

* make warning message better, temporarily disable cancer scanner

* fix biomass stacks

* add easy mode CVAR

* stack cleanup, make biomass 2x as fast

* bugfix

* new sprite from hyenh

* fix tests

* hello? :smilethink:

* :smilethink:

* medical scanner gets antirotting

* fix cloner and medical scanner

Co-authored-by: Moony <moonheart08@users.noreply.github.com>
 2022-08-29 21:31:27 -05:00
Flipp Syder
f00a5cb17a Merge branch 'master' into air-alarm-fixup 2022-08-23 13:21:05 -07:00
vulppine
776537cde3 assembly deletes on final step, sensor prefix in locale 2022-08-23 12:44:02 -07:00
vulppine
a11f8a03c0 whoops 2022-08-23 12:30:32 -07:00
vulppine
72d74222da air sensor in construction window 2022-08-23 11:58:24 -07:00
vulppine
fc5bda6efc air sensor construction graph 2022-08-23 11:53:57 -07:00
Morb
86d7a1fbb9 Fix categories (#10683) 2022-08-18 17:27:46 -07:00
Justin Trotter
0d2ebb80d9 Fixed nettle soup recipe (#10664) 2022-08-17 19:30:30 -07:00
Justin Trotter
695c62a76b Add musician, clown, and mime winter coats to uniform printer (#10676) 2022-08-17 21:22:30 -05:00
Martin Petkovski
e632787490 fixed typos and added descriptions (#10615) 2022-08-16 17:56:53 -07:00
OctoRocket
b8f81d5653 Fixes typo (#10621) 2022-08-15 23:57:03 +02:00
Rane
572a4f7fb3 Eye damage (#10262) 2022-08-13 22:59:14 -07:00
Julian Giebel
b2436c22a7 Adds disposal mailing units (again) (#7630) 2022-08-13 22:57:25 -07:00
Kevin Zheng
91ddba9927 Add flower crown (#10301) 2022-08-13 22:50:50 -07:00
Visne
906edc592d Fix/improve smokeables (#10497) 2022-08-13 22:20:31 -07:00
ZeroDiamond
5da795281b Musician's Tuxedo & Musician's Winter Coat (#10460) 2022-08-13 22:17:37 -07:00
Morb
acdd2a1be5 Localize construction categories (#10564) 2022-08-13 22:15:12 -07:00
ChilbroBaggins
ab4e2ef74f Material Wall Graphs (#10062) 
Co-authored-by: Jeff <velcroboy333@hotmail.com>
 2022-08-13 23:34:02 +10:00
Kevin Zheng
9cb7e0f6c4 Make atmos Turing-complete (#10520) 
* Add pneumatic valves

Pneumatic valves permit bidirectional flow between the inlet and outlet
if the pressure at the control port is high enough.

* Add construction recipe
 2022-08-11 16:19:31 -05:00
metalgearsloth
a549a85e81 Update tiles to modern standards (#10436) 2022-08-10 17:05:40 +10:00
Anthemic
18547834a2 Printable holofans (#10194) 2022-08-08 18:57:39 +10:00
Nemanja
b3f425f6dc Fix durathread recipe (#10375) 2022-08-06 18:15:32 -07:00
Nemanja
b8dcbd1bb7 Fix meat spike deconstruction (#10342) 2022-08-06 18:11:55 -07:00
Kevin Zheng
6a25eafe81 Fix recipe title case (#10302) 2022-08-05 20:42:05 +10:00
Rane
2f4849eae1 Cloning Rework (#8972) 
Co-authored-by: fishfish458 <fishfish458>
 2022-08-03 21:05:17 -07:00
Kara
7b356b7db7 Remove makeshift laser construction (#10183) 2022-07-30 20:34:51 -07:00
Rane
1c8bdaf7c4 Sleeping (#9793) 2022-07-26 21:46:24 -07:00
Rane
57206eb49c Port medibot + bot spawners from nyano (#9854) 
* Port medibot + bot spawners from nyano

* Make the injection thresholds constants

* Remove warning

* Check against const in system too

* resolving systems just isn't worth it

* only resolve entity manager once

* Reduceother resolves too

* fix post-merge

* woops
 2022-07-25 10:33:31 -05:00
Rinkashikachi
6137803891 Various localization fixes (#9860) 2022-07-24 04:44:45 +10:00
Vera Aguilera Puerto
a635ac40b9 Gas pipes now need to be unanchored before deconstruction. (#9904) 
Cleans up their graphs, they had no spacing at all.
 2022-07-20 22:30:08 +10:00
Rane
1e8efb1dd5 Port cleanbots from Nyano (#9853) 2022-07-17 22:48:36 -05:00
Vera Aguilera Puerto
4bcf7b73fd Fixes makeshift laser using the wrong type of construction step. (#9811) 
It needed to use the "material" step, not the "prototype" step...
 2022-07-16 19:43:24 +02:00
Rane
188934a748 Portable scrubbers (#9417) 2022-07-15 05:46:30 -07:00
ZeroDayDaemon
aa6000d8cc Bartending Tweaks (#9307) 2022-07-15 02:01:55 -07:00
Rane
abab5bedcd Port honkbots from nyano (#9698) 2022-07-15 00:54:34 -07:00
Rane
83c03b60a1 [2 lines] fix blinding (#9690) 
* Adds blinding + blindfolds (#8688)

* Adds blinding + blindfolds

* Don't break examining lol

* moment

* fix toggle lights behavior

* move checks around

* Sloth review

* Added a salvage funny

* review

* woops

* Switch circle shader

Co-authored-by: wrexbe <wrexbe@protonmail.com>

* resolve merge conflict

Co-authored-by: wrexbe <wrexbe@protonmail.com>
 2022-07-14 06:58:24 -05:00
Moony
a655891a8d Revert "Adds blinding + blindfolds (#8688)" (#9689) 
This reverts commit 7a7ab5e8c1.
 2022-07-13 16:50:35 -05:00
Rane
7a7ab5e8c1 Adds blinding + blindfolds (#8688) 
* Adds blinding + blindfolds

* Don't break examining lol

* moment

* fix toggle lights behavior

* move checks around

* Sloth review

* Added a salvage funny

* review

* woops

* Switch circle shader

Co-authored-by: wrexbe <wrexbe@protonmail.com>
 2022-07-11 22:55:04 -07:00
Rane
d32746199f Fix medical techfab and add unused bodybag recipe to it (#9607) 
* bodybags printable in medical techfab

* fix medical techfab
 2022-07-10 20:11:30 -05:00