11414 Commits
Author SHA1 Message Date
Mosley 0d9eebd20c Merge remote-tracking branch 'upstream/master' 2025-04-24 17:03:15 -05:00
SandPoot 06572b5e20 cover holes 2025-04-18 18:30:23 -03:00
SandPoot 054716857f push 2025-03-10 16:11:56 -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
SandPoot 3425760ced push 2025-02-25 17:48:02 -03:00
softcerv 662c230490 removes trying to access sounds that aren't there 2025-02-17 01:25:27 -05:00
SandPoot 2d87780147 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-02-13 18:06:56 -03:00
SandPoot 56d972eb0b all sorts of fixes and updates, may break stuff 2025-02-09 02:09:28 -03:00
MosleyandGitHub 313f48875e Merge pull request #1216 from SaraSayomi/Snaxi-regretti
Snaxi regretti
2025-02-02 23:25:27 -05:00
SandPoot 76042510df Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-01-28 19:21:39 -03:00
SandPoot cae94afdb7 push 2025-01-26 18:06:36 -03:00
SandPoot a2aa92cbc4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-01-24 02:08:58 -03:00
ariaworldandGitHub 44e507dfef [BEESTATION PORT] Semi-Port of Beestation Decal Fixes, Fixes turf decals disappearing on shuttle movements (#16119)
* SEMI-PORT OF BEESTATION PR #3111: Decal fixes

* Forgot this, rotate flag
2025-01-24 01:47:50 -03:00
Mosley f700fd616b Merge remote-tracking branch 'upstream/master' 2025-01-15 17:11:43 -05:00
SandPoot e3a3ca5892 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-01-04 23:24:59 -03:00
SandPoot 66cc8cf50f push 2025-01-01 20:20:16 -03:00
SandPoot 1cb96458bf h 2024-12-25 20:17:20 -03:00
SandPoot 9f32f2c0bf added the feature in the most broken way possible 2024-12-25 20:04:43 -03:00
SandPoot ce801b39b6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-12-24 19:31:23 -03:00
MosleyandGitHub 2f9def7c17 Merge pull request #1219 from JWosak/master
CogStation Update and Fixes
2024-12-12 02:07:13 -05:00
Mosley dedc5aef94 Merge remote-tracking branch 'upstream/master' 2024-12-05 16:49:03 -05:00
SandPoot 91e8a8ae3b quick fix 2024-12-04 16:22:27 -03:00
SandPoot 7ef7fc4f39 i just realized this might be possible 2024-12-04 16:12:06 -03:00
SandPoot 91c911383b stuff 2024-12-04 16:01:03 -03:00
SaraandGitHub 0cebc2bdda Merge branch 'SPLURT-Station:master' into Snaxi-regretti 2024-12-03 10:10:10 -07:00
ariaworld e23b1f84fd BEESTATION PORT PR#4567: Filters + plane_master atomized 2024-11-30 16:39:30 +01:00
Mosley 3c63bdc873 Merge remote-tracking branch 'upstream/master' 2024-11-29 19:41:18 -05:00
SandPootandGitHub 2a306556be Merge pull request #388 from xTheLifex/tweaks
Tweaks
2024-11-28 20:09:05 -03:00
Mosley 77cfbf8f7b fixes the rest of the announcements 2024-11-27 15:46:19 -05:00
Mosley a44046076a Merge remote-tracking branch 'upstream/master' 2024-11-21 22:44:41 -05:00
SandPoot 1d6008397a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-11-19 23:22:26 -03:00
JWosakandGitHub 93c2ed44ce Genpop Update 1 2024-11-04 17:06:39 +01:00
JWosakandGitHub 68af558202 Genpop closet sprite adapter 2024-11-03 20:44:57 +01:00
Metis f6af059a06 job titles 2024-11-02 03:16:16 -04:00
Sara 8091d7a060 More maints 2024-10-31 21:04:30 -06:00
Sara b0957d7def A-Maze-ing addition 2024-10-31 11:35:52 -06:00
Sara bd5d56336b Major push 2024-10-30 23:14:31 -06:00
KyleraceandMetis feacce1bb8 turns one of the vis_contents in openspace turfs to overlays (#58500)
one of the appearances that open space tiles add as vis_contents was an unchanging grey cover. its useless to keep it as vis_contents since its not supposed to change so its better to have it as an overlay. its possible that i can make openspace tiles not add the turf below as vis_contents and instead listen to objects entering and leaving it with connect_loc and add those objects as vis_contents then but that sounds like more trouble than its worth

edit: probably not the last part

overlays < vis_contents in maptick cost

also tramstation has the most open space tiles in high traffic areas compared to other maps. openspace tiles have 2 vis_contents each, equivalent to 2 objects that sendmaps processes every tick this pr only makes it 1 appearance in vis_contents. its also the map with the current highest maptick per player according to lemons graphs
2024-10-24 23:09:30 -04:00
Mosley cd03ca1151 Merge branch 'master' into content-stuff 2024-10-24 15:21:03 -05:00
Mosley 518fea2b1a Merge remote-tracking branch 'upstream/master' 2024-10-24 01:00:56 -05:00
Metis b59523ae89 enable byond-tracy 2024-10-23 14:00:51 -04:00
MothblocksandMetis 3a044ef627 Add defines for byond-tracy support (#70931)
Adds `USE_BYOND_TRACY`, which automatically loads a given
prof.dll/libprof.so using https://github.com/mafemergency/byond-tracy/.

Not intended for use in production, and we do not ship a copy of
byond-tracy. It is extremely easy to compile yourself, but if you're
someone interesting enough to play around with this then let me know and
I can just give you a build.

I'm going to be using this for init profiling.
2024-10-22 22:17:37 -04:00
SandPoot 7fa5456cb1 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13 into pr/xTheLifex/388 2024-10-20 18:29:55 -03:00
SandPoot e2cc28d21d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-10-20 18:05:53 -03:00
Mosley 7c8cbd3481 Merge branch 'master' into content-stuff 2024-10-16 18:37:02 -05:00
Metis a5e9ae8bc6 Update RCD.dm 2024-10-15 00:41:11 -04:00
Sara 5ba8c19b76 Plushie and Steppy
Fixes the susplush and steppy poster
2024-10-11 08:14:55 -06:00
Mosley fe54fd65d4 some fixes 2024-10-07 20:21:46 -05:00
Mosley 87b1ecf807 Merge remote-tracking branch 'venus/master' into content-stuff 2024-09-20 12:03:46 -05:00
ariaworld e526ae6dd7 New plant sprites 2024-09-20 13:46:21 +02:00