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-31 08:37:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
56,903 Commits 55 Branches 0 Tags
some-updates
Commit Graph
7433 Commits
Author SHA1 Message Date
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
SandPoot 9e88a05e8f push 2024-05-05 18:21:42 -03:00
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
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 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 9043920b69 Fix cooldown abilities never running 2024-04-13 20:14:15 -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
deathride58andGitHub dd8c641520 Merge pull request #15486 from SandPoot/kills-cache 
Solves issues with overlays by updating the whole subsystem
 2024-04-12 23:31:54 -04:00
SandPoot 002a4c31c1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-12 22:06:15 -03:00
SandPoot 91045350e5 overlay stuff 2024-04-12 22:01:03 -03:00
SandPoot ca8ce67cd6 mail 2024-04-10 20:54:04 -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 66bd025454 Fix a potential source of mob harddels 2024-04-07 02:58:19 -04:00
Elizabeth Lavenza aafce505f3 Fixes some actual harddels 2024-04-07 00:32:10 -04:00
Elizabeth Lavenza c94743d59c Fix invalid proc references in core code RegisterSignal calls 2024-04-06 22:07:53 -04:00
BongaTheProto 2709ec887c Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-04-06 19:06:12 -05:00
BongaTheProto dc057a41ad Merge branch 'master' into upstream-merge 2024-04-06 18:51:51 -05:00
BongaTheProtoandGitHub 40eeadef98 Merge pull request #1131 from liz-lavenza/fix/runtimes-one 
Fix a large number of runtimes
 2024-04-06 18:43:43 -05: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
deathride58andGitHub 448c0e014e Merge pull request #16068 from SandPoot/thrown,-not-projectile 
Fixes an incorrect type being used for blocking
 2024-04-05 21:55:51 -04: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
Elizabeth Lavenza 04b6652937 Fix incorrect procref for _paci_check 2024-04-02 17:22:45 -04:00
SandPoot 141d783708 not a projectile!! 2024-04-01 21:13:35 -03:00
Elizabeth Lavenza ebe7818d1f Fix thrown items runtiming in defense 2024-04-01 20:12:11 -04:00
ariaworldandGitHub f27731d95a Merge branch 'SPLURT-Station:master' into monkey-harddels 2024-04-01 21:01:07 +02:00
Elizabeth Lavenza 382cb28b15 Fix a number of reported runtimes 2024-04-01 11:33:31 -04:00
Elizabeth Lavenza 54c6814100 Fix runtime from qdeleted mobs in handle_organs 2024-04-01 11:33:31 -04:00
Elizabeth Lavenza a8f3a0b49d Fix runtimes from null throwingdatum in living/hitby() 2024-04-01 11:33:31 -04:00
Elizabeth Lavenza 551c6754be Fix runtimes from silicons trying to wag their tails or toggle their wings 2024-04-01 11:33:30 -04:00
Elizabeth Lavenza e7c21fa3a7 Fix runtimes from null thrower in living/hitby() 2024-04-01 11:33:30 -04: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
ariaworld 0b3ae62833 Hopefully fix monkey and slime hard-dels 2024-04-01 01:11:03 +02:00
BongaTheProto 6df04b8167 Merge remote-tracking branch 'upstream/master' into 515-auxmos 2024-03-30 17:40:23 -05:00
SandPoot ae0c4c14e8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-03-30 19:01:03 -03:00
SandPoot 2518dd9fac go 2024-03-30 18:03:05 -03:00
SandPoot 80666ec1dd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-03-30 16:47:39 -03:00
Elizabeth Lavenza bbcc0920ea Fix blood causing harddels. 2024-03-29 17:22:50 -04:00
Elizabeth Lavenza 9af75e419f Move implants clearing to living/Destroy() 2024-03-29 17:22:50 -04:00
Elizabeth Lavenza 907c217850 Fix implant-related simple_animal harddels 2024-03-29 17:22:50 -04:00
Elizabeth Lavenza 78fff6d292 Fix a number of trait-related harddels 2024-03-29 17:22:50 -04:00