Commit Graph

19036 Commits

Author SHA1 Message Date
Hatterhat
f100b6c5e4 multitools in basic tools, dumb headers 2020-02-05 19:47:20 -06:00
Hatterhat
6efe0dc273 haha what if i made everything interfacable 2020-02-04 18:55:19 -06:00
Hatterhat
385aea3d14 rcd ammo to indeng, typo 2020-02-04 18:50:09 -06:00
Lin
66638a39b7 Merge pull request #10851 from Citadel-Station-13/Ghommie-patch-3
Fixing little blood bank gnerator examine runtime error.
2020-02-04 20:36:28 +00:00
Lin
e8ea16c3f2 Merge pull request #10874 from Citadel-Station-13/Ghommie-patch-6
Fixes the petting element.
2020-02-04 20:34:59 +00:00
Ghom
c24ffa8f1c Merge pull request #10840 from Putnam3145/easier_bunker
Save panic bunker between rounds
2020-02-04 21:15:37 +01:00
kevinz000
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
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
kevinz000
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
kevinz000
be09322f8e Merge pull request #10882 from Citadel-Station-13/Ghommie-patch-8
Fixes "2048" subtle emotes.
2020-02-04 03:34:52 -07:00
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
97583bd98f Merge pull request #10853 from Ghommie/Ghommie-cit549
A PR about runtime errors
2020-02-04 03:20:34 -07:00
Ghom
d451115bf1 Merge pull request #10854 from Seris02/meteoralertchange
Makes a proc for meteor string gen
2020-02-04 08:15:32 +01:00
Seris02
0e13afc10f yeet 2020-02-04 13:25:14 +08:00
Seris02
8f70bd304d yee 2020-02-04 13:24:30 +08:00
Ghom
cc3955ecc7 Fixes pitch black characters 2020-02-04 06:04:43 +01:00
Ghom
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
Ghom
33ef9b4619 Update all_nodes.dm 2020-02-04 05:15:52 +01:00
Ghom
6a88e37ff2 Merge pull request #10801 from Seris02/risingbasschanges
changes to rising bass
2020-02-04 05:14:07 +01:00
Ghom
6de00c21f0 Update dna_console.dm 2020-02-04 04:11:21 +01:00
Ghom
b898be92f3 Update say_vr.dm 2020-02-04 02:36:46 +01:00
Ghom
5df6566f01 Update clown_weapons.dm 2020-02-03 20:44:58 +01:00
Ghom
40f7a72e3c Update slippery.dm 2020-02-03 20:32:50 +01:00
Ghom
3cb1a0e9c8 Update slippery.dm 2020-02-03 20:31:57 +01:00
Ghom
73d865d0f3 Fixes the petting element. 2020-02-03 18:42:22 +01:00
Putnam
bc52b99758 ok putnam 2020-02-03 03:27:06 -08:00
Putnam
82fbef9920 Made it real time, added to config 2020-02-03 03:13:19 -08:00
Artur
5bf1ebaa53 Initial Commit 2020-02-03 12:01:17 +01:00
Ghom
d5166322dc I can't believe I have done this. 2020-02-03 08:23:20 +01:00
Ghommie
84d9430ee4 PC too slow for compile. 2020-02-03 07:21:39 +01:00
Ghommie
0428b05cff Oh snap 2020-02-03 07:20:16 +01:00
Ghommie
81b5fe2de3 Further buff and fix for clown ops tearstache nade. 2020-02-03 07:08:47 +01:00
Ghommie
a365f3b499 Demodularize and nerfs mag rifles with re(?)added power cell requirements. 2020-02-03 05:16:32 +01:00
kevinz000
2393dc26eb Merge pull request #10779 from Ghommie/Ghommie-cit538
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
2020-02-02 16:31:59 -07:00
Ghom
aa41815119 Update logging.dm 2020-02-03 00:31:53 +01:00
kevinz000
c24c83c1bd Merge pull request #10835 from Ghommie/Ghommie-cit546
Something about runtime errors.
2020-02-02 16:31:15 -07:00
kevinz000
341430eab5 Merge pull request #10836 from Hatterhat/rcd-carts-engifab
adding stuff to techfabs - RCD carts, combifans
2020-02-02 16:30:59 -07:00
Ghom
f1e3261566 Update _logging.dm 2020-02-02 23:26:03 +01:00
Ghom
ff0f9b5de8 Update say_vr.dm 2020-02-02 23:24:02 +01:00
Ghom
d4aa410af0 Update atoms.dm 2020-02-02 23:18:30 +01:00
Hatterhat
ca8e40caea i mean its a stupid multiplier regardless
thanks ghom

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-02-02 14:33:45 -06:00
Hatterhat
9190b69ba3 double whoops 2020-02-02 13:40:23 -06:00
Hatterhat
5dc971f8e8 whoops 2020-02-02 13:20:43 -06:00
deathride58
10c95fa111 Makes quick item usage (click-dragging unequipped item) require combat mode to be enabled 2020-02-02 13:38:32 -05:00
Ghom
6f66d76680 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
Cleanup/Partial revert of RGB blood ""rework""
2020-02-02 19:08:57 +01:00
Ghom
97be223b0b Merge pull request #10799 from Seris02/goldentoolboxfix
makes the golden ""plastitanium"" toolbox actually plastitanium
2020-02-02 19:08:16 +01:00