Lin
7d0c3df2ad
Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
...
dullahans 2: electric boogaloo
2022-12-14 19:07:59 -07:00
Lin
7205781c47
Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song
...
Solves some harddels
2022-12-12 19:11:49 -07:00
SandPoot
8911fe5e0b
clear em
2022-12-11 17:58:45 -03:00
Putnam3145
e1cfa92080
fixes the worst use of a for loop ever
2022-09-13 23:19:12 -07:00
Putnam3145
9998ca7a10
another funny space cleaner gas buff
2022-08-18 23:54:01 -07:00
Putnam3145
c8a84c2172
forgot the ..()
2022-08-15 23:42:42 -07:00
Timothy Teakettle
835323bdbc
neurine fixes your traumas, yo!
2022-08-09 12:07:09 +01:00
Putnam3145
cdcdc11d9b
more space cleaner per space cleaner
2022-08-07 22:05:37 -07:00
Putnam3145
cda032a2dc
this wasn't even a copy+paste error, it's unaccountable
2022-08-06 22:53:00 -07:00
Putnam3145
c0073370b2
more chem gases
2022-08-06 22:42:58 -07:00
Putnam3145
f7bb3f3050
makes drying agent a chem gas
2022-08-06 16:08:55 -07:00
Cognition
70dbad7055
Tea dispensing fix
2022-07-22 12:19:54 -06:00
deathride58
20eb61b319
makes slimes specifically have overlay-blended blood!
2022-05-26 22:56:10 -04:00
Lin
a899b5db81
Merge pull request #15607 from Putnam3145/auxmos-1
...
Updates auxmos to 1.0 (plus other atmos stuff with it)
2022-05-13 05:45:33 +00:00
silicons
73741102ac
Merge pull request #15606 from timothyteakettle/salt-quirk
...
an actual salt pr (adds sodium sensitivity quirk)
2022-05-02 17:02:23 -07:00
Putnam3145
a7408beb4c
Updated auxmos to 1.0
2022-04-28 21:07:51 -07:00
Timothy Teakettle
ac4a41243a
add salt quirk
2022-04-27 14:58:54 +01:00
Putnam3145
b5ce67ce55
Weird reaction stuff
2022-04-26 01:14:41 -07: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
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
silicons
dee1db4a3a
Merge pull request #15558 from SandPoot/mechs-are-vehicles
...
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
BlueWildrose
3687361ba5
Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) ( #15304 )
...
* Butts
* testicle fix + hidden is back
* updated booba
* prob bad idea actually thinking about icon states
* fuck
* this should be everything now
* SandPoot's suggestion
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* tguify that last option
* Revert "tguify that last option"
This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.
* Revert "Merge branch 'master' into cursingcitadel"
This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.
* Revert "Revert "Merge branch 'master' into cursingcitadel""
This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2022-03-30 20:06:00 -07:00
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
silicons
a3284a0923
Merge pull request #15195 from DeltaFire15/med-revivalchem-nerf
...
Weakens chemistry's revival chems
2022-03-13 14:24:57 -07: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
f7ea1f377d
oops, replace all is a hell of a drug
2022-02-25 17:09:31 -03: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
Timothy Teakettle
56547a2556
generalizes recipe searching, adds chemistry functionality
2022-02-23 11:38:04 +00:00
timothyteakettle
b578c65d74
fixes
2022-02-23 00:52:17 +00:00
Timothy Teakettle
fd997e1615
initial test changes
2022-02-22 21:59:28 +00:00
SandPoot
aee811078a
Merge branch 'master' of https://github.com/SandPoot/Citadel-Station-13 into balloon-alert-port
2022-01-25 14:41:34 -03:00
SandPoot
5bca0fb563
Upload files
2022-01-25 14:32:25 -03:00
Putnam3145
a408957bc6
Various chem tweaks
2022-01-22 16:40:05 -08:00
silicons
f601580854
Merge pull request #15430 from DeltaFire15/synth-coolant
...
Synth stuff : Balancing Nightmare Edition (aka, coolant)
2022-01-22 13:59:12 -08:00
Lin
2379a2a342
Merge pull request #15370 from Putnam3145/genericized-plasma-trit
...
Total fire overhaul + new atmos stuff + uh oh stinky toxins nerf + sauna buff + ??
2022-01-03 22:31:40 +00:00
DeltaFire
50e7957909
no oxychem & tempchem processing
...
well, one exception, pyrosium and cryostane still work as they have conditional effects that are more of a chemical reaction than impact on metabolism.
2022-01-01 18:59:50 +01:00
DeltaFire
051f5780db
tweaks
...
Synthtissue borrowed health capped at 250, gradually flips from clonedamage towards toxdamage within 45 cycles.
Restores organ healing for strange reagent, but only in a very weak fashion (5 heal for failing organs)
2021-12-31 00:16:49 +01:00
Putnam3145
97051cad80
Fixes chem gases being added twice
2021-12-22 01:27:53 -08:00
silicons
555477a075
Update chem_synthesizer.dm
2021-12-18 09:18:23 -07:00
silicons
cc11cae967
Update chem_synthesizer.dm
2021-12-18 09:17:18 -07:00
DeltaFire
0faac6dce6
hoo boy
2021-12-14 23:06:42 +01:00
Lin
e506bc50dc
Merge pull request #15335 from DeltaFire15/synth-chem-time
...
Synth / IPC kinda-buffs - Chemwarfare Edition
2021-12-01 00:39:02 +00:00
Putnam3145
0bb3301535
A couple more boiling points I forgot
2021-11-26 23:04:57 -08:00
Putnam3145
7f61d2b56a
hydrogen is also a chem gas
2021-11-26 23:01:08 -08:00
DeltaFire
cf767252f6
effect multipler
2021-11-16 02:57:00 +01:00
Putnam3145
1da28b8ec6
Chem gas tweaks, + toxins rebalance
2021-11-15 16:29:30 -08:00
DeltaFire
6224da71a3
contents_explosion
...
at least this one had less overrides.
2021-11-14 21:41:42 +01:00
