Commit Graph

331 Commits

Author SHA1 Message Date
silicons
8d914571e8 Merge pull request #15094 from zeroisthebiggay/patch-20
removes building (fortnite) windows
2021-09-19 11:09:55 -07:00
zerothebigboy
68e2eb1d7a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners 2021-09-10 12:12:57 -04:00
zeroisthebiggay
70b0dad62d Update glass.dm 2021-09-07 03:26:39 -04:00
zerothebigboy
ccfde52b0d code 2021-09-02 23:45:03 -04:00
zerothebigboy
0e95e1a8ad cool 2021-09-01 05:14:17 -04:00
silicons
89d0c590e6 Merge pull request #14943 from WanderingFox95/WanderingFox95-custom-kegs
Custom Kegs
2021-07-18 15:06:30 -07:00
WanderingFox95
2e88a10ca6 Recipe 2021-07-15 01:50:44 +02:00
YakumoChen
42fed8a8fe craftable human hats 2021-07-05 04:58:52 +00:00
Linzolle
0cf7c5070d parentheses 2021-05-27 19:45:12 -05:00
Linzolle
46833abf0b add cult_permitted area flag 2021-05-27 19:34:00 -05:00
WanderingFox95
3ea98d3096 Merge branch 'master' into WanderingFox95-TheUnrollingPin 2021-04-29 10:54:00 +02:00
WanderingFox95
6c9ead8f1c Adds the Recipe to Wood Crafting 2021-04-26 18:42:33 +02:00
Hatterhat
4186b15a69 plastitanium glass OSC 2021-04-17 16:51:08 -05:00
LetterN
f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
CuteMoff
dd295d20c2 Merge branch 'master' into Plasmaispogtake2 2021-03-25 10:44:12 -04:00
CuteMoff
3efce37fd9 Update mineral.dm 2021-03-25 10:32:13 -04:00
CuteMoff
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
CuteMoff
a51a1ae68f Update mineral.dm 2021-03-23 21:24:11 -04:00
CuteMoff
048b8548ad Update mineral.dm 2021-03-23 20:53:07 -04:00
CuteMoff
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
Letter N
cb346a3847 a 2021-03-05 14:29:36 +08:00
SmArtKar
e4afe49687 Adds card crafting!" 2021-02-16 19:38:48 +03:00
silicons
829e946755 Merge pull request #14061 from Hatterhat/gauze-parity
something something gauze things
2021-01-17 20:40:09 -07: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
MrJWhit
abffac67b2 Port'n 2021-01-06 03:16:08 -05: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
shellspeed1
3735efbfca Ports construction bags 2020-11-29 18:29:03 -08:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
silicons
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
The0bserver
cddd46fce3 Maybe this will work. Maybe it won't. 2020-09-05 18:52:20 -04: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
lolman360
460c92de74 3 2020-08-24 00:20:04 +10:00
lolman360
05250939c6 e 2020-08-23 23:58:04 +10:00
lolman360
bc14155632 Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-08-23 17:01:45 +10:00
silicons
120bcfc00c Merge pull request #13178 from lolman360/plumb
[READY] ports plumbing (no more waiting for tgui4)
2020-08-20 21:32:26 -07:00
lolman360
bda2c740ba Merge branch 'master' into AnPrimAssistants 2020-08-21 11:08:13 +10:00
lolman360
4e23559065 Update sheet_types.dm 2020-08-18 18:15:24 +10:00
lolman360
8085ab01d9 culst! 2020-08-18 15:38:59 +10:00
lolman360
8f5078a15a Update mineral.dm 2020-08-18 14:47:47 +10:00