Commit Graph

291 Commits

Author SHA1 Message Date
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
Kara
50fc190f7f Visual popup addendum (#9570) 2022-07-09 02:32:06 -07:00
Kara
dc28b58468 Visual popup types (#9523)
* Visual popup types

* Pass over `PopupCoordinates` and `PopupCursor`

* `PopupEntity` pass

* Disease and reagent popup pass

* COLOUR
2022-07-09 04:09:52 -05:00
metalgearsloth
40eecdd78a Stamina damage (#9230) 2022-07-06 18:06:12 +10:00
Peptide90
bc19f52aa6 removes metal walls, adds rusted walls (#8416)
* removes metal walls, adds rusted walls

* removes 2 metal walls in bagel

* remove metal walls from pillar

* Remove icon from rust wall

* Made welding work

* removes old prototype
2022-07-04 02:11:47 -05:00
Peptide90
649b94303e Telescreens and big flat screen TV (#8842)
* first pass wall tv

* telescreen first pass

* adds flat screen television

* removed duplicate assets

* code changes and construction graph start

* Update lv stack to apc

* completed graphs and fixed bb sizes

* Proto update

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-07-04 17:10:29 +10:00
keronshb
d65601f024 Blocking and Shields (#8584)
* Blocking

* Fixes Bodytype bug

* Blocking Damage Modifier

* Storing bodytype

* Consolidates Stop Blocking code

* Consolidates more methods

* Some cleanup, hitbox fix

* Shield Textures

* Passive blocking modifier check

* Localization, popups, and more cleanup

* Small cleanup

* Relay event

* Fixes a shutdown bug, adds specific containers and sets

* Popups and sounds

* Fixes typo

* Removes whitespace, adds comment

* Some requested changes

* Remove Shared

* Audio fix

* More changes

* More requested changes

* Properly remove on shutdown

* Adds riot shields to seclathes

* SecTech Riot shield

* Constant variable

* Relay transfer to user blocking system

* More destruction behavior

* Adds a shape field

* Riot shield cleanup

* More requested changes.

* Prevents blocking attempt where a user cannot be anchored

* Listen for anchor change

* Unused using cleanup

* More shields.

* Buckler

* Construction

* Linter fix
2022-07-04 16:31:12 +10:00
Rane
3ff3d21ff1 Add mintemp to meth reaction (#9234) 2022-06-27 10:22:55 -07:00
Peptide90
c33508b7e1 Adds TileNotBlocked to atmos stuff (#8959) 2022-06-27 15:42:27 +10:00
Leon Friedrich
c25f2e6283 Drunk Shader (#8910)
Co-authored-by: Kara D <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-23 14:33:25 +10:00
Rane
b6e2ec4ec0 raw meat poisoning rework (#8831) 2022-06-22 21:13:13 -07:00
Rane
a4976acd70 chemical dispenser cleanup (#9030) 2022-06-22 16:26:13 -07:00
metalgearsloth
a18ba5c2b5 Power cell culling (#8814) 2022-06-16 18:37:07 +10:00