Commit Graph

10561 Commits

Author SHA1 Message Date
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
Thalpy 8909b0f6c3 Merge branch 'master' into Updates-holder 2019-10-09 09:01:09 +01:00
Fermi 9071826e70 I can't focus 2019-10-09 08:34:16 +01:00
Fermi 89d3a0534c Tweaker 2019-10-09 07:53:20 +01:00
Ghommie ac0b3629f1 roundstart quitters 2019-10-09 07:53:59 +02:00
Fermi ad0f34cdf8 Tweaks wiki a lil 2019-10-09 06:04:06 +01:00
Ghommie b4e975ef75 mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes. 2019-10-09 06:51:07 +02:00
Fermi f5bc825ef0 Merge branch 'Wiki-fermi' into Updates-holder 2019-10-09 05:35:05 +01:00
lolman360 c694cb8652 h 2019-10-09 13:35:23 +11: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
Trilbyspaceclone 1ccf95462a Update costumes_toys.dm 2019-10-08 19:07:02 -04:00
Trilbyspaceclone 0a878c17bc readds carpet 2019-10-08 18:51:58 -04:00
Trilbyspaceclone e4a2c21b8c Merge branch 'master' into Cargo_rebalance 2019-10-08 18:49:38 -04:00
Ghommie 9c3e532be7 Fixes lack of arguments on mobs' can_equip. 2019-10-09 00:21:55 +02:00
JTGSZ 2cd7f8f8ce More control over species based offsets 2019-10-08 17:03:51 -04:00
Poojawa 26e35376d6 ok 2019-10-08 15:15:56 -05:00
Poojawa c7f52fa292 Update other_reagents.dm 2019-10-08 14:29:22 -05:00
MrJWhit 2629402fa4 Makes zombie smell through their eyes
Gives zombie eyes the SEE_MOBS flag, the same as xenos, to let them "smell" living flesh.
2019-10-08 14:53:00 -04:00
Poojawa 17090d9aff Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 13:51:02 -05: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 9ee1987dec Applying kevinz' ominous warning suggestion 2019-10-08 20:04:08 +02: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 b397c4868f Theres a bit more limits now 2019-10-08 13:23:35 +01:00
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
Poojawa d7ab97dffc does some of the television's demands 2019-10-08 04:02:20 -05:00
lolman360 04521551f0 one commit wonder 2019-10-08 19:46:28 +11:00
Poojawa 3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05: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