Commit Graph
1490 Commits
Author SHA1 Message Date
BongaTheProto 22b61dba91 sm delam cooldown
it seems to work I guess
2024-04-22 20:12:41 -05:00
BongaTheProto 1e1fc329f8 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-04-13 14:12:39 -05:00
SandPoot 2e2528ee56 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-13 00:36:29 -03:00
SandPoot 91045350e5 overlay stuff 2024-04-12 22:01:03 -03:00
BongaTheProtoandGitHub 78d4eaeaaa Merge pull request #1135 from liz-lavenza/fix/upstream-merge-fix
Fix harddel issues with 515 upgrade PR
2024-04-07 03:16:55 -05:00
Elizabeth Lavenza 5ebaf59922 Fix invalid verb in admin_verbs_possess list 2024-04-07 00:32:10 -04:00
Elizabeth Lavenza 3619b3d634 Fix global procs called without GLOBAL_PROC and vice versa 2024-04-07 00:02:34 -04:00
BongaTheProto 2709ec887c Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-04-06 19:06:12 -05:00
SandPoot 7ec9e65dcf cease those screams 2024-04-05 18:39:33 -03:00
BongaTheProto 9faeb05972 fixes wrong verb references
Regex is a double edged sword.
Also fixes a bug I hadn't noticed in mentor verbs
2024-03-31 22:00:37 -05:00
BongaTheProto 327ea3999f Merge branch 'master' into 515-auxmos 2024-03-31 21:32:01 -05:00
Elizabeth Lavenza 90378d4da9 Fix direct Destroy calls 2024-03-28 18:18:31 -04:00
BongaTheProto d20caf7191 Merge branch '515-update' into upstream-merge 2024-03-24 17:39:24 -05: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 676cb864b1 missed proc refs 2024-03-12 22:17:30 -03:00
BongaTheProto 1883c47d5c basic ref regex
makes the proc calls compatible with 515
2024-03-11 19:46:05 -05: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
ariaworld 5245920cba Remove extools from ref finder 2024-02-05 18:10:15 +01:00
SandPoot 0b990039e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-16 18:00:55 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
BongaTheProto 750f742f95 Merge remote-tracking branch 'upstream/master' 2023-12-28 18:31:39 -05:00
SandPoot e7b267ca63 push 2023-12-27 01:06:25 -03:00
BongaTheProto 13cd269788 Merge remote-tracking branch 'upstream/master' 2023-12-25 14:28:51 -05:00
SandPoot be37603291 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-23 13:28:41 -03:00
SandPoot 27bdd4b732 aiModule > ai_module 2023-12-17 23:20:43 -03:00
SandPoot 7b62dbe7bb ai + mech 2023-12-17 23:15:59 -03:00
BongaTheProto c1c9fef224 Merge remote-tracking branch 'upstream/master' 2023-12-15 18:12:47 -05:00
SandPoot 8cdb82a23f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-12 22:06:13 -03:00
deathride58andGitHub 3e45c18ab4 Merge pull request #16038 from SandPoot/fix-lava+borgs
Deals with lava plus a lot of borg stuff
2023-12-12 19:25:13 -05:00
deathride58andGitHub e729badcd2 Merge pull request #16039 from SandPoot/maptexts-(verb)-maptexts-(variable)
Maptext()s the maptexts
2023-12-12 19:21:17 -05:00
SandPoot e457f40328 maptext 2023-12-11 17:43:24 -03:00
BongaTheProto 700fd57efb Merge remote-tracking branch 'upstream/master' 2023-12-08 20:22:05 -05:00
SandPoot c36105ef88 holy hell 2023-12-07 23:08:17 -03:00
SandPoot 42fdd30ba4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-05 17:47:58 -03:00
SandPoot d8572108bd pissed 2023-12-03 23:37:49 -03:00
SandPoot a558377206 more stuff i can't guarantee works by itself yet 2023-11-29 23:37:15 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
SandPoot b290efc434 push 2023-11-22 14:11:17 -03:00
BongaTheProto dca4dab806 Merge remote-tracking branch 'upstream/master' 2023-10-10 21:58:50 -05:00
SandPoot 41671a5f22 quick dmapi stuff update 2023-10-10 18:30:48 -03:00
BongaTheProto fb1dc86226 Merge remote-tracking branch 'upstream/master' 2023-09-03 18:06:53 -05:00
SandPoot f53a7a1f40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-09-03 17:47:27 -03:00
SandPootandGitHub f1d9fb376e Merge pull request #15969 from Phoenix4O4/port-ability-to-change-AI/Robot-laws
[PORT-YOG] Gives admins the ability to change AI/Robot Laws at wil
2023-09-03 15:24:48 -03:00
Tsurupeta eca4935865 reftracking 2023-08-08 14:01:16 +03:00
SandPoot e07874972b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-06-25 01:01:18 -03:00
KrissKr0ssandGitHub 0212870845 Update SDQL_2.dm 2023-06-24 22:41:56 -05:00
BongaTheProto a5ccea762f Update SDQL_2.dm 2023-06-24 20:12:58 -05:00
Lex 116dddc134 added datum and verbs for chane ai laws 2023-02-09 10:32:53 +03:00