Commit Graph

125 Commits

Author SHA1 Message Date
BlackMajor
355c1f91b7 Merge branch 'master' into protean-rework 2022-10-01 19:58:22 +13:00
BlackMajor
feaaf95b65 Update phase.dm 2022-09-30 04:11:25 +13:00
BlackMajor
c36f78b600 adds rig phase gun, moves some files around 2022-09-30 00:35:45 +13:00
Darlantan
a84d9c68e3 cleanup, icon_stuff, tutorial, sound, balance tweaks 2022-09-27 02:20:10 -04:00
Darlantan
28ca297677 "100% functional" commit 2022-09-25 17:54:03 -04:00
Darlantan
542ff5e02f how many times have I switched branches to fix mirrors 2022-09-25 17:54:03 -04:00
Darlantan
97e061b39c More branch switching 2022-09-25 17:54:03 -04:00
Darlantan
9199f5a281 switching branches AGAIN 2022-09-25 17:54:03 -04:00
Darlantan
65203bbfa0 switching branches again 2022-09-25 17:54:03 -04:00
Darlantan
97f330698a Move new files to new(ish) modularity folder 2022-09-25 17:54:03 -04:00
Razgriz
0b3333e12b Merge pull request #4970 from Verkister/cupcakebeast
Buffs muffin monster
2022-09-22 20:08:34 -07:00
Verkister
344486b795 new belly desc and even worse sprites >:3c 2022-09-21 18:42:26 +03:00
Verkister
822c3885fa Buffs muffin monster
Oh no.
Also adds sprites for the thing and a framework for simplemobs (via init_vore) or ingame varedits to set custom vorgan entry sounds.
2022-09-21 14:29:41 +03:00
BlackMajor
bb6c77dd57 Total Reassembly 2022-09-19 14:40:29 +12:00
Bib Bob
792f927e69 Adds more hat sprites for tesh
jank
2022-09-16 18:38:03 -05:00
BlackMajor
0af27b48f6 Prot EMP fixes 2022-09-16 12:44:16 +12:00
BlackMajor
c4455d4bd0 Merge branch 'master' into protean-rework 2022-09-12 23:40:01 +12:00
BlackMajor
19574a9950 Last of the prot snowflake modules 2022-09-12 22:40:52 +12:00
Nadyr
a56f4f4f97 Merge pull request #4850 from UniquaSa/stru
More supply packs and small teppi tweak
2022-09-10 21:36:06 -04:00
Kassc
5a86b4ffbc Added names and descriptions.
As tittle says, every pod option now has names and descriptions.
2022-09-10 21:10:22 -04:00
Darlantan
5e8b934cbf Super position survival pod for Kassc 2022-09-07 22:31:50 -04:00
SarmentiCampbell
30d4d95a3f removed crates 2022-09-06 18:41:15 +02:00
SarmentiCampbell
9bddec8134 crate
removed otie's crate
ay
2022-09-06 18:23:19 +02:00
Verkister
223c392f9e Update update_icons.dm 2022-09-02 16:41:57 +03:00
Verkister
f69597cd92 Fixes incorrect duplicate layer defines
And comments them out because they have no reason to be here in the first place as they already exist in the main file with their correct numbers and all.
2022-09-02 16:29:08 +03:00
BlackMajor
65e2cdd259 Some fixes 2022-08-30 22:24:10 +12:00
BlackMajor
b7cf45e7d3 Merge pull request #4801 from AnymousUnknow/master
Digitigrade sprite fix
2022-08-29 17:07:17 +12:00
Mysterijojo
abd263e794 Digitigrade sprite fix
Done big copy-paste error. This should fix it.
2022-08-28 20:54:21 -07:00
Nadyr
5ce5931291 Merge pull request #4769 from VictorZisthus/viro-monkey-business
Monkey Recycler for Virology
2022-08-28 19:07:03 -04:00
Nadyr
408bf4de39 Merge pull request #4767 from Holdelta/BarUpdate
Refactoring existing CHOMPStation drinks into the modular folder, visual update to some drinks, and adding new drinks from other servers.
2022-08-28 19:06:15 -04:00
Nadyr
bc4bc525b2 Merge pull request #4734 from ItsSelis/tgui-bellyexport
HTML Export of Bellies
2022-08-28 18:21:53 -04:00
Nadyr
9038e1d2ad Merge pull request #4732 from TheGreatKitsune/crawling-into-shoes
Micros can now crawl into shoes
2022-08-28 18:20:26 -04:00
Nadyr
fa6bdf9209 Merge pull request #4733 from Kazzc/DesertTiles
Desert Planet Tiles
2022-08-28 18:00:33 -04:00
BlackMajor
72f1ddc6fa protean rig armor 2022-08-26 16:11:06 +12:00
Kassc
4b93911a07 Test PR
Dunno, maybe this fixes something.
2022-08-25 19:58:02 -04:00
BlackMajor
43888a6718 starting prot rig modules 2022-08-25 21:57:08 +12:00
Victor Zisthus
1a2dae89ab Monkey Recycler for Virology
Dead monkey goes in, fresh monkey comes out (as a cube).

For virology, who won't have any use for the 4:1 monkey to cube ratio of the slime processor. All resources for this version are diverted to "reviving" monkeys 1:1.

Currently just code for it, nothing mapped in.
2022-08-23 17:26:22 -04:00
Test Turtle
5f314473ba Refactoring existing CHOMPStation drinks and adding new ones. 2022-08-23 02:12:28 -07:00
BlackMajor
a26503b1a5 bug fix 2022-08-23 01:33:41 +12:00
BlackMajor
44edd5178b Protean Tankiness nerf 2022-08-23 00:09:10 +12:00
Mysterijojo
014ea7a0c4 ... forgot the tails.
Forgot to split the tails.
2022-08-21 12:04:51 -07:00
Mysterijojo
0c209034fe Separated new markings into /modular_chomp
Hopefully reverted most the changes to /code, and ported them to /modular_chomp.
2022-08-21 12:01:15 -07:00
BlackMajor
e19cc2ebff some fixes 2022-08-20 19:35:05 +12:00
BlackMajor
7a7a006caf Merge branch 'master' into protean-rework 2022-08-20 09:53:04 +12:00
BlackMajor
afe6d88de2 Back to work. Protean rig interface. 2022-08-20 09:48:09 +12:00
ItsSelis
b0f6995eb3 Added Belly Color to Export 2022-08-19 08:52:30 +02:00
ItsSelis
de33a13f1c HTML Belly Export 2022-08-19 08:40:45 +02:00
Kassc
6c14d8cb22 Desert Planet Tiles
Little project I am still working on, expect a lot more sprite art but for now.
-Desert tiles
-Sand tiles
-Water tiles
-Gravel tiles
-Mud tiles
2022-08-19 02:09:34 -04:00
TheGreatKitsune
0ec7d86b1e Micros can now crawl into shoes 2022-08-18 22:16:16 -05:00
Mysterijojo
e9ed37adb5 Sect drone bodytype marking
Introduced sect drone bodytype markings, with appropriate wings and tail.
2022-08-18 06:56:47 -07:00