nik707
|
e4a41c6169
|
Merge pull request #9932 from Putnam3145/fix-genital-contam
Make organs no longer radiaoctively contaminable.
|
2019-12-06 20:37:53 -06:00 |
|
Ghommie
|
53ff425f04
|
Banishes some magic numbers from this realm.
|
2019-12-05 21:55:28 +01:00 |
|
Putnam3145
|
44c621e5e9
|
Merge pull request #9895 from Thalpy/OrganQoL
[READY] Organ quality of life fixes. Adds Organ fridges with items, Tweaks scanner, new surgery, tweaks chems
|
2019-11-30 22:22:52 -08:00 |
|
Ghommie
|
792f1947a7
|
Fixes limbs' set_disabled.
|
2019-11-27 19:45:27 +01:00 |
|
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 |
|
Putnam
|
6c51f09a82
|
Make organs no longer contaminable.
|
2019-11-23 21:14:24 -08: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
|
399986f3f7
|
Forgot to update the procs
|
2019-11-22 23:57:09 +00:00 |
|
Fermi
|
b056d91ea5
|
Removes the random love
|
2019-11-22 23:48:21 +00:00 |
|
Thalpy
|
db74091dd4
|
Strange revert
|
2019-11-21 19:47:00 +00:00 |
|
Thalpy
|
0cce3a01f4
|
Ghommie's requiem
|
2019-11-21 19:39:55 +00:00 |
|
Thalpy
|
bd07ff4bf7
|
This should be the one!
|
2019-11-21 18:55:43 +00:00 |
|
Thalpy
|
00bffba7ea
|
Why do surgeries always end up with jank
|
2019-11-21 15:57:21 +00:00 |
|
Thalpy
|
46076c95c7
|
Ghommie is a good friend
|
2019-11-21 14:22:04 +00:00 |
|
Thalpy
|
8256a206cf
|
Update code/modules/surgery/emergency_cardioversion_recovery.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-11-21 13:24:57 +00:00 |
|
kevinz000
|
8df8acb1b7
|
Merge pull request #9811 from Ghommie/Ghommie-cit353
Dreamchecker compatibility changes, part 2.
|
2019-11-20 21:49:58 -07:00 |
|
Fermi
|
b911fabb37
|
Okay bedtime
|
2019-11-21 04:25:25 +00:00 |
|
Fermi
|
18e1246fd0
|
Classic fixes
|
2019-11-21 03:16:18 +00:00 |
|
Fermi
|
cc53a0061f
|
Well it compiles
|
2019-11-21 02:15:58 +00:00 |
|
Ghommie
|
dd101ef221
|
Part 2
|
2019-11-19 18:00:56 +01:00 |
|
kevinz000
|
499afa6666
|
Merge pull request #9663 from Trilbyspaceclone/patch-235
Buffs/Fixes embalming
|
2019-11-14 15:54:38 -07:00 |
|
kevinz000
|
318c03cc28
|
Merge pull request #9683 from Ghommie/Ghommie-cit303
Dullahans fixes and QoL.
|
2019-11-14 15:52:11 -07: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 |
|
kevinz000
|
c46b425402
|
Merge pull request #9719 from Ghommie/Ghommie-cit318
Renames is_hot and is_sharp to get_temperature and get_sharpness, just like how ol tg did.
|
2019-11-10 11:26:06 -07:00 |
|
kevinz000
|
3570df6084
|
Merge pull request #9726 from Ghommie/Ghommie-cit323
Fixing several minor runtimes.
|
2019-11-10 11:10:16 -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 |
|
Ghommie
|
ae9ff92d33
|
Fixes free real estate paraplegic trait and bolas.
|
2019-11-05 18:03:50 +01:00 |
|
Ghommie
|
a650e1e411
|
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
|
2019-11-05 05:37:28 +01:00 |
|
Trilbyspaceclone
|
8a9e0dbbe3
|
pen b gone
|
2019-11-03 20:49:03 -05:00 |
|
Ghommie
|
543df8822e
|
.len
|
2019-11-03 18:17:34 +01:00 |
|
Ghommie
|
efbcce023a
|
Oh yea it won't work otherwise.
|
2019-11-03 18:16:19 +01:00 |
|