Commit Graph
29602 Commits
Author SHA1 Message Date
kevinz000 8556a6188f Merge remote-tracking branch 'citadel/master' into small_guncode_refactor 2020-02-04 03:47:01 -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
CitadelStationBot 7924be2534 Automatic changelog generation for PR #10873 [ci skip] 2020-02-04 04:38:34 -06:00
kevinz000andGitHub 55dafaa5db Merge pull request #10873 from Putnam3145/fix-relief-valve-ui
Updated relief valve UI to tgui-next
2020-02-04 03:38:31 -07:00
CitadelStationBot 0367691bf9 Automatic changelog generation for PR #10865 [ci skip] 2020-02-04 04:35:36 -06: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
CitadelStationBot 68589e1294 Automatic changelog generation for PR #10872 [ci skip] 2020-02-04 04:34:19 -06: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
CitadelStationBot 8ed0683975 Automatic changelog generation for PR #10847 [ci skip] 2020-02-04 04:33:58 -06: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
CitadelStationBot f78a75e15c Automatic changelog generation for PR #10862 [ci skip] 2020-02-04 04:33:00 -06: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
CitadelStationBot bea97d94b3 Automatic changelog generation for PR #10860 [ci skip] 2020-02-04 04:32:42 -06: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
kevinz000andGitHub 97583bd98f Merge pull request #10853 from Ghommie/Ghommie-cit549
A PR about runtime errors
2020-02-04 03:20:34 -07:00
CitadelStationBot c458c243a7 Automatic changelog generation for PR #10854 [ci skip] 2020-02-04 01:15:34 -06: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
Seris02andGitHub 0e13afc10f yeet 2020-02-04 13:25:14 +08:00
kevinz000andGitHub 1dfd149ab6 Merge pull request #10887 from Citadel-Station-13/Ghommie-patch-7
Fixes pitch black characters
2020-02-03 22:25:04 -07: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
CitadelStationBot d315110eac Automatic changelog generation for PR #10852 [ci skip] 2020-02-03 22:26:28 -06: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
CitadelStationBot 86e59808f1 Automatic changelog generation for PR #10801 [ci skip] 2020-02-03 22:14:10 -06:00
GhomandGitHub 6a88e37ff2 Merge pull request #10801 from Seris02/risingbasschanges
changes to rising bass
2020-02-04 05:14:07 +01:00
kevinz000andGitHub 3245424356 Merge pull request #10884 from Citadel-Station-13/Ghommie-patch-7
[s] fixing bad nasty endless dna console loop.
2020-02-03 21:02:45 -07:00
GhomandGitHub 6de00c21f0 Update dna_console.dm 2020-02-04 04:11:21 +01:00
GhomandGitHub b898be92f3 Update say_vr.dm 2020-02-04 02:36:46 +01:00
CitadelStationBot 0c57a78851 Automatic changelog generation for PR #10876 [ci skip] 2020-02-03 14:13:13 -06:00
kevinz000andGitHub e9a4d863a8 Merge pull request #10876 from Citadel-Station-13/Ghommie-patch-7
Fixes slipping.
2020-02-03 13:13:10 -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
Artur 5bf1ebaa53 Initial Commit 2020-02-03 12:01:17 +01:00
Putnam 8fa826ba1f Updated relief valve UI to tgui-next 2020-02-03 02:59:18 -08:00
CitadelStationBot 9156156696 Automatic changelog generation for PR #10866 [ci skip] 2020-02-03 01:57:42 -06:00
GhomandGitHub f8a2116d7d Merge pull request #10866 from ancientpower/skintone-match-fix
Fixes genital skintone mismatching
2020-02-03 08:57:39 +01:00
ancientpower b55b375d17 fixes a bug with skintone in character creation 2020-02-02 22:59:36 -06:00
Ghommie a365f3b499 Demodularize and nerfs mag rifles with re(?)added power cell requirements. 2020-02-03 05:16:32 +01:00
kevinz000andGitHub 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
GhomandGitHub aa41815119 Update logging.dm 2020-02-03 00:31:53 +01:00
kevinz000andGitHub c24c83c1bd Merge pull request #10835 from Ghommie/Ghommie-cit546
Something about runtime errors.
2020-02-02 16:31:15 -07:00
CitadelStationBot 497a691da2 Automatic changelog generation for PR #10836 [ci skip] 2020-02-02 17:31:01 -06:00
kevinz000andGitHub 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
GhomandGitHub f1e3261566 Update _logging.dm 2020-02-02 23:26:03 +01:00
GhomandGitHub ff0f9b5de8 Update say_vr.dm 2020-02-02 23:24:02 +01:00
GhomandGitHub d4aa410af0 Update atoms.dm 2020-02-02 23:18:30 +01:00