Commit Graph

314 Commits

Author SHA1 Message Date
SandPoot
2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
Lin
fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00:00
SandPoot
695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
Solaris-Shade
2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
Putnam3145
c392b7c3fb Allows pod people to be made using other fluids 2021-12-31 14:36:55 -08:00
DeltaFire
6aa906395c not a gaius reference
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
Putnam3145
b5890f60a7 Massively reduced oxygen req for bonfire 2021-09-17 15:50:20 -07:00
zerothebigboy
ccfde52b0d code 2021-09-02 23:45:03 -04:00
silicons
505fa13631 Merge pull request #14892 from WanderingFox95/WanderingFox95-GooglyEyes
[Ready] Googly Eyes! (Hydroponics)
2021-06-27 11:02:07 -07:00
WanderingFox95
6dcb54afe2 Walkingshrooms, your number 1 source of GOOGLY EYES 2021-06-24 14:56:42 +02:00
Putnam
86177c51c4 auxgm part 1
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
2021-06-08 09:54:28 -07:00
Putnam
d03bf641dd extreme optimization project to maybe fix game 2021-06-06 21:58:24 -07:00
The0bserver
989fb101f0 No more Human Harvests! 2021-04-02 20:05:50 -04:00
Hatterhat
6e18f10ead forgot i wasnt usin that oops 2021-01-17 01:50:28 -06:00
Hatterhat
cb1ef2d8ba cotton stack pull 2021-01-17 01:42:32 -06:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
The0bserver
6304a4010b provisional chanterelle fix 2020-10-04 01:41:57 -04:00
The0bserver
16425912da fairygrass-dead -> grass-dead 2020-10-04 01:14:03 -04:00
silicons
1f82e8985c Merge pull request #13314 from TheObserver-sys/ArcaneNutriMutaPort
No more chemspam: Ports portions of ArcaneMusic's botany rework from TG.
2020-10-01 12:15:49 -07:00
Blue Wildrose
13230d502e oops I fucked up 2020-09-09 22:36:11 -07:00
Blue Wildrose
7f028899fa Forgot valid salid - also included ambrosia deus, white cannabis, and lime fruit 2020-09-09 22:18:17 -07:00
The0bserver
5f5279d2ff You wish for change... (Added instabilities.) 2020-09-02 03:15:03 -04:00
The0bserver
2b36c4dcdf Regis, I will fight you, the irish, and some tea 2020-08-11 05:52:48 -04:00
The0bserver
5c6c298547 COOL PLANT FACTS:GARLIC WAS IN GROWING.DMI 2020-08-11 05:14:02 -04:00
The0bserver
66de3b5a4f Garlic, you will have a harvest state 2020-08-11 03:03:36 -04:00
The0bserver
d20a9bcf21 Initial Commit: Weed less awful. Garlic visible 2020-08-11 02:45:45 -04:00
silicons
8442d69858 Merge pull request #12963 from Seris02/morefix
ghost chilis fixed
2020-08-05 15:44:48 -07:00
Seris02
9b02b6619d Update code/modules/hydroponics/grown/chili.dm
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2020-08-06 06:44:17 +08:00
Timothy Teakettle
289c186f32 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-08-02 18:11:07 +01:00
silicons
8dfa3fcce8 Merge pull request #12947 from Seris02/podpersonfix
replica pod fix bounty
2020-08-01 03:29:16 -07:00
Seris02
0772d6687f ghost chilis fixed 2020-07-30 08:01:25 +08:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Seris02
dcd2c11f4e yay indicator 2020-07-28 20:43:38 +08:00
Seris02
84e9f406c7 yay it fix time for indicator 2020-07-28 17:41:17 +08:00
timothyteakettle
8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
silicons
3d2995b4e8 Merge pull request #12787 from CameronWoof/advanced-sutures-and-mesh
Ports Medicated Sutures and Advanced Regenerative Mesh from TG
2020-07-20 17:01:32 -07:00
silicons
fefc0530b8 Merge pull request #12795 from TheSpaghetti/patch-3
Makes extradimensional oranges weirder. [/TG/ PORT]
2020-07-20 16:54:43 -07:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
Timothy Teakettle
1a5008fee7 Merge branch 'master' into wound-port 2020-07-18 23:06:49 +01:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
CameronWoof
431c52b7e2 Merge remote-tracking branch 'upstream/master' into advanced-sutures-and-mesh 2020-07-17 17:22:43 -07:00
Timothy Teakettle
a4478b0cda it continues 2020-07-17 22:38:28 +01:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00