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
|
2e29f30fdf
|
Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing
|
2021-02-18 15:04:22 -03:00 |
|
SandPoot
|
cf2e70671a
|
upload files
|
2021-02-18 14:47:10 -03:00 |
|
silicons
|
e009b9ef5f
|
Merge pull request #14186 from SmArtKar/trading_card_game
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
|
2021-02-17 01:30:13 -07:00 |
|
SmArtKar
|
e4afe49687
|
Adds card crafting!"
|
2021-02-16 19:38:48 +03:00 |
|
dzahlus
|
84207813b7
|
rework of present sounds
Reworks already present sounds in the game, specifically of the folder "weapons"
|
2021-02-02 23:28:53 +01:00 |
|
silicons
|
dedb0cb62e
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-19 04:24:42 -07:00 |
|
silicons
|
2266a9e17b
|
Merge pull request #14037 from DeltaFire15/nanogel
Nanogel for robotic limbs
|
2021-01-17 20:42:19 -07: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 |
|
silicons
|
ea07ad6e48
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-13 15:41:28 -07:00 |
|
DeltaFire
|
6192d4ddab
|
fixes
|
2021-01-13 00:08:59 +01:00 |
|
DeltaFire
|
f591bff85b
|
sprite stuff
|
2021-01-12 23:54:40 +01:00 |
|
DeltaFire
|
032c169098
|
whoops
|
2021-01-12 23:29:51 +01:00 |
|
Hatterhat
|
2042de0f19
|
sterilegauze buff
|
2021-01-12 16:13:08 -06:00 |
|
Hatterhat
|
cb40ad4764
|
atomization is cowardice actually
|
2021-01-12 16:08:17 -06:00 |
|
DeltaFire
|
13beddd42b
|
nanogel time
|
2021-01-12 23:02:44 +01:00 |
|
silicons
|
ddad368d6a
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-08 00:33:57 -08:00 |
|
MrJWhit
|
abffac67b2
|
Port'n
|
2021-01-06 03:16:08 -05:00 |
|
silicons
|
4c6cc24343
|
Merge pull request #13948 from necromanceranne/sheath_stuff
Bokken and Bokken Accessories: Bonkvengeance
|
2021-01-03 18:18:29 -07: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
|
1fa828a3f7
|
upload files
|
2020-12-30 13:57:10 -03:00 |
|
Letter N
|
a808f805d4
|
ASYNC EVERYTHING!
|
2020-12-21 16:24:51 +08: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 |
|
DeltaFire
|
4ccf40f775
|
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
This reverts commit 27a099c6bf.
|
2020-10-11 00:53:18 +02:00 |
|
DeltaFire
|
27a099c6bf
|
Revert "Merge branch 'master' into robotic-limbs-PT2"
This reverts commit 73b5267425, reversing
changes made to 2e780bfff2.
|
2020-10-11 00:51:39 +02:00 |
|
DeltaFire
|
73b5267425
|
Merge branch 'master' into robotic-limbs-PT2
|
2020-10-11 00:44:28 +02:00 |
|
DeltaFire
|
06cb91ca3d
|
updates all BODYPART_ORGANIC occurances
:)
|
2020-10-06 18:01:25 +02:00 |
|
Detective-Google
|
260ed6eff6
|
fixes arcade carpet
|
2020-10-05 21:27:42 -05:00 |
|
Detective Google
|
98703e6ad6
|
Merge remote-tracking branch 'upstream/master' into arcade-carpets
|
2020-10-01 13:41:10 -05:00 |
|
silicons
|
c8d6f3d22a
|
Merge pull request #13477 from LetterN/patch-2
Adds craftable railings
|
2020-10-01 03:13:51 -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 |
|
Letter N
|
d9ab31e199
|
commit 2
|
2020-10-01 11:30:01 +08:00 |
|
Detective Google
|
643421bc23
|
adds arcade carpets
yay
|
2020-09-28 14:43:03 -05:00 |
|
silicons
|
1092eacc6e
|
Merge pull request #13397 from ArchieBeepBoop/microfans
Micro Powered Fans!
|
2020-09-27 00:03:43 -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 |
|
DeltaFire
|
f892309903
|
fixes
|
2020-09-15 17:35:58 +02: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 |
|