Commit Graph

1096 Commits

Author SHA1 Message Date
silicons
5a9fc99aba Merge pull request #14310 from Hatterhat/robo-surgery
[READY] robo-limb surgery tiers
2021-03-12 19:40:02 -07:00
Hatterhat
48de811919 fucking finally holy shit 2021-03-11 19:10:23 -06:00
Letter N
e84257e624 fix surgery cb, linter 2021-03-06 11:22:01 +08:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Hatterhat
80469a32f9 WHY WON'T YOU HIDE CORRECTLY 2021-03-01 22:33:21 -06:00
SandPoot
08d19e349f Update code/modules/surgery/advanced/toxichealing.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2021-02-26 10:06:53 -03:00
SandPoot
ccc50ff9ce upload toxichealing.dm 2021-02-24 20:47:46 -03:00
Hatterhat
24407b9768 time to set this up as a reminder 2021-02-24 14:58:57 -06:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
silicons
ae63422727 Merge pull request #14269 from Putnam3145/aphro-readd
More arousal logging; adds back aphro/nympho
2021-02-21 14:50:32 -07:00
Putnam
cbac292731 Adds back aphro, nympho 2021-02-18 21:22:43 -08:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Letter N
3f40e353aa Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-16 19:41:53 +08:00
silicons
61ab2a5a53 logging fixes 2021-02-13 19:47:17 -07:00
Letter N
a2419f760a Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-12 13:18:09 +08:00
Letter N
834e4730b3 not existing 2021-02-09 15:44:49 +08:00
Letter N
f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
silicons
b1ce9a9618 Update vocal_cords.dm 2021-02-08 03:09:19 -07:00
silicons
0895789217 Update vocal_cords.dm 2021-02-08 03:06:54 -07:00
TyrianTyrell
7fff6a75c0 Update tongue.dm 2021-02-07 04:29:19 -05:00
silicons
5037216f5a Update eyes.dm 2021-01-29 22:16:14 -07:00
Letter N
021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
silicons
2266a9e17b Merge pull request #14037 from DeltaFire15/nanogel
Nanogel for robotic limbs
2021-01-17 20:42:19 -07:00
silicons
310a631ffa Merge pull request #14025 from DeltaFire15/synth-robotics-revival
More Synth tweaks
2021-01-13 16:48:05 -07:00
DeltaFire
8b2044b407 another 2021-01-13 23:42:20 +01:00
silicons
ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -07:00
DeltaFire
1a521b846f thanks 2021-01-13 23:39:36 +01:00
Lin
04c5d34cb6 Merge pull request #14015 from DeltaFire15/synth-stuffs
Tweaks some Synth damage stuff
2021-01-13 18:40:03 +00:00
DeltaFire
6192d4ddab fixes 2021-01-13 00:08:59 +01:00
DeltaFire
4eab9e6520 why not 2021-01-11 18:06:43 +01:00
DeltaFire
8590d364e0 spellcheck 2021-01-11 02:18:58 +01:00
DeltaFire
2b1d79dae0 synth medstuff 2021-01-11 02:11:30 +01:00
silicons
72bc00bc22 Merge pull request #13993 from Arturlang/cursed_heart_tweaks
Makes cursed heart more tolerable
2021-01-10 01:36:43 -07:00
silicons
9733305997 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-09 14:56:32 -08:00
DeltaFire
05f7991981 snap 2021-01-09 20:37:24 +01:00
Lin
5e08df700f Merge pull request #13939 from silicons/reagentlogs
low level reagent logging additions
2021-01-09 16:24:40 +00:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
Artur
f5dc7d5c01 Makes cursed heart more tolerable 2021-01-07 22:27:13 +02:00
uomo91
6b0435e7b5 Port. 2021-01-01 00:46:47 -06:00
silicons
251bd3e06b logging 2020-12-31 12:33:05 -08:00
Letter N
1095142a5f Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-26 10:58:12 +08:00
Timothy Teakettle
2ca997e339 fix 2020-12-21 20:19:26 +00:00
Letter N
2966f985a3 rustg updates& makes shit work 2020-12-21 21:06:45 +08:00
silicons
c7396632db Merge pull request #13582 from timothyteakettle/i-hate-mcolor
adds advanced colouring mode: allows you to individually colour mutant parts
2020-11-22 13:33:28 -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
Putnam3145
9d300ade35 Merge pull request #13677 from silicons/newlines
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
DeltaFire15
ab81a7e3ef oops! (#13688) 2020-11-18 11:06:04 +01:00