Commit Graph

57 Commits

Author SHA1 Message Date
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
PixelTK
74bd86af2f Arachnid RE-REWORK (#19138)
* tasty silk and webby crates

* winter coat

* fuck

* Move some files around and stuff

* FUCK

* Web closet finished

* what the fuck

* brain empty

* loss

* loss 2

* fuck

* web typing indicators

* minor spelling mistake, I lost.

* hiss

* changed

* And they said "Let's remove pockets", funniest shit I've ever heard.

* 2 seconds of stun

* fuck it we pr

* resprite

* dummy

* arachnid creampie sprite

* different + more "natural" crate sprites

* Webbing suits and webbing dresses.

* and other stuff I forgot to commit.

* and gone.

* no

* Cloth.

* I forgot to commit this? What???

* Eyes.

* Comment trimming

* winter coat resprite
2023-09-04 13:02:54 -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
Flareguy
1b26a7f602 Slight monotile modification & raw sprites folder (#19613)
* slight steel tile fixes & raw sprites folder

* fuc
2023-08-30 19:02:35 -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
Kara
cfccb5959a Lavaland chasms (#19154) 2023-08-15 12:29:24 +10: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
Flareguy
ea06a33a81 Updates asteroid tile sprites & adds asteroid plating (and tile items too, I guess) (#18937) 2023-08-10 10:46:43 -07:00
Kara
42b38b7a5d Liquid plasma floor entity (#18957) 2023-08-11 00:16:51 +10: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
Flareguy
472c321f9b removes hueshifting on plating sprites (#18726) 2023-08-05 20:04:12 -04:00
Flareguy
55f95f3741 resprites plastic & dirty steel tiles to match new floortile style (#18643) 2023-08-04 02:55:07 -06:00
Flareguy
3c5d913b1e Tile Resprite: Return of Supernorn-style tiles (#18513)
* re-resprites tiles to closely match supernorn tiles

* swag messiah

* meta.json fixe

* we decided to make an entire episode about it
2023-08-01 00:09:46 -06:00
I.K
1bce3f70ef New glass floor textures (#17948)
* change

* Update attributions.yml
2023-07-11 13:34:07 -06:00
Kit0vras
b3ac3c076e Broken wood tiles (#16776)
* broken wood tiles decals

* deleting decals

* broken wood tile
2023-05-25 16:06:06 -06:00
metalgearsloth
e30c3ec5ad Revert "Plating & Tech Maint resprites (#15817)" (#16002) 2023-05-02 16:04:12 +10:00
Flareguy
06482a9b2a Plating & Tech Maint resprites (#15817) 2023-04-30 16:36:12 +10:00
brainfood1183
2fba2b18ab Adds Bananium (#14663) 2023-04-29 15:38:09 +10:00
metalgearsloth
6157dfa3c0 Salvage dungeons (#14520) 2023-03-10 16:41:22 +11:00
metalgearsloth
0aba0d2ec2 Content tile edge support (#13168) 2023-03-05 12:19:50 +11:00
metalgearsloth
37f432ca58 Procgen biomes (#13487)
* Planetmap tiles

Biomes etc etc

* a

* oop

* Chunk-based rendering

* funny

* Less allocations

* Fix overdraw

* Content tile edge support

Also updated grass to use it as a POC.

* Kindly revert

* Update for variant edges

* fixes

* Use fastnoise

* Remove redundant group

* a

* refactor a fair bit

* Prototype data instead

* tweaks

* a

* fix maths

* working

* a

* Slightly better empty support

* a

* flowers

* sounds

* lewd

* Networking

* more fixes

* better

* colours

* Some chunk loading

* Proper loading and unloading

* Better loading

* Fix parallax and movement sounds

* Anchoring support + decal setup

* Most of the way to load and unload

* Decal loading kinda werkin

* large trees

* started diffing

* a

* Variant support and deserts

* a

* snow

* agony, even

* working again

* todo

* a

* laba tiles

* aeiou

* a

# Conflicts:
#	Resources/Prototypes/Entities/Tiles/planet.yml
#	Resources/Prototypes/Tiles/planet.yml
#	Resources/Textures/Tiles/Planet/Lava/lava.rsi/meta.json

* laba

* Add lava

* Initial ignition

* triggers

* a

* a

* y

* Add basalt tiles

Did some unconventional things for the animation + rocks.

* fixies

* mergies

* promotion

* lava biome

* Lava planet start

* cleanup and more lava

* laba

* maccas

* biome stuf

* weh

* bongflicts

* aeaeae

* More fixes

* a

* these too
2023-02-12 02:15:09 +00:00
Nemanja
f450398df7 More anomalies (#13766) 2023-02-06 01:03:53 -04:00
metalgearsloth
e090cd393b Add basalt tiles (#13462) 2023-01-17 11:28:37 -07:00
metalgearsloth
6c9ce79387 Add lava (#13438) 2023-01-17 11:25:32 -07:00
metalgearsloth
375490bb8c Add command for creating simple planet maps (#12698) 2022-11-23 17:35:25 +11:00
brainfood1183
062d3c656e New Tiles (2 maintenance specific and 1 new wood). (#12193)
* new maint specific tiles

* merge

* merge

* merge

* merge

* Update Resources/Textures/Tiles/attributions.yml

Co-authored-by: Moony <moony@hellomouse.net>
2022-10-25 13:27:06 -05:00
Moony
023f1ae602 Even more tiles (again) (#12172)
* i should probably commit this.

* i forgot the rivets 😢

* OVERLAYS

* Fix some color inconsistencies.

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2022-10-24 11:33:31 -05:00
DrSmugleaf
186cf6f495 Add missing source field in Textures/Tiles/attributions.yml (#12155) 2022-10-23 04:47:30 +02:00
DrSmugleaf
21266d0f54 Fix missing comma in Textures/Tiles/attributions.yml (#12154) 2022-10-23 04:38:01 +02:00
Moony
ed8efa08b0 Even more tiles (#12140)
* tile gaming

* TRIM

* fucking BOM

* wood trim and some doobles

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2022-10-22 13:21:36 -05:00
Moony
5f5aea6aed Replace the floor tiles for realsies this time. (#12125)
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2022-10-21 18:53:25 -07:00
Paul Ritter
d154a89a63 fixes typo (#10578) 2022-08-14 11:13:12 +02:00
Peptide90
e748f9ac3d New grass & dirt tiles. Split minor update. (#10260)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-08-06 18:13:35 -07:00
Peptide90
86a3b55aad Adds two new cave floors (#9873) 2022-08-02 05:55:30 -07:00
Peptide90
433771f0ec moves all tile copyright to robust generic attribution format RGA (#10104)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2022-07-30 19:57:11 -07:00
Moony
c6a3c8d547 Rectifying attribution error(s). (#10090)
* Rctifying attribution error(s).

* Update copyright.txt

* Update Resources/Textures/Tiles/copyright.txt

Co-authored-by: ZeWaka <zewakagamer@gmail.com>

Co-authored-by: ZeWaka <zewakagamer@gmail.com>
2022-07-27 14:14:49 -05:00
Peptide90
8d9b56fce6 Goon floor pack 1 (#8267)
* floors boxing, arcadeblue2 and carpet clown

* adds gym, metaldiamond and carpetoffice from goon

* adds variants for boxing and gym

* tile variants updated
2022-06-02 12:10:58 +10:00
20kdc
dc45f14536 Underplating, go away (#8138) 2022-05-17 11:11:47 -07:00
Moony
12b682ee4d Tile variants content (#6956) 2022-03-09 20:59:44 +01:00
Leon Friedrich
36fcca8337 Mapping Actions (#6877) 2022-03-02 10:12:34 +11:00
Peptide90
fc667f8f44 Big tile PR (3 carpets, 4 red sands, 1 grass, 5 shuttle floors) (#6864) 2022-02-27 00:01:48 -07:00
Lamrr
ef2b4ee7d3 Updates reinforced tile sprite. (#6556) 2022-02-08 11:08:23 -07:00
AJCM-git
380f5d77f3 More tiles and some cleanup (#5608) 2021-12-11 16:08:33 -07:00
moonheart08
1b8b5b5d16 oh god it's BQL time (#5050)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2021-10-31 21:14:44 +01:00
Swept
e34888373a Respriting the codebase (#4820)
* Walls

* Airlocks mostly ported

* Disposal Unit

* Tiles

* Lighting

* Catwalk

* Windows

* Some vending machine work

* More Vending Machines

* Rest of vending machine sprites ported

* Fixes to vending machines

* Tables (This took a lot of work)

* Fixes low walls being required for window smoothing
- Also replaces window damage visualization

* Plasma Window

* APC

* SMES + Reorganized parts.yml

* Furniture and Organization and Removed Shelf

* Renamed seats.yml to chairs.yml

* Dispensers

* Lazy-fixed the glass airlocks

* Don't need this no more

* Tilez

* blue circuit my fucking beloved

* Switches lights to cev one

* Conveyors and Switch

* Reorients lights

* !ALERT! MAP CHANGES !ALERT!

Co-authored-by: Vera Aguilera Puerto <gradientvera@outlook.com>
2021-10-15 11:58:40 +02:00
Swept
5f9ba812ca Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
AJCM-git
ae41d03ec6 Re-organizing the Resources folder. Part 1. (#1234)
* First commit

* Lockers

* Lockers electric boogaloo

* Crates and Lockers

* Almost finishing the Textures folder

* Updating texture paths. Reminder to fix:
* Lockers
* Windows
* Vending Machines
* APC
* Catwalks
* Bedsheets and Cloaks
* Status effects

* dont know what happened here

* Commit before merge

* re-organizing

* Lockers broken

* Commit before merge

* Submodule

* renaming

* Fixing most issues

* forgot these ones

* Updating submodule

* typo

* Fixing some paths

* fixing some paths

* updating submodule

* (hopefully) fixing the submodule
2020-07-07 19:19:00 +02:00
Swept
bad7f9dc6b Lots of new inhands, adds phoron (#1220)
* Beaker Inhands

* Flashlight Inhands

* Tile Refactor

* Adds metal/glass sheet inhands

* Removes plasma

* Adds Phoron

* We boolin'

* Phoron inhands

* First Pass inhand food

* First food inhand pass

* Soda inhand sprites

* Actually adds them
2020-06-25 13:51:58 +02:00