cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-29 23:57:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
56,903 Commits 55 Branches 0 Tags
some-updates
Commit Graph
2394 Commits
Author SHA1 Message Date
BongaTheProto dbd4505372 Merge remote-tracking branch 'upstream/master' 2024-04-30 19:02:41 -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
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 02c37e950a Fix unavailable button tint not clearing on stat change 2024-04-13 20:14:19 -04:00
Elizabeth Lavenza 9043920b69 Fix cooldown abilities never running 2024-04-13 20:14:15 -04:00
Elizabeth Lavenza dfc903757a Fix unavailable button tint not clearing on stat change 2024-04-13 20:03:55 -04:00
Elizabeth Lavenza 2594f31762 Fix cooldown abilities never running 2024-04-13 20:03:55 -04:00
Elizabeth Lavenza 0772450dbc Port set_stat and COMSIG_MOB_STATCHANGE from TG 2024-04-13 20:00:29 -04:00
Elizabeth Lavenza 174aca4b01 Port set_stat and COMSIG_MOB_STATCHANGE from TG 2024-04-13 18:06:52 -04: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
SandPoot dfe90dfb61 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into pr/SandPoot/15486 2024-04-12 20:48:41 -03:00
chelandGitHub 02249ec43e Update nuclearbomb.dm 2024-04-11 20:05:24 -03:00
Elizabeth Lavenza 3619b3d634 Fix global procs called without GLOBAL_PROC and vice versa 2024-04-07 00:02:34 -04:00
SandPoot c2df4281b9 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-05 23:31:50 -03:00
SandPoot 7ec9e65dcf cease those screams 2024-04-05 18:39:33 -03:00
SandPoot 68fa21d602 content 2024-04-05 17:57:54 -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
BongaTheProtoandGitHub 0a564a92e7 Merge pull request #1127 from liz-lavenza/fix/harddels-one 
[TESTMERGE] Fix a number of harddels
 2024-03-31 21:15:28 -05:00
Elizabeth Lavenza 0721ea6ec1 Fix mob-related harddels 2024-03-29 17:22:50 -04:00
Elizabeth Lavenza 96a177a89b Fix blobstrain harddel 2024-03-28 18:14:49 -04:00
Elizabeth Lavenza a8599d6833 Fix dash harddel 2024-03-28 18:14:49 -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
BongaTheProto 8bbb0fda41 Merge branch 'master' into upstream-merge 2024-03-24 16:41:07 -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 8516b07eee please do not end your paths with / 2024-03-13 14:43:40 -03:00
SandPoot 676cb864b1 missed proc refs 2024-03-12 22:17:30 -03:00
Ayy-RoboticsandGitHub 4be2d017ab Merge branch 'SPLURT-Station:master' into AGRComplexNew 2024-03-12 16:07:36 -04:00
BongaTheProto 70fab829ae final is a new reserved word apparently 
idk how tg fixed it exactly
 2024-03-11 20:22:20 -05:00
BongaTheProto 1883c47d5c basic ref regex 
makes the proc calls compatible with 515
 2024-03-11 19:46:05 -05:00
BongaTheProtoandGitHub 33bed9574d Merge pull request #1091 from ariaworld/throwkiss-emote 
[NON-MODULAR PORT] Adds blowable kisses + improved code for updating lip color and applying special lipstick traits
 2024-03-11 17:46:46 -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
SandPoot fcd036dab5 final stuff, i think? 2024-03-07 20:31:53 -03:00
BongaTheProto 9f0b9b16fa Update wizard.dm 2024-03-01 21:27:06 -05:00
BongaTheProto 600a5b73f9 Update wizard.dm 2024-03-01 21:22:14 -05:00
BongaTheProto deda898ad0 followup 
hope it doesn't break much...
 2024-03-01 21:15:54 -05:00
BongaTheProto d1b0e9ec9f Merge remote-tracking branch 'upstream/master' 2024-03-01 21:15:28 -05:00
Ayy-RoboticsandGitHub b35b99f390 Merge branch 'SPLURT-Station:master' into AGRComplexNew 2024-02-28 21:10:28 -05:00
ariaworld aefd604725 Final tweaks for blow kiss update 2024-02-23 15:59:13 +01:00
Ayy-RoboticsandGitHub 9cb87d3174 Fixes minor error with ..() instead of TRUE 2024-02-19 19:02:36 -05:00
Ayy-RoboticsandGitHub f3e9a90b97 Lets Stargazers be spawned on the complex 
Don't think this is going to see much use on the complex itself, but it'll be good if someone else makes a space-based area that also uses Clock Cultists.
 2024-02-19 01:10:58 -05:00
Ayy-RoboticsandGitHub b7f00534e4 Fixes Clock Cult spellcasting slowdown. 
This one technically speeds up casting on all away missions, not just AGR Complex, but it is so improbable that that specific circumstance will happen that it shouldn't impact anything.
 2024-02-19 01:08:40 -05:00
Ayy-RoboticsandGitHub 66576ec285 Fixes Blood Cult Remnants lacking runes 
Adds the Cultmagic Bypass to the ritual part that controls placing runes.
 2024-02-19 01:05:33 -05:00
nickstershovel 1a0a313225 Fix borgs, fix ssd_mob_list removal 2024-02-10 21:42:20 +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
SandPoot 7eaef36e11 d k daunkey kaung 2024-01-03 22:42:03 -03:00