Ghommie
|
e977ba6729
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290
|
2019-11-10 23:17:58 +01:00 |
|
Ghommie
|
7e4aef46d9
|
Unmodularize and update pAI/Intellicards very slighty.
|
2019-11-03 04:23:31 +01:00 |
|
Ghommie
|
a5b37b658b
|
Purging a lot of space indention in favor of tabs.
|
2019-10-29 15:46:31 +01:00 |
|
Trilbyspaceclone
|
14000502b4
|
Update recipes_weapon_and_ammo.dm
|
2019-10-21 21:07:27 -04:00 |
|
Trilbyspaceclone
|
b4b875bf26
|
Merge branch 'master' into A_Tailer's_art
|
2019-10-21 21:06:21 -04:00 |
|
Trilbyspaceclone
|
2c72b91fbd
|
Triv curb kick
|
2019-10-21 19:16:13 -04:00 |
|
Trilbyspaceclone
|
5fced4427b
|
buffs paperwork
|
2019-10-21 19:05:53 -04:00 |
|
YakumoChen
|
37f58798ab
|
no crafting
|
2019-10-20 03:05:21 +00:00 |
|
TrilbySpaceClone
|
1707d6e6d2
|
er?
|
2019-10-18 01:22:19 -04:00 |
|
TrilbySpaceClone
|
18c9283d4a
|
Merge branch 'master' into A_Tailer's_art
|
2019-10-18 00:21:42 -04:00 |
|
Thalpy
|
e115c456f3
|
Ohh I'm fixing
|
2019-10-15 13:41:49 +01:00 |
|
Thalpy
|
acc0ff8a17
|
Adds craftable extended mags
|
2019-10-15 12:37:35 +01:00 |
|
Trilbyspaceclone
|
0b2c743f72
|
readds
|
2019-10-05 11:53:14 -04:00 |
|
Trilbyspaceclone
|
f43bd91072
|
Merge branch 'master' into A_Tailer's_art
|
2019-10-05 11:50:12 -04:00 |
|
kevinz000
|
6e55fec7bd
|
Merge pull request #9189 from Sishen1542/gatling
[READY] craftable laser minigun, because why not
|
2019-09-28 00:40:02 -07:00 |
|
Trilbyspaceclone
|
0a43c2b64d
|
Update recipes_clothing.dm
|
2019-09-05 06:42:41 -04:00 |
|
Sishen
|
a3967b6f77
|
aaaaaaaa
|
2019-09-03 02:29:08 -04:00 |
|
Dap
|
19678119c5
|
Merge branch 'plasmatables' into plasmaglass-tables-spears
|
2019-08-28 14:55:01 -06:00 |
|
TrilbySpaceClone
|
00c01709b2
|
moves banners into crafting
|
2019-08-26 15:46:41 -04:00 |
|
TrilbySpaceClone
|
44893b6ee7
|
It just works
|
2019-08-26 06:32:54 -04:00 |
|
Dap
|
f104ba1f90
|
Plasmaglass Spears and plasmaglass actually drops plasma shards!
|
2019-08-25 21:38:04 -06:00 |
|
Sishen
|
20f4e260e1
|
minigun ooga
|
2019-08-23 19:39:20 -04:00 |
|
lolman360
|
d93fceec98
|
oops recipe time thanks pax
|
2019-08-17 12:15:17 +10:00 |
|
lolman360
|
ffad3cfe22
|
so i should really not have access to github but
|
2019-08-11 11:14:47 +10:00 |
|
lolman360
|
8d7f4a1385
|
duira
|
2019-08-10 21:43:28 +10:00 |
|
kevinz000
|
cd6699cfed
|
Merge pull request #8660 from Trilbyspaceclone/Unmodular
Ummodular a few files - Fixes Freelance Crate costs
|
2019-08-05 00:47:28 -07:00 |
|
Trilbyspaceclone
|
3bad062c23
|
Merge branch 'master' into Unmodular
|
2019-08-05 00:04:44 -04:00 |
|
EgoSumStultus
|
4de05fc692
|
AAAAAAAAAAAAHHHHHHHHHHH
|
2019-08-02 06:48:14 -07:00 |
|
TrilbySpaceClone
|
606639ce23
|
part 1 fixing shit
|
2019-07-29 05:52:49 -04:00 |
|
Ghommie
|
589cdae0e1
|
Towels
|
2019-07-18 00:03:49 +02:00 |
|
Trilbyspaceclone
|
2a78caa127
|
Merge branch 'master' into Unmodular
|
2019-07-14 18:27:37 -04:00 |
|
Trilbyspaceclone
|
e9f36b79bb
|
Merge branch 'master' into meme_tools
|
2019-06-23 21:07:55 -04:00 |
|
Trilbyspaceclone
|
063fe4fdef
|
Merge branch 'master' into Unmodular
|
2019-06-23 21:06:21 -04:00 |
|
kevinz000
|
e7331b3c98
|
Merge pull request #8571 from Thalpy/Dwarf
Medical smartdarts.
|
2019-06-23 06:24:10 -07:00 |
|
TrilbySpaseClone
|
51119ad6fd
|
tools
|
2019-06-22 15:37:28 -04:00 |
|
Fermi
|
724ec93166
|
oops
|
2019-06-19 00:24:02 +01:00 |
|
Fermi
|
f5c98f5d57
|
Merge branch 'Dwarf' of https://github.com/Thalpy/Citadel-Station-13 into Dwarf
|
2019-06-19 00:17:30 +01:00 |
|
Fermi
|
fe6296b58a
|
Added crafting recipies as per Bhijin's request.
|
2019-06-19 00:17:18 +01:00 |
|
Ghom
|
95dc8084f1
|
Moving some tablecrafting recipes to the appropriate categories (#8658)
* Moving some recipes to the appropriate categories
* Fixes the not-a-sandwich recipe being M.I.A.
|
2019-06-17 11:18:49 -07:00 |
|
TrilbySpaseClone
|
b45c870ae4
|
Immodular
|
2019-06-16 19:58:49 -04:00 |
|
Thalpy
|
98fc55e9f8
|
Merge branch 'master' into Wheelchairs
|
2019-06-16 17:33:57 +01:00 |
|
kevinz000
|
4050ba98eb
|
Merge pull request #8549 from Trilbyspaceclone/patch-168
Fixes a unseen paper work exsplote
|
2019-06-08 01:23:31 -07:00 |
|
kevinz000
|
a866ceb8a2
|
Merge pull request #8543 from Trilbyspaceclone/patch-165
Makes SNOWCONES!
|
2019-06-08 01:15:58 -07:00 |
|
kevinz000
|
f201bd1508
|
Merge pull request #8494 from Trilbyspaceclone/ash_walker
Ash walker bone satchles.
|
2019-06-08 01:09:26 -07:00 |
|
Trilbyspaceclone
|
6fd83df81f
|
Update recipes.dm
|
2019-06-06 16:00:02 -04:00 |
|
Trilbyspaceclone
|
762c509315
|
Update craft.dm
|
2019-06-05 20:07:25 -04:00 |
|
kevinz000
|
0d97361dea
|
Merge pull request #8430 from Trilbyspaceclone/bad_idea
Adds improvised 7.62 rifle
|
2019-06-05 11:31:10 -07:00 |
|
Fermi
|
bebaf8e7a8
|
Wheelchairs are apparently banned, we now have HOVERCHAIRS!
|
2019-06-01 18:17:49 +01:00 |
|
Trilbyspaceclone
|
c73884aea4
|
huh...
|
2019-05-30 16:12:40 -04:00 |
|
Trilbyspaceclone
|
751b9adb53
|
Update recipes.dm
|
2019-05-30 16:10:10 -04:00 |
|