Commit Graph

4777 Commits

Author SHA1 Message Date
Pinta 617f126d0d Update sprite_accessories.dm 2023-02-16 23:45:30 -05:00
GDLW f14a3a3d8a Merge pull request #63 from GDLW24/random_junk
tiny little PR to fix someone's goofiness
2023-02-16 17:54:26 +01:00
Sonoida 79b156ca6b fixing someone's errors
what a goober, amirite
2023-02-16 17:53:28 +01:00
GDLW 2fa88225bf Merge pull request #62 from GDLW24/random_junk
small spriting + mapping fixes
2023-02-16 16:17:12 +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 29d2fe8279 i hate living 2023-02-16 20:57:39 +11:00
eyespy 4e8d5c2953 patch 2023-02-16 20:27:54 +11:00
eyespy 82bf96656e morefixy 2023-02-16 19:47:46 +11:00
eyespy d00f89702b morefixes 2023-02-16 19:43:30 +11:00
eyespy d991c3c700 fixes 2023-02-16 19:38:40 +11:00
eyespy a69d37449a Delete kamenstation.dmm 2023-02-16 19:16:11 +11:00
eyespy 93119b1054 Delete RandomRuins_SpaceRuins_TheDerelictProjectdone.dmm 2023-02-16 19:15:53 +11:00
eyespy 5102e76f9a Delete .gitignore 2023-02-16 19:15:09 +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
MrSky12 dfd40fe63a Merge pull request #60 from deertools/feeding-tube-fix
Refactors the feeding tube to be a subtype of the IV drip
2023-02-14 05:47:59 +00:00
Pinta 166752cdb0 refactor 2023-02-13 19:09:17 -05:00
GDLW 7a8d44e450 Merge pull request #59 from deertools/vore-weight-gain
Fatal vore now adds weight from digesting the prey
2023-02-13 23:43:02 +01:00
Pinta 7c79edeb1f Update bellymodes_vr.dm 2023-02-12 15:56:46 -05:00
MrSky12 0ce1a18083 Merge pull request #54 from AutVacc/master
Hair ports
2023-02-12 14:53:22 +00:00
MrSky12 a2000c4c27 Merge pull request #55 from deertools/weight_gain_spells
The first of many weight gain spells
2023-02-12 14:52:58 +00:00
MrSky12 13f4c239ab Merge pull request #56 from deertools/fattening-gun
Adds in the fatoray
2023-02-12 14:52:32 +00:00
MrSky12 d50885a151 Merge pull request #57 from deertools/double-bed-fix
Fixes double beds not being craftable
2023-02-12 14:52:17 +00:00
MrSky12 238fd0b476 Merge pull request #58 from deertools/calorite-collar
Calorite Colllars
2023-02-12 14:51:57 +00:00
Pinta df12b94802 Update calorite_collar.dm 2023-02-11 19:05:20 -05:00
Pinta 4e7b0c35e8 Update calorite_collar.dm 2023-02-11 18:55:34 -05:00
Pinta 84e3ef539a base collars 2023-02-11 18:55:21 -05:00
Pinta 8d58f47d57 Update sheet_types.dm 2023-02-11 16:59:37 -05:00
Pinta 2c15f7291f Update spells.dm 2023-02-11 02:20:29 -05:00
Pinta 8d2870538a Update fatoray.dm 2023-02-11 02:06:18 -05:00
Pinta bbf99b4c0d fat gun 2023-02-11 01:52:50 -05:00
Pinta 5767e01f2c icons 2023-02-10 23:46:21 -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
Pinta da3da4455f basic touch spells 2023-02-10 21:01:58 -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
MrSky12 96b8c2c0c9 Merge pull request #53 from deertools/weight_loss_methods
Using the gym equipment now makes you lose weight
2023-02-09 03:48:06 +00: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
MrSky12 fe9c7ee4cf Merge pull request #51 from deertools/fatness-refactor
Refactors Weight gain
2023-02-09 02:52:25 +00: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
MrSky12 87296d3789 Merge branch 'master' of https://github.com/KabKebab/GS13 2023-02-08 20:53:27 +01:00
MrSky12 bc7214282d Made the gato logo darker and transparent so it is not that blinding. 2023-02-08 20:53:24 +01:00
GDLW c6c16e3366 Merge pull request #50 from GDLW24/minor_reworks
small mapping changes
2023-02-08 20:51:28 +01:00
Sonoida 8b46cadbc1 small mapping tweaks
Feeder's den:
- fixed air tanks
- added clothing wardrobes
- made the place locked (syndie access)
- added some materials for the lathe
- extra space suit (for some fatty)
- added a cryo sleeper

Meta:
- changed some carpets

Fastfood:
- fixed air tanks
- added IDs for the workers
- made jukebox unrestricted
- removed FUNNY tiles

Omega:
- fixed air tanks
- fixed some shutters
2023-02-08 20:49:14 +01:00