Commit Graph
369 Commits
Author SHA1 Message Date
BongaTheProto 65c2092959 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-04-12 18:40:08 -05:00
SandPoot 516ae4a3f0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-12 17:21:56 -03:00
chelandGitHub 7de7aa6c43 Update items.dm 2024-04-11 20:12:13 -03:00
BongaTheProto b2e14a5393 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-03-24 17:02:38 -05:00
SandPoot b76127c2d7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-03-15 19:21:39 -03:00
SandPoot 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
BongaTheProto d1b0e9ec9f Merge remote-tracking branch 'upstream/master' 2024-03-01 21:15:28 -05:00
SandPoot 0b990039e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-16 18:00:55 -03:00
BongaTheProtoandGitHub 8e8999fa08 Merge branch 'Sandstorm-Station:master' into master 2024-01-07 19:58:34 -05:00
SandPoot 46384d2a67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-07 03:36:25 -03:00
SandPoot 003eec1850 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into update-to-action-buttons 2024-01-07 02:09:58 -03:00
deathride58andGitHub ae557a1df5 Merge pull request #16055 from SandPoot/point-bubbles
Pointing at something on yourself now shows the item
2024-01-06 22:51:35 -05:00
SandPoot 387b4b236c push 2024-01-07 00:37:16 -03:00
SandPoot 51c1c2abc9 huds! 2024-01-05 17:07:54 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot 7eaef36e11 d k daunkey kaung 2024-01-03 22:42:03 -03:00
BongaTheProto 96c670388f Update items.dm 2024-01-02 01:01:21 -05:00
BongaTheProto a9715638ad Merge remote-tracking branch 'upstream/master' 2024-01-02 01:00:59 -05:00
SandPoot 65ed5c79f4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-30 02:07:21 -03:00
SandPoot 2ab6c62ee6 prevent hit 2023-12-29 23:07:24 -03:00
SandPoot 4e9ff44ee7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-29 15:49:14 -03:00
SandPoot 2585c545fa not necessary 2023-12-28 00:37:23 -03:00
SandPoot b9a422ee2d throw at mobs laying down 2023-12-18 14:07:25 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
ariaworld 7bc56f700b Add: New lines for linters. 2023-11-18 18:29:50 +01:00
ariaworld 23f141965e First draft. 2023-10-31 14:03:34 +01:00
SandPoot b36da8f5d7 Revert "Revert "[DNM] Updates firemanning, throwing stuff""
This reverts commit def4b38a46.
2023-10-12 14:34:02 -03:00
BlueWildroseandGitHub def4b38a46 Revert "[DNM] Updates firemanning, throwing stuff" 2023-10-11 13:52:03 -06:00
SandPoot 5a90dabd3c stuff 2023-10-03 23:22:57 -03:00
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
SandPoot ebd9cedbfb this 2023-07-26 17:28:29 -03:00
SandPoot 7038059ab5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-05-06 10:47:06 -03:00
KrissKr0ss 66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
2023-05-01 00:16:20 -05:00
SandPoot d743096f8a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-09 17:50:19 -03:00
Jerry WesterandGitHub ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
SandPoot 82eff346c7 Merge Upstream 2023-01-07 22:52:22 -03:00
Jerry Wester f7ac3c7624 beeg commit 2022-12-11 20:32:35 -07:00
PeriodicChaosandJerry Wester 183b554ed3 modsuits part 1 2022-12-11 20:30:41 -07:00
SandPoot 1b42f5f99f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-07-08 20:20:44 -03:00
SandPoot 09e351277a this 2022-07-03 01:28:39 -03:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
SandPoot ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -03:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPootandGitHub c8df97474b Adds pick-up, drop and throw sounds for items. (#240) 2022-04-01 15:57:30 -03:00
SandPoot a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
SandPoot fb7a24b333 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-27 14:17:53 -03:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
SandPoot 5dc331c406 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-13 11:51:07 -03:00
keronshb f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00