Thalpy
|
9bb045b60a
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-10-08 13:10:35 +01:00 |
|
kevinz000
|
922e9849bd
|
Merge pull request #9391 from GrayRachnid/rebalancesk9borgs
Rebalances k9borg pounce/bite around the secborg's baton.
|
2019-10-08 00:36:26 -07: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 |
|
nik707
|
de117afd8b
|
Merge pull request #9410 from Poojawa/cryopod-tweaks
Fixes Cryopod quirks, makes the menu not complete shit
|
2019-10-07 18:24:38 -05:00 |
|
nik707
|
6803338df2
|
Merge pull request #9384 from jakeramsay007/Moar-Bugfixes
Fixes the Trek uniform/suit sprites
|
2019-10-07 18:19:59 -05:00 |
|
Thalpy
|
27c2c89766
|
Merge branch 'master' into Reagents_bitflats
|
2019-10-05 23:43:19 +01:00 |
|
Thalpy
|
5f5c719326
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-10-05 23:40:26 +01:00 |
|
kevinz000
|
356755d710
|
Merge pull request #9405 from Thalpy/SPPEEEEDDDDDMERGE
[SPPEEEEDDDDDMERGE] Fixes buffers not doing stuff because oops
|
2019-10-05 08:26:40 -07:00 |
|
Poojawa
|
0716b48a99
|
unmodularize it
|
2019-10-04 06:56:57 -05:00 |
|
kevinz000
|
828fe6e555
|
Merge pull request #9385 from Sishen1542/hypereut
fixing divine lightblade (chaplain hypereut) having energy reflect
|
2019-10-03 23:15:29 -07:00 |
|
Fermi
|
2abd15c7e7
|
Incase someone speedmerges
|
2019-10-04 04:48:34 +01:00 |
|
GrayRachnid
|
7d579e6a0f
|
Removed cell charge on bite.
|
2019-10-03 23:33:38 -04:00 |
|
GrayRachnid
|
211e7a2c60
|
removes charge from small jaws. Reduces big jaws charge to 250. Adds a thingy so they don't run out. removes misleading comments.
|
2019-10-03 23:05:38 -04: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 |
|
Fermi
|
9d0aeeee53
|
Strange.
|
2019-10-04 01:50:40 +01:00 |
|
Fermi
|
6fa4b3bb2e
|
Compiles
|
2019-10-04 01:28:14 +01:00 |
|
Fermi
|
76d194d9d8
|
Uh?
|
2019-10-04 00:15:12 +01:00 |
|
Jay
|
70cbd8c1ca
|
fixes bad icon path
|
2019-10-02 22:11:42 -05:00 |
|
GrayRachnid
|
ad9ddcb6da
|
Reduces cell charge to 750, spoolup time to 1 and reduces self-stun if missed.
|
2019-10-02 19:30:23 -04:00 |
|
GrayRachnid
|
e24c2ac249
|
Rebalances dogborg pounce/bite around the secborg's harmbaton.
|
2019-10-02 14:56:32 -04:00 |
|
Fermi
|
c7a3651d5e
|
Merge branch 'FERMICHEMCurTweaks' of https://github.com/Thalpy/Citadel-Station-13 into FERMICHEMCurTweaks
|
2019-10-02 19:42:35 +01:00 |
|
Fermi
|
7d6d2b6e8d
|
Stops mech murder
|
2019-10-02 19:42:21 +01:00 |
|
Sishen
|
8b766130f8
|
Update eutactic_blades.dm
|
2019-10-02 12:48:17 -04:00 |
|
Chayse Ramsay
|
68ca8a5ac0
|
whoops
|
2019-10-02 11:55:38 +01:00 |
|
Sishen
|
a2a6fa17fe
|
Update eutactic_blades.dm
|
2019-10-01 23:33:14 -04:00 |
|
Thalpy
|
bfee1c13ff
|
Bhijin's requests.
|
2019-10-01 20:58:31 +01:00 |
|
Fermi
|
05d292afc8
|
Yeah
|
2019-10-01 08:28:37 +01:00 |
|
Fermi
|
6a420d6c6f
|
Merge branch 'FERMICHEMCurTweaks' of https://github.com/Thalpy/Citadel-Station-13 into FERMICHEMCurTweaks
|
2019-10-01 08:24:36 +01:00 |
|
Fermi
|
a4d1eba3b3
|
Boosts nantites
|
2019-10-01 08:24:18 +01:00 |
|
Thalpy
|
cf8db59649
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-10-01 08:20:16 +01:00 |
|
Fermi
|
89f3a01bc0
|
Merge branch 'master' into tg-Organ-port
|
2019-10-01 06:17:58 +01:00 |
|
Jay
|
e0b8d28386
|
donator item
|
2019-09-30 22:16:27 -05:00 |
|
kevinz000
|
8d9520ee58
|
Merge pull request #9336 from Thalpy/beakerpH_tweaks
Tweaks how beakers melt in response to poll and feedback. Allows syringe/dropper use on beakers in heaters.
|
2019-09-28 00:26:51 -07:00 |
|
kevinz000
|
d7d4e3cbe2
|
Merge pull request #9349 from Ghommie/Ghommie-cit210
Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs.
|
2019-09-28 00:22:38 -07:00 |
|
Fermi
|
f5c5e81e67
|
I thought I removed this in the original PR!
|
2019-09-27 14:16:36 +01:00 |
|
Fermi
|
146219edf9
|
Merge branch 'master' into beakerpH_tweaks
|
2019-09-27 11:50:31 +01:00 |
|
Thalpy
|
1bdb66d5de
|
Okay a few things I just saw
|
2019-09-27 07:28:02 +01:00 |
|
Fermi
|
cc87682c25
|
Fix and eigen tweak.
|
2019-09-26 09:04:06 +01:00 |
|
Fermi
|
60adaa9f1b
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-09-26 08:44:21 +01:00 |
|
Ghommie
|
ee8f1022cc
|
Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs.
|
2019-09-24 02:02:24 +02:00 |
|
Fermi
|
8dcf74d5f0
|
Makes buffers not react with stab agent
|
2019-09-22 12:02:20 +01:00 |
|
Ghommie
|
33c3f0834e
|
Prevents sofas being wielded and thus transformed into normal chairs.
|
2019-09-21 20:01:42 +02: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 |
|
kevinz000
|
3e899e59f9
|
Merge pull request #9283 from Trilbyspaceclone/removal
Removes a lot of unused files
|
2019-09-21 01:45:11 -07:00 |
|
kevinz000
|
f259d98d7a
|
Merge pull request #9282 from Ghommie/Ghommie-cit193
Fixed a few dozen suits' body coverage inconsistencies.
|
2019-09-21 01:43:52 -07:00 |
|