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-27 14:46:57 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
5155 Commits
Author SHA1 Message Date
LinandGitHub 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
siliconsandGitHub dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles 
/obj/mecha ➡ /obj/vehicle/sealed/mecha
 2022-04-08 18:26:47 -07:00
BongaTheProto 10eb587407 Merge remote-tracking branch 'upstream/master' 2022-04-08 13:46:43 -05:00
SandPoot 31a179f95d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-08 13:57:46 -03:00
siliconsandGitHub 904990a037 Merge pull request #15584 from Arturlang/StasisBeds 
Stasis beds
 2022-04-08 09:47:26 -07:00
Solaris-ShadeandGitHub 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
BongaTheProtoandGitHub 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
siliconsandGitHub c8cab13081 Merge pull request #15565 from SandPoot/custom-statues 
Custom statues and sculpting changes.
 2022-04-06 12:12:24 -07:00
Artur 3824daba05 Trailing newlines 2022-04-06 16:10:57 +03:00
Artur c36019bf56 Adds stasis beds 2022-04-06 15:38:05 +03:00
BongaTheProtoandGitHub 5a6b1b9dc7 Merge branch 'Sandstorm-Station:master' into master 2022-04-01 19:42:35 -05:00
SandPootandGitHub c8df97474b Adds pick-up, drop and throw sounds for items. (#240) 2022-04-01 15:57:30 -03:00
Solaris-ShadeandGitHub a70fb1fb43 Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-31 15:29:31 -04:00
SandPoot 282941ca5b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-31 00:21:11 -03:00
BlueWildroseGitHubSandPootPutnam3145
 		3687361ba5 Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) (#15304) 
* Butts

* testicle fix + hidden is back

* updated booba

* prob bad idea actually thinking about icon states

* fuck

* this should be everything now

* SandPoot's suggestion

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* tguify that last option

* Revert "tguify that last option"

This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.

* Revert "Merge branch 'master' into cursingcitadel"

This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.

* Revert "Revert "Merge branch 'master' into cursingcitadel""

This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2022-03-30 20:06:00 -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
BongaTheProtoandGitHub 8d6007f3fa Merge branch 'Sandstorm-Station:master' into master 2022-03-26 13:23:24 -05:00
SandPoot 9c42027f65 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-25 11:54:12 -03:00
Solaris-ShadeandGitHub 01f28163c2 Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-24 20:40:31 -04:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
DeltaFire a8ff45ca16 fix 2022-03-22 18:05:58 +01:00
Solaris-ShadeandGitHub d9ff37d2ff Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-19 11:23:16 -04:00
SandPoot 16fddbb140 Upload files 2022-03-18 18:35:29 -03:00
BongaTheProto 614f952cd5 Merge remote-tracking branch 'upstream/master' 2022-03-17 22:59:13 -05:00
SandPoot 04231b54f3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-17 22:46:31 -03:00
SandPootandGitHub 96e38e965b Merge branch 'master' into mechs-are-vehicles 2022-03-17 22:23:48 -03:00
BongaTheProto 082f9a9d38 you mfs can't be trusted 2022-03-16 15:44:54 -05:00
SandPoot baee52349b Upload files 2022-03-16 15:41:07 -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 07fe9bdbca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-14 15:09:35 -03:00
SandPootandGitHub e466f47992 Replaces infoboxes with examine blocks (#235) 2022-03-14 14:22:18 -03:00
siliconsandGitHub a3284a0923 Merge pull request #15195 from DeltaFire15/med-revivalchem-nerf 
Weakens chemistry's revival chems
 2022-03-13 14:24:57 -07:00
Solaris-ShadeandGitHub 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 8badaaf8ec the thing 
the
 2022-03-04 19:51:12 -05:00
BongaTheProtoandGitHub a6a8724dac Merge pull request #202 from jbox144/Spess-law 
Space law
 2022-03-04 14:05:47 -06: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
siliconsandGitHub edd3a510f1 Merge pull request #15526 from timothyteakettle/bartender-pda 
adds bartender cartridge for drink recipe searching, updates chemist cartridge to have equivalent functionality for all recipes
 2022-02-26 18:08:47 -07:00
BongaTheProto 8f0943d89d Merge branch 'master' into lewdeded 2022-02-25 16:40:19 -05:00
BongaTheProtoandGitHub 43e9ea15ab Merge pull request #210 from The-Sun-In-Splendour/adv-plasm-cutter-classify 
adv plasm cutter is now correctly classified
 2022-02-25 14:27:41 -06: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
BongaTheProto 5eae6890f3 Merge branch 'master' into lewdeded 2022-02-24 23:05:30 -05:00
BongaTheProto 2ac1138ac1 Merge remote-tracking branch 'upstream/master' 2022-02-24 23:05:13 -05:00
BongaTheProto 7c9bef2a04 teehe (the sequel) 
reloaded
 2022-02-24 23:01:03 -05:00