shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,779 Commits 5 Branches 0 Tags
fa7bf43ce7cd3c35d841e9c79dc09a6eb8520fe5
Commit Graph

950 Commits

Author SHA1 Message Date
Poojawa
fa7bf43ce7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-16 17:44:10 -05:00
Poojawa
ec4b1fba72 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 23:27:50 -05:00
Poojawa
0faafe8deb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded 2019-09-13 23:26:27 -05:00
Trilbyspaceclone
5b2dba354a Merge branch 'master' into fruit 2019-09-13 14:00:11 -04:00
Poojawa
53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
Poojawa
9376bfb44d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded 2019-09-13 12:56:57 -05:00
kevinz000
591a584785 Merge pull request #9275 from Thalpy/InitialD 
Fixes analyse function on ChemMasters to correctly display purity and fixes the custom transfer for buffer to beaker button.
 2019-09-13 10:43:22 -07:00
Poojawa
2bf4d00d29 Double checking my work 2019-09-12 00:46:18 -05:00
Poojawa
65a89030eb reverts the bleed changes till they can be better tuned 2019-09-12 00:14:26 -05:00
Poojawa
94afbbd560 Adding Horn colors, multiple-select legs, and species squash 
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking.  Sprites tweaked on a bunch of critters. Added new wings....
 2019-09-11 17:46:17 -05:00
Fermi
6b76b09449 Missed 2 2019-09-11 23:30:56 +01:00
Fermi
c79c4aafa5 Cleans up var/test into targetReagent 2019-09-11 18:51:05 +01:00
Fermi
409cbe876a Okay ACTUALLY does what I want it to. 2019-09-11 18:46:32 +01:00
Fermi
d59196f430 oops 2019-09-11 16:38:55 +01:00
Poojawa
6353bd1064 Cult heals do bleed stopping 
blood cap raised because honestly there's so much bleed_rate heal available now too
 2019-09-11 04:37:22 -05:00
kevinz000
ff0c3ee844 Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining 
The art of drunken captaining
 2019-09-10 22:06:36 -07:00
kevinz000
829a2615c5 Merge pull request #9247 from Thalpy/QuantFix 
Partially fixes tiny runaway decimals in reagents.
 2019-09-10 10:27:40 -07:00
Fermi
816ae638a2 [TO_TEST] 2019-09-05 23:19:53 +01:00
Fermi
29e5c1c10a Still some residual chems kicking about..!! 2019-09-05 23:15:30 +01:00
Trilbyspaceclone
dbdaae83b6 Update medicine_reagents.dm 2019-09-04 13:29:58 -04:00
Poojawa
b2252a1c74 Medical assistance treats bleed_rate to stop phantom bleeding 2019-08-30 02:46:57 -05:00
Poojawa
dae3e91293 MIGHT HELP IF SYNTHETICS EXISTED, WHOOPS 2019-08-30 00:07:06 -05:00
TrilbySpaceClone
ea7235d089 Merge branch 'master' into fruit 2019-08-29 21:15:18 -04:00
Ghommie
24fe7126c4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-08-24 19:05:51 +02:00
Poojawa
d60ba0a207 Fixes missing DNA info for slimes, resolves virology issues 2019-08-24 04:14:47 -05:00
Poojawa
32c7a7c3ee Virology's broken as fuck, damnifino why 2019-08-21 03:36:40 -05:00
Poojawa
23333f6ea5 reverts the majority of clean act because it doesn't work properly otherwise 2019-08-20 23:03:31 -05:00
Poojawa
bda3ac8745 blood dna is fixed, your ERP code is too 2019-08-20 07:41:50 -05:00
Code-Cygnet
167b18d045 Update code/modules/reagents/chemistry/reagents/alcohol_reagents.dm 
Error spotted at 2138 and fixed by Sishen, aka Papa Pax!

Co-Authored-By: Sishen1542 <sishen1542@gmail.com>
 2019-08-19 15:28:51 -04:00
TrilbySpaceClone
6c6391b4c4 Merge branch 'master' into fruit 2019-08-19 07:37:12 -04:00
Trilbyspaceclone
cce33ec7e5 Update drink_reagents.dm 2019-08-19 07:17:57 -04:00
Poojawa
cede93299e REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE 2019-08-19 04:48:37 -05:00
Code-Cygnet
5840284e9e Update alcohol_reagents.dm 
Edited a typo at line 2144.
 2019-08-18 22:14:41 -04:00
Code-Cygnet
975a33aad7 Update alcohol_reagents.dm 
Adds commander and chief, starting at line 2125 and ending at 2146.. hopefully.
 2019-08-17 19:38:58 -04:00
Trilbyspaceclone
bcf65dc901 Update drink_reagents.dm 2019-08-17 00:58:02 -04:00
Trilbyspaceclone
3851739533 Update other_reagents.dm 2019-08-17 00:06:58 -04:00
Trilbyspaceclone
c81fd8fcd4 Update drink_reagents.dm 2019-08-17 00:02:22 -04:00
Trilbyspaceclone
5225665516 kev fix 2019-08-16 23:48:41 -04:00
Poojawa
264cbf8108 reverts the add_blood back to add_blood_DNA 2019-08-15 12:49:10 -05:00
Poojawa
0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00
Poojawa
2073921f4b Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-15 08:39:41 -05:00
Trilbyspaceclone
0056e3eb61 Update other_reagents.dm 2019-08-13 11:49:00 -04:00
Trilbyspaceclone
3224e6ca4a ..() 2019-08-13 11:46:52 -04:00
Fermi
51a6ae96a0 R.data 2019-08-12 00:37:57 +01:00
Fermi
c0bbb099f8 Fixes disappearing chems. 2019-08-12 00:36:45 +01:00
TrilbySpaceClone
821463f59c Nya 2019-08-11 11:47:56 -04:00
Poojawa
dcd682bd59 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-10 23:48:47 -05:00
Poojawa
283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00
Fermi
004b79d4cd Vodka is alkaline 2019-08-08 15:31:07 +01:00
Fermi
99e95dcedf Guess who forgot message admins 2019-08-07 18:57:38 +01:00