231 Commits

Author SHA1 Message Date
Metis ea00b29d08 chem changes 2024-10-12 15:26:43 -04:00
SandPoot 676cb864b1 missed proc refs 2024-03-12 22:17:30 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
silicons da09439093 Merge pull request #15585 from SandPoot/Initialize(mapload)
Every case of initialize that should have mapload, does
2022-04-15 17:41:57 -07:00
BlueWildrose f235839351 Adds carcinisoprojection jelly, a limb regrowth chem that is made from slime mutation toxin & blood (#15053)
* Limb regrowth chem, new disease of crab cancer

* Limb regrowth adjustments

* oops, sorry linters.

* oh right this would probably fuck with dullahans

* woops missed a newline

* Update code/modules/reagents/chemistry/reagents/medicine_reagents.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>

* just realized this check is unnecessary.

* let's add a mood debuff while we're at it

* Update medicine_reagents.dm

* add a bounty

* misspelling

* Update crabcancer.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2022-04-15 00:37:08 +02:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
silicons edd3a510f1 Merge pull request #15526 from timothyteakettle/bartender-pda
adds bartender cartridge for drink recipe searching, updates chemist cartridge to have equivalent functionality for all recipes
2022-02-26 18:08:47 -07:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
Timothy Teakettle 027002f928 haha what if we didn't show secretcatchem 2022-02-23 12:07:03 +00:00
silicons 5204f5a6d9 Merge pull request #13991 from Putnam3145/auxtools-atmos
Replaces extools with auxtools; atmos overhaul
2021-06-27 11:01:32 -07:00
DeltaFire c7a098da06 suffering (aka, a bunch of fixes) 2021-06-21 19:05:31 +02:00
Putnam 833d34ba8e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-11 16:28:12 -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
bunny232 1a72070f5c slimejelly
a
2021-06-07 21:44:33 -04:00
Hatterhat d9977e24b5 Update medicine.dm 2021-03-22 21:29:48 -05:00
Auris456852 8334e8c2c0 Corrects Hexacamphor 2021-03-10 00:35:00 +02:00
Putnam cbac292731 Adds back aphro, nympho 2021-02-18 21:22:43 -08:00
silicons e009b9ef5f Merge pull request #14186 from SmArtKar/trading_card_game
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
2021-02-17 01:30:13 -07:00
SmArtKar e4afe49687 Adds card crafting!" 2021-02-16 19:38:48 +03:00
Fermi 57cd698994 Tweaks and fixes. Should be freature complete now. 2021-01-04 13:40:26 +00:00
Fermi 37c3bbbd9c Fixing things and gui 2021-01-04 01:48:35 +00:00
silicons 3ad65d9b76 Merge pull request #13911 from raspy-on-osu/salicyclic-acid
salicyclic acid
2020-12-30 14:46:04 -07:00
raspy-on-osu d2c0e1ba41 salicyclic acid 2020-12-29 02:35:42 -05:00
YakumoChen 3bdf4bacdc removes slime blood conversion 2020-12-19 10:28:56 +00:00
silicons f8d43b7544 Merge pull request #13679 from DeltaFire15/system-corruption
[TESTMERGE ONLY] System Corruption for robotic species
2020-11-18 22:54:51 -07:00
silicons 5b03f5b0ec more 2020-11-12 23:36:18 -07:00
DeltaFire 78da9f0578 system cleaner is now creatable
recipe:
2 iron
2 oil
2 calomel
2 acetone
outcome:
4 system cleaner
2020-11-13 04:21:00 +01:00
Tupinambis 3224533a7c Merge branch 'master' into spooder 2020-10-11 14:31:23 -05:00
silicons 3557f00316 Merge pull request #13498 from deathride58/lingbloodupgrade
Lingblood rework (Loudness is now an average, rather than a sum)
2020-10-06 17:04:38 -07:00
deathride58 cbe6178a11 reworks ling blood - loudness is now calculated via the average of your loud abilities rather than the sum 2020-10-02 19:21:30 -04:00
Tupinambis d2860b38c7 normalization 2020-10-01 18:46:31 -05:00
Tupinambis f1bc1ccafb Merge branch 'master' into spooder
# Conflicts:
#	code/modules/surgery/organs/eyes.dm

I have no idea if this will work
2020-10-01 17:10:42 -05:00
Detective Google 98703e6ad6 Merge remote-tracking branch 'upstream/master' into arcade-carpets 2020-10-01 13:41:10 -05:00
Tupinambis 113b84ab50 Ports arachnids from WaspStation 2020-09-30 15:10:17 -05:00
Detective Google 643421bc23 adds arcade carpets
yay
2020-09-28 14:43:03 -05:00
Timothy Teakettle 58737e42b9 empulse using range 2020-09-10 19:52:34 +01:00
timothyteakettle e0f44ef717 new emps 2020-09-10 03:49:47 +01:00
lolman360 f10053fe96 suture 2020-08-11 18:03:59 +10:00
lolman360 308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
Putnam 467f66b2a6 Removed crocin/hexacrocin. 2020-08-08 00:46:30 -07:00
timothyteakettle 8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
lolman360 17d1fd0692 fixes 2020-07-22 12:42:46 +10: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
timothyteakettle 8709a72fc0 fry everything 2020-07-20 00:40:18 +01:00
CameronWoof 431c52b7e2 Merge remote-tracking branch 'upstream/master' into advanced-sutures-and-mesh 2020-07-17 17:22:43 -07:00
silicons c924290cd1 Merge pull request #12733 from TheObserver-sys/Finally,moreblorble
Slime Extractification
2020-07-17 17:10:32 -07:00
CameronWoof a493ecdc4a suture and mesh additions 2020-07-15 16:44:24 -07:00
silicons 72c5c2234e ok 2020-07-12 05:15:55 -07:00
The0bserver db625eb93f Initial Commit: Adds slimeball recipe 2020-07-10 23:04:25 -04:00
timothyteakettle 76b5557e1e bunch of grammar corrections 2020-06-27 02:12:44 +01:00