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-30 16:16:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
414 Commits
Author SHA1 Message Date
SandPoot 0313149d1c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-08 02:43:01 -03:00
SandPootandGitHub 04ea151153 Adds Loincloths (#159) 2021-05-04 13:22:10 -03:00
WanderingFox95andGitHub 3ea98d3096 Merge branch 'master' into WanderingFox95-TheUnrollingPin 2021-04-29 10:54:00 +02:00
WanderingFox95andGitHub 6c9ead8f1c Adds the Recipe to Wood Crafting 2021-04-26 18:42:33 +02:00
SandPoot bab386168e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-18 23:23:02 -03:00
HatterhatandGitHub 4186b15a69 plastitanium glass OSC 2021-04-17 16:51:08 -05:00
SandPoot 0165c4a7c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-10 12:34:59 -03:00
LetterN f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
SandPoot 1a7d33b801 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-27 11:41:32 -03:00
CuteMoffandGitHub dd295d20c2 Merge branch 'master' into Plasmaispogtake2 2021-03-25 10:44:12 -04:00
CuteMoffandGitHub 3efce37fd9 Update mineral.dm 2021-03-25 10:32:13 -04:00
SandPoot 73c0ff2f8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-24 23:57:03 -03:00
CuteMoffGitHubSandPoot
 		ea200acd9f Update code/game/objects/items/stacks/sheets/mineral.dm 
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
 2021-03-23 23:17:24 -04:00
CuteMoffandGitHub a51a1ae68f Update mineral.dm 2021-03-23 21:24:11 -04:00
CuteMoffandGitHub 048b8548ad Update mineral.dm 2021-03-23 20:53:07 -04:00
CuteMoffandGitHub 428591c452 Update mineral.dm 2021-03-23 20:36:48 -04:00
Letter N 935e46b492 The Mapping Update 
Cleans up the map (again)
Makes mining code more better
 2021-03-12 12:11:35 +08:00
SandPoot 20509121b8 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-08 14:07:57 -03:00
Letter N cb346a3847 a 2021-03-05 14:29:36 +08:00
SandPoot 1bdabd4e82 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-17 17:35:20 -03:00
SmArtKar e4afe49687 Adds card crafting!" 2021-02-16 19:38:48 +03:00
SandPoot 44acce82ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-19 00:10:54 -03:00
siliconsandGitHub 829e946755 Merge pull request #14061 from Hatterhat/gauze-parity 
something something gauze things
 2021-01-17 20:40:09 -07:00
SandPoot 67ad6cbbb8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-15 19:03:13 -03:00
Hatterhat 798b25846d gauze parity 2021-01-14 20:53:55 -06:00
The0bserver ffe401544c First wave of fixing 2021-01-13 23:35:37 -05:00
SandPoot c79e8434cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-08 11:31:10 -03:00
MrJWhit abffac67b2 Port'n 2021-01-06 03:16:08 -05:00
SandPoot 168799038d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-04 02:05:26 -03:00
necromanceranne 0aa5338f9b Adds wakibokken, puts bokken crafting into the craft menu, makes proper bokken a little harder to make but obviously an upgrade, makes crafted katanas and bokken have actual belt overlays 2021-01-01 05:42:28 +11:00
SandPoot c585095ba5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-04 12:29:55 -03:00
shellspeed1 3735efbfca Ports construction bags 2020-11-29 18:29:03 -08:00
SandPoot af0f6e7bd0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-18 23:12:54 -03:00
silicons 803bff4e5f funny 2020-11-12 23:34:42 -07:00
Enric Gabriel 7df07d2859 Merge branch 'master' of upstream into master 2020-10-01 12:49:01 -03:00
siliconsandGitHub 47aef0d574 Merge pull request #13443 from ItzGabby/gabby-wooden-floors 
Gabbys new wooden floor tile types
 2020-10-01 03:04:21 -07:00
ItzGabby b97b595f6f Three new wooden floor types 2020-09-26 18:29:46 -04:00
Dip 8d33b3a8da convert to machinery type 2020-09-16 20:28:31 -03:00
Dip 7e00d81758 Microfan Rework 2020-09-16 19:28:59 -03:00
Dip 394d383746 Clone Microfans 2020-09-15 19:27:58 -03:00
Enric Gabriel ef96fd6389 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-11 18:51:33 -03:00
The0bserver cddd46fce3 Maybe this will work. Maybe it won't. 2020-09-05 18:52:20 -04:00
Enric Gabriel 20b25372e1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-05 13:09:14 -03:00
lolman360 55c8250324 AAAAAAAAAAAAAAAAA 2020-08-28 12:44:59 +10:00
lolman360 daeaf81ab6 e 2020-08-24 01:25:26 +10:00
lolman360 0f9f1e240c w 2020-08-24 00:51:13 +10:00
lolman360 4b2b4afc64 e 2020-08-24 00:49:31 +10:00
lolman360 6463d0b785 Merge branch 'AnPrimAssistants' of https://github.com/lolman360/Citadel-Station-13 into AnPrimAssistants 2020-08-24 00:27:29 +10:00
lolman360 b74c5ba22d ee 2020-08-24 00:27:22 +10:00
lolman360andGitHub 460c92de74 3 2020-08-24 00:20:04 +10:00