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 2025-12-09 07:48:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,023 Commits 55 Branches 0 Tags
master
Commit Graph

3370 Commits

Author SHA1 Message Date
Mosley
a44046076a Merge remote-tracking branch 'upstream/master' 2024-11-21 22:44:41 -05:00
SandPoot
1d6008397a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-11-19 23:22:26 -03:00
Sim
f37074fe35 silicons can now use the emote panel 2024-10-05 12:05:47 -03:00
Sim
7eb38bedf6 changed cit_emotes to new audio system 2024-10-01 11:37:53 -03:00
BongaTheProto
652a380d02 Merge remote-tracking branch 'upstream/master' 2024-05-20 18:15:04 -05:00
SandPoot
e31747dc08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-05-20 18:55:33 -03:00
SandPoot
7832dbdba4 push 2024-05-20 18:25:24 -03: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
7dbd856e27 Fix spinfusor overlay 2024-04-16 04:01:37 -04:00
Elizabeth Lavenza
a639499d3a Fix invalid gun overlays 2024-04-16 02:25:20 -04:00
Elizabeth Lavenza
0b4dcfd73a Fix invalid gun overlays 2024-04-16 02:19:41 -04:00
Elizabeth Lavenza
e5811a64ab Add blank icon state to suppress modular pistol runtime 2024-04-16 01:20:59 -04:00
Elizabeth Lavenza
497972b308 Add blank icon state to suppress modular pistol runtime 2024-04-16 01:14:28 -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
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
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
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
SandPoot
fcd036dab5 final stuff, i think? 2024-03-07 20:31:53 -03:00
BongaTheProto
558d33f7c6 Merge branch 'master' into upstream-merge 2024-03-04 16:59:05 -05:00
BongaTheProto
d1b0e9ec9f Merge remote-tracking branch 'upstream/master' 2024-03-01 21:15:28 -05:00
Sim
dab0d3848c mrrp mrrp meow 2024-02-10 18:03:17 -03:00
Sim
8ad0b28309 Update cit_emotes.dm 2024-02-10 17:50:35 -03:00
Sim
9e20653cca Update cit_emotes.dm 2024-02-10 17:35:51 -03:00
Sim
368311d43c Update cit_emotes.dm 2024-02-10 17:29:15 -03:00
Sim
3680f9b2a6 more cat changes 2024-02-10 17:27:07 -03:00
Sim
72555da64f apparently meow1 breaks the code 2024-02-10 17:19:36 -03:00
Sim
d497659709 mrrp mrrp meow 2024-02-10 17:07:32 -03:00
Tree
00b5f338f4 Kinkmate Nerf.dm 
Kinkmate Chem Sell Value Nerf so Cargo doesn't get ban he'd for selling viagra.
 2024-01-19 23:37:06 +00:00
SandPoot
0b990039e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-16 18:00:55 -03:00
BongaTheProto
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
SandPoot
51c1c2abc9 huds! 2024-01-05 17:07:54 -03:00
SandPoot
c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03: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
6733de69bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stacks 2023-12-29 23:16:11 -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
deathride58
ce1d757159 Merge pull request #16016 from SandPoot/throwing-update 
[TESTMERGE] Updates firemanning, throwing stuff
 2023-12-28 22:44:59 -05: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
ariaworld
f0c288c5c2 Potency + Body morpher 2023-12-20 19:33:47 +01:00
SandPoot
b9a422ee2d throw at mobs laying down 2023-12-18 14:07:25 -03:00