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-07-18 03:04:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
58,023 Commits 55 Branches 0 Tags
master
Commit Graph

392 Commits

Author SHA1 Message Date
Mosley e286bd40f3 Merge remote-tracking branch 'upstream/master' 2024-08-27 15:43:55 -05:00
SandPoot dc08550162 push 2024-08-25 04:38:03 -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
BongaTheProto 2709ec887c Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-04-06 19:06:12 -05:00
SandPoot 68fa21d602 content 2024-04-05 17:57:54 -03:00
BongaTheProto 327ea3999f Merge branch 'master' into 515-auxmos 2024-03-31 21:32:01 -05:00
Elizabeth Lavenza 78fff6d292 Fix a number of trait-related harddels 2024-03-29 17:22:50 -04: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
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
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
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
BongaTheProto 085bb06e94 Merge remote-tracking branch 'upstream/master' 2023-09-16 14:32:38 -05:00
SandPoot 3c7e79d384 do after update 2023-09-09 15:39:49 -03:00
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
BongaTheProto ee6823c69b Merge remote-tracking branch 'upstream/master' 2022-12-13 12:14:11 -05:00
Lin 7205781c47 Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song 
Solves some harddels
 2022-12-12 19:11:49 -07:00
SandPoot 8911fe5e0b clear em 2022-12-11 17:58:45 -03:00
BongaTheProto a949e5d08c Merge remote-tracking branch 'upstream/master' 2022-10-28 16:43:28 -05:00
SandPoot 24ee6077c7 push changes 2022-10-23 00:18:03 -03:00
Toxici11i 8f91555dd7 Massive update. 
Signed-off-by: Toxici11i
 2022-05-06 22:29:33 +01:00
SandPoot 2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
Lin fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
Solaris-Shade 0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05: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
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
DeltaFire 6aa906395c not a gaius reference 
hhhh let me just replace all the ex_acts missing some args and adjust them
 2021-11-14 21:34:59 +01:00
Letter N bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08: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
Timothy Teakettle 7b2708b12b Update mind_transfer.dm 2021-09-16 15:42:13 +01:00
Artur 30016f38a8 compiles 2021-07-28 02:13:57 +03:00
keronshb 482b679937 Should fix the linter? 2021-05-27 12:24:16 -04:00
keronshb 8f1db2d5ec Fixes some stuff 
Actually ticks the spell, fixes the brain damage issue, etc.
 2021-05-27 12:16:54 -04:00
keronshb 78db6bd5c2 Ports Floor Cluwnes 
Oh fuck oh god
 2021-05-26 21:58:35 -04:00
silicons 5601badbff deterministic explosion system (#13392) 
* wae explosions

* okay

* changes

* fixes

* fix

* ok

* ok

* kills more dead code

* okay

* fix

* ok

* tiles

* ok

* okay

* woops

* ok

* fix

* okay

* mob damage

* fixes

* insanity

* more

* more

* fixes

* more

* woot

* don't commit that

* YES

* fix
 2021-05-12 05:44:53 -05:00
keronshb 834ec62c0b Nightmare Jaunt Change 
Prevents Nightmares from being pulled OUT of jaunt from vendors and engraved messages.
 2021-05-03 00:05:39 -04:00
LetterN f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
Putnam 899b94f0f3 Made threat a subsystem instead of dynamic-attached. 2021-03-24 23:44:37 -07:00
Letter N 935e46b492 The Mapping Update 
Cleans up the map (again)
Makes mining code more better
 2021-03-12 12:11:35 +08:00
dzahlus ca1fe9d6c0 Update shapeshift.dm 
for keb
 2021-03-02 02:40:23 +01:00
dzahlus f206213603 60 second cooldown instead of 3 minutes 2021-03-01 22:16:23 +01:00
dzahlus 12c7e22c28 ugh lavaland 2021-02-26 15:57:27 +01:00