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 |
|
silicons
|
a77aa8bd41
|
Merge pull request #14766 from Linzolle/cultfix
Fix cult area shenanigans, cult can do stuff in maint again.
|
2021-06-09 11:22:26 -07:00 |
|
silicons
|
cb52be5dd9
|
fixes linter warnings (#14778)
* woo
* woo
|
2021-05-31 10:19:20 -05: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 |
|
LetterN
|
e3fb2d5491
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-24 21:55:47 +08: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 |
|
LetterN
|
228105b391
|
laptop and closet decon fix
|
2021-03-16 14:47:28 +08: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
|
c624c3ae14
|
economical inflation
|
2021-03-05 20:00:45 +08:00 |
|
Letter N
|
cb346a3847
|
a
|
2021-03-05 14:29:36 +08:00 |
|
Letter N
|
45278c02a2
|
send it
|
2021-03-04 16:41:42 +08:00 |
|
Letter N
|
7e427aa8e6
|
HOTFIX AEIOU
|
2021-03-04 16:20:44 +08:00 |
|
Letter N
|
5304029dd9
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-23 11:01:42 +08:00 |
|
Letter N
|
037378eb7d
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-19 10:34:47 +08:00 |
|
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 |
|
Letter N
|
de67720a0a
|
icons should exist
|
2021-02-14 11:39:56 +08:00 |
|
Letter N
|
45d6a5f87f
|
it compiles, UNTESTED YET
|
2021-02-13 21:41:59 +08:00 |
|
Letter N
|
5db87b9065
|
more updates!
|
2021-02-12 17:52:59 +08: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 |
|