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-11 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,326 Commits 55 Branches 0 Tags
1a90c96e4b82b56a3b3917f19bcb514580f49b04
Commit Graph

859 Commits

Author SHA1 Message Date
DrPainis
7dab80cbb7 fuck 2021-05-23 23:42:16 -04:00
DrPainis
51911e1f27 adds the recipe for goliath calamari 2021-05-23 23:36:11 -04:00
DrPainis
a7add64905 adds a lazily made sprite for goliath calamari 
I suck at spriting so this is the best I could do.
 2021-05-23 23:29:25 -04:00
DrPainis
ce1b170b46 adds goliath calamari 2021-05-23 23:27:48 -04:00
silicons
898d1d2c7f Merge pull request #14731 from WanderingFox95/WanderingFox95-Efink 
The E-Fink (Yes, really)
 2021-05-18 17:08:58 -06:00
silicons
58df45ee3f Merge pull request #14727 from zeroisthebiggay/patch-10 
more drink mixture flavortext
 2021-05-18 16:44:35 -06:00
WanderingFox95
57d22c6962 Typo 2021-05-17 12:36:12 +02:00
WanderingFox95
a947ec1322 Recipes 2021-05-17 12:30:01 +02:00
zeroisthebiggay
a0b83950ae Update drinks_recipes.dm 2021-05-15 12:03:04 -04:00
zeroisthebiggay
03c2f752fa Update drinks_recipes.dm 2021-05-15 11:51:43 -04:00
zeroisthebiggay
2bc5edede0 Update drinks_recipes.dm 2021-05-15 09:51:48 -04:00
zeroisthebiggay
8166167a45 Update drinks_recipes.dm 2021-05-15 09:44:21 -04:00
zeroisthebiggay
1ff27aa732 Update drinks_recipes.dm 2021-05-15 09:43:55 -04:00
zeroisthebiggay
90f9c3cb79 Update drinks_recipes.dm 2021-05-15 09:39:56 -04:00
zerothebigboy
37873d6750 gommit 2021-05-15 08:52:24 -04:00
silicons
625488891e Merge pull request #14650 from WanderingFox95/WanderingFox95-LavalandWine 
Lavaland Wine: Pinot Mort (Ready)
 2021-05-12 04:43:11 -06:00
WanderingFox95
25fc57cbef Merge branch 'master' into WanderingFox95-LavalandWine 2021-04-29 10:54:18 +02:00
WanderingFox95
3ea98d3096 Merge branch 'master' into WanderingFox95-TheUnrollingPin 2021-04-29 10:54:00 +02:00
WanderingFox95
8d8f1173ab Adds the unflattening functionality 2021-04-26 18:44:02 +02:00
WanderingFox95
b8292f7f56 Small adjustment to quantity 
Oops, it only made 3 instead of 4
 2021-04-21 15:15:07 +02:00
WanderingFox95
57938e7b15 Adds the Recipe 
2 Ash
1 Lizard Wine
1 Vitrium Froth
 2021-04-20 19:36:30 +02:00
DrPainis
a329188f95 moves list_reagents back to where it was 
fuck
 2021-04-17 02:56:46 -04:00
DrPainis
ea585233a2 makes goliath meat have reagents again 
sorry, I lost my brain cells for a second
 2021-04-17 02:56:06 -04:00
DrPainis
c69233c731 adds ash drake meat 
yes, it's unnecessary
no, I don't care
let me eat drakes
 2021-04-17 02:52:21 -04:00
ItzGabby
4a49f6eebe barked on 2021-03-19 01:38:17 -04:00
silicons
3693eb1f16 Merge pull request #14374 from SandPoot/don't-litter-please 
Makes it so you don't drop cans upon crushing them
 2021-03-09 00:20:43 -07:00
Letter N
de6f1401bb final fix 2021-03-08 13:24:28 +08:00
SandPoot
80cb870311 upload drinks.dm 2021-03-07 21:39:10 -03:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
DeltaFire
b214d70383 Merge pull request #14268 from Citadel-Station-13/silicons-patch-16 
alternatively, replaces the cube sentinel spawn with an actual simplemob sentinel that drops a carbon sentinel body on death so you still get to run this to the ground without being able to be a literal alien queen
 2021-02-23 13:01:27 +01:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
silicons
e792d8d61f Update snacks_meat.dm 2021-02-18 17:35:34 -07: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
Letter N
3f40e353aa Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-16 19:41:53 +08:00
Letter N
de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
silicons
61ab2a5a53 logging fixes 2021-02-13 19:47:17 -07:00
Letter N
8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
Lin
04aaa7aeda Merge pull request #14129 from MrJWhit/cursed-name 
Porting a cursed name about drinking
 2021-01-24 13:24:19 -06:00
MrJWhit
6dd674dae4 Porting 2021-01-22 20:47:45 -05:00
MrJWhit
d9f2cccd84 Hehoo maybe I should actually see what happens when I compile 2021-01-22 13:33:18 -05:00
MrJWhit
5fe6772c58 Update microwave.dm 2021-01-22 13:23:10 -05:00
Letter N
021b28a2b7 cleanup 
shitcode - b - gone
 2021-01-20 11:08:21 +08:00
YakumoChen
fba17abaf4 god damn it Trilby 2021-01-16 08:23:08 +00:00
silicons
2bf5a0e91e Merge pull request #14008 from TheSpaghetti/patch-5 
Removes double punctuation in the tumor bread description.
 2021-01-09 15:37:19 -07:00
Lin
5e08df700f Merge pull request #13939 from silicons/reagentlogs 
low level reagent logging additions
 2021-01-09 16:24:40 +00:00
TheSpaghetti
b52e8bf447 double punctuation bad 
no
 2021-01-09 00:18:15 -05:00
timothyteakettle
a375448a54 fixes 2021-01-05 23:18:52 +00:00
Timothy Teakettle
535dede85b i teleported bread 2021-01-05 22:20:41 +00:00