 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
|
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 |
|
|
lolman360
|
bb86003510
|
w e w
|
2020-08-18 10:04:52 +10:00 |
|
|
lolman360
|
7ca4fa2f55
|
compilies/??
|
2020-08-15 17:09:12 +10:00 |
|
|
lolman360
|
49948e77a4
|
SELLYOULOSE
|
2020-08-11 18:08:40 +10:00 |
|
|
lolman360
|
308d77da7c
|
Merge branch 'master' into plumb
|
2020-08-09 22:48:18 +10:00 |
|
|
silicons
|
2a0f2a38a7
|
Fix
|
2020-08-05 21:42:05 -07:00 |
|
|
silicons
|
815ddd1866
|
oh boy
|
2020-08-05 21:34:26 -07:00 |
|
|
Timothy Teakettle
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
|
Timothy Teakettle
|
dc14c02570
|
fix crates
|
2020-07-27 21:55:51 +01:00 |
|
|
Hatterhat
|
14fba6a056
|
funny parry sticks
|
2020-07-24 21:19:01 -05:00 |
|
|
Timothy Teakettle
|
7fb55a02a5
|
section one
|
2020-07-24 22:34:22 +01:00 |
|
|
lolman360
|
0f1aa3c0ca
|
'lolman? did you test your code?'
no i did not ms. kevinz
|
2020-07-22 10:49:56 +10:00 |
|
|
CameronWoof
|
431c52b7e2
|
Merge remote-tracking branch 'upstream/master' into advanced-sutures-and-mesh
|
2020-07-17 17:22:43 -07:00 |
|
|
CameronWoof
|
a493ecdc4a
|
suture and mesh additions
|
2020-07-15 16:44:24 -07:00 |
|
|
Artur
|
280d3de6c3
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-07 18:37:45 +03:00 |
|
|
Ghom
|
17ee8c5960
|
Merge pull request #12660 from YakumoChen/master
Reverts improv small arms, makes guncrafting easier and faster
|
2020-07-04 18:35:22 +02:00 |
|