Commit Graph

1178 Commits

Author SHA1 Message Date
Fermi
6fa4b3bb2e Compiles 2019-10-04 01:28:14 +01:00
Fermi
76d194d9d8 Uh? 2019-10-04 00:15:12 +01: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
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
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
Fermi
8dcf74d5f0 Makes buffers not react with stab agent 2019-09-22 12:02: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
Thalpy
641196b9dd Merge branch 'master' into FERMICHEMCurTweaks 2019-09-19 19:57:57 +01:00
Fermi
08eeda97f5 Heck 2019-09-19 01:45:21 +01:00
TrilbySpaceClone
ef4b5c1b34 gone_reduced_to_atoms 2019-09-12 23:06:46 -04:00
Ghommie
2226bd3b69 More adjustments. 2019-09-13 00:25:52 +02:00
Thalpy
f50e84a20c Merge branch 'master' into NeuroFix 2019-09-11 16:24:00 +01:00
Fermi
b22994e546 Removes MK stuffs 2019-09-10 21:59:24 +01:00
Fermi
4f0afb6e45 50 to 100 2019-09-10 21:36:49 +01:00
Fermi
0a4090d83c Fixes weird message 2019-09-10 21:12:43 +01:00
Thalpy
ce5095321c Merge branch 'master' into FERMICHEMCurTweaks 2019-09-10 20:52:31 +01:00
Fermi
12626c8db2 Okay I dunno why it does what it do but it do. 2019-09-10 20:51:22 +01:00
Fermi
621851790e Damnit hat, don't get too excited now, y'all. 2019-09-10 20:46:38 +01:00
Fermi
443f9e433d Final tweaks 2019-09-10 20:18:45 +01:00
Fermi
f03c9c236d Compile fixes and tweaks. 2019-09-10 18:54:47 +01:00
Fermi
8b20df838d Just testing now. 2019-09-10 18:15:04 +01:00
BlackMajor
0b581a1ded Merge branch 'master' into Doggo-sit 2019-09-10 11:02:57 +12:00
Fermi
033057d380 OOPS 2019-09-08 02:55:40 +01:00
Fermi
d883192cf9 Forgot to save 2019-09-08 02:53:11 +01:00
Fermi
2a98f94b24 Rewrite 2019-09-08 02:52:22 +01:00
Fermi
018ebc32ae All that remains is MK testing. 2019-09-08 02:46:43 +01:00
Fermi
d90b4769f1 MK, SDGF, Astrogen, Eigen, BE, furranium, hattmium tweaks and fixes. 2019-09-05 22:30:53 +01:00
BlackMajor
fbc2d3c8fe Ports dogborg sprites from RP to main
Includes sit sprites, rest style verb, changing where sit sprites update in robot update_icons so that eye layers get cut properly when resting, etc.
2019-09-06 01:23:53 +12:00
Fermi
f1f762ef48 Darnit bobby 2019-09-04 21:45:55 +01:00
Fermi
91cace6812 Merge remote-tracking branch 'upstream/master' into FERMICHEMCurTweaks 2019-09-03 20:33:33 +01:00
Fermi
7890ad08d5 what is this 2019-09-03 20:30:21 +01:00
Fermi
a605d2a776 Todo: finish new words and review langauge 2019-09-03 20:16:41 +01:00
nik707
dd7907c3d7 Merge pull request #9057 from EgoSumStultus/male-AI-vox
Adds the Male AI vox voice.
2019-09-02 18:27:03 -05:00
Fermi
77eef5de6f Heat plays a component now. 2019-08-30 20:42:22 +01:00
nik707
dfdbb23d99 Merge pull request #9178 from deathride58/polyfix
fixes the poly tgs command not working at all
2019-08-29 19:45:11 -05:00
nik707
bfd17d66cd Merge pull request #9074 from Citadel-Station-13/donator_grouping
Donator grouping system
2019-08-29 18:31:23 -05:00
Fermi
124d8503dc Tests and fixes. 2019-08-29 00:12:16 +01:00
Ghommie
24fe7126c4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-08-24 19:05:51 +02:00
deathride58
1376791e7a fixes the poly tgs command not working at all 2019-08-22 20:13:56 -04:00
Poojawa
a0308a2760 Enables Poly phrases on tgs commands 2019-08-18 08:29:28 -05:00
kevinz000
9071917e72 Merge pull request #9088 from Poojawa/blurry-runtimes
Fixes some runtimes and removes a holodeck exploit
2019-08-16 17:05:21 -07:00
kevinz000
ce62780ba0 Merge pull request #9095 from fludd12/snowflake-b-gone
Un-snowflakes My Custom Item
2019-08-16 17:04:45 -07:00