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-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,140 Commits 55 Branches 0 Tags
a0cbb5247916a74d8956567c2bf13d2dfd6bb603
Commit Graph

453 Commits

Author SHA1 Message Date
Lin
03c62f4359 Merge pull request #15876 from SandPoot/fix-deadchat_broadcast 
Fixes deadchat_broadcast
 2022-10-25 04:36:00 +00:00
SandPoot
24ee6077c7 push changes 2022-10-23 00:18:03 -03:00
shellspeed1
dfddbc23c3 ports https://github.com/tgstation/tgstation/pull/53603 Credit to TiviPlus 2022-09-22 01:10:08 -07:00
silicons
9fbc2a47f0 Update shuttle.dm 2022-08-21 18:05:19 -07:00
silicons
18b797d0f4 Merge pull request #15758 from LetterN/patch-12 
fix pod not unlocking on code delta
 2022-08-20 12:27:11 -07:00
Letter N
46fb0a5024 HACK: this is not intended but it UNLOCKS the pod 2022-08-09 12:42:28 +08:00
Letter N
ba74a18471 Update emergency.dm 2022-08-06 13:17:47 +08:00
Putnam3145
33889870c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-05-17 13:22:40 -07: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
Putnam3145
6199aa4d60 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-03-30 12:35:12 -07:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00:31 -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
silicons
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
SandPoot
8acb800301 Upload files 2022-02-02 17:57:48 -03:00
Putnam3145
629ce5bea6 Station traits 2021-12-08 16:17:35 -08: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
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Putnam3145
dbdc3001ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-16 23:33:14 -07:00
silicons
431acd9d5c Merge pull request #14820 from qweq12yt/more-cargo-stuff 
[FIX] Some cargo related fixes
 2021-06-13 15:15:20 -07:00
Putnam
833d34ba8e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-11 16:28:12 -07:00
qweq12yt
584dce4a80 updating comments 2021-06-11 01:34:19 -03:00
qweq12yt
0ca61af62a fixed combo lockers 2021-06-10 16:50:44 -03:00
keronshb
25fe97e8fe Lets Disposal pipes work on the cargo shuttle again 
Silly removal.
 2021-05-29 13:21:23 -04:00
silicons
47489c21d6 Merge remote-tracking branch 'citadel/master' into auxtools-atmos 2021-04-27 00:59:45 -07:00
qweq12yt
b97a38f125 todo comment 
hopefully i will be able to do it in the future, or someone else will implement it
 2021-03-31 00:55:14 -03:00
qweq12yt
04f90b749f fixes material crates not shipping 2021-03-30 12:33:23 -03:00
LetterN
86b8bbf727 no more free shipping 2021-03-21 21:44:04 +08:00
Putnam
cc360288bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-08 14:46:46 -08:00
Letter N
e84257e624 fix surgery cb, linter 2021-03-06 11:22:01 +08:00
Letter N
a43309a097 shuttle pog 2021-03-05 22:26:55 +08:00
Putnam
f07a9c13fb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-02 01:44:58 -08:00
Letter N
5c39381117 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-23 11:36:05 +08:00
Letter N
7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Putnam
51100c9bf9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-01-20 18:38:52 -08:00
Letter N
125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00
Letter N
021b28a2b7 cleanup 
shitcode - b - gone
 2021-01-20 11:08:21 +08:00
Putnam
158dd11d8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-01-19 17:52:40 -08:00
Putnam
f05df1c7de Huge optimizations+some fixes 2021-01-19 17:48:20 -08:00
silicons
ae290cf5f0 newlines 2021-01-13 16:56:36 -07:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
Letter N
cd5d558fad safety? what's that? 
* maybe table-breaking change
 2021-01-04 11:57:12 +08:00