shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,080 Commits 5 Branches 0 Tags
aa696edd847d51900de83b344d8f65f4e4e148d3
Commit Graph

139 Commits

Author SHA1 Message Date
kappa-sama
aa696edd84 this 2020-10-20 19:39:23 -04:00
lolman360
6b096d80cc eee o aaa 2020-08-25 18:55:57 +10:00
lolman360
bd5848a0e3 Update recipes_misc.dm 2020-08-24 08:52:42 +10:00
lolman360
289280f0ec Update recipes_misc.dm 2020-08-24 00:00:39 +10:00
lolman360
bc14155632 Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-08-23 17:01:45 +10:00
lolman360
1deafc7103 its asking me to commit hold on 2020-08-23 17:01:32 +10:00
lolman360
2a3ada511e It's all codersprites? 
Always has been.
 2020-08-23 16:51:55 +10:00
silicons
c7c74e7c51 Merge pull request #13213 from lolman360/breath 
breath mask balaclava
 2020-08-22 15:22:04 -07:00
silicons
876dc36dbc Merge pull request #13201 from kiwedespars/return-the-punch 
makes it so you can craft armwraps roundstart again.
 2020-08-22 15:21:22 -07:00
kiwedespars
055d397e1e adds tape 2020-08-21 13:34:02 -07: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
623fe1cb69 Update recipes_clothing.dm 2020-08-21 12:00:09 +10:00
lolman360
bda2c740ba Merge branch 'master' into AnPrimAssistants 2020-08-21 11:08:13 +10:00
lolman360
4259332cfd e 2020-08-19 18:37:31 +10:00
kiwedespars
bd239b01b3 Update recipes_clothing.dm 2020-08-17 23:52:41 -07:00
lolman360
bb86003510 w e w 2020-08-18 10:04:52 +10:00
silicons
8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
lolman360
09fc795f3b AnPrim 2020-08-17 11:45:24 +10:00
Lin
d287f44d9a Merge pull request #13045 from silicons/coggers 
ports bronze (fake clockwork) airlocks and windows
 2020-08-16 20:20:03 -05:00
kiwedespars
7c653d0891 i actually kinda like the idea that you need a point for paths. 
- whoops actually increases stamdamage of mansus grasp to 60.
- ascensions bumped up to 5 each.
- recipe for a codex made a bit harder.
 2020-08-16 04:34:04 -07:00
kiwedespars
aa46e355da more more more. 
- sacrifices give 2 charges now.
- books no longer contain a charge by default. (sorry gamerko, no easy ascensions while i sleep.)
- books are easier to craft.
 2020-08-14 05:19:57 -07:00
lolman360
6f7badda41 Merge branch 'master' into plumb 2020-08-12 09:03:11 +10:00
lolman360
740b4f3ecf WHOOPS 2020-08-11 17:50:30 +10:00
lolman360
6ec9a3c4bd craftable plunger 2020-08-11 17:38:16 +10:00
chrisbbbbbbb
758d540c9e Suture/Mesh Crafting 2020-08-09 20:33:40 +02:00
silicons
815ddd1866 oh boy 2020-08-05 21:34:26 -07:00
Letter N
454baea55f Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-04 09:31:34 +08:00
Hatterhat
6dfdff34ef durathread armor kits 2020-07-30 13:38:04 -05:00
Letter N
b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Iatots
e6dd213a2a Update recipes_misc.dm 2020-07-23 20:26:11 +02:00
Letter N
d5a6a3ecd9 actual code chang 2020-07-22 12:02:31 +08: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
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
kappa-sama
ad4f909d79 ashwalkers 2020-07-01 08:19:27 -04:00
kappa-sama
3695595034 ammunition 2020-07-01 08:17:13 -04:00
kappa-sama
73d616b3a4 more accurate 2020-07-01 08:13:30 -04:00
kappa-sama
49af0d11c7 string 2020-07-01 08:09:39 -04:00
kappa-sama
1fffd0a608 45 seconds lol 2020-07-01 08:02:41 -04:00
kappa-sama
cfc14a04f1 Merge branch 'master' into patch-28 2020-07-01 07:48:46 -04:00
kappa-sama
1f38c3029c yeah ok 2020-07-01 07:40:43 -04:00
YakumoChen
6f50664189 removes improv handguns 2020-07-01 08:48:10 +00:00
YakumoChen
35ee3e6aeb No pocket guns, unstupids part names 2020-07-01 08:43:34 +00:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
timothyteakettle
76b5557e1e bunch of grammar corrections 2020-06-27 02:12:44 +01:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
SmArtKar
170a38a3a7 Porting sutures and meshes from /TG/ (#12532) 
* Porting sutures and meshes from /TG/

* Recipes fix
 2020-06-16 16:22:56 -07:00
Artur
ceba739231 Cooonflicts 2020-06-16 01:23:42 +03:00