Commit Graph

112 Commits

Author SHA1 Message Date
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
kevinz000
0f750932e2 playing with fire will get me roasted 2020-09-25 13:13:29 -03:00
Dip
bf11aa68dc fix 2020-09-25 11:00:36 -03:00
Dahlular
a6648fa822 Revert "Cursed Blood Trait" 2020-09-25 06:23:51 -06:00
Dip
67b9e33eeb damage 2020-09-24 17:30:52 -03:00
Dip
f48a70f1c9 less prob because it was spammy af 2020-09-24 16:42:01 -03:00
Dip
fe85e4afea commit 2020-09-24 16:36:27 -03:00
QuoteFox
324dd8327d Merge pull request #487 from ArchieBeepBoop/runtimefixes
Let's play the game of experimental runtime fixes.
2020-09-24 11:25:54 +01:00
Dahlular
cfa6e536c8 Merge pull request #489 from Chemlight/Lightweight-Trait
Lightweight trait
2020-09-23 19:23:26 -06:00
Chemlight
decfb768e2 Lightweight trait
A lightweight trait that was ported from skyrats, gives you twice the drunk power from drinks, watch what you down with each swig!
2020-09-23 00:11:54 -07:00
Dip
72c8e681e3 runtimev1-experimental 2020-09-22 16:37:51 -03:00
Dip
9aa6a44267 Eldritch Affairs Port 2020-09-20 20:26:15 -03:00
Dahlular
6be7a731f1 Some fixes + Neuters Growth Serum 2020-09-14 03:06:44 -06:00
JaySparrow
322c6a3147 Formaldehyde works now
One unit of formaldehyde stops organ decay. Like how everyone thought it worked but didn't.
2020-09-12 04:13:50 -05:00
Versallion
30e50b0c6b Synthtissue now takes sugar instead of nutriment
megaepic win for all these doctors

i hope that didnt fuck up something
2020-09-07 22:06:35 -05:00
Vladin Ampora
5cddfc861e Who are you? Where am I?
funny drinks shit hahahahaahaahahdbwdeuwfhfof
2020-09-06 05:23:02 -04:00