Commit Graph

424 Commits

Author SHA1 Message Date
MrSky12
6ba955d90c Reapply "Merge branch 'master' into trash-eat-Mk2"
This reverts commit d638582401.
2024-05-15 23:28:30 +02:00
MrSky12
d638582401 Revert "Merge branch 'master' into trash-eat-Mk2"
This reverts commit c82be8287a, reversing
changes made to 8cb3330fef.
2024-05-15 23:03:29 +02:00
Alphas00
cd91c84586 Service sign
Added an "open/closed" sign, toggles between either when used. Crafted with 1 sheet of cardboard
2024-05-05 09:41:15 +02:00
evilew
ea7a7a8281 Merge pull request #167 from deertools/515-compatiblity
More 515 updates
2024-03-29 17:38:48 +01:00
Pinta
eb06cb3364 procs 2024-03-29 12:33:21 -04:00
evilew
dd40b04a46 Merge pull request #164 from deertools/515-compatiblity
[PLEASE TEST-MERGE THIS OR SOMETHING BEFORE FULLY MERING] Updates us to 515
2024-03-27 18:01:15 +01:00
evilew
37cb4db1c3 lorebooks, gatolaw, map schtuff
- removed coomburger from recipes
- added updated space law books (thanks Chloe)
- placed updated space law books on the maps
- updated the hotel space ruin a bit to make it prettier
- updated WELCOME TO GATO pamphlet slightly
- added lipoifier kegs (just a preset for now)
2024-03-26 13:59:12 +01:00
Pinta
4ace8e4f78 aaaaaaaaaa 2024-03-24 07:50:58 -04:00
Pinta
63009681fa it compiles, that's better than it not compiling, right? 2024-03-24 06:36:59 -04:00
Pinta
d46cf2d981 a start 2024-03-24 05:20:10 -04:00
evilew
8c5759b023 map fixes, small preset tweaks
- added Oliver plush
- given soporific bullets to feeder den agents
- something fixes in cfc whiteship
- fast food detailing
2024-03-21 21:58:24 +01:00
evilew
e53fc1729b implementing new meals and recipes
also included LGO plush
2024-02-18 18:59:16 +01:00
Aeris Bennet
7c64f8b301 Did as much as I can with adding more GATO branding. 2024-02-09 02:29:29 +00:00
Alphas00
24a78b7f94 Rolling Paper craft
-Adds the option to craft rolling paper for rollies by using 1 sheet of cloth
2024-01-11 23:10:51 +01:00
evilew
55dd5d10ae small fixes
- added stuff for feederden botany
- small gato lore naming tweak
- engie hardsuits have slightly higher rad res
- small naming fix in fatty_drinks
- fixed a runtime with calorite tiles (also fixing calorite not popping up on scanners in xenoarch)
- couple more job titles related to med
2023-12-23 14:21:16 +01:00
evilew
3b7783c894 nerfed heat produced from candles and cigs 2023-10-21 14:16:47 +02:00
evilew
44d3149a46 small tweaks
- fixed creambeasts and chocoslimes fighting
- added a gym to Xenoarch base
- assigned Fanatic Feeders to Syndicate faction, so the turrets don't do friendly fire
- small bits of GATO reflavoring
- ported Spider Legs (wings slot), gator taul tail and alt naga tail sprite from Virgo
2023-09-27 12:40:01 +02:00
evilew
7ca379800c added candy decals and walls, organized GS13 turfs a bit
this also changes some small things, like removing corn oil from vent clog event and nerfing lipoifier generation from grinding calorite
2023-09-05 02:36:42 +02:00
psq95
cb43bf0dfc Label GS13 changes
Since commit 5084020 on Jan 30, 2023
2023-08-29 21:50:24 +01:00
psq95
5840c8ab99 Add null checks to client prefs checks
client.prefs. -> client?.prefs?.
2023-05-13 23:53:47 +01:00
GDLW
024b7b9503 fixed calorite doors spawning statues
yup. oops
2023-05-13 20:42:54 +02:00
GDLW
03c84d6bd9 calorite doors
tl;dr the fatter you are, the longer you get stuck and the more you fatten (thank you surftheseawing for immense help with the code)
2023-05-09 13:55:22 +02:00
eyespy
8a93c57397 stunbatons aren't as harsh (and i moved oily oafs to it's own thing) 2023-04-04 02:01:06 +10:00
GDLW
4fcf9826c0 Merge branch 'KabKebab:master' into random_junk 2023-03-16 18:05:23 +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
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
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
Pinta
8d58f47d57 Update sheet_types.dm 2023-02-11 16:59:37 -05:00
Pinta
2c50b4acbc tile obj sprites 2023-02-05 20:35:07 -05:00
Pinta
6472b7c058 wew 2023-02-05 20:13:25 -05:00
Sonoida
27b2e2a9e8 new GATO carpet (thanks Cubic) + minor map fixes
- first variant of GATO carpet (made by CubicP1sa)
- small mapping fixes on Pubby (centered around the bar)
2023-01-12 00:10:03 +01:00
Sonoida
fdc909fd5c small map fixes + continuing to work on calorite
- added a proper dancing pole to one of Pubby's maintbars
- changed airlocks to glass airlocks in Box sauna
- Meta's shooting range doesn't have windows anymore
- added notes to Feeder's Den
- routed disposals in Feeder's Den
- new space ruin! Fast food restaurant (still gotta add ghostrole junk to it though)
2023-01-11 17:30:22 +01:00
Sonoida
e32566ec40 renamed calorit into calorite, initialized it into more files
I think that might be all. Now it's just a matter of coding, testing and spriting.
2023-01-05 14:23:18 +01:00
Sonoida
3b24c6eff1 added a fattening tile
related to the new WG mineral, this tile wil fatten up anyone who steps on it

(other changes: had to comment out some stuff that I won't work on for now, it was producing errors)
2023-01-04 19:37:49 +01:00
Sonoida
60af4e60c5 implementing calorit (new mineral)
Just setting the scene for the item, basically. It doesn't have a single sprite yet, nor does it have any 'special' code
2023-01-04 18:06:04 +01:00
Sonoida
4ca6d4d368 finished cookie synth for all robots + further map updates
- added cookie synthesizer that's compatible with all robots
- added cookie synth to robotic dep in current station maps
- fixed feeding tube's sprites to make them transparent
- fixed satdorms in Omega a bit more
2022-12-17 20:10:28 +01:00
Sonoida
e90079fac5 various little fixes, resprites and attempt to make cookie synth buildable
- made feeding tube purchasable via cargo
- resprited "KK" supply pods into "GG" pods (GATO)
- added contraband Corn Oil poster (made by Cubic)
- changed sounds of one of the plushes
- added Feeding Tube to some spots in all of the current maps
- resprited one of the "GATO" console sprites into something more detailed
- attempted to make cookie synthesizer buildable and attachable to any borg. Still WIP!
2022-12-16 12:49:57 +01:00
Sonoida
91cab0bdca added belly size increase button, added kinichi plush
Just as the title says. The belly size increase button allows you to move up a size, similar to "deflate belly" button
2022-12-15 20:41:05 +01:00
Sonoida
9880b65240 one extra fix to feeding tube, rose plush
- fwend acquired :)
- fixed some naming issues in the feeding tube
2022-12-15 15:05:27 +01:00
Sonoida
92a7ee092b fighting with dorm sat continues, new plush, tweaking the feeding tube
- added Melony plush,
- continuing to get confused over the OmegaStation dorm sat id linking (bolting doors and toggling shutters),
- removed pointless cargo seller option for the feeding hose,
- temporarily made Omega the default starting map
2022-12-12 23:20:24 +01:00
DynaJ0ule
1ad2e7e035 allows for building a meal vendor with fixes 2022-11-22 03:38:55 -05:00
Sonoida
971ca33f5d silly lil fix
:^)
2022-11-16 16:58:29 +01:00
Sonoida
c1c16aa27f tiny lil fixes in sprites
to a certain lil thing
2022-11-15 21:59:18 +01:00
MrSky12
ad066ac5b7 Gatofication 10/10/2022 2022-10-10 12:29:23 +02:00
SomeGuyEatingPie
984aeaaf70 Scale Start
Scale is now:
-craftable
-able to be disasembled
2022-06-05 18:46:27 +01:00
MrSky12
da87e88321 Gatofication 2 2022-06-03 00:07:56 +02:00
MrSky12
53c7e6925a Belch emote
A belchier emote for hornier burpers
2022-05-28 18:17:59 +02:00
SomeGuyEatingPie
66b1dbe632 final fix 2022-05-18 20:51:16 +01:00
SomeGuyEatingPie
0b9a58dd54 Copied hyper code
Copied code from hyper
2022-05-18 20:09:25 +01:00
KabKebab
12a865f2e0 Merge branch 'master' of https://github.com/KabKebab/GS13 2022-05-07 21:00:23 +02:00