Commit Graph

548 Commits

Author SHA1 Message Date
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
TheGreatKitsune
a4ecc0b74d Switch to using modular chomp folder 2022-08-21 10:23:30 -05: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
Mysterijojo
02e19e6c2b Correctly moved virus markings
Moved markings from markings.dmi, tails.dmi, and taurs.dmi to markings_ch.dmi, tails_ch.dmi, and taurs_ch.dmi

Moved altered code to modular_chomp folder
2022-08-17 21:24:08 -07:00
TheGreatKitsune
5f0ed62225 Merge master into vore-sprites 2022-08-07 19:38:53 -05:00
TheGreatKitsune
6b542e59d2 Add reforming 2022-08-04 15:04:34 -05:00
Razgriz
0e7c8d3b24 Merge pull request #4609 from TheGreatKitsune/autotranscore-pref
Adds preference for automatic transcore notifications
2022-07-26 01:58:18 -07:00
Razgriz
dc64faf0c5 Merge pull request #4608 from VictorZisthus/nerf-vore
Nerfing Vore
2022-07-26 01:57:42 -07:00
TheGreatKitsune
1ba02ac761 Adds preference for automatic transcore notifications 2022-07-25 19:39:46 -05:00
Victor Zisthus
f5d01823ef a 2022-07-25 18:58:51 -04:00
Victor Zisthus
2c8186cccc removed an oopsie 2022-07-25 18:55:49 -04:00
Victor Zisthus
ffd72fd200 Nerfing Vore
I've come to nerf vore in the vorecode, and only the headmins and maintainers can stop me!
2022-07-25 18:49:00 -04:00
LordSaladin
edcbbcd7ad Merge branch 'master' into FabAdditions 2022-07-23 17:48:08 +01:00
Razgriz
ded1d7a205 Merge pull request #4589 from tacoguy7765093/theescapeplan
Un nerfs the autolathe
2022-07-22 00:50:11 -07:00
LordSaladin
bdfb0776ac Creates modular files for autolathe arms and protofab weapons
replaces the existing weapons_ch file for the protofab designs with a modular one along with creating a modular arms file for the autolathe, in addition  this makes the caseless rifle and it's magazines printable the former via the protofab and the latter via the autolathe.(I've set the rifle so it requires at least 5 levels in material, combat and phoron so that buying the crate from cargo is still viable when there's no sci or mining.)
2022-07-21 17:39:35 +01:00
BlackMajor
dedf7fd50b if prbt is so good why isnt there a prbt2 2022-07-21 23:34:06 +12:00
Bib Bob
0673570164 Un nerfs the autolathe
The autolathe can now print the rest of the t1 parts that was removed back in 2017 because of the scope for upstream.

This should allow for projects to be more easily done.

The parts lathe is staying to prevent map conflicts if such place has one.
2022-07-20 19:25:13 -05:00
BlackMajor
1affb3a089 Some preferred changes 2022-07-20 22:34:04 +12:00
Kassc
9d620f4096 Merge pull request #4329 from VictorZisthus/majormapedits
Massive Broad Scope Changes
2022-07-13 19:02:32 -04:00
TheGreatKitsune
6c8bc4f8f4 Fix resist animation, hide a currently unused option 2022-07-09 14:30:19 -05:00
TheGreatKitsune
79e3f9d0f5 Fixing taur vore sprites 2022-07-09 11:26:02 -05:00
TheGreatKitsune
30fa381175 Merge master into vore-sprites branch 2022-07-07 09:34:54 -05:00
TheGreatKitsune
7d3f361d8e Fix stepping on folk laying down. 2022-07-07 00:35:08 -05:00
Nadyr
4e1e725526 Fixing dreamchecker 2022-06-26 04:25:18 -04:00
Nadyr
a5970e7ab7 Fixing dreamchecker 2022-06-26 04:23:51 -04:00
Nadyr
99945c8f0d Fixing dreamchecker 2022-06-26 04:23:18 -04:00
Nadyr
93830975fc fixing dreamchecker 2022-06-26 04:20:20 -04:00
BlackMajor
d74d15fa72 Merge branch 'master' into protean-rework 2022-06-25 09:45:23 +12:00
Nadyr
a2d9c8b58a Merge branch 'master' into upstream-merge-13122 2022-06-22 22:37:44 -04:00
TheGreatKitsune
30c79dc929 Move stuff to modular_chomp, and add struggle animation 2022-06-21 10:24:38 -05:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00