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-17 21:32:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,604 Commits 55 Branches 0 Tags
901b93e534a880bb2b014dbbd5f80c149e6ec01a
Commit Graph

1356 Commits

Author SHA1 Message Date
Timothy Teakettle
7ed2ee82bf core changes 2022-08-04 14:11:42 +01:00
BongaTheProto
a72b79f56c Merge remote-tracking branch 'upstream/master' 2022-07-20 21:41:02 -05:00
SandPoot
da1df79599 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-07-20 23:30:31 -03:00
SandPoot
57734fcafb SEND_SIGNAL always sends all arguments but second when doing the proc call 2022-07-19 20:34:34 -03:00
BongaTheProto
0b89d8c778 Merge remote-tracking branch 'upstream/master' 2022-06-20 01:08:17 -05:00
SandPoot
25deceb75f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-19 23:02:20 -03:00
TripleShades
7fa776106f maybe? 2022-06-15 17:20:15 -04:00
TripleShades
f808c23303 oops 2022-06-15 16:51:56 -04:00
TripleShades
50bab1bd63 glassware typo fix so it can be crafted 2022-06-15 16:46:00 -04:00
silicons
9ded655c71 Update ui.dm (#15683) 2022-06-14 06:04:01 +02:00
BongaTheProto
03f4c65fc4 Merge remote-tracking branch 'upstream/master' 2022-06-11 23:25:29 -05:00
SandPoot
07a4c5c12b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-11 04:54:12 -03:00
silicons
9a17ef3bf2 Merge pull request #15663 from deathride58/blockquotes 
Blockquotes for chat; Prettier examine text and more!
 2022-06-10 22:09:12 -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
Lin
6f97ec2b1d Merge pull request #15656 from deathride58/animfix 
Animation refresh - Fully restores animations broken by BYOND updates, some light animation-related tweaks, and more
 2022-06-07 18:05:07 +00:00
deathride58
04a0a3b869 chat blockquotes; prettier examine text and more! 2022-06-03 18:55:18 -04:00
deathride58
ce3fac30d6 Fully restores the functionality of audiovisual redirection 2022-06-03 14:31:12 -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
5789781bb8 these maps aren't even used 2022-05-18 22:45:39 -05: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
BongaTheProto
6ada3f7c94 Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen 2022-04-18 21:36:14 -05:00
SandPoot
05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
silicons
da09439093 Merge pull request #15585 from SandPoot/Initialize(mapload) 
Every case of initialize that should have mapload, does
 2022-04-15 17:41:57 -07:00
SandPoot
13fb647b9e Update files (#15597) 2022-04-15 16:31:50 +02:00
BongaTheProto
a4fac709c3 Merge remote-tracking branch 'upstream/master' 2022-04-09 11:43:45 -05: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
SandPoot
9df4ed8253 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:48:16 -03:00
SandPoot
ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -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
silicons
dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles 
/obj/mecha ➡ /obj/vehicle/sealed/mecha
 2022-04-08 18:26:47 -07:00
Solaris-Shade
48db01702b Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-04-06 22:31:51 -04:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
BongaTheProto
f5af499eee Merge branch 'Sandstorm-Station:master' into master 2022-04-06 16:01:25 -05:00
SandPoot
66b05f5261 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-06 16:40:58 -03:00
Putnam3145
7ebd03e049 Adds beauty back 2022-03-30 15:45:27 -07: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
16fddbb140 Upload files 2022-03-18 18:35:29 -03:00
SandPoot
25bcad7be8 Update code/datums/components/armor_plate.dm 2022-03-16 18:06:25 -03:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
BongaTheProto
7dc36994a9 Merge remote-tracking branch 'upstream/master' 2022-03-14 13:31:20 -05:00
SandPoot
e466f47992 Replaces infoboxes with examine blocks (#235) 2022-03-14 14:22:18 -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
BongaTheProto
54aec9bd98 Merge remote-tracking branch 'upstream/master' 2022-02-27 14:38:06 -05:00
SandPoot
fb7a24b333 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-27 14:17:53 -03:00
SandPoot
f7ea1f377d oops, replace all is a hell of a drug 2022-02-25 17:09:31 -03:00
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00