Commit Graph

11402 Commits

Author SHA1 Message Date
Mosley
313f48875e Merge pull request #1216 from SaraSayomi/Snaxi-regretti
Snaxi regretti
2025-02-02 23:25:27 -05: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
Mosley
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
Sara
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
SandPoot
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
JWosak
93c2ed44ce Genpop Update 1 2024-11-04 17:06:39 +01:00
JWosak
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
Kylerace
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
Mothblocks
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
Mosley
f8c0405d06 Merge remote-tracking branch 'venus/master' into content-stuff
Gallifrey stands!
2024-09-20 01:37:56 -05:00
Mosley
a920e96462 Update world.dm 2024-09-20 01:29:12 -05:00
Mosley
d0bf81dc09 Revert "Purifies code, fix collapsible TGUI component"
This reverts commit 1f38f22a58.
2024-09-20 01:22:41 -05:00
ariaworld
752f3ee63c Some fixes (parallax and closets) 2024-09-20 00:00:50 +02:00
ariaworld
3964cc1101 Some useful things (I hope title.dm will work, praying) 2024-09-19 01:44:56 +02:00
ariaworld
87f439a50f Check in announcement system 2024-09-18 00:58:37 +02:00
ariaworld
93b1db7cfe + 2024-09-14 23:51:52 +02:00
ariaworld
67b519b070 Meow,, 2024-09-14 15:53:53 +02:00
ariaworld
dd75dd162d Fuck 2024-09-12 23:54:19 +02:00
ariaworld
09c351482f Update 2024-09-09 14:32:53 +02:00
ariaworld
e41ddf4e2b Ze update... 2024-09-09 14:08:38 +02:00
ariaworld
27e2e80cb8 Add: random-gen maintenance and other useful things 2024-09-08 22:46:28 +02:00