fed1634cf6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2025-11-19 16:23:37 -03:00
ff87a194e9
merge UI_Icons/ui_icons
2025-04-03 11:46:54 -03:00
9f4a7ef4f3
bad dels + looks like this was not going well
2025-03-10 16:38:50 -03:00
054716857f
push
2025-03-10 16:11:56 -03:00
b76127c2d7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-15 19:21:39 -03:00
a65f323734
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit
2024-03-08 19:10:22 -03:00
be37603291
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-23 13:28:41 -03:00
7b62dbe7bb
ai + mech
2023-12-17 23:15:59 -03:00
ae873bd925
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-06 17:10:38 -03:00
f698cbb8a7
bump
2023-12-01 14:54:05 -03:00
a558377206
more stuff i can't guarantee works by itself yet
2023-11-29 23:37:15 -03:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
8bf6e9ffcc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-08-05 13:51:50 -03:00
403c49afab
push
2023-08-04 00:11:08 -03:00
072087ec14
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-02-15 20:22:44 -03:00
c60f36a42b
files
2023-01-28 01:10:49 -03:00
a0c181a721
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-04 15:13:32 -03:00
29be8573ea
Upload files
2022-02-02 02:01:04 -03:00
e8c8d2b0ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-25 11:38:07 -03:00
d46990f902
Finishing the strip menu
2021-12-31 14:26:32 -03:00
8510dcc08a
Ports tgui stripping (finally) ( #15401 )
...
* Upload files
* Update items.dm
* Update files
* Update files
* Update strippable.dm
* Update strippable
* Update strippable.dm
* Upload files
* Update files
* Update files
* Update files
* update files
* Update files
* Update dog.dm
* Update strippable.dm
* Update equipping
* Update strippable.d
* Upload files
* Upload files
* Update monkey.dm
2021-12-30 07:40:15 +01:00
99019166e4
i think it works
...
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
d6d037de43
Merge pull request #15232 from Putnam3145/minesweeper-removal
...
Removes minesweeper
2021-10-27 05:11:48 -07:00
dc22e02a1b
Removes minesweeper
2021-10-01 23:08:08 -07:00
b23b88524d
Upload files
2021-09-28 22:03:17 -03:00
12ae614833
fix1
2021-09-08 10:22:55 +08:00
4289b8be1e
Merge remote-tracking branch 'citadel/master' into backend_sync
2021-04-28 22:34:17 -07:00
7cc6bba5ff
fixes
2021-04-28 22:27:09 -07:00
f40f4c8257
upload files
2021-04-23 19:30:28 -03:00
34697acf74
missing icon fix & stop throwing out parts
2021-03-05 19:29:52 +08:00
f2f97f5855
ae
2021-03-04 22:01:46 +08:00
5897cfd97b
when tgui
...
subscript text
2021-03-04 16:39:44 +08:00
834e4730b3
not existing
2021-02-09 15:44:49 +08:00
cf692e8426
subsystem upgrades
2020-12-14 15:28:59 +08:00
19f1e99a8c
mass ports like 15 tg prs + counting ( #13386 )
...
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-10-10 12:20:33 +02:00
435565f1d8
Merge remote-tracking branch 'origin/master' into TGUI_Updoot
2020-09-21 00:16:12 +03:00
fd2ec66757
Ports "Fix bicon(icon2html) showing full dmis, fix asset cache hashes being incorrect." ( #13347 )
2020-09-06 09:23:28 +02:00
3bef4ba35e
TGUI updates + statpanel
2020-09-02 17:52:47 +03:00
afe32406c0
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
2020-08-22 13:40:36 +08:00
8d70e21239
the unexpected paperwork update. paperwork rp? And also includes ntnet upgrade because fuck it.
2020-08-20 19:40:47 +08:00
3b7bca28b3
Functional* code
2020-08-20 13:50:33 +08:00
610e25beb7
oops updates asset cache
2020-08-17 20:51:05 +08:00
6f7badda41
Merge branch 'master' into plumb
2020-08-12 09:03:11 +10:00
a4040ace26
hewwo have you tried to work?
2020-08-10 10:50:07 +08:00
308d77da7c
Merge branch 'master' into plumb
2020-08-09 22:48:18 +10:00
a19e306137
less redtext - updates anomalies
2020-08-03 20:53:36 +08:00
894ea242b4
asset cache update. may fuck shit up
2020-07-30 14:28:01 +08:00
17d1fd0692
fixes
2020-07-22 12:42:46 +10:00
0f1aa3c0ca
'lolman? did you test your code?'
...
no i did not ms. kevinz
2020-07-22 10:49:56 +10:00
5f9364c5f8
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
SandPoot