Fermi
|
cd47412db2
|
Merge branch 'master' into Spookytime
|
2019-10-11 19:10:48 +01:00 |
|
Fermi
|
bfd97a82ca
|
Eh 4 mins.
|
2019-10-11 18:56:33 +01:00 |
|
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 |
|
Ghommie
|
e734b36ee3
|
quickfixes lowpop nuclear war tc malus calculation.
|
2019-10-10 20:54:19 +02:00 |
|
kevinz000
|
3e6415d4b5
|
Merge pull request #9324 from Linzolle/crusher
Ports "Adds toggleable light and blinking charging light to crusher" and "Lets the kinetic crusher be one-hand carried"
|
2019-10-10 02:23:15 -07:00 |
|
kevinz000
|
0f74a735cb
|
Merge pull request #9412 from Ghommie/Ghommie-cit213
Ports "Makes supermatter melt walls if it finds itself in one"
|
2019-10-10 02:21:32 -07:00 |
|
kevinz000
|
d9ff4235eb
|
Merge pull request #9447 from Ghommie/Ghommie-cit223
No digitigrade plasmaman suits sprites for the time being, thank you.
|
2019-10-10 02:20:45 -07:00 |
|
kevinz000
|
fda64df569
|
Merge pull request #9257 from Thalpy/Blind-quirk-without-anger
[READY] Blind quirk without anger
|
2019-10-10 02:19:17 -07:00 |
|
kevinz000
|
89747a3a6e
|
Merge pull request #9368 from Seris02/master
Fixes luminescent dark blue major effect and changes the "autoprocess" button to "autoclone"
|
2019-10-10 02:18:25 -07:00 |
|
kevinz000
|
6e029c3360
|
Merge pull request #9415 from Ghommie/Ghommie-cit214
Removes the minimum player cap for the war ops in favour or a more proportional telecrystal bonus.
|
2019-10-10 02:13:25 -07:00 |
|
kevinz000
|
fb028b7997
|
Merge pull request #9432 from Putnam3145/pandemic-qol
Made PanD.E.M.I.C beaker stuff more like ChemMaster
|
2019-10-10 02:12:41 -07:00 |
|
kevinz000
|
f791b399a0
|
Merge pull request #9446 from Sishen1542/ung
abscond can no longer be cast from inside a locker
|
2019-10-10 02:11:17 -07:00 |
|
kevinz000
|
c4f8956985
|
Merge pull request #9433 from Poojawa/hoss-tails
Corrects a missing tail state
|
2019-10-10 02:10:31 -07:00 |
|
kevinz000
|
f686ea75d3
|
Merge pull request #8615 from Ghommie/Ghommie-cit45
Virtual reality componentization.
|
2019-10-10 02:09:51 -07:00 |
|
kevinz000
|
0c9a065096
|
Merge pull request #8401 from Ghommie/Ghommie-cit11
Refactoring Implants' loc n°3
|
2019-10-10 02:09:37 -07: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 |
|
Ghommie
|
2ac24b2ac6
|
Fixing head rev blebs
|
2019-10-09 18:18:49 +02: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 |
|
Ghommie
|
50ad5f269b
|
unrandomizes mind names.
|
2019-10-09 01:30:31 +02: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 |
|
Poojawa
|
cbefe95ade
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into hoss-tails
|
2019-10-08 13:50:29 -05:00 |
|
Sishen1542
|
14823d3452
|
Update code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-10-08 14:05:39 -04:00 |
|
Ghommie
|
c4a8b80851
|
No digitigrade plasmaman suits spriting, thank you.
|
2019-10-08 18:43:40 +02:00 |
|
Sishen
|
5df84d6ab5
|
Update scripture_drivers.dm
|
2019-10-08 11:36:38 -04: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 |
|