juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,277 Commits 57 Branches 0 Tags
60737dc36eccfa5c5e9e92e755d32012bc2edff0
Commit Graph

111 Commits

Author SHA1 Message Date
Ed
c42b77d0c9 Merge pull request #658 from crystallpunk-14/ed-11-12-2024-upstream 
Upstream sync
 2024-12-11 21:18:17 +03:00
Ed
cd736e4fd4 Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Maps/oasis.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/audio.yml
 2024-12-11 14:49:02 +03:00
Ed
576bbe91d0 Roofs (#657) 
* simple roo system

* tweaks

* roof sprite update

* transparent roof

* wooden roof sprite

* remove weather: false from all tiles

* stone roof + roofs crafting

* final shtrix, maps update

* fuck

* fix checks

* reagent auto vaporize tweaks

* Update base.yml
 2024-12-11 14:44:16 +03:00
Flareguy
56fd7cbb6f Removes burnt tiles (#33422) 
remove burnt tiles
 2024-11-28 09:49:41 +03:00
Ed
ab1e071fdf Merge remote-tracking branch 'upstream/master' into ed-03-10-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
 2024-10-03 17:34:08 +03:00
TakoDragon
542817807d Red circuit floor (#32557) 
* red circuit added

* index colour begone
 2024-10-01 23:35:48 -06:00
Ed
c82b17a65e Merge remote-tracking branch 'upstream/master' into ed-19-08-2024-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/atlas.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/Traits/speech.yml
#	Resources/Prototypes/Voice/disease_emotes.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/game_presets.yml
#	Resources/Prototypes/secret_weights.yml
 2024-08-19 19:06:38 +03:00
NotSoDamn
381e0d6f93 No weather on concrete tiles (#30952) 
* concrete weather

* miss
 2024-08-13 15:39:25 -06:00
Ed
dd580c68c9 Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Resources/Prototypes/Accents/word_replacements.yml
 2024-08-05 15:28:42 +03:00
Ko4ergaPunk
27f3bea46d Cutter machine & steel mozaic item tiles (#30431) 
* no texture machine

* done

* delete wip

* bug fixes

* oops

* CutterMachineCircuitboard
Glass: 500
 2024-08-01 13:26:32 +03:00
Ed
0931c9e7d1 Merge remote-tracking branch 'upstream/master' into ed-12-07-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
 2024-07-12 12:53:42 +03:00
Nemanja
21d0f85cc2 metal foam grenades (#29428) 
* metal foam grenades

* wow okay

* meh

* bruh

* test

* push
 2024-07-08 00:26:58 +10:00
Ed
dbdb81381b Merge remote-tracking branch 'upstream/master' into ed-30-06-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/lobbyscreens.yml
 2024-06-30 11:18:30 +03:00
Jaraten
dcfd3f6aa5 New tiles (#274) 
* New tiles

* fix yaml & resprite

* migration fix

* ftl fix

* fix typo

* fix typo +1

* fix C# typo

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-06-27 22:16:05 +03:00
lzk
325ab97a7d Prying reinforced tile now will give you back metal rod (#29084) 
* Reinforced tile can we welded back into metal rod

* more changes

* weh

* fix

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-06-23 01:47:02 +10:00
Ed
e2f97ece50 Wallmount update (#262) 
* add wallmount systems

* add construction condition
 2024-06-21 18:27:18 +03:00
Flareguy
9a32a1949c Removes Trials of Mana grassland sprites: Bare Minimum Edition (#28868) 
* replace the grass sprites. again

* Fix dirt

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2024-06-11 23:04:43 -07:00
IProduceWidgets
89235b9e1b Add astro-jungle/mowed grass and astro-snow (#26381) 2024-03-24 18:14:04 -07:00
MACMAN2003
f0e8695a91 Clockwork structures and furniture (#24673) 
* sprites

something something strength and certainty of steel (except this is brass)

* test1

* commas it was commas

* commas and brackets

* LET THERE BE BRASS

* brass-glass-etc-windows-thindows-floors-lattice

* ALL THE STRUCTURES!!

"Which structures did you add?"
"all."

* buyable brass

and on the first day the quartermaster said "let there be brass" and all the cargo techs stopped inve$ting in awe

* Update windoor.yml

i forgor 💀

* Update tiles.ftl

* i hate random capital letters

* linter fix 1

whew, thank god for linters

* fix 2

* maybe this

shot in the dark, idk what the hell i'm doing hopefully this fixes it?

* fix attempt 1

weather to true, maybe the thingy got confused?

* remove clockwork lattice

it's fixed the test fail... but at what cost?

* changes 1

* fix clockwork windoor

* FLOORS

HAHAHA LET THERE BE FLOORS

* try linter fix 1

i love linters they find things i'd never catch myself

* tweaks fixes 1

fixes merge conflict and does more stuff part two later because i'm tired

* tweaks fixes 2

i should probably do this stuff during the day when i have more energy but eh

* Update assembly.yml

* Update chairs.yml

* fix door sprites

somehow the deny_unlit was broken for all the clockwork doors

* fix glass.yml
 2024-03-06 03:25:59 +03:00
Ps3Moira
83cd1089fe Add Large Wood Floors (#25462) 
Large Wood Floors
 2024-02-22 14:59:41 +03:00
Ed
f64a32990a Train station (#24927) 
* some content

* some next content

* fixes

* remove stained window

* return bot message?

* woah! Full map added!

* map update

* big update

* camera server

* Corvax playtest feedback

* add mail system and 30$ meteor shield

* update

* updatik

* hardwork

* pipip

* update

* remove from mappool

* fixes

* sentipode

* e
 2024-02-20 15:21:31 -07:00
Flareguy
a93466ac24 Shuttle floor resprite (#25127) 
* resprites shuttle tiles

* resprites shuttle floor tiles & adds grey/black shuttle tiles

* attributions.yml update
 2024-02-11 13:53:56 -07:00
Nemanja
5e2e652165 Generalize tile prying to any tool quality (#24432) 
* Generalize tile prying to any tool quality

* ballin
 2024-01-22 23:45:40 -08:00
themias
557e5eb476 Add reagent specific footstep sounds (#24406) 
* Add sticky footsteps

* Update Resources/Audio/Effects/Footsteps/attributions.yml

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

---------

Co-authored-by: ike709 <ike709@users.noreply.github.com>
 2024-01-22 23:18:33 -05:00
Kara
8399d0a9eb Faux astro-tiles for science & mappers (#22586) 
* Faux astro-tiles for science

* didnt mean to commit dode
 2023-12-16 01:20:57 -07:00
Flareguy
ae1a1b9e07 adds lime tiles (#22235) 2023-12-08 12:49:07 -06:00
NULL882
f268e626a7 Mining things (#21909) 
* mining-doors

* mining-tiles

* mining-window

* Change copyright in meta.json

* Change license in attributions.yml
 2023-11-27 14:25:15 -07:00
Flareguy
6e8ed007b8 Adds damaged plating (#21711) 
* adds damaged & burnt plating tiles, corrects a miscrediting in attributions.yml

* placeholder BEGONE

* fix those attributions
 2023-11-16 22:57:00 -07:00
Flareguy
d58793f61e Adds damaged steel tiles (#21700) 
* adds destroyed steel tiles; corrects a mistake in attributions.yml

* dode
 2023-11-16 14:09:50 -07:00
Ed
94cda6a253 Shadow Dimension visual pack (#21237) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-10-26 00:36:22 +11:00
DrSmugleaf
66fd8de531 Add missing tile migration for glass alt > alt (#19940) 2023-09-09 01:37:12 -06:00
Emisse
ca289d4f0b Revert "Semi revert glass tile resprite (#19266)" (#19931) 
This reverts commit 38f921f831.
 2023-09-09 00:33:22 -06:00
potato1234_x
38f921f831 Semi revert glass tile resprite (#19266) 2023-09-06 14:41:53 -07:00
Kara
cd9ceb2378 Ice & snow tile modernization (#19689) 
* Add snow tile edges

* Changes for edge tile prio

* Add support for tile weightlessness

* Add weightlessness to ice

* snow duggy moments

* fix ice thing yeah

* actually why even use weightless movement

* upd8 nukieplanet

* i have no idea what im doing

* sprite modifications
 2023-08-31 15:31:23 -06:00
Nemanja
f4503864d5 Concrete and asphalt tiles (#19642) 
* concrete and asphalt

* los decals
 2023-08-29 17:50:11 -05:00
Flareguy
370cbfbbdd Yet Another Asteroid-Related Tile Update (read: asteroid tile variantizing) (#19237) 
* makes asteroid tiles and snow use weighted variantize, adds snow plating

* GO FUCK YOURSELF!!!!

* hello? boner department, id like to order a DINNER. make it MAMA LUIGI

* test fix. hopefully. boner. boobies.

* did he know? (no)
 2023-08-24 23:40:04 -04:00
PixelTK
f189b73fe5 Arachnid rework (#18631) 
* Merge before I fuck up anything again

* craft whitelist

* Sericulture

* Spider

* gone

* quickly fixed

* and coders taketh away

* And we take more away

* sericulture improvements

* arachnid

* better webbed

* OH WAIT

* test fail
 2023-08-13 01:38:05 -06:00
Vordenburg
1df650871d Support weighted tile variantize (#18940) 
* Support weighted tile variantize

* Remove unused using

* Use an array
 2023-08-13 01:25:54 -06:00
Flareguy
ea06a33a81 Updates asteroid tile sprites & adds asteroid plating (and tile items too, I guess) (#18937) 2023-08-10 10:46:43 -07:00
Flareguy
8c256d3960 Adds Checkerboard Tiles, External Hull Plating, Hardened Reinforced Floors, & Monotile Dirty Decal (#18676) 
* adds checkered floor tiles, hull tiles, and steel monotile decal

* adds checker floors, hull floors, and dirty steel monotile decal

* adds hardened reinf tiles
 2023-08-06 02:27:48 -06:00
Ilya246
9261cef915 fire axe plating (#18087) 2023-07-17 01:47:20 -06:00
deltanedas
5d5151c772 prevent rcd destroying planets (#16120) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-07-16 23:46:35 +10:00
I.K
1bce3f70ef New glass floor textures (#17948) 
* change

* Update attributions.yml
 2023-07-11 13:34:07 -06:00
Nemanja
ba753d0f17 Pulling fasto (#17696) 
* faster pulling + pulling gravity tweaks

* merciful
 2023-06-28 14:03:16 -06:00
Nemanja
9946bd1f61 Sheet-meister 2000 (#16686) 2023-06-15 10:49:23 +10:00
Kit0vras
b3ac3c076e Broken wood tiles (#16776) 
* broken wood tiles decals

* deleting decals

* broken wood tile
 2023-05-25 16:06:06 -06:00
20kdc
ea64b86331 Remove plural BaseTurfs as a thing in favour of BaseTurf (#16560) 2023-05-19 17:10:56 +10:00
20kdc
af1d77ed74 Completely remove every last reference to underplating. (#16559) 2023-05-19 16:58:49 +10:00
metalgearsloth
6157dfa3c0 Salvage dungeons (#14520) 2023-03-10 16:41:22 +11:00
metalgearsloth
46b27a68ff Weather tweaks (#14271) 2023-03-07 12:28:50 +11:00