Commit Graph

1050 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
MrSky12
acf1d99ad2 Revert "Porteded from yogger"
This reverts commit fe3bef0f9b.
2024-05-15 23:03:18 +02:00
MrSky12
c13d8400fd Reapply "Sticky Web pulled by Web Weaver"
This reverts commit 78eb1af17b.
2024-05-15 13:38:17 -07:00
MrSky12
78eb1af17b Revert "Sticky Web pulled by Web Weaver"
This reverts commit 1c4f1abeea.
2024-05-15 13:19:04 -07:00
ReoDaProtovali
fe3bef0f9b Porteded from yogger
no effort
2024-05-14 21:51:27 -05:00
evilew
3bfb823968 small tweaks
- removed lewd hyper trait objectives
- added knockdown airlock stun (back)
2024-05-13 19:38:17 +02:00
Alphas00
1c4f1abeea Sticky Web pulled by Web Weaver
Characters that are being pulled by a character who has the Web Weaver quirk will not get stuck in the webs
2024-05-07 14:27:49 +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
Alphas00
693d2b6dee Web Weaver webs and Genital Nutriment
Web Weaver quirk now also adds an action to spin sticky webs where you stand.
Characters with the Web Weaver quirk can freely move through webs.
Added nutriment as an option for fluid for genitals
2024-04-30 22:17:29 +02:00
evilew
d8fd5b7629 believe it or not, more of that fucking lava window fixes
just made the lava into a harmless preset now ig
2024-04-06 19:08:26 +02:00
evilew
fc30027d32 small tweaks
- fixed breached floor on Box maints
- removed fall stun from door stuckage
- fixed Haydee pistol sprites
- fixed a typo in Haydee cargo package
- made some lathes public in Kilo
- removed whiteship port on FastFood
2024-04-01 18:10:54 +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
472b51194f including haydee suit into various spots
- also made costume vendors accessible by anyone
- added haydee suits to contraband cargo, hacked autodrobe (costume) vendor, some autoylathes etc
2024-03-29 17:28:45 +01:00
Pinta
8f4c481d45 more stuff 2024-03-29 11:48:11 -04:00
Pinta
4b4d5a2432 whoops, I missed some 2024-03-27 16:54:48 -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
55f5578d5b a step in the right direction 2024-03-25 23:02:43 -04:00
Pinta
4ace8e4f78 aaaaaaaaaa 2024-03-24 07:50:58 -04:00
Pinta
6dcab06780 more changes 2024-03-24 06:54:57 -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
1d84e55661 stuckage tweaks, voice of god
- added two commands to voice of god: inflation (activated by: "blimp, balloon, inflate, bloat") and weight gain: (activated by: "gain, fatten, widen, get fatter, get fat")
- fixed airlock stuckage messages, so the long one is only visible to the player, while bystanders get a short one
- added super-pacman to the hotel space ruin
2024-03-08 13:41:01 +01:00
evilew
dc64540938 restaurant + random tweaks
- more details to fast food (radio tower, extra items, trash asteroid, floor decals)
- changed some job presets to include certain items or names (restaurant guys get IDs and radios now for instance)
- moved some code for convenience
- ATVs are now faster, scooters are slower
2024-03-07 15:25:13 +01:00
evilew
c58e7dff83 VV's door stuckage code
- adds a chance to be stuck in doors if you're fat enough. The chance increases the fatter you are
2024-03-03 23:36:18 +01:00
evilew
6ae6973b9c Merge pull request #159 from KabKebab/lil-upgrades
small tweaks
2024-02-19 22:54:44 +01:00
evilew
c41b1b6a19 chair breakage mechanics - by VV 2024-02-19 00:12:14 +01:00
evilew
e53fc1729b implementing new meals and recipes
also included LGO plush
2024-02-18 18:59:16 +01:00
Pinta
4cc7d40d83 maps and some other tweaks 2024-02-14 02:18:49 -05:00
Aeris Bennet
7c64f8b301 Did as much as I can with adding more GATO branding. 2024-02-09 02:29:29 +00:00
evilew
5abeb8aaef Merge pull request #151 from surftheseawing/doorfix
Halt autoclose when blocked too many times
2024-01-26 22:00:17 +01:00
psq95
55f3970cc5 Halt autoclose when blocked too many times
Wooden barricades in powered airlocks cause lag as the doors try to autoclose over and over.

This change adds a failure count that increments each time a door attempts to close but something is blocking it. If it fails too many times, it simply stops trying. Doors can be closed manually once the blockage is removed.
2024-01-26 20:56:33 +00:00
Aeris Bennet
964c1e2025 Removing hunter code. It's unused. 2024-01-16 18:31:40 +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
MrSky12
286fa4b1f6 Turned candyfloor into grass
Should be having grass stepping sounds now
2023-11-14 21:28:59 +01:00
evilew
3b7783c894 nerfed heat produced from candles and cigs 2023-10-21 14:16:47 +02:00
evilew
daa5b90829 blacklist Kilo from Electrical Storm event
far too troublesome and frequent on this map
2023-09-29 17:16:28 +02:00
evilew
6227dd1f76 cryopods reflavor, small antag tweaks
nothing really changed other than sprites and flavor text.

also nerfed high-chaos and antag events. Also fixed minor tweaks
2023-09-28 03:11:50 +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
8771da02f7 fatness nerfs + working on fudge monster 2023-09-05 02:37:23 +02:00
evilew
0601efe099 candyland on demone
just added/changed some turfs, moved some ruins into our own folder, delicately nerfed the cake golem
2023-09-05 02:36:42 +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
84f75678d9 Tag removal of fly person TF from teleporter 2023-08-29 21:49:04 +01:00
GDLW
a4ca1f4863 small tweaks
- removed the chance to become a fly if you use the stationary tele
- added a mealdor to lavaland syndie base
2023-06-22 18:07:42 +02:00
psq95
5840c8ab99 Add null checks to client prefs checks
client.prefs. -> client?.prefs?.
2023-05-13 23:53:47 +01:00