kevinz000
|
d9c38d0589
|
Merge pull request #8948 from Ghommie/Ghommie-cit156
Cleaning up the arousal module.
|
2019-10-31 17:27:03 -07:00 |
|
Ghommie
|
bf92aa2ffb
|
Unmodularize MkII hyposprays and other reagent items sprites.
|
2019-10-26 19:14:28 +02: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
|
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 |
|
Ghommie
|
e1928a18f1
|
Porting GetComponent macros removal, and some related changes.
|
2019-10-23 15:04:28 +02: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 |
|
kevinz000
|
994bfddc1b
|
Merge pull request #9477 from Thalpy/tgOrganFixes
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
|
2019-10-16 12:44:34 -07:00 |
|
Poojawa
|
184e81eec0
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-16 01:51:51 -05:00 |
|
deathride58
|
9fd4e7f673
|
Merge pull request #9472 from Thalpy/Quickfixforfood
[speedmerge] Quickfixforfood and fixes the chem hindenburg
|
2019-10-15 06:32:59 -04:00 |
|
Ghommie
|
321c30cf89
|
now with 51% more loads.
|
2019-10-14 06:24:54 +02:00 |
|
Ghommie
|
3671755142
|
My cat resting on my neck is just sooo warm, like a best scarf.
|
2019-10-14 06:06:25 +02:00 |
|
Thalpy
|
06599523a9
|
Ghommie is a saint
|
2019-10-13 22:06:57 +01:00 |
|
Thalpy
|
3b8ea30d9b
|
I did it
|
2019-10-12 20:06:46 +01:00 |
|
Thalpy
|
f6796b93b3
|
Fixes graft
|
2019-10-12 18:22:48 +01:00 |
|
Fermi
|
2e03985696
|
aaaa
|
2019-10-12 07:55:19 +01:00 |
|
Poojawa
|
394c947d14
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-11 23:10:45 -05:00 |
|
kevinz000
|
a9dcf681ce
|
Merge pull request #9457 from Ghommie/Ghommie-cit227
Fixing a runtime when examining unloaded cit hyposprays.
|
2019-10-11 12:16:50 -07:00 |
|
kevinz000
|
2e74833e72
|
Merge pull request #9444 from Thalpy/Updates-holder
[Testmerge first] [Ready] Cleans up holder.dm code and fixes some of the cross bugs from shotgun PR merging.
|
2019-10-11 12:08:12 -07:00 |
|
Ghommie
|
26e6ba9686
|
Fixing a runtime when examining unloaded cit hyposprays.
|
2019-10-09 18:34:54 +02:00 |
|
Fermi
|
ad0f34cdf8
|
Tweaks wiki a lil
|
2019-10-09 06:04:06 +01:00 |
|
Ghommie
|
735755019e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-10-09 01:18:30 +02:00 |
|
Fermi
|
bc118d5ead
|
Merge branch 'master' into Updates-holder
|
2019-10-08 12:21:56 +01:00 |
|
Fermi
|
b8c87a5f40
|
Spicy
|
2019-10-08 12:05:06 +01:00 |
|
Poojawa
|
3113074bfb
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-08 02:55:32 -05:00 |
|
Thalpy
|
564c1fde9f
|
Merge branch 'master' into Reagents_bitflats
|
2019-10-08 07:31:03 +01:00 |
|
kevinz000
|
0073d99a22
|
Merge pull request #9309 from Thalpy/tg-Organ-port
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
|
2019-10-07 23:29:19 -07:00 |
|
Thalpy
|
27c2c89766
|
Merge branch 'master' into Reagents_bitflats
|
2019-10-05 23:43:19 +01:00 |
|
Ghommie
|
cac4157894
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-10-05 22:03:37 +02:00 |
|
Fermi
|
2abd15c7e7
|
Incase someone speedmerges
|
2019-10-04 04:48:34 +01:00 |
|
Fermi
|
d1c381cad3
|
lye down
|
2019-10-04 03:27:30 +01:00 |
|
Fermi
|
10f5fc3b47
|
Buffer fix
|
2019-10-04 03:22:53 +01:00 |
|
Ghommie
|
6dbac16c74
|
Sanitizing the fermis code biohazard.
|
2019-10-03 04:31:11 +02:00 |
|
Ghommie
|
02df68a1cf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-10-02 07:26:09 +02:00 |
|
Fermi
|
89f3a01bc0
|
Merge branch 'master' into tg-Organ-port
|
2019-10-01 06:17:58 +01:00 |
|
Poojawa
|
117e5a409d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-01 00:05:44 -05:00 |
|
Thalpy
|
1bdb66d5de
|
Okay a few things I just saw
|
2019-09-27 07:28:02 +01:00 |
|
Fermi
|
8dcf74d5f0
|
Makes buffers not react with stab agent
|
2019-09-22 12:02:20 +01:00 |
|
Poojawa
|
5876a235c2
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-22 00:22:18 -05:00 |
|
Fermi
|
97fa05f446
|
Merge branch 'master' into tg-Organ-port
|
2019-09-21 14:01:52 +01:00 |
|
Fermi
|
f8dfb1e3aa
|
Okay.
|
2019-09-21 12:45:10 +01:00 |
|
Fermi
|
a3ae942c1d
|
Okay.. I think this fixes it all.
|
2019-09-21 11:13:20 +01:00 |
|
kevinz000
|
313956002b
|
Merge pull request #9269 from Thalpy/FermiGrenades
Re-enables fermichem mechanics for grenades, nuances heat for general handling and enables SDGF/hatmium explosions.
|
2019-09-21 01:46:22 -07:00 |
|
Fermi
|
15d36cbaa1
|
I need to stop leaving .dm files open in dreammaker.
|
2019-09-21 09:37:54 +01:00 |
|
Fermi
|
a08c1229d6
|
OKAY now I'm done I think.
|
2019-09-21 09:31:53 +01:00 |
|
Fermi
|
4b44b31aa3
|
Okay, feature done
|
2019-09-21 08:24:46 +01:00 |
|
Fermi
|
a8747449c2
|
All good
|
2019-09-20 21:50:04 +01:00 |
|
Fermi
|
d12fd72ebf
|
Updates a buncha stuff.
|
2019-09-20 21:11:20 +01:00 |
|
Fermi
|
9b2f67d67d
|
reagent_flags is used elsewhere, renamed to chemical_flags
|
2019-09-20 19:43:37 +01:00 |
|
Fermi
|
3f2933adbf
|
Ghommies' requests.
|
2019-09-19 23:31:36 +01:00 |
|