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 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,289 Commits 55 Branches 0 Tags
acf06abed5cc10f8ab3ad173fbd4fc355ad64553
Commit Graph

820 Commits

Author SHA1 Message Date
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
silicons
251bd3e06b logging 2020-12-31 12:33:05 -08:00
timothyteakettle
fcd8d35c76 thank 2020-12-27 02:23:57 +00:00
Timothy Teakettle
c3e9cdd9a5 finale 2020-12-26 23:09:19 +00:00
MrJWhit
f5b99b83f8 Fully functional 2020-12-13 02:29:29 -05:00
Putnam3145
f7034818a4 Merge pull request #13672 from Citadel-Station-13/silicons-patch-4 
chief sub
 2020-11-18 17:50:50 -08:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
silicons
cbb6febfe2 Update snacks_sandwichtoast.dm 2020-11-11 13:56:18 -07:00
silicons
792080ca3f Merge pull request #13533 from shellspeed1/jambalya- 
Face hugger jambalaya. Should be ready.
 2020-10-10 22:02:46 -07:00
Timothy Teakettle
385bd57940 reworks family heirlooms, adds heirlooms that can be based off your species (#13444) 
* corgi tracker

* better heirloom system

* typo
 2020-10-10 12:15:39 +02:00
shellspeed1
2c59a5b9f8 more spelling 2020-10-06 17:36:57 -07:00
shellspeed1
3f634743e1 spelling 2020-10-06 16:27:12 -07:00
shellspeed1
2ffcdb4862 Soups on 2020-10-06 16:07:29 -07:00
Blue Wildrose
7f028899fa Forgot valid salid - also included ambrosia deus, white cannabis, and lime fruit 2020-09-09 22:18:17 -07:00
Blue Wildrose
1b77e69fb4 Slimepeople diet changes 2020-09-09 18:11:25 -07:00
silicons
8699ce2174 fixes a bunch of broken clickdelays (#13218) 
* fixes

* fix
 2020-08-25 20:58:20 +02:00
silicons
c1d8d1d439 Merge pull request #13090 from lolzalolka/lean 
Added Burek to Space
 2020-08-11 01:42:58 -07:00
chrisbbbbbbb
e8ac70696f new food idk? 2020-08-09 18:58:32 +02:00
Winter Flare
76293ee032 My balls are raw. Meatballs, that is. (#13075) 
* Food Processor produces Raw Meatball

* No nutrition loss from slabs.
 2020-08-09 16:01:52 +02:00
silicons
f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4 
TGUI4 port
 2020-08-09 05:46:21 -07:00
Putnam
9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
Letter N
333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
TrilbySpaceClone
f2e4b7eacc grammer 2020-08-04 10:07:04 -04:00
TrilbySpaceClone
0f29235e6a Tea Party 2020-08-04 09:15:44 -04:00
Letter N
9a9e3ffef5 fixfixfix squared. Will not fix missing clockslab tabs, you just have to give it a category. 2020-08-03 21:14:17 +08:00
Letter N
b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Letter N
5d4bb48628 another batch. MAJOR: ccpodlauncher, cargo/console.dm, smartfrige, holodeck/computer.dm, biogenerator 2020-07-29 15:10:01 +08:00
Lin
81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental 
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
 2020-07-28 21:51:10 -05:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
Timothy Teakettle
ed8723e74e Merge branch 'master' into species-are-dumb 2020-07-23 22:15:10 +01:00
Timothy Teakettle
8f8aaee36c fixes up drinks 2020-07-23 22:09:14 +01:00
Timothy Teakettle
450509347a tidy species more 2020-07-23 21:57:32 +01:00
silicons
db24df58a0 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:36:46 -07:00
silicons
9f66163d4f Merge pull request #12828 from Owai-Seek/foodport-p2-7/12/20 
Ports several food sprites/foods from Baystation/Citadel RP
 2020-07-23 10:35:30 -07:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons
2f11fb6a8b ok 2020-07-21 11:59:39 -07:00
silicons
184e3992f3 fixes 2020-07-21 11:56:23 -07:00
silicons
4d48abf3a6 fixes 2020-07-21 11:46:17 -07:00
Timothy Teakettle
4b70e29e36 let the fry smite work 2020-07-20 19:42:07 +01:00