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-23 12:47:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
58,023 Commits 55 Branches 0 Tags
master
Commit Graph
235 Commits
Author SHA1 Message Date
BongaTheProto 353e81e8ce Merge remote-tracking branch 'upstream/master' 2024-05-29 17:56:50 -05:00
SandPoot 95a30412ad Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-05-25 15:46:29 -03:00
SandPoot ad0f659226 push 2024-05-23 21:53:15 -03: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 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
ariaworld 93f0fb7e6c Fix a few hard-dels 2024-01-21 16:14:07 +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 c1c9fef224 Merge remote-tracking branch 'upstream/master' 2023-12-15 18:12:47 -05:00
SandPoot 36f3edaf4c push 2023-12-10 15:16:51 -03:00
SandPoot a558377206 more stuff i can't guarantee works by itself yet 2023-11-29 23:37:15 -03:00
KeplerWasTaken 02c20c35e4 Mafia verb removal 2023-03-28 23:22:55 +02:00
SandPoot 32535e69b6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-23 18:31:23 -03:00
siliconsandGitHub f2b8061d4b Update observer.dm (#15802) 2022-08-21 20:39:17 -07:00
BongaTheProto 6d385f2b2e Merge remote-tracking branch 'upstream/master' 2022-06-07 19:10:13 -05:00
SandPoot be1357bdb0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-07 17:29:38 -03:00
deathride58 dac4e9b974 fixes ghost pixel z not resetting on orbit stop 2022-06-05 18:01:15 -04:00
deathride58 1a918ed8db animation refresh - huge unatomized bundle of fixes and tweaks to numerous animations in the game 2022-05-31 19:22:30 -04:00
BongaTheProto a4fac709c3 Merge remote-tracking branch 'upstream/master' 2022-04-09 11:43:45 -05:00
SandPoot 9df4ed8253 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:48:16 -03:00
Solaris-Shade 2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update 
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
 2022-03-06 15:20:23 -05:00
BongaTheProto ffcca5c46b Merge remote-tracking branch 'upstream/master' 2022-02-08 01:16:02 -05:00
SandPoot 7523279254 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-07 22:07:59 -03:00
siliconsandGitHub af6e43c595 refactors clickcatchers/parallax/fullsceren (#15460) 
* :)

* that

* move those there

* refactor that too

* wew

* stuff

* almost.

* sigh

* just need speed

* stuf

* pain

* hm

* tweaks

* that

* eh

* wack

* a

* done

* that's important

* wacky

* all that

* fixes

* typo

* that

* a

* funny

* that

* that

* woo

* help im losing my fucking mind

* okay

* fix
 2022-02-07 15:17:24 -08:00
E 0592520bea fixes runtimes 2021-12-06 20:36:46 +01:00
SandPoot f1f6ac0109 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-31 22:14:23 -03:00
Letter NandGitHub bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot 32a6e63698 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-27 23:11:54 -03:00
SandPoot d55d628efe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-08 21:34:03 -03:00
SandPoot 437b3105d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-08 21:05:41 -03:00
SandPoot 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
keronshb 6cc4e35b44 Mob lists 2021-09-19 13:28:41 -04:00
SandPoot ed83bb4b24 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-05 00:45:29 -03:00
Putnam3145 2692f6285f Fixes a runtime in ghost update_icon 
Please make sure that no overrides have arguments when you add a new argument to a method.
 2021-09-03 01:21:21 -07:00
SandPoot ab9b824ce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-08 14:18:09 -03:00
Artur 82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
SandPoot c3f429e718 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-05 14:51:20 -03:00
Putnam 3760be44d9 Added observe logging 2021-03-30 20:41:48 -07:00
SandPoot 8996930bdf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-04 20:40:45 -03:00
SmArtKar a7bc066891 Auto-Observe! 2021-01-28 17:09:28 +03:00
SandPoot 6b7359aa6a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-01 15:19:56 -03:00
silicons abb37896a9 please work 2020-12-28 17:35:47 -08:00
SandPoot 766493cc16 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-22 18:03:33 -03:00