Commit Graph

2793 Commits

Author SHA1 Message Date
Sonoida
14ca88cde6 small random tweaks
- added WG culture bottle preset
- tweaked gym equipment weight loss a bit
- added a lot of WG-related loot to lavaland pool table
- changed some xenoarch Tp locations
2023-03-18 14:10:44 +01:00
GDLW
4fcf9826c0 Merge branch 'KabKebab:master' into random_junk 2023-03-16 18:05:23 +01:00
Sonoida
949545b799 finished hair gradient port
forgot to add a couple vars like a goober
2023-03-16 15:35:19 +01:00
Sonoida
8e402721dd porting hair gradient (wip)
it doesn't actually seem to work at all, will continue later
2023-03-16 13:54:05 +01:00
Sonoida
56491d8dca new gun!!
calorite cannon + other small tweaks, continuing to work on calorite research
2023-03-14 01:05:20 +01:00
Sonoida
59cdacd0b5 lil fix
nothing worthwhile, just  keeping this for later
2023-03-12 19:39:45 +01:00
Sonoida
8ec0a931f0 added presets, continuing work on research tree
also added a new fatoray sprite, thank you Ambassadoing
2023-03-08 16:15:46 +01:00
Sonoida
12108520f1 starting work on nutri tech
research trees work + exclusive file for nutri tech

also fixed the fatoray sprite a bit
2023-03-08 14:45:37 +01:00
MrSky12
3bf35fb464 Merge pull request #77 from eyespy2222/testbranch
Mister Mann's mint toxin update! (RUN FATTIES)
2023-03-08 09:15:21 +00:00
eyespy
72ccbb01be Mister Mann's mint toxin update! (RUN FATTIES)
tweaks mint toxin to gib people more consistently by only gibbing people with TRAIT_BLOB.
2023-03-08 16:42:04 +11:00
MrSky12
468c3b2cf5 push chocolate water code 2023-02-28 01:02:10 +01:00
eyespy
55c1992174 Merge branch 'master' into testbranch 2023-02-23 22:20:48 +11:00
eyespy
cc2a878c6d Dance 'till your dead!
adds calorite dance floors and a dead sprite for cake people.
2023-02-23 19:15:05 +11:00
MrSky12
5ea6dc2bb8 Merge pull request #73 from deertools/fat-speed-refactor
Refactors the weight gain movement speed penalty
2023-02-23 05:43:27 +00:00
Pinta
c40a03a256 Update weight.dm 2023-02-22 23:19:50 -05:00
Pinta
9b7b075402 Update mobs.dm 2023-02-22 22:54:58 -05:00
Pinta
d728e9baf6 refactor 2023-02-22 22:52:47 -05:00
Pinta
1bb753076c maps 2023-02-22 15:02:33 -05:00
MrSky12
84fe4065e6 Merge pull request #69 from eyespy2222/testbranch
finishing what i started (and cake people!))
2023-02-20 11:12:30 +00:00
Pinta
e4ac1a0bb6 prefs 2023-02-19 16:55:47 -05:00
eyespy
e6c9a14282 moving code around for convenience 2023-02-19 21:01:36 +11:00
eyespy
3298f659b5 finishing what i started (and cake people!))
hopefully this fixes some bugs that were made present due to a botched PR I did a few days ago, as well as properly implementing craftable cake people (or cake golems, if you wanna call them that). sadly the code that was present when i tried to make my modifications for some reason does not give the person attempting to eat the cake person any nutriment or vitamins, so i would appreciate it if a more experienced coder gave me a hint on how to fix this, or just fixed it themselves.
2023-02-19 15:45:03 +11:00
MrSky12
578ea6d12d Metha Changes Part 200
What has been added?

- Outfats edit, as usual.
- Added in Pettan Kometomo
#9277 's candy tiles (Choclit_alt2 and the bubblegum floor have been coded in.)
- Added chocolate slime sprite. (Waiting for someone to code it in cause I suck at coding.)
2023-02-18 02:41:11 +01:00
AutVacc
c20ebec35a hair iconpath fix
fixed two misnamed hairs
2023-02-16 20:14:52 -05:00
Sonoida
79b156ca6b fixing someone's errors
what a goober, amirite
2023-02-16 17:53:28 +01:00
Sonoida
ec1204b099 spriting + mapping fixes
- fixed Sauna bolts on Boxstation
- fixed door namings in Moka's room in CentComm
- placed couple more feeding tube machines in Meta maints
- removed ghost role from Deep Storage
- added boltable doors to Feeder's Den
- added broken variant of calorite tiles
- refreshed GATO sprites of banner and logo decal
- added new food sprites (sushi and cakes), MADE BY KISSASTA
2023-02-16 16:11:03 +01:00
GDLW
34a89c1687 Merge pull request #61 from eyespy2222/testbranch
DID I HEAR A ROCK AND STONE?!?!?!!?!
2023-02-16 12:16:21 +01:00
eyespy
82bf96656e morefixy 2023-02-16 19:47:46 +11:00
eyespy
d00f89702b morefixes 2023-02-16 19:43:30 +11:00
eyespy
29756d756b Revert "Revert "DID I HEAR A ROCK AND STONE?!?!?!!?!""
This reverts commit 544605fca6.
2023-02-16 18:03:22 +11:00
eyespy
544605fca6 Revert "DID I HEAR A ROCK AND STONE?!?!?!!?!"
This reverts commit 99b80d9784.
2023-02-16 18:01:12 +11:00
eyespy
99b80d9784 DID I HEAR A ROCK AND STONE?!?!?!!?!
FOR KARL!!
2023-02-16 17:48:49 +11:00
Pinta
166752cdb0 refactor 2023-02-13 19:09:17 -05:00
MrSky12
0ce1a18083 Merge pull request #54 from AutVacc/master
Hair ports
2023-02-12 14:53:22 +00:00
Pinta
8d58f47d57 Update sheet_types.dm 2023-02-11 16:59:37 -05:00
AutVacc
b153479967 Merge branch 'master' of https://github.com/AutVacc/GS13 2023-02-10 22:25:40 -05:00
AutVacc
3c26746cb2 hair ports
added 89 human hairs, 12 podperson hairs, alphabetized
2023-02-10 22:22:02 -05:00
GDLW
7aa6674af4 Merge pull request #52 from deertools/whoops
Fixes issue with weight gain refactor
2023-02-10 17:43:04 +01:00
Pinta
20e78ec145 weight loss 2023-02-08 22:34:53 -05:00
Pinta
9997454a24 I made a goof 2023-02-08 21:56:56 -05:00
Pinta
80bb2d660f Update examine.dm 2023-02-08 21:38:05 -05:00
Pinta
fae85472eb examine text 2023-02-08 21:35:54 -05:00
Pinta
f97f47bb2e wew 2023-02-08 20:17:52 -05:00
Pinta
9fc2f81150 wew 2023-02-08 18:24:13 -05:00
Pinta
8b3ee4ffe3 wew 2023-02-07 21:02:19 -05:00
Pinta
bba71bcdf9 a 2023-02-07 19:30:45 -05:00
MrSky12
27cbade63c Merge pull request #48 from DynaJ0ule/loneops_changes
Loneops changes
2023-02-07 09:55:17 +01:00
Pinta
c922c71fa1 nerf 2023-02-06 21:30:27 -05:00
DynaJ0ule
d342f3f628 Comment clarification 2023-02-06 12:41:35 -05:00
DynaJ0ule
0fa615acec TC nerfs acroos the board, keep some differences 2023-02-06 12:41:12 -05:00