SandPoot
24ee6077c7
push changes
2022-10-23 00:18:03 -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
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
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
Putnam3145
07bd8437da
I missed a couple
2022-01-22 17:04:18 -08:00
Putnam3145
a408957bc6
Various chem tweaks
2022-01-22 16:40:05 -08: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
f50dafe141
Fixes SDGF nutrition growth not to be exponential
2021-12-13 17:01:22 -08:00
DeltaFire
8ca1015510
reagent_all_process macro
2021-11-13 03:23:11 +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
DeltaFire
5d6978bb2f
oh god oh fuck
2021-11-04 21:06:42 +01:00
DeltaFire
64367ff7ba
edge case protection
2021-10-02 18:33:57 +02:00
DeltaFire
9f3688f9cc
health payback affected by metabolism
2021-09-25 02:32:29 +02:00
DeltaFire
31679157dc
adjust
2021-09-25 02:24:12 +02:00
DeltaFire
6cffeacd42
typo
2021-09-22 23:32:35 +02:00
DeltaFire
2e2aa36875
grab the ghost
2021-09-22 22:47:08 +02:00
DeltaFire
7752e0d624
synthtissue and sr
2021-09-22 22:30:43 +02:00
BlueWildrose
af94680c7d
this probably sounds better
2021-08-22 14:45:18 -07:00
BlueWildrose
d117a9b662
woops, that actually was needed.
2021-08-19 04:41:18 -07:00
BlueWildrose
48b2877fab
unhornys the MK ultra gas
2021-08-19 04:25:54 -07:00
BlueWildrose
f5688b1ed0
bring back old smoke effect
2021-08-19 01:47:00 -07:00
Artur
5acd7fef2d
makes salglu not deadly
2021-08-02 21:54:47 +03:00
Artur
2adfbea215
Merge remote-tracking branch 'origin/master' into fake_blood
2021-07-23 18:50:09 +03:00
silicons
3070f178e0
Merge remote-tracking branch 'citadel/master' into combat_patches_1
2021-07-18 15:12:52 -07:00
silicons
8710731b87
tweaks
2021-07-01 20:42:55 -07:00
Putnam3145
c253a2de86
alright how about these
2021-06-21 09:52:54 -07:00
silicons
cd0a0bbe5c
Update healing.dm
2021-05-06 03:02:46 -07:00
Artur
35bfba1f6a
Redoes the variable changes into procs
2021-05-05 18:15:13 +03:00
Artur
92e6646a4c
time to make blood even more pain
2021-05-05 14:44:21 +03:00
Blue Wildrose
a7726aa383
re-enlarging the value
2021-04-01 06:07:25 -07:00
Blue Wildrose
e7099c67a1
oh right some fucker at cargo would abuse this.
2021-04-01 05:45:26 -07:00
Putnam
cbac292731
Adds back aphro, nympho
2021-02-18 21:22:43 -08:00
Letter N
a17716be5b
bye
2021-02-16 18:15:02 +08:00
Fermi
f236b2da29
Merge branch 'master' into Dispencer-UI-change
2021-02-06 02:40:27 +00:00
DeltaFire
ee7c45fe77
Merge pull request #14031 from Putnam3145/fermi-emp-fix
...
Fixes fermichem EMPs being massive.
2021-01-30 18:44:20 +01:00
Putnam3145
94d419c6cd
Update modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
...
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
2021-01-20 14:08:07 -08:00
Letter N
021b28a2b7
cleanup
...
shitcode - b - gone
2021-01-20 11:08:21 +08:00
Blue Wildrose
27f30e526c
oh right guess these variables won't be used any more.
2021-01-14 07:22:25 -07:00
Blue Wildrose
7ece70faac
Enough of this fuckin CBT and titty straining
2021-01-14 07:14:16 -07:00
Putnam
699d8e1e88
Fixes fermichem EMPs being massive.
2021-01-11 21:06:47 -08:00
Fermi
5b703e84a4
Merge branch 'master' into Dispencer-UI-change
2021-01-04 16:21:06 +00:00
Fermi
d9047e458c
Testing and bugfixes
2021-01-04 15:47:35 +00:00
Fermi
57cd698994
Tweaks and fixes. Should be freature complete now.
2021-01-04 13:40:26 +00:00
Fermi
c7965d3b4a
Pushing to review diff
2021-01-04 10:53:21 +00:00
Fermi
37c3bbbd9c
Fixing things and gui
2021-01-04 01:48:35 +00:00
Blue Wildrose
642c4a5806
erect up the config instead in case this situation comes up again.
2021-01-02 00:18:49 -07:00
