Commit Graph
33527 Commits
Author SHA1 Message Date
BongaTheProto f5729b95fe rust-g
v3.2.0
2024-05-16 20:38:07 -05:00
BongaTheProto 2eb72509ec auxmos
updates auxmos to the latest commit
2024-05-14 21:06:12 -05:00
BongaTheProtoandGitHub 6fe72aba1d Merge pull request #1138 from Fabian272/patch-3
Makes bounty consoles printable
2024-05-09 00:07:00 -05:00
BongaTheProtoandGitHub af8f911343 Merge pull request #1144 from MysteryMan21333/Mining-suit-fix
Mining Suit Taur Sprite Fix
2024-05-09 00:00:56 -05:00
BongaTheProto 85cc6cf84e Merge remote-tracking branch 'upstream/master' 2024-05-06 20:15:55 -05:00
SandPoot 8a87fb1a4e push 2024-05-06 17:06:38 -03:00
SandPoot 1156258d08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-05-06 16:06:00 -03:00
deathride58andGitHub 7901edea8f Merge pull request #16085 from SandPoot/fix-hat-runtime
Kitty ears no longer runtime
2024-05-06 13:48:30 -04:00
SandPoot e706b328ca push 2024-05-05 20:02:50 -03:00
SandPoot 9e88a05e8f push 2024-05-05 18:21:42 -03:00
ariaworld 8efbd2dd26 Quirk removal admin log + allow hermit to load custom character 2024-05-02 16:37:45 +02:00
MysteryMan21333 e2bbedbb64 Merge branch 'Mining-suit-fix' of https://github.com/MysteryMan21333/S.P.L.U.R.T-Station-13 into Mining-suit-fix 2024-04-30 21:04:01 -05:00
MysteryMan21333 37f8c1b79a V1.0 2024-04-30 21:02:58 -05:00
BongaTheProto dbd4505372 Merge remote-tracking branch 'upstream/master' 2024-04-30 19:02:41 -05:00
SandPoot 043b9d6ff9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-29 17:45:58 -03:00
SandPoot 691ac44a6a holidays is an assoc list 2024-04-29 17:04:39 -03:00
BongaTheProtoandGitHub 2c795610e5 Merge pull request #1134 from Vhariik/Dum
Nerf of the miracle ruin
2024-04-25 17:57:23 -05:00
SandPoot 91a9223df6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-25 17:08:42 -03:00
deathride58 0517ece12a fixes floor decals and other missing signal-added overlays by making sure things properly call parent update_icon 2024-04-24 22:30:25 -04:00
SandPoot a1a80c5d4f pusher 2024-04-24 20:12:27 -03:00
deathride58andGitHub b956e0c40e Merge pull request #16080 from SandPoot/industrial-lift
[READY] for Z debug. Industrial lift (not shuttle edition)
2024-04-23 22:53:40 -04:00
deathride58 543daa52ac Adds lift to Snaxi, fixes industrial lifts clipping through floors 2024-04-23 22:41:25 -04:00
SandPoot ae8d0493db proc_ref 2024-04-23 22:44:56 -03:00
SandPoot 0717399333 CAR!!! 2024-04-23 22:32:28 -03:00
BongaTheProto 22b61dba91 sm delam cooldown
it seems to work I guess
2024-04-22 20:12:41 -05:00
BongaTheProto e0d2191e7d Update overlays.dm
comments out the icons test because upstream hasn't bothered to fix the runtimes it finds yet
2024-04-19 18:17:01 -05:00
BongaTheProtoandGitHub a319169f11 Merge pull request #1141 from liz-lavenza/fix/upstream-04-15-2024
Fix more issues in upstream merge PR
2024-04-17 18:41:40 -05:00
BongaTheProto c5f07b2c14 Update preferences.dm
adds more link options
2024-04-17 18:37:10 -05:00
SandPoot 4c25ac80a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-16 18:25:10 -03:00
Elizabeth Lavenza 2c12f089ee Fix Create and Destroy causing stacking turf decals 2024-04-16 02:55:51 -04:00
Elizabeth Lavenza a639499d3a Fix invalid gun overlays 2024-04-16 02:25:20 -04:00
Elizabeth Lavenza 928cd8fd40 Fix invalid box overlays 2024-04-16 02:25:18 -04:00
Elizabeth Lavenza 0b4dcfd73a Fix invalid gun overlays 2024-04-16 02:19:41 -04:00
Elizabeth Lavenza e57c803e3a Fix invalid box overlays 2024-04-16 02:19:36 -04:00
Elizabeth Lavenza c69f30e846 Fix missing junk mail return hint 2024-04-16 02:12:46 -04:00
Elizabeth Lavenza bc59c78db0 Fix missing junk mail return hint 2024-04-16 02:05:36 -04:00
Elizabeth Lavenza 2f683eee31 Fix string cell types 2024-04-16 01:20:59 -04:00
Elizabeth Lavenza b25da4ba53 Fix invalid gun overlays 2024-04-16 01:20:59 -04:00
Elizabeth Lavenza 322ce2a79c Fix mail bag not holding mail 2024-04-16 01:20:59 -04:00
Elizabeth Lavenza e74d787bf1 Fix string cell types 2024-04-16 01:14:28 -04:00
Elizabeth Lavenza 86c1a2eeaa Fix invalid gun overlays 2024-04-16 01:14:28 -04:00
Elizabeth Lavenza b1f0eb3183 Fix mail bag not holding mail 2024-04-16 01:14:28 -04:00
Elizabeth Lavenza e2b6a36ca3 Blacklist abstract template types from C&D 2024-04-16 00:43:43 -04:00
BongaTheProto 8e713f10e0 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-04-15 17:32:15 -05:00
tgstation-server 83f93ae136 Update TGS DMAPI 2024-04-15 03:26:38 +00:00
SandPoot fc53ab850c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-14 20:15:08 -03:00
Elizabeth Lavenza bf2f337e95 Fix duplicate set_stat definitions from earlier partial port 2024-04-13 21:18:22 -04:00
Elizabeth Lavenza 7f2e5a8945 Fix nonexistent keyboard overlays 2024-04-13 20:14:19 -04:00
Elizabeth Lavenza e37fbc72e0 Fix miniature egun overlays 2024-04-13 20:14:19 -04:00
Elizabeth Lavenza 54f584fa80 Fix instakill laser rifle overlays 2024-04-13 20:14:19 -04:00