 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 |
|
|
Lin
|
6aa6eaafe6
|
Merge branch 'master' into abductor-update
|
2019-11-15 23:24:51 +00:00 |
|
|
Ghommie
|
6484eea339
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-11-15 00:36:50 +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 |
|
|
Lin
|
df051186eb
|
Merge branch 'master' into abductor-update
|
2019-11-11 00:08:59 +00:00 |
|
|
Ghommie
|
09860d463f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-11-10 23:23:36 +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 |
|
|
Ghommie
|
4b667743b9
|
Regenerating limbs won't no longer gib dullahans.
|
2019-11-03 17:50:03 +01:00 |
|
|
Ghommie
|
7bd905e6b2
|
Mistakes were made.
|
2019-11-03 15:13:18 +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 |
|
|
Ghommie
|
02935c062d
|
Fixing more issues.
|
2019-11-03 05:37:10 +01:00 |
|
|
Ghommie
|
401f21d746
|
Fixing broken fixes. Testing.
|
2019-11-03 01:19:45 +01:00 |
|
|
Ghommie
|
a204fddc4b
|
Fixing some issues with dullahans.
|
2019-11-01 18:51:06 +01:00 |
|
|
kevinz000
|
d9c38d0589
|
Merge pull request #8948 from Ghommie/Ghommie-cit156
Cleaning up the arousal module.
|
2019-10-31 17:27:03 -07:00 |
|
|
Linzolle
|
266f1ff958
|
Merge remote-tracking branch 'upstream/master' into abductor-update
|
2019-10-29 23:58:01 -05: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 |
|
|
kevinz000
|
e6046d62d6
|
Merge pull request #9528 from Ghommie/Ghommie-cit244
Fixes some peculiarities with hands layer overlapping stuff
|
2019-10-29 21:38:24 -07:00 |
|
|
Trilbyspaceclone
|
ec4b94c3c0
|
Update embalming.dm
|
2019-10-29 20:22:44 -04:00 |
|
|
Ghommie
|
1b8bda7040
|
Fixes some average runtimes, how null...
|
2019-10-30 00:48:51 +01:00 |
|