Commit Graph

572 Commits

Author SHA1 Message Date
Cognition
ca414ca712 Grown inedibles now properly take seed stats into account 2022-07-22 16:32:05 -06:00
TripleShades
3a8140d646 fixes growth state display for cannabis 2022-06-15 16:41:54 -04:00
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
silicons
984f37cc80 fix 2022-02-15 22:03:27 -07:00
silicons
ce6e8c99c6 fixes 2022-02-15 21:56:36 -07:00
Putnam3145
c392b7c3fb Allows pod people to be made using other fluids 2021-12-31 14:36:55 -08:00
DeltaFire
6224da71a3 contents_explosion
at least this one had less overrides.
2021-11-14 21:41:42 +01: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
SandPoot
bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
WanderingFox95
fe8a652689 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-19 21:32:03 +02: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
Artur
cdbd585f4d update_appearance 2021-07-28 02:13:57 +03:00
WanderingFox95
e5e8faec30 Applying suggestions from the review
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
2021-07-21 19:46:18 +02:00
WanderingFox95
e084e60c0b lowercase #3 2021-07-20 23:01:20 +02:00
WanderingFox95
15e36d7897 Cultivator & Hatchet 2021-07-20 18:57:47 +02:00
WanderingFox95
6ed0d699e9 keg code, far away from kegs
cause it's just a big barrel that doesn't ferment anything.
2021-07-15 01:50:01 +02:00
Putnam3145
f3b590f5f0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps 2021-06-30 02:19:02 -07: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
WanderingFox95
5e650075d4 Googly eyes. 2021-06-24 14:56:05 +02:00
Putnam3145
630098c8aa that might be all 2021-06-21 20:03:27 -07: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
silicons
2bcf05ee22 Update hydroponics.dm 2021-02-28 01:23:37 -07:00
silicons
841bb2aac2 Merge pull request #14265 from SandPoot/tool_behavior-replacing
Tool behavior replacing
2021-02-21 14:48:50 -07:00
MrJWhit
ea47ab1610 Update seed_extractor.dm 2021-02-19 10:00:43 -05: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
4a0adc49f6 mod 2021-02-13 20:00:28 -07:00
silicons
a1e92e55aa Merge pull request #14102 from Hatterhat/somatobuff-50513
[READY] somatoray buff - mutation locks + revolution ray
2021-01-25 23:17:29 -07:00
silicons
2acdee8d01 Merge pull request #14076 from Hatterhat/cotton-stack-pull
pulling cotton (or durathread) while standing on a pile of cotton (or durathread) picks all of them
2021-01-20 15:21:44 -07:00
Letter N
021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
Hatterhat
a8cb8b79c6 for one, dont forget the sprites, dumbass 2021-01-19 17:40:34 -06:00
Hatterhat
e006587f4b today i will not test my code 2021-01-19 17:24:33 -06: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
251bd3e06b logging 2020-12-31 12:33:05 -08:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00