juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,005 Commits 57 Branches 0 Tags
80da7edecccee4f370040ad7daaccf2cfee422ee
Commit Graph

3294 Commits

Author SHA1 Message Date
Morb
80da7edecc Add variants of equipped headsets sprite (#11240) 2022-09-16 07:43:18 -07:00
rolfero
0ae6c80e4d changes SpawnPrototype to GivePrototype where it makes sense (#11182) 
Co-authored-by: CommieFlowers <rasmus.cedergren@hotmail.com>
 2022-09-16 07:41:21 -07:00
ChilbroBaggins
86f63a17d4 Rasta hat (#11269) 
Co-authored-by: Jeff <velcroboy333@hotmail.com>
 2022-09-16 07:40:49 -07:00
metalgearsloth
14d48f4306 Pointing arrow changes (#11097) 2022-09-16 07:37:15 -07:00
lapatison
fd77678ddf Add 2 bottle boxes to chemistry supplies crate (#11330) 2022-09-16 07:27:28 -07:00
metalgearsloth
4df4238c4c Nerf bible (#10023) 2022-09-16 07:27:05 -07:00
Justin Trotter
6bf45709e9 Add access locks to gas canisters (#10575) 2022-09-16 07:06:29 -07:00
Nemanja
dc1d8ec9b4 random loadout support (#11027) 2022-09-16 07:03:45 -07:00
NoobyLegion
62260da16b Changes the large beaker size to 10. (#11219) 
Co-authored-by: - <no@email.local>
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
 2022-09-16 04:10:23 -07:00
Peptide90
464f4853c9 NSS Pillar mk2 - New Pillar (#11200) 
* new pillar

* finished atmos etc

* misc changes
 2022-09-15 21:55:43 -05:00
lapatison
374e59c01b Salami Lid 1984 (#11332) 
* Update food.yml

* Update food.yml

* Update food.yml

* Update Resources/Prototypes/Catalog/Fills/Crates/food.yml

Co-authored-by: Moony <moonheart08@users.noreply.github.com>

Co-authored-by: Moony <moonheart08@users.noreply.github.com>
 2022-09-15 17:15:44 -05:00
lapatison
5cece74ab4 Update drinks_cans.yml (#11278) 2022-09-15 14:07:11 -05:00
metalgearsloth
ed442a7d3b Cargo price tweaks 2 (#11307) 
* Cargo price tweaks 2

* Allow cargo selling dead organics
 2022-09-15 12:29:07 -05:00
metalgearsloth
d8754b2014 Give suppressed artifacts a much higher sell price (#11305) 2022-09-15 12:28:06 -05:00
themias
3dd479f436 Add lathe recipe for chemistry bottle (#11324) 2022-09-15 12:27:46 -05:00
keronshb
e90e8052c4 Beam Component and Lightning Component (#10196) 2022-09-16 01:49:01 +10:00
Illiux
3722106cd4 Add 2 bottle boxes to chemistry lockers (#11298) 2022-09-15 08:17:32 -05:00
wrexbe
dc8cc81137 More minor UI refactor stuff (#11287) 2022-09-14 20:42:35 -07:00
metalgearsloth
ad7a851e27 Cargo economy balance (#11123) 
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
 2022-09-15 11:53:17 +10:00
wrexbe
34dfba2619 Move slot UI files around (#11282) 
* Move files around for themes
 2022-09-14 17:13:28 -07:00
Illiux
71e46de0fc Rework the ChemMaster's output handling (#11207) 
* Fix doc comment on FitsInDispenserComponent

It's clearly intended to be a doc comment, but wasn't.

* Allow the ChemMaster to accept canisters and bottles

* Give the ChemMaster an output container slot

* Tweak ChemMaster UI layout

* Make more ChemMaster UI tweaks

* Update ChemMaster SpinBox max handling

* Rework the ChemMaster

* Apply suggestions from code review

Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>

* Implement PR feedback

* Switch ChemMaster to a tabbed UI layout

* Rename Amount to Dosage for clarity

* Replace Amount with Dosage in messages

* Clarify dose in UI

Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>
 2022-09-14 19:10:12 -05:00
metalgearsloth
8871c445b8 Cleanup factions code (#11075) 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2022-09-14 11:45:02 -07:00
rolfero
aa070f908b Hide mob damage (#11217) 
* hides melee weapon damage for mobs

* sig fix?

Co-authored-by: CommieFlowers <rasmus.cedergren@hotmail.com>
 2022-09-14 12:17:23 -05:00
Mervill
b8d1843335 Adds a new SolutionExplosionBehavior for the benefit of fuel tanks and future exploding canisters (#11260) 2022-09-14 12:15:54 -05:00
themias
a68e9da700 Add trash tags to some items (#11270) 2022-09-14 12:14:54 -05:00
Alex Evgrashin
9ce3a18e3f Chameleon clothing (#8444) 
Co-authored-by: Moony <moonheart08@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-09-14 18:42:14 +10:00
Nemanja
cff6fe267c Use Segments for RandomMetadata (#11190) 
* use segments for randomized names now

* separator datafields

* public api
 2022-09-14 00:13:22 -07:00
Rane
f14f3d4999 make windoor, railing, and directional window bounds not awful (#10469) 2022-09-14 17:11:26 +10:00
Kai Shiba
e060b2cf41 Allowed stunbaton for Wall Recharger (#11259) 2022-09-14 17:05:00 +10:00
Morb
d6f37244f6 Lawyer fashion (#11249) 
* Update lawyer black suit sprites

* Update lawyer blue suit sprites

* Update lawyer red suit sprites

* Update lawyer purple suit sprites

* Add lawyer jumpskirt analogs

* Add laceup shoes

* Add laceup shoes to lawyer, librarian and musician

* Add skirt to lawyer starting gear

* Add new clothes to lawdrobe

* Add criminal lawyer suit

* Move good suit & rename jumpsuits to just suits

* Fix good suit ids in lawdrobe
 2022-09-13 23:47:08 -05:00
Flipp Syder
f9922d9160 Restrict ghost role speech/movement to component flags (#11183) 2022-09-14 13:46:49 +10:00
Morb
89367f71e4 Localize material names (#11059) 2022-09-14 13:00:08 +10:00
Morb
ebcce52abe Localize tile names (#11060) 2022-09-14 12:53:37 +10:00
themias
2141a31c8a Fix tranq shells not injecting solution (#11254) 2022-09-14 12:40:50 +10:00
Kara
eaa4bc4aea Remove clonexadone (#11253) 2022-09-13 12:51:31 -07:00
Kara
3e4e0657b0 Revert "Fix handheld radios incoming messages" (#11248) 2022-09-13 05:50:56 -07:00
Kevin Zheng
d194a02ab8 Stop hiding gas recyclers under the floor (#11241) 2022-09-12 22:52:28 -07:00
themias
a308d86bc6 Fix handheld radios incoming messages (#11237) 2022-09-12 20:32:07 -07:00
themias
d36a58dd2e Add visualizer to hot coffee and tea (#11211) 2022-09-11 20:53:48 -07:00
Kevin Zheng
45349e3c0d Add gas recyclers (#9934) 
* Add RemoveVolume()

RemoveVolume(vol) captures the common pattern of:

    air.RemoveRatio(vol / air.Volume)

Change existing code to use this method where appropriate.

* Add gas recyclers

Gas recyclers catalyze the conversion of CO2 and N2O to O2 and N2. The
gas recycler component takes waste gas from the input net and releases
the result into the output net.

To make things more fun, the input net must be pressurized to 3 MPa and
heated to at least 300 C; otherwise, no reaction will occur.

Game-mechanic wise, gas recyclers contain the catalyst for the
conversion reaction, and therefore, requires no external power. However,
the external pumps and heaters required to make the reaction happen
still do.

* Fix gas recyclers

Fix negative sqrt, fix pressure check after remove.
 2022-09-11 18:02:01 -05:00
Alex Evgrashin
a3ab172574 Fixed artifact storage (#11205) 2022-09-11 17:24:00 -05:00
och-och
633c74d440 Display gender and age when examining humanoids (#11177) 2022-09-11 07:45:39 -07:00
Nemanja
e43ee216f6 store system currency rework (#10893) 2022-09-10 23:54:16 -07:00
Kevin Zheng
b9463e6df7 Adjust light power consumption (#11105) 2022-09-10 23:49:40 -07:00
TaralGit
47dd0ff2e8 Advanced laser gun and four resprites (#11102) 
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2022-09-10 23:46:38 -07:00
Rane
fdba747541 introduce requirement to prevent from being tasked to steal your own item (#11139) 2022-09-10 23:43:31 -07:00
Nemanja
114dccc896 NoRot: true on cables (#11175) 2022-09-10 23:39:58 -07:00
rolfero
4b23521af5 Melee special examine (#11168) 
Co-authored-by: CommieFlowers <rasmus.cedergren@hotmail.com>
 2022-09-10 23:39:36 -07:00
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
Nemanja
7199defdff among pequeno (#11115) 
* among pequeno

* better colors + fucked up sprites oops

* Update meta.json

* copy*right* and price 3
 2022-09-10 19:08:16 -05:00