Fermi
|
db416defd6
|
Fixes/updates some chems.
|
2019-10-08 13:08:13 +01:00 |
|
Fermi
|
a9ad80691e
|
Okay this too
|
2019-10-08 12:57:06 +01:00 |
|
Fermi
|
f0e803f056
|
PANIC
|
2019-10-08 12:38:39 +01:00 |
|
Fermi
|
1da86bec1c
|
Kev pls
|
2019-10-08 12:31:01 +01:00 |
|
Fermi
|
bc118d5ead
|
Merge branch 'master' into Updates-holder
|
2019-10-08 12:21:56 +01:00 |
|
Fermi
|
06ad17e539
|
More mild
|
2019-10-08 12:16:33 +01:00 |
|
Fermi
|
b8c87a5f40
|
Spicy
|
2019-10-08 12:05:06 +01:00 |
|
lolman360
|
5cc16011ac
|
paren
|
2019-10-08 20:13:44 +11:00 |
|
lolman360
|
ddb781a144
|
examines
|
2019-10-08 20:09:07 +11:00 |
|
YakumoChen
|
6faa0ee6e9
|
reverts jetpack efficiency
|
2019-10-08 09:03:12 +00:00 |
|
lolman360
|
2709570f01
|
techwebs and stuff i forgot
i am not a 1 commit wonder
|
2019-10-08 20:02:26 +11:00 |
|
lolman360
|
04521551f0
|
one commit wonder
|
2019-10-08 19:46:28 +11:00 |
|
kevinz000
|
fe1a78f413
|
Merge pull request #9421 from Ghommie/Ghommie-cit218
Porting some spraycan fixes and tweaks.
|
2019-10-08 00:34:58 -07:00 |
|
kevinz000
|
abef83f56e
|
Merge pull request #9427 from Ghommie/Ghommie-cit219
Skeleton and zombie tweaks/balance (featuring "makes halloween skeletons not the overpowered pirate ones")
|
2019-10-08 00:34:33 -07:00 |
|
kevinz000
|
8aacedaefa
|
Merge pull request #9316 from Thalpy/Reagents_bitflats
[READY] [FermiChem] Turns reaction vars into bitflags and adds a few new procs related to that.
|
2019-10-08 00:33:21 -07:00 |
|
kevinz000
|
6fc746a5af
|
Merge pull request #9226 from Trilbyspaceclone/unmodular_2
Unmodulars a few things + new sprite + new welder tank(unused
|
2019-10-08 00:30:54 -07:00 |
|
kevinz000
|
3d404b6967
|
Merge pull request #9287 from Thalpy/Wiki
Adds a markdown parse of all chems for use with github wiki to debug menu.
|
2019-10-08 00:30:00 -07:00 |
|
kevinz000
|
26b076c5aa
|
Merge pull request #9314 from Trilbyspaceclone/patch-228
Makes blood gun take 1/4 the blood to use
|
2019-10-08 00:29:41 -07:00 |
|
kevinz000
|
06e312b208
|
Merge pull request #9032 from Ghommie/Ghommie-cit178
Ports plasmaman departmental envirosuits and tweaks.
|
2019-10-08 00:28:06 -07:00 |
|
kevinz000
|
f405cd1be3
|
Merge pull request #8937 from Ghommie/Ghommie-cit153
darkmode/lightmode fixes and tweaks.
|
2019-10-08 00:25:51 -07:00 |
|
kevinz000
|
76ede7a473
|
Merge pull request #9406 from Poojawa/carpet-colors
More Carpet colors and liquid carpet varients
|
2019-10-07 23:39:52 -07:00 |
|
kevinz000
|
dcb37bfd0e
|
Merge pull request #9418 from Ghommie/Ghommie-cit216
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
|
2019-10-07 23:36:11 -07:00 |
|
kevinz000
|
7c94029006
|
Merge pull request #9431 from Ghommie/Ghommie-cit221
Ports "Makes the illegal tech node harder to unlock"
|
2019-10-07 23:35:18 -07:00 |
|
kevinz000
|
d3f29c4084
|
Merge pull request #9413 from Poojawa/sprays-obey-fashion
Makes Medsprays align with patches
|
2019-10-07 23:32:48 -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
|
6803338df2
|
Merge pull request #9384 from jakeramsay007/Moar-Bugfixes
Fixes the Trek uniform/suit sprites
|
2019-10-07 18:19:59 -05:00 |
|
JTGSZ
|
30a41292d8
|
left extra letter in comment
|
2019-10-07 18:02:16 -04:00 |
|
Ghommie
|
fce6f13471
|
Ports "Chat Subsystem ported from TerraGov-Marine-Corps"
|
2019-10-07 23:58:15 +02:00 |
|
JTGSZ
|
7951d87022
|
species clothing restrictions
species clothing restrictions
|
2019-10-07 17:55:16 -04:00 |
|
Linzolle
|
4bdd38b422
|
i feel like this is a really stupid way to fix it
|
2019-10-07 16:17:42 -05:00 |
|
Ghommie
|
99e9280eaf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit178
|
2019-10-07 21:41:04 +02:00 |
|
Poojawa
|
93ad7f1066
|
Corrects a missing tail state
|
2019-10-07 04:30:23 -05:00 |
|
Putnam
|
caf9bc56da
|
Make replacement update icon
|
2019-10-07 01:34:22 -07:00 |
|
Putnam
|
b452de12ff
|
Made PanD.E.M.I.C beaker stuff more like ChemMaster
|
2019-10-07 01:23:17 -07:00 |
|
kevinz000
|
dd46509597
|
Merge pull request #9377 from Thalpy/Fixes_melting_grenades
[Mild urgency] Fixes melting cleaning grenades found in janitor/cargoboxes.
|
2019-10-06 21:37:50 -07:00 |
|
Ghommie
|
8228e52f43
|
Ports "Makes the illegal tech node harder to unlock"
|
2019-10-07 06:19:48 +02:00 |
|
Ghommie
|
7dfd6005d9
|
I hate nerfing things :(
|
2019-10-06 19:24:31 +02:00 |
|
Ghommie
|
a1a3bbe99f
|
Skeleton tweaks (featuring "makes halloween skeletons not the overpowered pirate ones")
|
2019-10-06 19:16:13 +02:00 |
|
Ghommie
|
a9e30720ec
|
key, ckey, key, ckey
|
2019-10-06 18:40:24 +02:00 |
|
Fermi
|
ea031d6d40
|
Slowly getting there
|
2019-10-06 11:09:54 +01:00 |
|
Ghommie
|
f01f00710f
|
Porting some spraycan fixes.
|
2019-10-06 05:30:16 +02:00 |
|
Fermi
|
d023d58b2c
|
Changes
|
2019-10-06 02:10:46 +01:00 |
|
Fermi
|
63647b58ba
|
Merge branch 'Spookytime' of https://github.com/Thalpy/Citadel-Station-13 into Spookytime
|
2019-10-06 00:37:01 +01:00 |
|
Fermi
|
aff7f808ec
|
oops
|
2019-10-06 00:36:57 +01:00 |
|
Thalpy
|
3f21c0af5b
|
Text
|
2019-10-06 00:32:42 +01: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 |
|
Ghommie
|
32a73b24c0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
|
2019-10-05 18:22:43 +02: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 |
|