kevinz000
|
6b53845f06
|
Merge pull request #9268 from Thalpy/FERMICHEMCurTweaks
[READY] [Please merge me] Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.
|
2019-11-26 16:01:48 -07:00 |
|
BlackMajor
|
c81d1fe7a3
|
Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
|
2019-11-25 11:31:03 +13:00 |
|
Fermi
|
614a462176
|
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
This reverts commit 1509d9d183.
|
2019-11-24 03:33:02 +00:00 |
|
Fermi
|
ba4fa1ef67
|
Revert "PLASE"
This reverts commit 8af225e6e3.
|
2019-11-24 03:06:08 +00:00 |
|
Fermi
|
aeb8606ce0
|
Revert "Revert "PLASE""
This reverts commit 00601a0c87.
|
2019-11-24 03:04:52 +00:00 |
|
Fermi
|
3155e3ffb3
|
Revert "Revert "Removes the random love""
This reverts commit ce7e9ac452.
|
2019-11-24 03:04:20 +00:00 |
|
Fermi
|
1509d9d183
|
Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit 135608551f, reversing
changes made to ce7e9ac452.
|
2019-11-24 03:04:13 +00:00 |
|
Fermi
|
c8b206a4cf
|
Revert "pls"
This reverts commit 8c97511871.
|
2019-11-24 03:04:04 +00:00 |
|
Fermi
|
4c1c257035
|
Revert "Revert "pls""
This reverts commit b23f2a4460.
|
2019-11-24 03:02:21 +00:00 |
|
Fermi
|
9eaed4ea8e
|
Revert "pls2"
This reverts commit 0eb635b908.
|
2019-11-24 03:02:04 +00:00 |
|
Fermi
|
0eb635b908
|
pls2
ugh
|
2019-11-24 02:52:17 +00:00 |
|
Fermi
|
b23f2a4460
|
Revert "pls"
This reverts commit 8c97511871.
|
2019-11-24 02:49:20 +00:00 |
|
Fermi
|
8c97511871
|
pls
ugh
|
2019-11-24 02:47:52 +00:00 |
|
Fermi
|
135608551f
|
Merge remote-tracking branch 'upstream/master'
|
2019-11-24 02:45:28 +00:00 |
|
Fermi
|
ce7e9ac452
|
Revert "Removes the random love"
This reverts commit b056d91ea5.
|
2019-11-24 02:45:06 +00:00 |
|
Fermi
|
00601a0c87
|
Revert "PLASE"
This reverts commit 8af225e6e3.
|
2019-11-24 02:44:00 +00:00 |
|
Fermi
|
8af225e6e3
|
PLASE
|
2019-11-24 02:41:21 +00:00 |
|
Fermi
|
b404e18b15
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-11-23 00:10:33 +00:00 |
|
Fermi
|
b056d91ea5
|
Removes the random love
|
2019-11-22 23:48:21 +00:00 |
|
Ghommie
|
dd101ef221
|
Part 2
|
2019-11-19 18:00:56 +01:00 |
|
Ghommie
|
358db4f390
|
Dreamchecker compatibility changes, part 2.
|
2019-11-14 14:54:12 +01:00 |
|
Ghommie
|
1e49ce76d3
|
Dreamchecker compatibility changes, part 1.
|
2019-11-10 20:48:30 +01:00 |
|
kevinz000
|
39e55edcb3
|
Merge pull request #9734 from Ghommie/Ghommie-cit324
Ports CEV-eris delivery packages sprites, also dunking old syndie cybernetics box sprite.
|
2019-11-10 11:45:47 -07:00 |
|
Ghommie
|
ae6e50b081
|
resprited delivery packages.
|
2019-11-06 18:27:33 +01:00 |
|
Ghommie
|
97dd0bd70c
|
Yes.
|
2019-11-05 23:13:10 +01:00 |
|
kevinz000
|
5bfcc663f5
|
Merge pull request #9662 from Ghommie/Ghommie-cit294
Fixes some average runtimes, how null...
|
2019-11-03 06:19:40 -07:00 |
|
kevinz000
|
d9c38d0589
|
Merge pull request #8948 from Ghommie/Ghommie-cit156
Cleaning up the arousal module.
|
2019-10-31 17:27:03 -07:00 |
|
kevinz000
|
fb936a5319
|
Merge pull request #9598 from deathride58/runtimefixpass
various runtime fixes - plasmaman tongues no longer have a maxHealth of "alien" and more
|
2019-10-29 21:41:11 -07:00 |
|
Ghommie
|
1b8bda7040
|
Fixes some average runtimes, how null...
|
2019-10-30 00:48:51 +01:00 |
|
Ghommie
|
79c3700d25
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-10-25 12:42:28 +02:00 |
|
Ghommie
|
cb74be29ae
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262
|
2019-10-25 12:40:50 +02:00 |
|
Ghommie
|
a50606bb67
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259
|
2019-10-24 10:10:07 +02:00 |
|
deathride58
|
0ae8953da9
|
various runtime fixes - plasman tounges no longer have a maxhealth value of "alien", simplemobs no longer runtime when shot, removing filters from something that lacks filters now works
|
2019-10-24 02:52:40 -04:00 |
|
Ghommie
|
c882c098cc
|
Porting movespeed modification system updates.
|
2019-10-23 19:24:34 +02:00 |
|
Ghommie
|
e1928a18f1
|
Porting GetComponent macros removal, and some related changes.
|
2019-10-23 15:04:28 +02:00 |
|
Thalpy
|
67af19a7f0
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-10-17 16:20:38 +01:00 |
|
Poojawa
|
66c8c17bbd
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-17 05:45:06 -05:00 |
|
Ghommie
|
475303bd02
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-10-17 00:50:30 +02:00 |
|
Thalpy
|
4b069afb42
|
Scrub a dub dub
|
2019-10-15 08:42:40 +01:00 |
|
Thalpy
|
91762d7c65
|
Cleanup
|
2019-10-15 08:22:53 +01:00 |
|
Fermi
|
a80b5c8a84
|
Autosurgies
|
2019-10-14 13:39:39 +01:00 |
|
Fermi
|
8ddd5402fe
|
Mobcheck
|
2019-10-14 13:35:42 +01:00 |
|
Fermi
|
7b2c8e58ff
|
Fixes freezing and ghost rider
|
2019-10-14 13:23:39 +01:00 |
|
Thalpy
|
8a5562e92e
|
Ghmoneie
|
2019-10-13 23:56:18 +01:00 |
|
Thalpy
|
924fa50659
|
Update code/modules/surgery/organs/organ_internal.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-10-13 23:55:42 +01:00 |
|
Thalpy
|
094221f4ae
|
IndenettSADgsdfafhfdnfzbdf
|
2019-10-13 23:52:34 +01:00 |
|
Thalpy
|
7973347bf3
|
indent
|
2019-10-13 23:50:25 +01:00 |
|
Thalpy
|
1621c4c7d4
|
stupid bitflags
|
2019-10-13 23:50:08 +01:00 |
|
Thalpy
|
04b40fd557
|
Tongues decay slower.
|
2019-10-12 18:01:02 +01:00 |
|
Thalpy
|
96d5a0f74c
|
Heart decay
|
2019-10-12 18:00:34 +01:00 |
|