Commit Graph

127 Commits

Author SHA1 Message Date
DragonTrance e57ba1502e tiny bit of cleanup 2020-12-27 12:19:54 -07:00
DragonTrance 76b0b45a0b drink flinging fix
finally
2020-12-27 12:12:41 -07:00
Archie f9a7a97198 a 2020-12-25 11:25:43 -03:00
Archie b2a1a63bb1 Reagent Fix Pack 1 2020-12-24 14:30:43 -03:00
Lin a7c539ac32 Ports reagents id removal and typepath usage. 2020-12-09 14:32:36 -03:00
Dahlular ede0632fbf Merge pull request #726 from MalricB/euthanasia
Ports vampires. Or, bloodsuckers, rather.
2020-12-03 19:18:47 -07:00
Dahlular 02b1aba9d7 Merge pull request #709 from ArchieBeepBoop/blacklistfix1
Re-Porting the Trait Blacklist System (Fixes broken respawn traits)
2020-12-01 20:14:06 -07:00
CygnusB ad8a067015 agonyyyy 2020-12-01 18:09:00 -03:00
Dip 7f7dd54b86 Typos 2020-11-27 15:01:34 -03:00
Dahlular 6645e50dad Merge pull request #694 from ArchieBeepBoop/improvements
ATMOS Firelocks and more
2020-11-21 22:54:02 -07:00
Dahlular 7ca1b3084b Merge pull request #691 from ArchieBeepBoop/radioactivedecal
Adds a radioactive type of greenglow cleanable decal
2020-11-21 22:52:05 -07:00
Dip 2a5c61dc45 fuck me 2020-11-22 01:29:01 -03:00
Ghom 7a8fcf77d4 ATMOS Firelocks and more 2020-11-19 11:04:04 -03:00
Dip a2089ee778 Adds a radioactive type of greenglow cleanable decal 2020-11-17 22:53:42 -03:00
kevinz000 5eb8b535c3 Merge pull request #9505 from Thalpy/Smartdart-QoL
[READY] Tweaks smartdarts with a few quality of life functions, and add a few new things.
2020-11-17 00:31:16 -03:00
Chemlight 6a0f2d5602 Hotfix bus
Simply fixing code and further testing for a potential prototype, don't know where I'm going to this.
2020-11-12 04:48:27 -08:00
Dip be3dbb0ed6 Merge remote-tracking branch 'upstream/master' into sprayfixes 2020-11-10 12:15:44 -03:00
Dahlular 12ee6aaf27 Merge pull request #672 from Chemlight/Funny-Coder-Bus
Funny-character-bus-code
2020-11-10 03:10:29 -07:00
Dahlular cbdce23df4 Merge pull request #652 from ArchieBeepBoop/virofixes
[TESTMERGE] The Viro Rework done right? Ports a load of viro, (sentient) disease, symptoms code updates from tg.
2020-11-10 01:54:24 -07:00
Chemlight 3e4f99daa9 Merge remote-tracking branch 'upstream/master' into Funny-Coder-Bus 2020-11-09 23:16:19 -08:00
Chemlight 8c0f1756a1 Funny-character-bus-code
This little pull is litterally a pull for a single character I'd like to bus, basicly a walking chem dispenser, so lets go!
2020-11-09 23:03:12 -08:00
Dip 12f0ee88ac ahem, desc 2020-11-09 17:33:55 -03:00
Dip c4cf92aba8 right 2020-11-09 17:33:15 -03:00
Dip 540df54984 whoops. 2020-11-09 17:30:45 -03:00
Dip cd6483bda5 Random runtime + icon fix 2020-11-09 17:21:43 -03:00
kevinz000 f138e5cf53 Fixing Hypospray
Unmodularize MkII hyposprays and other reagent items sprites.
2020-11-09 16:45:17 -03:00
Dip a180778587 Botany Fixes 2020-11-07 13:13:46 -03:00
Dip 0eb87e4846 NT to Kinaris text changes 2020-11-07 11:09:49 -03:00
Dip 9bdbfe430f synthblood missing recipe 2020-11-03 04:55:00 -03:00
kevinz000 752a3d9bcc Merge pull request #9418 from Ghommie/Ghommie-cit216
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
2020-11-03 01:51:18 -03:00
Dahlular 60ab437ac8 Merge pull request #643 from Jay-Sparrow/Bug-fixin
Hardsuits must contain girth
2020-11-02 20:53:26 -07:00
JaySparrow 8240f5d0a7 Big bits
Cram em in
2020-11-02 04:25:02 -06:00
Vladin dcdc153369 fixed code comments to be accurate
clean code and clean code comments are nice
2020-10-30 06:27:03 -04:00
Vladin 5356c63bd5 Superior medicine is actually superior
Effective threshold increased from 25 to 30
Less effective healing increased to match basic healing chems
2020-10-30 06:21:35 -04:00
Ghom 28cdb9c5f1 Oh no. 2020-10-30 05:30:15 -03:00
Dip 9acf8ffd40 merge conflict drinks.dmi 2020-10-29 13:50:19 -03:00
Dahlular bbbd52a4a4 Merge pull request #623 from ArchieBeepBoop/numbertwo
Ports: GetComponent macros removal, and few other updates.
2020-10-29 10:30:33 -06:00
kevinz000 45f7b020c4 Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2020-10-28 05:48:57 -03:00
kevinz000 89aa5852c8 Merge pull request #9226 from Trilbyspaceclone/unmodular_2
Unmodulars a few things + new sprite + new welder tank(unused
2020-10-28 05:32:56 -03:00
kevinz000 f1f89cbb50 Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining
The art of drunken captaining
2020-10-28 05:12:18 -03:00
kevinz000 2c7c66fc89 Merge pull request #9589 from Ghommie/Ghommie-cit259
Porting GetComponent macros removal, and few other updates.
2020-10-27 14:42:55 -03:00
kevinz000 7034e00e1c Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining
The art of drunken captaining
2020-10-27 13:28:17 -03:00
Dip bde27f9cc6 nuclear particle runtime fix 2020-10-25 06:59:37 -03:00
Dip a479698c95 just in case this becomes a problem 2020-10-18 17:53:40 -03:00
Dip c91a106b0d fixes and runtimes 2020-10-17 23:55:40 -03:00
deathride58 cc26593463 Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
kevinz000 8408c6669f Merge pull request #9882 from FestiveBall/Fersi
[READY] Allows addition of reagents to sleepers for injection and detection of failed organs (minor GUI tweak.)
2020-10-13 01:26:13 -03:00
Dip aa7d47a23b Examine Code Refactor 2020-10-06 23:36:21 -03:00
kevinz000 b8bc551d51 Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-10-03 19:35:47 -03:00
QuoteFox cfd822170f Merge pull request #502 from ArchieBeepBoop/hunter2
Cursed Blood Trait (fixed)
2020-09-27 05:35:43 +01:00