51 Commits

Author SHA1 Message Date
KrissKr0ss 66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
2023-05-01 00:16:20 -05:00
Jerry Wester ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
Jerry Wester f7ac3c7624 beeg commit 2022-12-11 20:32:35 -07:00
PeriodicChaos 183b554ed3 modsuits part 1 2022-12-11 20:30:41 -07:00
Artur b71a6497e8 Crafting menu fixes and such
Fixes crafting buttons making more of themselves on relogs, and cleans some wierd as fuck shit.
2021-07-16 03:23:02 +03:00
WanderingFox95 02bbe70810 This is so the crafting menu doesn't break. My bad. 2021-06-16 23:23:38 +02:00
WanderingFox95 5f4a07ce12 Also I'm a dork and forgot the recipe. 2021-06-16 13:41:15 +02:00
kappa-sama 1f7b15d8f8 clonwops 2021-03-19 15:35:17 -03: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 cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Hatterhat cb40ad4764 atomization is cowardice actually 2021-01-12 16:08:17 -06: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
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 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
Iatots e6dd213a2a Update recipes_misc.dm 2020-07-23 20:26:11 +02: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
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
Ghommie 30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
kevinz000 2e01c46fc9 Merge pull request #12227 from TheObserver-sys/WhyInEnginesNameDidWeUseACellFromAtmosForElectroplating
Fixes Electroplating for real this time! We promise!
2020-05-14 04:46:47 -07:00
The0bserver e9a432d438 Initial Commit: Hey Drake? Where's the cell for electroplating? 2020-05-12 04:07:26 -04:00
Trilbyspaceclone 80687bb17f Update recipes_misc.dm 2020-05-07 18:00:50 -04:00
kevinz000 7828c4a5ab Merge pull request #12102 from Ghommie/Ghommie-cit722
Removing cargo "paperwork" and a few other bloat packs.
2020-05-07 09:11:45 -07:00
Ghommie 65899bf906 Removing cargo "paperwork" and a few other bloat packs. 2020-05-03 19:56:00 +02:00
Lin f659c036ef Merge pull request #12036 from kevinz000/electrochromatic_windows
Electrochromatic (dim-on-demand) windows
2020-05-02 19:13:29 +00:00
TrilbySpaceClone 1191268430 kevs request 2020-04-27 07:34:23 -04:00
kevinz000 28da033111 fine 2020-04-26 17:37:27 -07:00
kevinz000 bf7962d8f9 wow lotsa effort huh 2020-04-26 03:36:09 -07:00
kevinz000 af3651172c wow lotsa effort huh 2020-04-26 03:29:31 -07:00
TrilbySpaceClone c3fc133282 *crys* 2020-04-20 18:28:57 -04:00
TrilbySpaceClone 58cb5e391e *scream* 2020-04-20 18:22:13 -04:00
TrilbySpaceClone 4d55f169d5 oh god oh fuck 2020-04-20 17:05:03 -04:00
TrilbySpaceClone 8ca7bb7535 Right... 2020-04-18 09:46:56 -04:00
Ghommie 86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00