Ghommie
|
5dc1de1d04
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-05 04:34:54 +01:00 |
|
CitadelStationBot
|
038f78bbcd
|
Automatic changelog generation for PR #10893 [ci skip]
|
2020-02-04 17:04:24 -06:00 |
|
Ghom
|
642a8c4217
|
Merge pull request #10893 from Arturlang/TGUI_Next_Crafting
[READY]TGUI Next Crafting
|
2020-02-05 00:04:21 +01: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 |
|
CitadelStationBot
|
dbe144f961
|
Automatic changelog generation for PR #10874 [ci skip]
|
2020-02-04 14:35:02 -06: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 |
|
CitadelStationBot
|
5e1cbd7174
|
Automatic changelog generation for PR #10840 [ci skip]
|
2020-02-04 14:15:40 -06:00 |
|
Ghom
|
c24ffa8f1c
|
Merge pull request #10840 from Putnam3145/easier_bunker
Save panic bunker between rounds
|
2020-02-04 21:15:37 +01:00 |
|
Artur
|
72f4df82b6
|
Recompile for tgui next
|
2020-02-04 13:11:55 +01:00 |
|
Artur
|
614a44ea18
|
Merge remote-tracking branch 'upstream/master' into TGUI_Next_Crafting
|
2020-02-04 13:11:02 +01:00 |
|
Artur
|
ed60724a8e
|
Whoops
|
2020-02-04 12:13:14 +01:00 |
|
Artur
|
0391513220
|
Works now
|
2020-02-04 12:05:15 +01:00 |
|
CitadelStationBot
|
8e44f98a83
|
Automatic changelog generation for PR #10867 [ci skip]
|
2020-02-04 04:55:24 -06: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 |
|
CitadelStationBot
|
7924be2534
|
Automatic changelog generation for PR #10873 [ci skip]
|
2020-02-04 04:38:34 -06:00 |
|
kevinz000
|
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 |
|
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 |
|
CitadelStationBot
|
68589e1294
|
Automatic changelog generation for PR #10872 [ci skip]
|
2020-02-04 04:34:19 -06: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 |
|
CitadelStationBot
|
8ed0683975
|
Automatic changelog generation for PR #10847 [ci skip]
|
2020-02-04 04:33:58 -06: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 |
|
CitadelStationBot
|
f78a75e15c
|
Automatic changelog generation for PR #10862 [ci skip]
|
2020-02-04 04:33:00 -06: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 |
|
CitadelStationBot
|
bea97d94b3
|
Automatic changelog generation for PR #10860 [ci skip]
|
2020-02-04 04:32:42 -06: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 |
|
Artur
|
4bd916d08a
|
Adds the initial crafting UI stuff.
|
2020-02-04 10:28:53 +01:00 |
|
CitadelStationBot
|
c458c243a7
|
Automatic changelog generation for PR #10854 [ci skip]
|
2020-02-04 01:15:34 -06: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 |
|
kevinz000
|
1dfd149ab6
|
Merge pull request #10887 from Citadel-Station-13/Ghommie-patch-7
Fixes pitch black characters
|
2020-02-03 22:25:04 -07: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 |
|
CitadelStationBot
|
d315110eac
|
Automatic changelog generation for PR #10852 [ci skip]
|
2020-02-03 22:26:28 -06: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 |
|
CitadelStationBot
|
86e59808f1
|
Automatic changelog generation for PR #10801 [ci skip]
|
2020-02-03 22:14:10 -06:00 |
|
Ghom
|
6a88e37ff2
|
Merge pull request #10801 from Seris02/risingbasschanges
changes to rising bass
|
2020-02-04 05:14:07 +01:00 |
|
kevinz000
|
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 |
|
Ghom
|
6de00c21f0
|
Update dna_console.dm
|
2020-02-04 04:11:21 +01:00 |
|
Ghommie
|
a726f09201
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-04 03:54:52 +01:00 |
|
Ghom
|
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 |
|
kevinz000
|
e9a4d863a8
|
Merge pull request #10876 from Citadel-Station-13/Ghommie-patch-7
Fixes slipping.
|
2020-02-03 13:13:10 -07: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 |
|