 Fermi
|
8f6c988536
|
Explod
|
2019-10-11 18:17:43 +01:00 |
|
|
Fermi
|
8e71a20528
|
Oops
|
2019-10-11 18:16:25 +01:00 |
|
|
Fermi
|
ae46b2932e
|
Bath is ready to go.
|
2019-10-11 18:15:46 +01:00 |
|
|
Fermi
|
3009f8b2cc
|
Meow
|
2019-10-11 17:56:24 +01:00 |
|
|
Fermi
|
d21f7f9a9b
|
Jacq fix
|
2019-10-11 15:26:39 +01:00 |
|
|
Fermi
|
349b5f4369
|
GRUMBLING INTENSIFIES
|
2019-10-11 14:36:35 +01:00 |
|
|
Fermi
|
3ae8581d96
|
HOPE
|
2019-10-11 14:34:40 +01:00 |
|
|
Thalpy
|
41946dd9cf
|
Updates icons
|
2019-10-10 09:27:15 +01:00 |
|
|
Thalpy
|
348f6a4db4
|
Fixes Icons
|
2019-10-10 07:36:44 +01:00 |
|
|
Thalpy
|
eaa84418c9
|
Fixes compile errors
|
2019-10-10 07:17:22 +01:00 |
|
|
Fermi
|
8f9622cbe2
|
Well lets try it
|
2019-10-09 18:01:09 +01:00 |
|
|
Fermi
|
53e8d64388
|
Ah I see now
|
2019-10-09 17:51:14 +01:00 |
|
|
Fermi
|
746a656c27
|
Merge branch 'master' into Spookytime
|
2019-10-09 16:44:39 +01:00 |
|
|
Fermi
|
35fe28ce43
|
oof
|
2019-10-09 16:40:55 +01:00 |
|
|
Fermi
|
8a7f27803c
|
Maybe
|
2019-10-09 16:40:01 +01:00 |
|
|
Fermi
|
c4ac815598
|
Oof
|
2019-10-09 16:35:20 +01:00 |
|
|
Fermi
|
3eea5310c9
|
Ugh
|
2019-10-09 16:32:55 +01:00 |
|
|
Fermi
|
b023671db4
|
Damnit Jaqc
|
2019-10-09 16:22:09 +01:00 |
|
|
Fermi
|
146e0aae29
|
Crashes make me sad
|
2019-10-09 15:03:04 +01:00 |
|
|
Fermi
|
b34f648e60
|
Adds landmarks.
|
2019-10-09 13:57:19 +01:00 |
|
|
Fermi
|
b19c078447
|
Restructuring.
|
2019-10-09 12:09:41 +01:00 |
|
|
Fermi
|
1dce18962d
|
Jaqc complete.
|
2019-10-09 11:58:36 +01:00 |
|
|
Fermi
|
9071826e70
|
I can't focus
|
2019-10-09 08:34:16 +01:00 |
|
|
Fermi
|
10ce91c686
|
aaa
|
2019-10-08 13:45:16 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|