Commit Graph
19353 Commits
Author SHA1 Message Date
kevinz000andGitHub 13df3dbb05 Merge pull request #10867 from Ghommie/Ghommie-cit551
Further buff and fix to the clown ops' tearstache grenade.
2020-02-04 03:55:22 -07:00
kevinz000 8db3fbdf88 modularize out taser rework 2020-02-04 03:49:09 -07:00
kevinz000 8556a6188f Merge remote-tracking branch 'citadel/master' into small_guncode_refactor 2020-02-04 03:47:01 -07:00
kevinz000andGitHub aa129b9539 Update species.dm 2020-02-04 03:46:13 -07:00
kevinz000andGitHub 275b1f73e0 Merge pull request #10849 from Ghommie/Ghommie-cit547
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-04 03:39:14 -07:00
kevinz000andGitHub 66fc2e77f0 Merge pull request #10865 from Ghommie/Ghommie-cit550
Demodularizes and nerfs magnetic rifles/pistols with power cell requirements.
2020-02-04 03:35:33 -07:00
kevinz000andGitHub be09322f8e Merge pull request #10882 from Citadel-Station-13/Ghommie-patch-8
Fixes "2048" subtle emotes.
2020-02-04 03:34:52 -07:00
kevinz000andGitHub f5cd0cf48f Merge pull request #10872 from Arturlang/reflective_ornot
Makes shield no longer block energy projectiles and be destroyed when damaged too much.
2020-02-04 03:34:16 -07:00
kevinz000andGitHub ab696ac50a Merge pull request #10847 from Citadel-Station-13/Ghommie-patch-2
Fixes Space Ninja "Nothing" Objective.
2020-02-04 03:33:55 -07:00
kevinz000andGitHub b34d6cba0c Merge pull request #10864 from Citadel-Station-13/Ghommie-patch-1
Hello subtler roleplayers, I see you.
2020-02-04 03:33:14 -07:00
kevinz000andGitHub d5a44097a3 Merge pull request #10862 from Hatterhat/boy-i-fucked-up-that-examine
seed extractor examine tweak/fix
2020-02-04 03:32:57 -07:00
kevinz000andGitHub 8f83e8c107 Merge pull request #10860 from deathride58/combatmodeclickdrag
Makes quick item usage (click-dragging unequipped item) require combat mode
2020-02-04 03:32:39 -07:00
Artur 0452286468 Fixes no thrall bloodcost 2020-02-04 11:21:47 +01:00
kevinz000andGitHub 97583bd98f Merge pull request #10853 from Ghommie/Ghommie-cit549
A PR about runtime errors
2020-02-04 03:20:34 -07:00
Artur 4bd916d08a Adds the initial crafting UI stuff. 2020-02-04 10:28:53 +01:00
Seris02 49f80d52a8 bug fixes 2020-02-04 17:18:45 +08:00
GhomandGitHub d451115bf1 Merge pull request #10854 from Seris02/meteoralertchange
Makes a proc for meteor string gen
2020-02-04 08:15:32 +01:00
Ghommie a0caada859 runtime drifting 2020-02-04 08:05:27 +01:00
GhomandGitHub dd4e1d8f57 Update flowers.dm 2020-02-04 06:57:07 +01:00
GhomandGitHub 4e4b0d718a Update mushrooms.dm 2020-02-04 06:52:54 +01:00
GhomandGitHub dcb3447c12 Update misc.dm 2020-02-04 06:51:50 +01:00
Ghommie b6509d25e6 Ports "Cleans up plante gene mutability." 2020-02-04 06:34:42 +01:00
Seris02andGitHub 0e13afc10f yeet 2020-02-04 13:25:14 +08:00
Seris02andGitHub 8f70bd304d yee 2020-02-04 13:24:30 +08:00
GhomandGitHub cc3955ecc7 Fixes pitch black characters 2020-02-04 06:04:43 +01:00
GhomandGitHub bb3505c184 Merge pull request #10852 from MrJWhit/Comments-out-meteor-defense-tech-node
Comments out meteor defense tech node
2020-02-04 05:26:25 +01:00
GhomandGitHub 33ef9b4619 Update all_nodes.dm 2020-02-04 05:15:52 +01:00
GhomandGitHub 6a88e37ff2 Merge pull request #10801 from Seris02/risingbasschanges
changes to rising bass
2020-02-04 05:14:07 +01:00
Ghommie 26d8d9387a ok 2020-02-04 05:06:59 +01:00
Ghommie 0eb5aa0a2a Removing a couple troublesome NSFW unused prefs. 2020-02-04 04:58:09 +01:00
GhomandGitHub 6de00c21f0 Update dna_console.dm 2020-02-04 04:11:21 +01:00
ancientpower 5aecdb6a4d initial commit 2020-02-03 20:10:39 -06:00
GhomandGitHub b898be92f3 Update say_vr.dm 2020-02-04 02:36:46 +01:00
kevinz000andGitHub 54d70cd9fe Update gun.dm 2020-02-03 18:33:24 -07:00
Ghommie 89466de29e Good catch linter. 2020-02-04 02:30:14 +01:00
Ghommie 0f708cb856 pAI shenanigeans 2020-02-04 02:26:42 +01:00
Ghommie 7723450d11 welp. 2020-02-04 02:21:23 +01:00
Ghommie d13d8dd953 Less hacky. 2020-02-04 02:13:11 +01:00
Ghommie 63c8612ccd Refactoring mob holders into an element. 2020-02-04 01:42:59 +01:00
kevinz000andGitHub 24b2bb06bf Update mecha_equipment.dm 2020-02-03 13:17:50 -07:00
kevinz000 8910efadfa Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit 2020-02-03 13:07:49 -07:00
GhomandGitHub 5df6566f01 Update clown_weapons.dm 2020-02-03 20:44:58 +01:00
GhomandGitHub 40f7a72e3c Update slippery.dm 2020-02-03 20:32:50 +01:00
GhomandGitHub 3cb1a0e9c8 Update slippery.dm 2020-02-03 20:31:57 +01:00
ancientpower be0695e146 bunny ear style 2020-02-03 12:05:00 -06:00
GhomandGitHub 73d865d0f3 Fixes the petting element. 2020-02-03 18:42:22 +01:00
Putnam aabd0b9e79 fixing quirk removal (whoops) 2020-02-03 08:18:49 -08:00
Putnam e4e5b651e6 making permassassin scale with dynamic 2020-02-03 08:11:03 -08:00
Putnam 88ce25a09b hopefully fixing the once-assassin 2020-02-03 08:10:45 -08:00
Putnam 72c1f60af7 and now the voting works 2020-02-03 08:10:34 -08:00