Commit Graph

7447 Commits

Author SHA1 Message Date
Thalpy
02da3c524e Fixed reaction mechanics - pre status edits 2019-04-15 22:08:00 +01:00
Thalpy
3aa92325cf Jubiously day, I fixed the reaction, mostly and xeno broke 2019-04-15 01:05:32 +01:00
Thalpy
e2fb670314 Fixed spelling of explode 2019-04-14 23:21:59 +01:00
Thalpy
3d4245905a Accidental double vars 2019-04-14 23:16:18 +01:00
Thalpy
68813cf12a fixed add_reagent 2019-04-14 23:11:55 +01:00
Thalpy
f6a6e2b226 Merge branch 'FermiChem' of https://github.com/Thalpy/Citadel-Station-13 into FermiChem 2019-04-14 22:57:12 +01:00
Thalpy
0cee082e81 Added default fermichemvals to recipies 2019-04-14 22:57:08 +01:00
Thalpy
bf647c38e8 Variables don't work as I thought and it makes me sad. 2019-04-14 19:52:23 +01:00
Thalpy
e025ba8eb1 Fixed merge conflicts 2019-04-14 16:37:10 +01:00
Thalpy
ccdd077a4c Bugfixes 2019-04-14 16:31:26 +01:00
Thalpy
eac8478812 Minor deltapH tweaks 2019-04-14 06:02:35 +01:00
Thalpy
a082b3c532 Fixed purity calculation issue 2019-04-14 05:56:38 +01:00
Thalpy
ed27c5dfe4 Main reaction loop set up!! (I hope!!) 2019-04-14 05:38:43 +01:00
Thalpy
8e9ea0b506 Main reaction loop set up!! (I hope!!) 2019-04-14 05:31:04 +01:00
Thalpy
a86ef643b4 Mid progress through reaction mechanics. 2019-04-12 17:18:23 +01:00
Fermi
28ffc996f7 Added synthetic-derived growth factor amonst some bugfixes. 2019-04-12 05:10:00 +01:00
Fermi
f059a19d8b Made plastic&metamaterial beakers slightly larger cause no one uses them 2019-04-12 00:44:54 +01:00
Fermi
5113b3aabc Added eigenstate chem effects, need to add reaction vars. 2019-04-12 00:42:01 +01:00
JMFrench
1d9bf5b3b4 Moonsugar
Added Moonsugar effects
2019-04-01 18:01:39 +01:00
Fermi
8e2775bbe3 A few changes (mix edit for Neko)
MeowMeowMeowMeowMeowMeowMeow
2019-03-14 03:27:25 +00:00
kevinz000
821a31afb8 Merge pull request #8090 from deathride58/tgpushes
Replaces disarm right click action with tgstation/tgstation#42958's disarm pushes
2019-03-10 13:51:44 -07:00
kevinz000
b17b2a0a4a Merge pull request #8097 from AmatsuDF/master
Adds Chilling effects to Slime Crossbreeding
2019-03-10 13:50:37 -07:00
kevinz000
698adb7c7d Merge pull request #8056 from deathride58/tegnerf
Makes the efficiency of the TEG be dependant on how much gas is actively combusting in the hot pipe
2019-03-10 13:48:42 -07:00
kevinz000
d681b30df5 Merge pull request #8102 from Trilbyspaceclone/semi-auto
Fixes ever case I can fine of WT-550 Auto Rifle being called Auto Rifle and not Semi-Auto - SMG
2019-03-10 13:44:57 -07:00
kevinz000
4451d8e3ad Merge pull request #8070 from deathride58/consensualcults
Makes bloodcult conversions consensual, similar to Bay.
2019-03-10 13:44:20 -07:00
kevinz000
b143f6f883 Merge pull request #8098 from Coolgat3/patch-2
Equalizes security helmet and beret armor
2019-03-10 13:42:44 -07:00
Amatsu Darkfyre
2d286e525d Changes Adamantine Suit's armor values to not be bad.
Also recolors the Slime Mask so it's more obvious at a glance what it is.
2019-03-10 15:10:07 -04:00
Trilbyspaceclone
5197c0fb94 Update weapon_designs.dm 2019-03-09 20:34:39 -05:00
Trilbyspaceclone
8b99ca8094 Update packs.dm 2019-03-09 20:31:00 -05:00
Trilbyspaceclone
5aa5f1ed56 SMG 2019-03-09 20:29:19 -05:00
Trilbyspaceclone
ce7c76e8a4 ? 2019-03-09 20:12:44 -05:00
Trilbyspaceclone
8f9542bc43 Update automatic.dm 2019-03-09 20:05:07 -05:00
Trilbyspaceclone
beb812e291 Update packs.dm 2019-03-09 20:03:40 -05:00
Trilbyspaceclone
979f9125ef Update weapon_designs.dm 2019-03-09 19:54:48 -05:00
Coolgat3
45a4693618 Update helmet.dm 2019-03-09 16:42:27 +01:00
Coolgat3
eb786cbfde Update jobs.dm 2019-03-09 16:39:51 +01:00
deathride58
5e6395270b Merge pull request #7889 from Citadel-Station-13/kevinz000-patch-7
Reworks meth
2019-03-08 21:05:20 -05:00
deathride58
c2acda5a96 Merge pull request #8073 from Citadel-Station-13/kevinz000-patch-27
bunker bypass now sanitizes ckeys automatically to avoid errors
2019-03-08 20:51:15 -05:00
deathride58
2ae75ccd21 Merge pull request #8078 from Citadel-Station-13/kevinz000-patch-29
Fixes SDQL2 list association recursing/printing
2019-03-08 20:50:50 -05:00
deathride58
e5f5520393 Merge pull request #8075 from BlackMajor/master
More borg sprites
2019-03-08 20:50:33 -05:00
deathride58
6ed81162b3 Merge pull request #8089 from Trilbyspaceclone/patch-70
[MIRROR] - P.A.C.M.A.N code cleaning #42891
2019-03-08 20:49:38 -05:00
deathride58
6aaee476c8 Merge pull request #8079 from Citadel-Station-13/kevinz000-patch-30
Adds wrapper list access index for SDQL2
2019-03-08 20:49:18 -05:00
deathride58
3b3fcb5d19 Merge pull request #8094 from Trilbyspaceclone/patch-75
[MIRROR] Watcher's Wing No Longer Perma-Disarms #41708
2019-03-08 20:48:40 -05:00
deathride58
5aa9dd7c14 Merge pull request #8092 from Trilbyspaceclone/patch-71
More miner point cards
2019-03-08 20:46:57 -05:00
deathride58
f7c9b1cd32 Merge pull request #8066 from Citadel-Station-13/kevinz000-patch-23
Fixes the panic bunker
2019-03-08 20:43:42 -05:00
deathride58
2cd9c69ed1 Merge pull request #8083 from Poojawa/patch-3
Fixes genital-less VR people
2019-03-08 20:43:25 -05:00
Amatsu Darkfyre
54a9b3206f Updates in response to feedback from Bhijn. Also adding in missed icons from my first sweep and renamed _corecross.dm to __corecross.dm. 2019-03-08 17:22:40 -05:00
Coolgat3
af04b72476 Making secberets protect as much as helmets 2019-03-08 17:36:46 +01:00
Amatsu Darkfyre
575c7ebeba Adds Chilling effects to Slime Crossbreeding, along with their icons and proper DM files. Nothing is modularized, as this is all content from upstream, so there should be no upstream conflicts when or if a sync occurs. 2019-03-08 04:02:21 -05:00
nik707
a89ab006c1 Adds new and immersive sound for combat
Dink!
2019-03-05 15:03:08 -06:00