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
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
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
Putnam3145
b91fb21234
Merge branch 'chem-gases' into genericized-plasma-trit
2021-11-14 11:51:22 -08:00
DeltaFire
8ca1015510
reagent_all_process macro
2021-11-13 03:23:11 +01:00
DeltaFire
b4e6b0785d
chemscan
...
chemscanning (reads: health analyzers mostly) show reagents in grey if not processable due to being invalid
2021-11-12 19:38:10 +01:00
DeltaFire
4f8848cfb8
more info
...
chem master and chem analyzer now state who can actually process a chem
2021-11-12 19:09:14 +01:00
Putnam3145
0b0a7192f9
removes the "REM" macro
2021-11-09 16:35:32 -08:00
DeltaFire
1277df1013
typod
2021-11-04 22:02:51 +01:00
DeltaFire
5cd49dcfd1
preservahyde
2021-11-04 21:20:27 +01:00
DeltaFire
5d6978bb2f
oh god oh fuck
2021-11-04 21:06:42 +01:00
DeltaFire
bb3eb904eb
resolves hypo inconsistancy
2021-11-03 03:03:18 +01:00
silicons
a32eabb7ae
fix
2021-10-29 22:44:01 -07: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
qweq12yt
0bb9b23537
restore spray bottle sounds
2021-09-27 17:32:07 -03:00
DeltaFire
99a4af025b
hearts don't need blood
...
typo
2021-09-25 02:46:11 +02:00
DeltaFire
7752e0d624
synthtissue and sr
2021-09-22 22:30:43 +02:00
zerothebigboy
4c82eeeb2a
soup
2021-09-18 18:18:04 -04:00
silicons
e342145663
Merge pull request #15070 from zeroisthebiggay/prisoners
...
prisoners - aka ports prisoners from tg hell yeah
2021-09-12 20:59:12 -07:00
zerothebigboy
f077f374bd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into why
2021-09-11 23:04:48 -04:00
zerothebigboy
ba72e3d8f0
why
2021-09-11 23:04:21 -04:00
