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-26 22:28:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
675 Commits
Author SHA1 Message Date
Pin-alternative 1e6dcafa97 Merge remote-tracking branch 'upstream/master' into rework 2022-11-10 09:17:22 +11:00
BongaTheProto a949e5d08c Merge remote-tracking branch 'upstream/master' 2022-10-28 16:43:28 -05:00
SandPoot 02e4551a27 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-25 22:52:45 -03:00
Pin-alternative d57be23411 sizes rework 2022-10-23 16:53:39 +11:00
SandPoot 24ee6077c7 push changes 2022-10-23 00:18:03 -03:00
Pin-alternative a3522082d8 init 2022-10-03 13:18:05 +11:00
Pin-alternative c0f224efff some more crap 2022-05-28 20:18:09 +10:00
BongaTheProto a4fac709c3 Merge remote-tracking branch 'upstream/master' 2022-04-09 11:43:45 -05:00
SandPoot ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -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
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
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -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
siliconsandGitHub a3284a0923 Merge pull request #15195 from DeltaFire15/med-revivalchem-nerf 
Weakens chemistry's revival chems
 2022-03-13 14:24:57 -07: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
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
Timothy Teakettle 027002f928 haha what if we didn't show secretcatchem 2022-02-23 12:07:03 +00:00
BongaTheProto d0563e1462 fix fix and reinstaurate 
temporarily fixes the fucking 300000 space.dm runtimes and also readds the forced fem and masc stuff
 2022-02-16 00:43:05 -05:00
BongaTheProtoandGitHub fca6400273 Merge branch 'Sandstorm-Station:master' into master 2022-02-04 11:56:50 -05:00
SandPootandGitHub 805ff012fc Fix drinks (#225) 2022-02-04 11:20:21 -03:00
BongaTheProto 9ce527e068 Merge remote-tracking branch 'upstream/master' 2022-01-26 00:20:29 -05:00
SandPoot e8c8d2b0ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-25 11:38:07 -03:00
Putnam3145 07bd8437da I missed a couple 2022-01-22 17:04:18 -08:00
Putnam3145 a408957bc6 Various chem tweaks 2022-01-22 16:40:05 -08:00
DeltaFire 051f5780db tweaks 
Synthtissue borrowed health capped at 250, gradually flips from clonedamage towards toxdamage within 45 cycles.

Restores organ healing for strange reagent, but only in a very weak fashion (5 heal for failing organs)
 2021-12-31 00:16:49 +01:00
BongaTheProtoandGitHub b484927e55 Inverse milking moment (#216) 
* smol micro runtime fix

:3

* blepppppp

lots of c

* Delete .NETFramework,Version=v4.0,Profile=Client.AssemblyAttributes.cs

* Delete UnstandardnessTestForDM.csproj.AssemblyReference.cache
 2021-12-27 17:52:14 -03:00
BongaTheProtoandGitHub a24e6264cc Merge branch 'Sandstorm-Station:master' into master 2021-12-16 12:24:47 -05:00
SandPoot 24e342b7fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-16 10:33:03 -03:00
Putnam3145 f50dafe141 Fixes SDGF nutrition growth not to be exponential 2021-12-13 17:01:22 -08:00
BongaTheProto 58e75ee58b Merge remote-tracking branch 'upstream/master' 2021-12-07 10:32:42 -05:00
BongaTheProtoandGitHub c3068fc135 "Small" climax revamp (#203) 2021-12-07 10:57:35 -03:00
BongaTheProtoandGitHub 41bcf2ec17 Merge branch 'Sandstorm-Station:master' into master 2021-11-30 21:38:45 -05:00
SandPoot a49a1c625d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-30 22:25:44 -03:00
BongaTheProto 1293e7be22 Added some stuff 
- config changes
- the extra sprites
- etc.

still have to look into the no clothes bug that makes you need to expose your genitals for the layers to actually work
 2021-11-24 03:54:16 -05:00
DeltaFire 8ca1015510 reagent_all_process macro 2021-11-13 03:23:11 +01:00
DeltaFire 4f8848cfb8 more info 
chem master and chem analyzer now state who can actually process a chem
 2021-11-12 19:09:14 +01:00
Mosley1f 59b5447a29 Merge branch 'pr/3' 2021-11-04 20:43:45 -05:00
DeltaFire 5d6978bb2f oh god oh fuck 2021-11-04 21:06:42 +01:00
DeltaFire 64367ff7ba edge case protection 2021-10-02 18:33:57 +02:00
DeltaFire 9f3688f9cc health payback affected by metabolism 2021-09-25 02:32:29 +02:00
DeltaFire 31679157dc adjust 2021-09-25 02:24:12 +02:00
DeltaFire 6cffeacd42 typo 2021-09-22 23:32:35 +02:00
DeltaFire 2e2aa36875 grab the ghost 2021-09-22 22:47:08 +02:00
DeltaFire 7752e0d624 synthtissue and sr 2021-09-22 22:30:43 +02:00
SandPoot e738c3cf21 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-27 12:40:48 -03:00
BlueWildroseandGitHub af94680c7d this probably sounds better 2021-08-22 14:45:18 -07:00