58023 Commits

Author SHA1 Message Date
Mosley
24c0a1314f some fixes
I have no idea if these works, this just allows the server to compile
2025-04-24 17:18:02 -05:00
Mosley
0d9eebd20c Merge remote-tracking branch 'upstream/master' 2025-04-24 17:03:15 -05:00
SandPoot
ae7f6438be Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13 2025-04-22 21:34:24 -03:00
SandPoot
b4559df09a this pretty much breaks most methods of cloning 2025-04-22 21:33:53 -03:00
Sandstorm-Bot
d4e6927eda Automatic changelog compile, [ci skip] 2025-04-22 23:41:03 +00:00
Sandstorm Bot
65fb587ac4 Automatic changelog generation for PR #400 [ci skip] 2025-04-21 23:47:09 +00:00
SandPoot
71bdb471ce Merge pull request #400 from ElectoriaLegend/master
Swap boob sprites by the old Skyrat ones.
2025-04-21 20:46:21 -03:00
ElectoriaLegend
9c4d107b45 Max boob size pref change 2025-04-21 20:40:24 -03:00
ElectoriaLegend
ae756d52d5 Merge branch 'master' of https://github.com/ElectoriaLegend/Sandstorm-Sexupdate 2025-04-21 04:45:22 -03:00
ElectoriaLegend
6ce600e89e Gotcha 2025-04-21 04:45:04 -03:00
SandPoot
28e2b6ec72 Update generate_documentation.yml 2025-04-21 04:36:19 -03:00
SandPoot
0b638239c8 Merge pull request #399 from Sandstorm-Station/automated-sex
Makes the interactions subsystem tick
2025-04-21 04:31:28 -03:00
ElectoriaLegend
91f06484bc Merge branch 'Sandstorm-Station:master' into master 2025-04-21 04:29:29 -03:00
ElectoriaLegend
46a9822e6e Removes the old boob file 2025-04-21 04:29:04 -03:00
ElectoriaLegend
ca5c348971 Booba 2025-04-21 04:28:19 -03:00
SandPoot
620b4dfea7 push 2025-04-21 04:17:50 -03:00
Sandstorm Bot
000dcaaa0e Automatic changelog generation for PR #398 [ci skip] 2025-04-18 21:42:28 +00:00
SandPoot
1dd307c238 Merge pull request #398 from Sandstorm-Station/storm
Ashstorms refill dug holes
2025-04-18 18:41:37 -03:00
SandPoot
06572b5e20 cover holes 2025-04-18 18:30:23 -03:00
SandPoot
f0fb1ad3d7 no more pausing metabolization, go build a stasis bed you lazy. 2025-04-18 17:37:43 -03:00
Sandstorm Bot
4ef4e2c7cc Automatic changelog generation for PR #397 [ci skip] 2025-04-18 19:50:57 +00:00
SandPoot
44c271e94d Merge pull request #397 from ElectoriaLegend/master
Improves frotting
2025-04-18 16:50:06 -03:00
ElectoriaLegend
cff6cd6f09 Better frotting 2025-04-18 16:36:19 -03:00
Sandstorm Bot
63ca9dd7f9 Automatic changelog generation for PR #396 [ci skip] 2025-04-18 18:54:38 +00:00
SandPoot
6220537d4d Merge pull request #396 from Sandstorm-Station/finally-fix-additional-details
Fix additional details
2025-04-18 15:53:47 -03:00
SandPoot
e17d8fd74c push 2025-04-18 15:43:30 -03:00
SandPoot
c80db513b6 fixes inventory equip preview 2025-03-27 18:12:30 -03:00
SandPoot
147d75e2f6 Merge pull request #393 from Sandstorm-Station/corru
New hud "corru"
2025-03-10 23:51:28 -03:00
SandPoot
9f4a7ef4f3 bad dels + looks like this was not going well 2025-03-10 16:38:50 -03:00
SandPoot
054716857f push 2025-03-10 16:11:56 -03:00
SandPoot
2b89062c10 i had to get into linux to do this + merges ui_icons 2025-03-04 21:59:24 -03:00
SandPoot
0950869f7f i had to get into linux to do this - deletes UI_Icons 2025-03-04 21:59:08 -03:00
SandPoot
f6405100b5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-02-25 21:46:53 -03:00
deathride58
4cc5b839e6 Merge pull request #16125 from SandPoot/general-fixes
A bunch of fixes
2025-02-25 18:17:14 -05:00
SandPoot
3425760ced push 2025-02-25 17:48:02 -03:00
SandPoot
74ca0f3a32 knowing languages should be in the MIND!! 2025-02-25 12:36:38 -03:00
deathride58
7ba9f0db22 Merge pull request #16123 from SandPoot/more-hud-stuff
Add hud_owner to more stuff for safety
2025-02-17 01:47:43 -05:00
deathride58
e3a2962a4c Merge pull request #16124 from sheepishgoat/footstep-fix
Fixes runtimes that occur when catwalks try to play a sound that doesn't exist.
2025-02-17 01:47:13 -05:00
softcerv
662c230490 removes trying to access sounds that aren't there 2025-02-17 01:25:27 -05:00
SandPoot
1a694d09de yeah 2025-02-16 17:28:29 -03:00
SandPoot
d124030959 playing it safe 2025-02-16 16:41:59 -03:00
Mosley
76329b1057 Merge pull request #1238 from FelixRuin/patch-1
crystalwire AGRCOMPLEX was rewrite base beartrap
2025-02-13 21:50:02 -05:00
SandPoot
dca8b2503c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-02-13 18:11:36 -03:00
SandPoot
2d87780147 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-02-13 18:06:56 -03:00
deathride58
3e3d82cba3 Merge pull request #16122 from SandPoot/oops-storage-hud-stuff
Fix storage problems introduced with last pr
2025-02-13 15:48:50 -05:00
SandPoot
fc530786b8 push 2025-02-13 17:39:15 -03:00
deathride58
19a0156175 Merge pull request #16121 from SandPoot/death
Updates a ton of stuff based on tg
2025-02-13 12:30:14 -05:00
Sandstorm-Bot
d91e280537 Automatic changelog compile, [ci skip] 2025-02-10 06:43:53 +00:00
Sandstorm Bot
0267cb159b Automatic changelog generation for PR #392 [ci skip] 2025-02-10 06:43:15 +00:00
SandPoot
d31082d33b Merge pull request #392 from Sandstorm-Station/accessories-stuf
Fixing accessories ™️
2025-02-10 03:42:22 -03:00