Commit Graph

2877 Commits

Author SHA1 Message Date
Timothy Teakettle
02912aa4ad add color type to all polychromics 2020-10-15 20:57:45 +01:00
DeltaFire
4c8087b78a aactually
CurveSharpT:
2 -> 1.5
2020-10-15 21:56:52 +02:00
DeltaFire
af0c2239db tweaks reaction some more
thermic constant:
15 -> 7
CurveSharpT:
3 -> 2

Catalyst requirement:
none -> 5u uranium
2020-10-15 21:49:15 +02:00
Timothy Teakettle
37030baa70 Merge remote-tracking branch 'upstream/master' into loadout-json 2020-10-15 20:05:56 +01:00
Timothy Teakettle
f337061c51 more defines 2020-10-15 20:05:39 +01:00
DeltaFire
c52bbb3707 tweaks temp curve
Dampens the exponentialness of the temp curve somewhat
CurveSharpT:
5 -> 3
2020-10-13 18:26:03 +02:00
DeltaFire
aa28e65570 more tweaking for the reagent itself
Rad removal tweaked:
From 20 - 90 radiation per tick to
3.3% - 16.6% of total radiation amount, per tick.
2020-10-09 00:42:52 +02:00
DeltaFire
2d684c88be readds a accidentally removed thing
Apparently, someone accidentally removed the functionality of being able to inject beakers in heaters without having to remove them, which is pretty required fore more complex reactions. This readds that.
Also tweaks the Ion release of the zeolite reaction a bit (-0.2 > -0.15)
2020-10-09 00:06:01 +02:00
silicons
1b1efce556 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-06 17:11:21 -07:00
DeltaFire
79636c3054 even more value tweaking 2020-10-05 17:18:50 +02:00
DeltaFire
b46c4d613c some more value tweaking 2020-10-05 16:59:51 +02:00
DeltaFire
3058ea8954 typo 2020-10-05 16:51:16 +02:00
DeltaFire
3c4834d03c rebalances zeolites 2020-10-05 16:32:47 +02:00
Putnam
737257552a Fixes ghost funny + keeps SDGF view fix. 2020-10-02 23:17:12 -07:00
Detective Google
57132d0b32 Merge remote-tracking branch 'upstream/master' into clothing 2020-10-01 14:06:21 -05:00
CoreFlare
9d76f6af80 good cloaks
i like gooder cloaks
2020-10-01 15:08:39 +01:00
silicons
38c25bdc9d Merge pull request #13466 from Putnam3145/sdgf-fix
Cleans up and fixes SDGF code a bit, consistent naked clones, transfer_ckey resets view range
2020-10-01 03:07:08 -07:00
silicons
ebcbe7e901 Merge pull request #13431 from EmeraldSundisk/cargoclothes
Gives Cargo Technicians the choice of longer trousers.
2020-10-01 03:03:41 -07:00
silicons
8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
Detective Google
c4480afc09 Adds a bunch of RP clothes and ports the detvendor 2020-09-30 20:50:00 -05:00
silicons
9f3b456583 Merge pull request #13416 from BlueWildrose/slimenoises
Unique slimeperson screams and laughter, and adds new customizable speech verbs
2020-09-30 09:22:25 -07:00
Putnam
2b1f9405ae fixed the config names and such. 2020-09-29 05:13:48 -07:00
Putnam
47d43b1710 Made 80% at 1 purity, but harder ramp. 2020-09-29 04:10:50 -07:00
Putnam
8a01b949bf Cleaned up SDGF and consistencised clones. 2020-09-29 03:47:09 -07:00
EmeraldSundisk
7f0834608e Merge pull request #65 from EmeraldSundisk/Citadel-Station-13-master
Citadel station 13 master
2020-09-27 10:09:12 -07:00
LetterJay
89557a8ee3 Update custom_items.dm 2020-09-25 10:46:43 -05:00
Jay
8fef121064 Fixes missing hair when wearing halo 2020-09-25 10:45:13 -05:00
silicons
57c4a3416a Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-25 01:03:15 -07:00
EmeraldSundisk
079d4eeb58 Merge pull request #63 from EmeraldSundisk/Citadel-Station-13-master
ffs
2020-09-24 19:18:50 -07:00
EmeraldSundisk
e4f0cd6a27 loadout 2020-09-23 22:27:53 -07:00
Blue Wildrose
19f14b6608 error correction
I'm a dummy
2020-09-22 03:22:10 -07:00
Blue Wildrose
006a625504 Slimeperson screams and laughter! 2020-09-22 02:41:11 -07:00
Jay
3864f14843 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into customskirt 2020-09-21 22:19:45 -05:00
silicons
9fef16964c Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-21 03:13:51 -07:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
silicons
8ebe765d70 fixes 2020-09-20 02:03:18 -07:00
silicons
1ea0dd9f76 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-19 15:56:13 -07:00
Jay
67cc7ea04e getting annoying 2020-09-19 10:02:34 -05:00
Jay
a2ad87bebd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into customskirt
# Conflicts:
#	icons/obj/custom.dmi
#	modular_citadel/code/modules/custom_loadout/custom_items.dm
2020-09-18 19:23:31 -05:00
Jay
16e6d309b6 makes skirt a under clothing instead of a suit 2020-09-18 16:56:42 -05:00
Jay
2bcc3d59a0 oops 2020-09-18 00:56:14 -05:00
Jay
a82dc79dbb Hopefully fixes icon overlay issue for the halo 2020-09-18 00:51:59 -05:00
Jay
efa3627460 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into customskirt 2020-09-16 11:20:43 -05:00
silicons
7f145b7948 Merge pull request #13388 from DeltaFire15/plush-ling
Adds peculiar plushies, which are made by failing to make plushmium
2020-09-15 17:31:18 -07:00
timothyteakettle
2d1f5ccb43 check your paths 2020-09-15 23:20:57 +01:00
LetterJay
e7ae124006 Update custom_items.dm 2020-09-15 12:32:39 -05:00
Jay
43ddae6542 ckey 2020-09-15 12:31:14 -05:00
Jay
05c580023d Custom atmos skirt for donator 2020-09-15 08:13:14 -05:00
LetterJay
680dee6a82 Update __donator.dm 2020-09-13 16:28:24 -05:00
Jay
511b845b75 donator 2020-09-13 15:32:09 -05:00