Commit Graph

2076 Commits

Author SHA1 Message Date
DeltaFire dab3f6f125 Merge pull request #13699 from silicons/nanite_updates
nanite updates: permanent nanites, hostile lockdown, anti-virus, resistance tweaking
2020-12-14 05:56:48 +01:00
Timothy Teakettle e413fcb091 more fixes 2020-12-06 22:14:35 +00:00
timothyteakettle 61cc33d995 Merge remote-tracking branch 'upstream/master' into loadout-json 2020-12-06 17:26:04 +00:00
timothyteakettle 0f540884eb Merge branch 'master' into loadout-json 2020-12-06 17:24:24 +00:00
DeltaFire15 a1d38033a4 Merge pull request #13576 from Sonic121x/patch-2
Add a bunch of digitigrade uniform
2020-11-27 22:31:10 +01:00
silicons 8f36a1d2ec okay 2020-11-22 15:20:52 -07: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 1faaabd7d0 nanite bane causes corruption
Title. 1 corruption per reagent tick, as it IS a pretty rare chemical to see, might give it some uses for robot assasinations, as it's a bit quieter than EMPing parts of the station repeatedly.
2020-11-13 03:51:11 +01:00
Jay e1c8d669d5 Exo frame donator 2020-11-07 10:23:14 -06:00
silicons a13765b7c9 Merge pull request #13521 from DeltaFire15/zeolites-tweaking
[READY] Rebalances zeolites and their reaction
2020-11-07 00:16:29 -07:00
silicons 871084f43e Merge pull request #13636 from SiliconMain/patch-11
gas masks for engi loadouts
2020-10-29 14:05:19 -07:00
silicons 0307884eab Merge pull request #13627 from Ghommie/Ghommie-cit841
Here I fix a few issues.
2020-10-28 07:53:22 -07:00
silicons 5c53a2cbe2 Merge pull request #13607 from timothyteakettle/polychrome-maid
polychromic maid outfit
2020-10-28 07:46:55 -07:00
SiliconMain 1f46248c2c Update mask.dm 2020-10-28 09:27:59 -05:00
Timothy Teakettle 0c2e1997ce more loadout 2 2020-10-25 22:49:39 +00:00
Ghommie f49f72338f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841 2020-10-25 15:01:57 +01:00
Ghommie 90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
timothyteakettle 71134ed8c3 better loadout flags 2020-10-25 01:08:35 +00:00
LetterJay c4f25e3114 Fixes donator item (#13609) 2020-10-24 21:24:05 +02:00
silicons 61aee3be39 Merge pull request #13588 from Delams-The-SM/extra_emotes
Adding hiss, purr and meow emotes
2020-10-23 00:20:14 -07:00
timothyteakettle 049f153cbf works but looks weird 2020-10-21 00:55:02 +01:00
Timothy Teakettle 608e5147de Revert "Revert "add color type to all polychromics""
This reverts commit 587a2f8f19.
2020-10-20 20:05:11 +01:00
LetterJay 81d0eb5631 Update __donator.dm 2020-10-19 22:10:20 -05:00
Jay 44fa0d5387 donator vest and shirt 2020-10-19 12:30:35 -05:00
Delams-The-SM 22f54dbc7d Adding hiss, purr and meow to emotes 2020-10-18 01:49:58 +02:00
Timothy Teakettle 587a2f8f19 Revert "add color type to all polychromics"
This reverts commit 02912aa4ad.
2020-10-15 23:05:07 +01:00
Sonic121x 69e8281538 Update suits.dm 2020-10-16 04:35:33 +08:00
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